Revert "Merge branch 'dev' into rel/2.0.0"

This reverts commit 8ff9ef7, reversing
changes made to c02d701.

Author: pranavkm

NuGet.config

@@ -2,8 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
-    <add key="Roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
+    <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-release/api/v3/index.json" />
     <add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>

appveyor.yml

@@ -1,4 +1,4 @@
-init:
+init:
   - git config --global core.autocrlf true
 branches:
   only:
@@ -10,10 +10,6 @@ branches:
 build_script:
   - ps: .\build.ps1
 clone_depth: 1
-environment:
-  global:
-    DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-    DOTNET_CLI_TELEMETRY_OPTOUT: 1
 test: off
 deploy: off
 os: Visual Studio 2017 Preview

build.ps1

@@ -33,7 +33,7 @@ cd $PSScriptRoot
 $repoFolder = $PSScriptRoot
 $env:REPO_FOLDER = $repoFolder
 
-$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
+$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0.zip"
 if ($env:KOREBUILD_ZIP)
 {
     $koreBuildZip=$env:KOREBUILD_ZIP

build.sh

@@ -2,7 +2,7 @@
 repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $repoFolder
 
-koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
+koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0.zip"
 if [ ! -z $KOREBUILD_ZIP ]; then
     koreBuildZip=$KOREBUILD_ZIP
 fi

build/common.props

@@ -12,9 +12,6 @@
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
     <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-
-    <!-- Generate full pdbs for desktop targeting projects on platforms that support generating full pdbs. -->
-    <DebugType Condition="'$(OS)'=='Windows_NT' AND '$(TargetFramework)'=='net46'">full</DebugType>
   </PropertyGroup>
 
   <ItemGroup>

build/dependencies.props

@@ -12,7 +12,7 @@
     <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
     <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
     <RoslynVersion>2.3.1</RoslynVersion>
-    <RoslynDevVersion>2.3.0-beta4-*</RoslynDevVersion>
+    <RoslynDevVersion>2.6.0-beta*</RoslynDevVersion>
     <StreamJsonRpcVersion>1.1.92</StreamJsonRpcVersion>
     <TestSdkVersion>15.3.0-*</TestSdkVersion>
 

src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorExtensions.cs

@@ -29,10 +29,10 @@ public static void Register(IRazorEngineBuilder builder)
             builder.Features.Add(new ViewComponentTagHelperPass());
             builder.Features.Add(new RazorPageDocumentClassifierPass());
             builder.Features.Add(new MvcViewDocumentClassifierPass());
+            builder.Features.Add(new AssemblyAttributeInjectionPass());
 
             if (!builder.DesignTime)
             {
-                builder.Features.Add(new AssemblyAttributeInjectionPass());
                 builder.Features.Add(new InstrumentationPass());
             }
         }

src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperDescriptorProvider.cs

@@ -55,12 +55,7 @@ public void Execute(TagHelperDescriptorProviderContext context)
             var factory = new ViewComponentTagHelperDescriptorFactory(compilation);
             for (var i = 0; i < types.Count; i++)
             {
-                var descriptor = factory.CreateDescriptor(types[i]);
-
-                if (descriptor != null)
-                {
-                    context.Results.Add(descriptor);
-                }
+                context.Results.Add(factory.CreateDescriptor(types[i]));
             }
         }
 

src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenEditHandler.cs

@@ -13,7 +13,7 @@ public DirectiveTokenEditHandler(Func<string, IEnumerable<ISymbol>> tokenizer) :
         {
         }
 
-        protected override PartialParseResultInternal CanAcceptChange(Span target, SourceChange change)
+        protected override PartialParseResult CanAcceptChange(Span target, SourceChange change)
         {
             if (AcceptedCharacters == AcceptedCharactersInternal.NonWhiteSpace)
             {
@@ -25,11 +25,11 @@ protected override PartialParseResultInternal CanAcceptChange(Span target, Sourc
                     // Did not modify whitespace, directive format should be the same.
                     // Return provisional so extensible IR/code gen pieces can see the full directive text
                     // once the user stops editing the document.
-                    return PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional;
+                    return PartialParseResult.Accepted | PartialParseResult.Provisional;
                 }
             }
 
-            return PartialParseResultInternal.Rejected;
+            return PartialParseResult.Rejected;
 
         }
 

src/Microsoft.AspNetCore.Razor.Language/Legacy/AutoCompleteEditHandler.cs

@@ -31,16 +31,16 @@ public AutoCompleteEditHandler(Func<string, IEnumerable<ISymbol>> tokenizer, Acc
 
         public string AutoCompleteString { get; set; }
 
-        protected override PartialParseResultInternal CanAcceptChange(Span target, SourceChange change)
+        protected override PartialParseResult CanAcceptChange(Span target, SourceChange change)
         {
             if (((AutoCompleteAtEndOfSpan && IsAtEndOfSpan(target, change)) || IsAtEndOfFirstLine(target, change)) &&
                 change.IsInsert &&
                 ParserHelpers.IsNewLine(change.NewText) &&
                 AutoCompleteString != null)
             {
-                return PartialParseResultInternal.Rejected | PartialParseResultInternal.AutoCompleteBlock;
+                return PartialParseResult.Rejected | PartialParseResult.AutoCompleteBlock;
             }
-            return PartialParseResultInternal.Rejected;
+            return PartialParseResult.Rejected;
         }
 
         public override string ToString()