From 1b04a1e8ccfdcb5d84fef0febbe1901e65ba29c5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Feb 2021 17:07:41 +0000 Subject: [PATCH 01/12] Merged PR 12939: [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Extensions.Logging**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.12 to 3.1.13 (parent: Microsoft.Extensions.Logging) - **Microsoft.AspNetCore.Analyzer.Testing**: from 3.1.12-servicing.21069.9 to 3.1.13-servicing.21116.4 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: from 3.1.12-servicing.21069.9 to 3.1.13-servicing.21116.4 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.ActivatorUtilities.Sources**: from 3.1.12-servicing.21069.9 to 3.1.13-servicing.21116.4 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.Abstractions**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.Memory**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.SqlServer**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.StackExchangeRedis**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.CommandLineUtils.Sources**: from 3.1.12-servicing.21069.9 to 3.1.13-servicing.21116.4 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Abstractions**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.AzureKeyVault**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Binder**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.CommandLine**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.EnvironmentVariables**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.FileExtensions**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Ini**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Json**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.KeyPerFile**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.UserSecrets**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configura... --- NuGet.config | 8 ++ eng/Version.Details.xml | 280 ++++++++++++++++++++-------------------- eng/Versions.props | 140 ++++++++++---------- 3 files changed, 218 insertions(+), 210 deletions(-) diff --git a/NuGet.config b/NuGet.config index 956dd635f252..b28ee7b4a781 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,12 +6,16 @@ + + + + @@ -23,6 +27,7 @@ + @@ -32,14 +37,17 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6424260978d2..272d61e61a42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,261 +33,261 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling 7f783df7bb2513f30f7d86f2ff1a80e9d5a5a9c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d078590d98ae5658ff49fbcb3815bf4483c6a66c + 5b7fc584fa25b1132a5459c9d65bb678dbc159a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d078590d98ae5658ff49fbcb3815bf4483c6a66c + 5b7fc584fa25b1132a5459c9d65bb678dbc159a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d078590d98ae5658ff49fbcb3815bf4483c6a66c + 5b7fc584fa25b1132a5459c9d65bb678dbc159a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d078590d98ae5658ff49fbcb3815bf4483c6a66c + 5b7fc584fa25b1132a5459c9d65bb678dbc159a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d078590d98ae5658ff49fbcb3815bf4483c6a66c + 5b7fc584fa25b1132a5459c9d65bb678dbc159a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d078590d98ae5658ff49fbcb3815bf4483c6a66c + 5b7fc584fa25b1132a5459c9d65bb678dbc159a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d078590d98ae5658ff49fbcb3815bf4483c6a66c + 5b7fc584fa25b1132a5459c9d65bb678dbc159a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -361,9 +361,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - 059a4a19e602494bfbed473dbbb18f2dbfbd0878 + 9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -390,17 +390,17 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0267ad09c6f2e2a37b23b7d230ffbf9e787dd388 + 64df28ec4a52d6cc23efffbb918eab87ee42600f https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0267ad09c6f2e2a37b23b7d230ffbf9e787dd388 + 64df28ec4a52d6cc23efffbb918eab87ee42600f @@ -410,13 +410,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - 50a99d5d3c6e68aecf70627897c0d862a92fc283 + 9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f https://github.com/dotnet/arcade @@ -430,9 +430,9 @@ https://github.com/dotnet/arcade 251249a04a9686ca2660e2acaa3094446a48f10d - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 4210e7d19b3e18ecadbd1c4c8589e39eea035d5f + 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 393ff0fcef19..51f9b88473c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,9 +67,9 @@ 3.4.1-beta4-20127-10 3.1.6 - 3.1.12-servicing.21069.9 + 3.1.13-servicing.21116.2 3.1.0 - 3.1.12 + 3.1.13 2.1.0 1.1.1 @@ -90,84 +90,84 @@ 4.7.0 4.7.0 4.7.0 - 4.7.1 + 4.7.2 4.7.2 3.2.1 4.7.1 4.7.0 - 3.1.4 + 3.1.5 3.2.0 - 3.1.12-servicing.21069.9 - 3.1.12-servicing.21069.9 - 3.1.12-servicing.21069.9 - 3.1.12-servicing.21069.9 - 3.1.12-servicing.21069.9 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12-servicing.21069.9 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12-servicing.21069.9 - 3.1.12 - 3.1.12 - 3.1.12-servicing.21069.9 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12-servicing.21069.9 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12-servicing.21069.9 - 3.1.12 - 3.1.12-servicing.21069.9 - 3.1.12-servicing.21069.9 - 3.1.12 + 3.1.13-servicing.21116.4 + 3.1.13-servicing.21116.4 + 3.1.13-servicing.21116.4 + 3.1.13-servicing.21116.4 + 3.1.13-servicing.21116.4 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13-servicing.21116.4 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13-servicing.21116.4 + 3.1.13 + 3.1.13 + 3.1.13-servicing.21116.4 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13-servicing.21116.4 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13-servicing.21116.4 + 3.1.13 + 3.1.13-servicing.21116.4 + 3.1.13-servicing.21116.4 + 3.1.13 3.1.8-servicing.20420.4 - 3.1.12 + 3.1.13 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 3.1.12 3.1.12 From cf2c5c9c6dca430b97aa96429b84d0da07eb77f1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Feb 2021 21:41:20 +0000 Subject: [PATCH 02/12] Merged PR 12932: [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-aspnetcore-tooling This pull request updates the following dependencies [marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d - **Build**: 20210217.3 - **Date Produced**: 2/17/2021 8:18 PM - **Commit**: 1756aa62b0ee24952b064aabf88f240da51179b1 - **Branch**: refs/heads/internal/release/3.1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.AspNetCore.Razor.Language**: [from 3.1.12 to 3.1.13][1] - **Microsoft.CodeAnalysis.Razor**: [from 3.1.12 to 3.1.13][1] - **Microsoft.NET.Sdk.Razor**: [from 3.1.12 to 3.1.13][1] - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 3.1.12 to 3.1.13][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling/branches?baseVersion=GC7f783df&targetVersion=GC1756aa6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d) --- NuGet.config | 3 +++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index b28ee7b4a781..c402dfc51404 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -33,6 +34,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 272d61e61a42..70d48e7c7ee6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,21 +17,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx 620cea9ccf0359993e803c900059932966399584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 7f783df7bb2513f30f7d86f2ff1a80e9d5a5a9c5 + 1756aa62b0ee24952b064aabf88f240da51179b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 7f783df7bb2513f30f7d86f2ff1a80e9d5a5a9c5 + 1756aa62b0ee24952b064aabf88f240da51179b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 7f783df7bb2513f30f7d86f2ff1a80e9d5a5a9c5 + 1756aa62b0ee24952b064aabf88f240da51179b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 7f783df7bb2513f30f7d86f2ff1a80e9d5a5a9c5 + 1756aa62b0ee24952b064aabf88f240da51179b1 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore diff --git a/eng/Versions.props b/eng/Versions.props index 51f9b88473c0..c3311e71da6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -169,10 +169,10 @@ 3.1.13 3.1.13 - 3.1.12 - 3.1.12 - 3.1.12 - 3.1.12 + 3.1.13 + 3.1.13 + 3.1.13 + 3.1.13 + + true false false diff --git a/Directory.Build.targets b/Directory.Build.targets index ade53fc51d60..417057a3090f 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -57,7 +57,8 @@ - false + + false diff --git a/eng/Build.props b/eng/Build.props index 576ca818a798..2f86a7090c62 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -60,7 +60,7 @@ - + @@ -74,6 +74,10 @@ + + @@ -87,6 +91,17 @@ + + + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index 99d20fb2aa7c..b24cf893501b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 1 14 false - + 0 3 2 diff --git a/src/Installers/Windows/SharedFramework/Product.wxs b/src/Installers/Windows/SharedFramework/Product.wxs index 2a71da323a2a..3375094918c0 100644 --- a/src/Installers/Windows/SharedFramework/Product.wxs +++ b/src/Installers/Windows/SharedFramework/Product.wxs @@ -2,7 +2,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj index 1b64c2cbb834..1574f5794ff4 100644 --- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj +++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj @@ -61,12 +61,16 @@ + $(InstallersOutputPath) $(InstallersOutputPath) $(InstallersOutputPath) + $(SharedFrameworkArm64HarvestRootPath)aspnetcore-runtime-internal-$(PackageVersion)-win-arm64.zip $(SharedFrameworkX64HarvestRootPath)aspnetcore-runtime-internal-$(PackageVersion)-win-x64.zip $(SharedFrameworkX86HarvestRootPath)aspnetcore-runtime-internal-$(PackageVersion)-win-x86.zip + + + diff --git a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj index 7aa16e58ec00..f9f285c87394 100644 --- a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj +++ b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj @@ -29,20 +29,35 @@ - - - SharedFrameworkLib - {5244BC49-2568-4701-80A6-EAB8950AB5FA} - True - True - - - SharedFrameworkLib - {5244BC49-2568-4701-80A6-EAB8950AB5FA} - True - True - - + + + + + SharedFrameworkLib + {5244BC49-2568-4701-80A6-EAB8950AB5FA} + True + True + + + + + + + SharedFrameworkLib + {5244BC49-2568-4701-80A6-EAB8950AB5FA} + True + True + + + SharedFrameworkLib + {5244BC49-2568-4701-80A6-EAB8950AB5FA} + True + True + + + + + diff --git a/src/Installers/Windows/SharedFrameworkLib/Library.wxs b/src/Installers/Windows/SharedFrameworkLib/Library.wxs index dde16acbd7ff..c30f743d0bb3 100644 --- a/src/Installers/Windows/SharedFrameworkLib/Library.wxs +++ b/src/Installers/Windows/SharedFrameworkLib/Library.wxs @@ -16,6 +16,9 @@ + + + - + @@ -21,7 +21,7 @@ - + diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj index b673cf415236..81e32c53ee42 100644 --- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj +++ b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj @@ -21,6 +21,8 @@ DDBB771F-963F-47D3-8510-9ABD04DBE1D1 2.0 $(RepoRoot)\src\Installers\Windows\TargetingPack\TargetingPackPackage.nuspec + $(TargetingPackVersionPrefix) + $(TargetingPackVersionPrefix) @@ -61,7 +63,7 @@ $(InstallersOutputPath) - $(TargetingPackHarvestRoot)aspnetcore-targeting-pack-$(PackageVersion).zip + $(TargetingPackHarvestRoot)aspnetcore-targeting-pack-$(TargetingPackVersionPrefix).zip diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index dacb9e790439..bb079c09eb32 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -4,10 +4,16 @@ <_FileRevisionVersion>$(VersionSuffixDateStamp) <_FileRevisionVersion Condition=" '$(_FileRevisionVersion)' == '' ">42424 - $(AspNetCoreMajorMinorVersion).$(AspNetCorePatchVersion).$(_FileRevisionVersion) + $(BundleVersion).$(_FileRevisionVersion) + $(AspNetCoreMajorMinorVersion).$(AspNetCorePatchVersion).$(_FileRevisionVersion) $(BundleVersion) + + + $(DefineConstants);InstallerVersion=500 + $(DefineConstants);InstallerVersion=200 + $(DefineConstants);MajorVersion=$(AspNetCoreMajorVersion) $(DefineConstants);MinorVersion=$(AspNetCoreMinorVersion) $(DefineConstants);Version=$(Version) From 82baa7bdff226a99fdbc4133987de499e5e6cff9 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 3 Mar 2021 11:01:38 -0800 Subject: [PATCH 04/12] Run SetupPrivateFeedCredentials in win-arm64 job (#30604) --- .azure/pipelines/ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 775a76339919..6fb27e8a4e49 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -258,6 +258,15 @@ stages: installNodeJs: false installJdk: false steps: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: ./build.cmd -ci -arch arm64 From 3b1fd90dbd4f53bfeed643934359c85373c990a9 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 3 Mar 2021 17:17:07 -0800 Subject: [PATCH 05/12] Move artifacts block to bottom of win-arm64 leg (#30634) --- .azure/pipelines/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 6fb27e8a4e49..f6678b2a84b8 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -296,6 +296,16 @@ stages: $(_InternalRuntimeDownloadArgs) /bl:artifacts/log/Release/Build.Installers.Arm64.binlog displayName: Build Arm64 Installers + + # A few files must also go to the VS package feed. + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: NuGetCommand@2 + displayName: Push Visual Studio packages + inputs: + command: push + packagesToPush: 'artifacts/packages/**/VS.Redist.Common.AspNetCore.*.nupkg' + nuGetFeedType: external + publishFeedCredentials: 'DevDiv - VS package feed' artifacts: - name: Windows_arm64_Logs @@ -307,16 +317,6 @@ stages: - name: Windows_arm64_Installers path: artifacts/installers/ - # A few files must also go to the VS package feed. - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: NuGetCommand@2 - displayName: Push Visual Studio packages - inputs: - command: push - packagesToPush: 'artifacts/packages/**/VS.Redist.Common.AspNetCore.*.nupkg' - nuGetFeedType: external - publishFeedCredentials: 'DevDiv - VS package feed' - # Build MacOS - template: jobs/default-build.yml From 31f427a11d142905968164d316094127ec85265f Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 9 Mar 2021 11:02:00 -0800 Subject: [PATCH 06/12] Update baseline & SDK --- eng/Baseline.Designer.props | 430 ++++++++++++++++++------------------ eng/Baseline.xml | 148 ++++++------- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 292 insertions(+), 292 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 6fdc38effd2b..334ff5659219 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 3.1.12 + 3.1.13 @@ -14,7 +14,7 @@ - 3.1.12 + 3.1.13 @@ -25,83 +25,83 @@ - 3.1.12 + 3.1.13 - - - + + + - + - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - - + + - 3.1.12 + 3.1.13 - - + + - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 @@ -109,97 +109,97 @@ - 3.1.12 + 3.1.13 - - - + + + - - - + + + - 3.1.12 + 3.1.13 - - + + - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - - - + + + - - - + + + - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - - + + - - + + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - - - - + + + + - - - - + + + + @@ -244,215 +244,215 @@ - 3.1.12 + 3.1.13 - - + + - 3.1.12 + 3.1.13 - + - + - + - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - + - + - + - 3.1.12 + 3.1.13 - - - - - - + + + + + + - - - - - - + + + + + + - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - - + + - 3.1.12 + 3.1.13 - - + + - - + + - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - - + + - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - - - + + + - - - + + + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - - + + - - + + - 3.1.12 + 3.1.13 - - - + + + - 3.1.12 + 3.1.13 - - + + - 3.1.12 + 3.1.13 @@ -460,236 +460,236 @@ - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - - + + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - + - - + + - 3.1.12 + 3.1.13 - - + + - 3.1.12 + 3.1.13 - - + + - - + + - - - - + + + + - 3.1.12 + 3.1.13 - - + + - - + + - 3.1.12 + 3.1.13 - + - + - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - - - - + + + + - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - + - 3.1.12 + 3.1.13 - - + + - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - 3.1.12 + 3.1.13 - - - + + + - 3.1.12 + 3.1.13 - - - + + + - - - + + + - 3.1.12 + 3.1.13 - - - + + + - - - + + + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index e95bace8adec..1f5ea586ec40 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,87 +4,87 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index 530bcbb1e8c0..f3c0d16fe5f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 3 1 14 - false + true 0 3 diff --git a/global.json b/global.json index 97783de603ef..5a6555d9a5ca 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "3.1.112" + "version": "3.1.113" }, "tools": { - "dotnet": "3.1.112", + "dotnet": "3.1.113", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" From b8a46a8fe742bc85b9254edbfc63c6ad2a154212 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 9 Mar 2021 14:30:53 -0800 Subject: [PATCH 07/12] [release/3.1] Make sure SharedFx & TargetingPack msi names match (#30439) * Make sure SharedFx & TargetingPack msi names match (#28298) * Make sure SharedFx & TargetingPack msi names match * Insert packageVersion into OutputName when available * Move props around again * Fix .msi names (#28572) --- eng/targets/Wix.Common.targets | 8 ++++++++ .../Windows/SharedFramework/SharedFramework.wixproj | 10 +++------- .../Windows/TargetingPack/TargetingPack.wixproj | 10 +++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/targets/Wix.Common.targets b/eng/targets/Wix.Common.targets index 4c6d15a790be..d7421ee2fc75 100644 --- a/eng/targets/Wix.Common.targets +++ b/eng/targets/Wix.Common.targets @@ -18,6 +18,14 @@ + + + <_GeneratedPackageVersion>$(PackageVersion) + <_GeneratedPackageVersion + Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) + + $(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix) + yes $(OutputName.Replace('-', '_')).cab $(ProductName) diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj index 1574f5794ff4..79659760fbd2 100644 --- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj +++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj @@ -3,10 +3,10 @@ + $(RuntimeInstallerBaseName)- + -win-$(Platform) Microsoft ASP.NET Core Shared Framework AspNetCore.SharedFramework - AspNetCoreSharedFramework - $(Name)-$(Platform) Package yes sfx_$(Platform).cab @@ -80,11 +80,7 @@ - - <_GeneratedPackageVersion>$(PackageVersion) - <_GeneratedPackageVersion - Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) - $(RuntimeInstallerBaseName)-$(_GeneratedPackageVersion)-win-$(Platform)$(TargetExt) + $(OutputName)$(TargetExt) Microsoft ASP.NET Core $(PackageBrandingVersion) Shared Framework ($(Platform)) $(DefineConstants);ProductName=$(ProductName) diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj index 81e32c53ee42..869112ea43dc 100644 --- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj +++ b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj @@ -3,10 +3,10 @@ + $(TargetingPackInstallerBaseName)- + -win-$(Platform) Microsoft ASP.NET Core Targeting Pack AspNetCore.TargetingPack - AspNetCoreTargetingPack - $(Name)-$(Platform) Package true true @@ -72,12 +72,8 @@ - - <_GeneratedPackageVersion>$(PackageVersion) - <_GeneratedPackageVersion - Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) Microsoft ASP.NET Core $(PackageBrandingVersion) Targeting Pack ($(Platform)) - $(TargetingPackInstallerBaseName)-$(_GeneratedPackageVersion)-win-$(Platform)$(TargetExt) + $(OutputName)$(TargetExt) $(DefineConstants);ProductName=$(ProductName) From 1159b3ba36065950ea3db12399d54175cfa94501 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Mar 2021 14:31:29 -0800 Subject: [PATCH 08/12] [release/3.1] Clear disabled package sources (#30400) - remove remaining way user NuGet.config can infect builds --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index c402dfc51404..1a2f00fa03b3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,6 +26,7 @@ + From 5d283352d833c90f9d834f80696138d8e196c7e3 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 9 Mar 2021 15:07:35 -0800 Subject: [PATCH 09/12] Update MessagePack-CSharp (#30607) --- src/submodules/MessagePack-CSharp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submodules/MessagePack-CSharp b/src/submodules/MessagePack-CSharp index 8861abdde93a..66ff4086d168 160000 --- a/src/submodules/MessagePack-CSharp +++ b/src/submodules/MessagePack-CSharp @@ -1 +1 @@ -Subproject commit 8861abdde93a3b97180ac3b2eafa33459ad52392 +Subproject commit 66ff4086d16826e559fe77f7612716088fa1a514 From d16a305f837043b9d47bc010f69bbd282e9279f4 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 9 Mar 2021 15:54:18 -0800 Subject: [PATCH 10/12] Fix spelling of property (#30516) --- eng/Versions.props | 2 +- eng/targets/Packaging.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f3c0d16fe5f6..566196990eef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 3 1 14 - true + true 0 3 diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets index 94ccbabbc827..f38a2336d4d1 100644 --- a/eng/targets/Packaging.targets +++ b/eng/targets/Packaging.targets @@ -1,7 +1,7 @@ Date: Wed, 10 Mar 2021 22:23:02 +0000 Subject: [PATCH 11/12] Update dependencies from https://github.com/dotnet/arcade build 20210308.9 (#30809) [release/3.1] Update dependencies from dotnet/arcade --- NuGet.config | 6 --- eng/Version.Details.xml | 12 ++--- eng/Versions.props | 3 +- eng/common/build.ps1 | 48 +++++++++-------- eng/common/build.sh | 26 ++++++--- eng/common/tools.ps1 | 25 ++++----- eng/common/tools.sh | 113 +++++++++++++++++++++++++++------------- global.json | 4 +- 8 files changed, 144 insertions(+), 93 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1a2f00fa03b3..94d09bf5a355 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,19 +4,14 @@ - - - - - @@ -29,7 +24,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70d48e7c7ee6..d7f855b0cd06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -418,17 +418,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-extensions 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f - + https://github.com/dotnet/arcade - 251249a04a9686ca2660e2acaa3094446a48f10d + ab42d248928f65dd174a2383f3256e68d9379bb7 - + https://github.com/dotnet/arcade - 251249a04a9686ca2660e2acaa3094446a48f10d + ab42d248928f65dd174a2383f3256e68d9379bb7 - + https://github.com/dotnet/arcade - 251249a04a9686ca2660e2acaa3094446a48f10d + ab42d248928f65dd174a2383f3256e68d9379bb7 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions diff --git a/eng/Versions.props b/eng/Versions.props index 566196990eef..8fd3dcd294e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,6 @@ 1 14 true - 0 3 2 @@ -64,7 +63,7 @@ --> - 1.0.0-beta.21110.10 + 1.0.0-beta.21158.9 3.4.1-beta4-20127-10 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index e001ccb481cf..a2d79b4468c6 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -22,6 +22,8 @@ Param( [switch] $ci, [switch] $prepareMachine, [switch] $help, + [string] $runtimeSourceFeed = "", + [string] $runtimeSourceFeedKey = "", [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -29,33 +31,35 @@ Param( function Print-Usage() { Write-Host "Common settings:" - Write-Host " -configuration Build configuration: 'Debug' or 'Release' (short: -c)" - Write-Host " -platform Platform configuration: 'x86', 'x64' or any valid Platform value to pass to msbuild" - Write-Host " -verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)" - Write-Host " -binaryLog Output binary log (short: -bl)" - Write-Host " -help Print help and exit" + Write-Host " -configuration Build configuration: 'Debug' or 'Release' (short: -c)" + Write-Host " -platform Platform configuration: 'x86', 'x64' or any valid Platform value to pass to msbuild" + Write-Host " -verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)" + Write-Host " -binaryLog Output binary log (short: -bl)" + Write-Host " -help Print help and exit" Write-Host "" Write-Host "Actions:" - Write-Host " -restore Restore dependencies (short: -r)" - Write-Host " -build Build solution (short: -b)" - Write-Host " -rebuild Rebuild solution" - Write-Host " -deploy Deploy built VSIXes" - Write-Host " -deployDeps Deploy dependencies (e.g. VSIXes for integration tests)" - Write-Host " -test Run all unit tests in the solution (short: -t)" - Write-Host " -integrationTest Run all integration tests in the solution" - Write-Host " -performanceTest Run all performance tests in the solution" - Write-Host " -pack Package build outputs into NuGet packages and Willow components" - Write-Host " -sign Sign build outputs" - Write-Host " -publish Publish artifacts (e.g. symbols)" + Write-Host " -restore Restore dependencies (short: -r)" + Write-Host " -build Build solution (short: -b)" + Write-Host " -rebuild Rebuild solution" + Write-Host " -deploy Deploy built VSIXes" + Write-Host " -deployDeps Deploy dependencies (e.g. VSIXes for integration tests)" + Write-Host " -test Run all unit tests in the solution (short: -t)" + Write-Host " -integrationTest Run all integration tests in the solution" + Write-Host " -performanceTest Run all performance tests in the solution" + Write-Host " -pack Package build outputs into NuGet packages and Willow components" + Write-Host " -sign Sign build outputs" + Write-Host " -publish Publish artifacts (e.g. symbols)" Write-Host "" Write-Host "Advanced settings:" - Write-Host " -projects Semi-colon delimited list of sln/proj's to build. Globbing is supported (*.sln)" - Write-Host " -ci Set when running on CI server" - Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build" - Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" - Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." + Write-Host " -projects Semi-colon delimited list of sln/proj's to build. Globbing is supported (*.sln)" + Write-Host " -ci Set when running on CI server" + Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build" + Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" + Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." + Write-Host " -runtimeSourceFeed Alternate feed source for restoring .NET Runtimes and SDKs" + Write-Host " -runtimeSourceFeedKey Key value for non-public values of runtimeSourceFeed" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -75,7 +79,7 @@ function InitializeCustomToolset { } function Build { - $toolsetBuildProj = InitializeToolset + $toolsetBuildProj = InitializeToolset -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey InitializeCustomToolset $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.binlog") } else { "" } diff --git a/eng/common/build.sh b/eng/common/build.sh index 6236fc4d38cd..230e41ac2e90 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -29,11 +29,14 @@ usage() echo "" echo "Advanced settings:" - echo " --projects Project or solution file(s) to build" - echo " --ci Set when running on CI server" - echo " --prepareMachine Prepare machine for CI run, clean up processes after build" - echo " --nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" - echo " --warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" + echo " --projects Project or solution file(s) to build" + echo " --ci Set when running on CI server" + echo " --prepareMachine Prepare machine for CI run, clean up processes after build" + echo " --nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" + echo " --warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" + echo " --runtimeSourceFeed Alternate (fallback) source for .NET Runtime and SDK installation" + echo " --runtimeSourceFeedKey Credentials (if needed) for authenticating to runtimeSourceFeed" + echo "" echo "Command line arguments not listed above are passed thru to msbuild." echo "Arguments can also be passed in with a single hyphen." @@ -73,6 +76,9 @@ configuration='Debug' prepare_machine=false verbosity='minimal' +runtimeSourceFeed='' +runtimeSourceFeedKey='' + properties='' while [[ $# > 0 ]]; do @@ -141,6 +147,14 @@ while [[ $# > 0 ]]; do node_reuse=$2 shift ;; + -runtimesourcefeed) + shift + runtimeSourceFeed="$1" + ;; + -runtimesourcefeedkey) + shift + runtimeSourceFeedKey="$1" + ;; *) properties="$properties $1" ;; @@ -166,7 +180,7 @@ function InitializeCustomToolset { } function Build { - InitializeToolset + InitializeToolset $runtimeSourceFeed $runtimeSourceFeedKey InitializeCustomToolset if [[ ! -z "$projects" ]]; then diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 84651fea050e..2205c9e81173 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -96,7 +96,7 @@ function Exec-Process([string]$command, [string]$commandArgs) { } } -function InitializeDotNetCli([bool]$install) { +function InitializeDotNetCli([bool]$install, [string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey) { if (Test-Path variable:global:_DotNetInstallDir) { return $global:_DotNetInstallDir } @@ -138,7 +138,7 @@ function InitializeDotNetCli([bool]$install) { if (-not (Test-Path(Join-Path $dotnetRoot "sdk\$dotnetSdkVersion"))) { if ($install) { - InstallDotNetSdk $dotnetRoot $dotnetSdkVersion + InstallDotNetSdk -dotnetRoot $dotnetRoot -version $dotnetSdkVersion -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey } else { Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Unable to find dotnet with SDK version '$dotnetSdkVersion'" ExitWithExitCode 1 @@ -207,8 +207,8 @@ function GetDotNetInstallScript([string] $dotnetRoot) { return $installScript } -function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = "") { - InstallDotNet $dotnetRoot $version $architecture +function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey ) { + InstallDotNet -dotnetRoot $dotnetRoot -version $version -architecture $architecture -skipNonVersionedFiles $false -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey } function InstallDotNet([string] $dotnetRoot, @@ -233,10 +233,9 @@ function InstallDotNet([string] $dotnetRoot, & $installScript @installParameters } catch { - Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from public location." - - # Only the runtime can be installed from a custom [private] location. - if ($runtime -and ($runtimeSourceFeed -or $runtimeSourceFeedKey)) { + # If we fail, retry from a custom (possibly private) location. + if ($runtimeSourceFeed -or $runtimeSourceFeedKey) { + Write-Host "Failed to install dotnet runtime '$runtime' version '$version' from public location; trying specified alternate feed credentials" if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } if ($runtimeSourceFeedKey) { @@ -253,6 +252,7 @@ function InstallDotNet([string] $dotnetRoot, ExitWithExitCode 1 } } else { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' version '$version' from public location." ExitWithExitCode 1 } } @@ -439,7 +439,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ return $vsInfo[0] } -function InitializeBuildTool() { +function InitializeBuildTool([string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey) { if (Test-Path variable:global:_BuildTool) { return $global:_BuildTool } @@ -451,7 +451,7 @@ function InitializeBuildTool() { # Initialize dotnet cli if listed in 'tools' $dotnetRoot = $null if (Get-Member -InputObject $GlobalJson.tools -Name "dotnet") { - $dotnetRoot = InitializeDotNetCli -install:$restore + $dotnetRoot = InitializeDotNetCli -install:$restore -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey } if ($msbuildEngine -eq "dotnet") { @@ -523,7 +523,8 @@ function InitializeNativeTools() { } } -function InitializeToolset() { +function InitializeToolset([string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey) +{ if (Test-Path variable:global:_ToolsetBuildProj) { return $global:_ToolsetBuildProj } @@ -545,7 +546,7 @@ function InitializeToolset() { ExitWithExitCode 1 } - $buildTool = InitializeBuildTool + $buildTool = InitializeBuildTool -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey $proj = Join-Path $ToolsetDir "restore.proj" $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "ToolsetRestore.binlog") } else { "" } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index acbb0c5b3ffd..c50849b01d0e 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -28,6 +28,10 @@ prepare_machine=${prepare_machine:-false} # True to restore toolsets and dependencies. restore=${restore:-true} +# Allows restoring .NET Core Runtimes and SDKs from alternative feeds +runtimeSourceFeed=${runtimeSourceFeed:-""} +runtimeSourceFeedKey=${runtimeSourceFeedKey:-""} + # Adjusts msbuild verbosity level. verbosity=${verbosity:-'minimal'} @@ -95,6 +99,12 @@ function InitializeDotNetCli { fi local install=$1 + local runtimeSourceFeedArg="" + local runtimeSourceFeedKeyArg="" + if [[ $# == 3 ]]; then + runtimeSourceFeedArg=$2 + runtimeSourceFeedKeyArg=$3 + fi # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism export DOTNET_MULTILEVEL_LOOKUP=0 @@ -140,7 +150,7 @@ function InitializeDotNetCli { if [[ ! -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then if [[ "$install" == true ]]; then - InstallDotNetSdk "$dotnet_root" "$dotnet_sdk_version" + InstallDotNetSdk "$dotnet_root" "$dotnet_sdk_version" "unset" $runtimeSourceFeedArg $runtimeSourceFeedKeyArg else Write-PipelineTelemetryError -category 'InitializeToolset' "Unable to find dotnet with SDK version '$dotnet_sdk_version'" ExitWithExitCode 1 @@ -171,26 +181,26 @@ function InitializeDotNetCli { function InstallDotNetSdk { local root=$1 local version=$2 - local architecture="" + local architecture="unset" if [[ $# == 3 ]]; then architecture=$3 fi - InstallDotNet "$root" "$version" $architecture + InstallDotNet "$root" "$version" $architecture "not-a-runtime" 0 $runtimeSourceFeed $runtimeSourceFeedKey } function InstallDotNet { local root=$1 local version=$2 - + GetDotNetInstallScript "$root" local install_script=$_GetDotNetInstallScript local archArg='' - if [[ -n "${3:-}" ]]; then + if [[ -n "${3:-}" && "$3" != "unset" ]]; then archArg="--architecture $3" fi local runtimeArg='' - if [[ -n "${4:-}" ]]; then + if [[ -n "${4:-}" && "$4" != "not-a-runtime" ]]; then runtimeArg="--runtime $4" fi @@ -200,40 +210,61 @@ function InstallDotNet { fi bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." - if [[ -n "$runtimeArg" ]]; then - local runtimeSourceFeed='' - if [[ -n "${6:-}" ]]; then - runtimeSourceFeed="--azure-feed $6" - fi + local runtimeSourceFeed='' + if [[ -n "${6:-}" ]]; then + runtimeSourceFeed="--azure-feed $6" + fi - local runtimeSourceFeedKey='' - if [[ -n "${7:-}" ]]; then - # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' - # '-d'. To work around this, do a simple detection and switch the parameter - # accordingly. - decodeArg="--decode" - if base64 --help 2>&1 | grep -q "BusyBox"; then - decodeArg="-d" - fi - decodedFeedKey=`echo $7 | base64 $decodeArg` - runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + local runtimeSourceFeedKey='' + if [[ -n "${7:-}" ]]; then + # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' + # '-d'. To work around this, do a simple detection and switch the parameter + # accordingly. + decodeArg="--decode" + if base64 --help 2>&1 | grep -q "BusyBox"; then + decodeArg="-d" fi + decodedFeedKey=`echo $7 | base64 $decodeArg` + runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + else + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." + fi - if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then - bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { - local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." - ExitWithExitCode $exit_code - } - else + if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then + bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." ExitWithExitCode $exit_code - fi + } + else + ExitWithExitCode $exit_code fi } } +function with_retries { + local maxRetries=5 + local retries=1 + echo "Trying to run '$@' for maximum of $maxRetries attempts." + while [[ $((retries++)) -le $maxRetries ]]; do + "$@" + + if [[ $? == 0 ]]; then + echo "Ran '$@' successfully." + return 0 + fi + + timeout=$((3**$retries-1)) + echo "Failed to execute '$@'. Waiting $timeout seconds before next attempt ($retries out of $maxRetries)." 1>&2 + sleep $timeout + done + + echo "Failed to execute '$@' for $maxRetries times." 1>&2 + + return 1 +} + function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" @@ -246,13 +277,21 @@ function GetDotNetInstallScript { # Use curl if available, otherwise use wget if command -v curl > /dev/null; then + # first, try directly, if this fails we will retry with verbose logging curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || { - local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." - ExitWithExitCode $exit_code + if command -v openssl &> /dev/null; then + echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation" + echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443 + fi + echo "Will now retry the same URL with verbose logging." + with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." + ExitWithExitCode $exit_code + } } - else - wget -q -O "$install_script" "$install_script_url" || { + else + with_retries wget -v -O "$install_script" "$install_script_url" || { local exit_code=$? Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." ExitWithExitCode $exit_code @@ -268,7 +307,7 @@ function InitializeBuildTool { return fi - InitializeDotNetCli $restore + InitializeDotNetCli $restore $runtimeSourceFeed $runtimeSourceFeedKey # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" diff --git a/global.json b/global.json index 5a6555d9a5ca..7015ff4c765a 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21110.10", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21110.10" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21158.9", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21158.9" } } From 1ab35bc598ad1a626be7bf9a51ac18f2ba0540f9 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 22 Mar 2021 14:04:08 -0700 Subject: [PATCH 12/12] Fixup targeting pack intermediate zip version --- src/Installers/Windows/TargetingPack/TargetingPack.wixproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj index 099e158b6848..7349f20e3f67 100644 --- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj +++ b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj @@ -63,7 +63,9 @@ $(InstallersOutputPath) - $(TargetingPackHarvestRoot)aspnetcore-targeting-pack-$(TargetingPackVersionPrefix).zip + $(TargetingPackVersionPrefix) + $(TargetingPackZipVersion)-$(VersionSuffix) + $(TargetingPackHarvestRoot)aspnetcore-targeting-pack-$(TargetingPackZipVersion).zip