From dd5dac97e52178a1e43bc6661547fdba12f60a33 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2019 16:16:34 +0000 Subject: [PATCH] [master] Update dependencies from aspnet/Extensions (dotnet/aspnetcore-tooling#409) * Update dependencies from https://github.com/aspnet/Extensions build 20190410.2 - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview5.19210.2 - Microsoft.AspNetCore.Testing - 3.0.0-preview5.19210.2 - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview5.19210.2 - Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview5.19210.2 - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview5.19210.2 - Microsoft.Extensions.Logging - 3.0.0-preview5.19210.2 Dependency coherency updates - System.Diagnostics.DiagnosticSource - 4.6.0-preview5.19208.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging) - System.Text.Encodings.Web - 4.6.0-preview5.19208.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.DependencyModel - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 3.0.0-preview5.19208.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging) * Try a coherent SDK and Runtime * Try again * Fix codecheck * Update dependencies from https://github.com/aspnet/Extensions build 20190410.2 - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview5.19210.2 - Microsoft.AspNetCore.Testing - 3.0.0-preview5.19210.2 - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview5.19210.2 - Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview5.19210.2 - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview5.19210.2 - Microsoft.Extensions.Logging - 3.0.0-preview5.19210.2 Dependency coherency updates - System.Diagnostics.DiagnosticSource - 4.6.0-preview5.19208.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging) - System.Text.Encodings.Web - 4.6.0-preview5.19208.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.DependencyModel - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 3.0.0-preview5.19208.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging) * Try again * Update dependencies from https://github.com/aspnet/Extensions build 20190410.2 - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview5.19210.2 - Microsoft.AspNetCore.Testing - 3.0.0-preview5.19210.2 - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview5.19210.2 - Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview5.19210.2 - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview5.19210.2 - Microsoft.Extensions.Logging - 3.0.0-preview5.19210.2 Dependency coherency updates - System.Diagnostics.DiagnosticSource - 4.6.0-preview5.19208.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging) - System.Text.Encodings.Web - 4.6.0-preview5.19208.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.DependencyModel - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 3.0.0-preview5.19208.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27608-16 (parent: Microsoft.Extensions.Logging) * Update dependencies from https://github.com/aspnet/Extensions build 20190412.9 - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview5.19212.9 - Microsoft.AspNetCore.Testing - 3.0.0-preview5.19212.9 - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview5.19212.9 - Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview5.19212.9 - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview5.19212.9 - Microsoft.Extensions.Logging - 3.0.0-preview5.19212.9 Dependency coherency updates - System.Diagnostics.DiagnosticSource - 4.6.0-preview5.19211.22 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27611-18 (parent: Microsoft.Extensions.Logging) - System.Text.Encodings.Web - 4.6.0-preview5.19211.22 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27611-18 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.DependencyModel - 3.0.0-preview5-27611-18 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 3.0.0-preview5.19211.22 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27611-18 (parent: Microsoft.Extensions.Logging) * Update dependencies from https://github.com/aspnet/Extensions build 20190413.4 - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview5.19213.4 - Microsoft.AspNetCore.Testing - 3.0.0-preview5.19213.4 - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview5.19213.4 - Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview5.19213.4 - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview5.19213.4 - Microsoft.Extensions.Logging - 3.0.0-preview5.19213.4 Dependency coherency updates - System.Diagnostics.DiagnosticSource - 4.6.0-preview5.19212.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27613-02 (parent: Microsoft.Extensions.Logging) - System.Text.Encodings.Web - 4.6.0-preview5.19212.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27613-02 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.DependencyModel - 3.0.0-preview5-27613-02 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 3.0.0-preview5.19212.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27613-02 (parent: Microsoft.Extensions.Logging) * Update dependencies from https://github.com/aspnet/Extensions build 20190414.1 - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview5.19214.1 - Microsoft.AspNetCore.Testing - 3.0.0-preview5.19214.1 - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview5.19214.1 - Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview5.19214.1 - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview5.19214.1 - Microsoft.Extensions.Logging - 3.0.0-preview5.19214.1 Dependency coherency updates - System.Diagnostics.DiagnosticSource - 4.6.0-preview5.19212.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27613-11 (parent: Microsoft.Extensions.Logging) - System.Text.Encodings.Web - 4.6.0-preview5.19212.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27613-11 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.DependencyModel - 3.0.0-preview5-27613-11 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 3.0.0-preview5.19212.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27613-11 (parent: Microsoft.Extensions.Logging) * Restore with the appropriate RuntimeFrameworkVersion before building or publishing * Fix incremental test * Update dependencies from https://github.com/aspnet/Extensions build 20190416.8 - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview5.19216.8 - Microsoft.AspNetCore.Testing - 3.0.0-preview5.19216.8 - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview5.19216.8 - Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview5.19216.8 - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview5.19216.8 - Microsoft.Extensions.Logging - 3.0.0-preview5.19216.8 Dependency coherency updates - System.Diagnostics.DiagnosticSource - 4.6.0-preview5.19215.16 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27616-01 (parent: Microsoft.Extensions.Logging) - System.Text.Encodings.Web - 4.6.0-preview5.19215.16 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27616-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.DependencyModel - 3.0.0-preview5-27616-01 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 3.0.0-preview5.19215.16 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-preview5-27616-01 (parent: Microsoft.Extensions.Logging) \n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/f9c222d3055cb383b682334dbf2c71ad23d713be --- .../BuildIncrementalismTest.cs | 4 ++-- .../MSBuildIntegrationTestBase.cs | 20 ++++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs index fb0a5f0abe..31c67f5acc 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIncrementalismTest.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests var thumbprintLookup = new Dictionary(); // Act 1 - var result = await DotnetMSBuild("Build"); + var result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false); 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"); + result = await DotnetMSBuild("Build", runRestoreBeforeBuildOrPublish: false); } Assert.BuildPassed(result); diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs index 4803f4d46d..dd6c6e71b2 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/MSBuildIntegrationTestBase.cs @@ -60,7 +60,8 @@ 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; var buildArgumentList = new List @@ -82,8 +83,25 @@ 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"); + } buildArgumentList.Add($"/p:Configuration={Configuration} {args}"); var buildArguments = string.Join(" ", buildArgumentList);