[release/3.0] Update dependencies from aspnet/Extensions (dotnet/aspnetcore-tooling#1132)

* Update dependencies from https://github.com/aspnet/Extensions build 20190913.2

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc2.19463.2
- Microsoft.AspNetCore.Testing - 3.0.0-rc2.19463.2
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc2.19463.2
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc2.19463.2
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-rc2.19463.2
- Microsoft.Extensions.Logging - 3.0.0-rc2.19463.2

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0 (parent: Microsoft.Extensions.Logging)
- System.Reflection.Metadata - 1.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)

* Update dependencies from https://github.com/aspnet/Extensions build 20190913.3

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc2.19463.3
- Microsoft.AspNetCore.Testing - 3.0.0-rc2.19463.3
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc2.19463.3
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc2.19463.3
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-rc2.19463.3
- Microsoft.Extensions.Logging - 3.0.0

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0 (parent: Microsoft.Extensions.Logging)
- System.Reflection.Metadata - 1.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)

* Update dependencies from https://github.com/aspnet/Extensions build 20190913.5

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc2.19463.5
- Microsoft.AspNetCore.Testing - 3.0.0-rc2.19463.5
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc2.19463.5
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc2.19463.5
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-rc2.19463.5
- Microsoft.Extensions.Logging - 3.0.0

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0 (parent: Microsoft.Extensions.Logging)
- System.Reflection.Metadata - 1.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Net.Compilers.Toolset - 3.3.1-beta4-19462-11 (parent: Microsoft.Extensions.Logging)

* Restore test projects prior to running SDK tests (dotnet/aspnetcore-tooling#1078)

* Fix 3.0 tests
\n\nCommit migrated from eaf897c542

src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs

@@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var thumbprintLookup = new Dictionary<string, FileThumbPrint>();
 
             // Act 1
-            var result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false);
+            var result = await DotnetMSBuild("Build");
 
             var directoryPath = Path.Combine(result.Project.DirectoryPath, IntermediateOutputPath);
             var filesToIgnore = new[]
@@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 // We want to make sure nothing changed between multiple incremental builds.
                 using (var razorGenDirectoryLock = LockDirectory(RazorIntermediateOutputPath))
                 {
-                    result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false);
+                    result = await DotnetMSBuild("Build");
                 }
 
                 Assert.BuildPassed(result);

src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs

@@ -69,8 +69,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             bool suppressTimeout = false,
             bool suppressBuildServer = false,
             string buildServerPipeName = null,
-            MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet,
+            MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet)
-            bool runRestoreBeforeBuildOrPublish = true)
         {
             var timeout = suppressTimeout ? (TimeSpan?)Timeout.InfiniteTimeSpan : null;
 
@@ -117,23 +116,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             if (!string.IsNullOrEmpty(target))
             {
-                // Restore before build or publish
-                if (runRestoreBeforeBuildOrPublish &&
-                    (string.Equals("Build", target, StringComparison.OrdinalIgnoreCase)
-                        || string.Equals("Publish", target, StringComparison.OrdinalIgnoreCase)))
-                {
-                    buildArgumentList.Add($"/t:Restore");
-                }
-
                 buildArgumentList.Add($"/t:{target}");
             }
             else
             {
-                // By default, restore then build
-                if (runRestoreBeforeBuildOrPublish)
-                {
-                    buildArgumentList.Add($"/t:Restore");
-                }
                 buildArgumentList.Add($"/t:Build");
             }
 

src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/PackIntegrationTest.cs

@@ -230,10 +230,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("PackageLibraryDirectDependency", additionalProjects: new[] { "PackageLibraryTransitiveDependency" })]
         public async Task Pack_NoBuild_IncludesStaticWebAssets()
         {
-            var result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false);
+            var result = await DotnetMSBuild("Build");
             Assert.BuildPassed(result, allowWarnings: true);
 
-            var pack = await DotnetMSBuild("Pack", "/p:NoBuild=true", runRestoreBeforeBuildOrPublish: false);
+            var pack = await DotnetMSBuild("Pack", "/p:NoBuild=true");
             Assert.BuildPassed(pack, allowWarnings: true);
 
             Assert.FileExists(pack, OutputPath, "PackageLibraryDirectDependency.dll");

src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ProjectDirectory.cs

@@ -73,7 +73,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 var newProjectFilePath = Path.Combine(directoryPath, targetProjectName + extension);
                 File.Move(oldProjectFilePath, newProjectFilePath);
 
-                CopyGlobalJson(repositoryRoot, destinationPath);
+                CopyRepositoryAssets(repositoryRoot, destinationPath);
 
                 return new ProjectDirectory(
                     destinationPath,
@@ -140,16 +140,16 @@ $@"<Project>
                     });
             }
 
-            void CopyGlobalJson(string repositoryRoot, string projectRoot)
+            void CopyRepositoryAssets(string repositoryRoot, string projectRoot)
             {
-                var srcGlobalJson = Path.Combine(repositoryRoot, "global.json");
+                var files = new[] { "global.json", "NuGet.config" };
-                if (!File.Exists(srcGlobalJson))
-                {
-                    throw new InvalidOperationException("global.json at the root of the repository could not be found. Run './build /t:Noop' at the repository root and re-run these tests.");
-                }
 
-                var destinationGlobalJson = Path.Combine(projectRoot, "global.json");
+                foreach (var file in files)
-                File.Copy(srcGlobalJson, destinationGlobalJson);
+                {
+                    var srcFile = Path.Combine(repositoryRoot, file);
+                    var destinationFile = Path.Combine(projectRoot, file);
+                    File.Copy(srcFile, destinationFile);
+                }
             }
         }
 

src/Razor/test/testassets/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj

@@ -1,16 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-  
+
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
   </PropertyGroup>
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <RuntimeAdditionalRestoreSources Condition="'$(RuntimeAdditionalRestoreSources)' == ''">$(MSBuildThisFileDirectory)..\TestPackageRestoreSource\</RuntimeAdditionalRestoreSources>
+    <RuntimeAdditionalRestoreSources Condition="'$(RuntimeAdditionalRestoreSources)'==''">$(MSBuildThisFileDirectory)..\TestPackageRestoreSource\</RuntimeAdditionalRestoreSources>
-    <RestoreSources>
+    <RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(RuntimeAdditionalRestoreSources)</RestoreAdditionalProjectSources>
-      $(RestoreSources);
-      $(RuntimeAdditionalRestoreSources)
-    </RestoreSources>
   </PropertyGroup>
 
   <ItemGroup>

src/Razor/test/testassets/Directory.Build.props

@@ -18,21 +18,10 @@
 
     <RazorSdkCurrentVersionProps>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
     <RazorSdkCurrentVersionTargets>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets>
-  
-    <!-- Necessary while testing with unreleased packages. -->
-    <RestoreSources>
-      $(RestoreSources);
-      https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
-      https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json;
-      https://api.nuget.org/v3/index.json;
-    </RestoreSources>
-
-    <RestoreSources Condition="$(BuildingTestAppsIndependently) == false">
-      $(RestoreSources);
-      https://dotnet.myget.org/F/roslyn/api/v3/index.json;
-    </RestoreSources>
   </PropertyGroup>
 
+  <Import Project="$(SolutionRoot)..\..\eng\Versions.props" />
+
   <PropertyGroup>
     <!-- Working around an issue in XDT transforms -->
     <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>