From cb3c49da8e10482cc019f6145c74b084a2efedbe Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Feb 2021 00:05:26 +0000 Subject: [PATCH 1/3] [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-core-setup --- NuGet.config | 19 ++----------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index d189797980d..9c6075b1196 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,9 @@ - - + @@ -18,22 +17,8 @@ - - - - - - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c85cedbfe5..214edd2f527 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,17 +82,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 + + https://github.com/dotnet/core-setup + 2155b1825cee9a88eec48a7cc42e80c4a4a8ec5a https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup 3acd9b0cd16596bad450c82be08780875a73c05c - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0267ad09c6f2e2a37b23b7d230ffbf9e787dd388 + + https://github.com/dotnet/core-setup + 2155b1825cee9a88eec48a7cc42e80c4a4a8ec5a https://dev.azure.com/dnceng/internal/_git/dotnet-corefx diff --git a/eng/Versions.props b/eng/Versions.props index 5cb99ef757d..abf5664227c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ 3.1.6 3.1.0 - 3.1.12 - 3.1.12-servicing.21069.9 + 3.1.13 + 3.1.13-servicing.21110.2 2.1.0 1.1.1 From 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Feb 2021 23:42:47 +0000 Subject: [PATCH 2/3] [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-core-setup - Coherency Updates: - System.Text.Encodings.Web: from 4.7.1 to 4.7.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.Platforms: from 3.1.4 to 3.1.5 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9c6075b1196..694a158c28a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,10 @@ + - + @@ -18,12 +19,13 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44806db6291..d7ae3def9a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -66,9 +66,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 @@ -83,20 +83,20 @@ All Runtime.$rid packages should have the same version. --> - https://github.com/dotnet/core-setup - 2155b1825cee9a88eec48a7cc42e80c4a4a8ec5a + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 64df28ec4a52d6cc23efffbb918eab87ee42600f https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup 3acd9b0cd16596bad450c82be08780875a73c05c - - https://github.com/dotnet/core-setup - 2155b1825cee9a88eec48a7cc42e80c4a4a8ec5a + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 64df28ec4a52d6cc23efffbb918eab87ee42600f - + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - 50a99d5d3c6e68aecf70627897c0d862a92fc283 + 9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e diff --git a/eng/Versions.props b/eng/Versions.props index e1f65b5ac46..a4e39f16329 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,7 @@ 3.1.6 3.1.0 3.1.13 - 3.1.13-servicing.21110.2 + 3.1.13-servicing.21116.2 2.1.0 1.1.1 @@ -74,11 +74,11 @@ 4.7.0 4.7.0 4.7.0 - 4.7.1 + 4.7.2 4.7.2 4.7.1 - 3.1.4 + 3.1.5 1.0.0-beta.21110.10 From fcfe9395bf0e945794f20ef5d29120b3671b6e1a Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 9 Mar 2021 10:51:02 -0800 Subject: [PATCH 3/3] Update baseline & SDK --- eng/Baseline.Designer.props | 484 ++++++++++++++++++------------------ eng/Baseline.xml | 108 ++++---- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 299 insertions(+), 299 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 233ed25ee33..def62c9b0fc 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,230 +2,230 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 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 @@ -238,358 +238,358 @@ - 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 @@ -598,20 +598,20 @@ - 3.1.12 + 3.1.13 - - + + - - - + + + - 3.1.12 + 3.1.13 @@ -619,7 +619,7 @@ - 3.1.12 + 3.1.13 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 627dd6ff5bf..bd2f4067580 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,58 +4,58 @@ This file contains a list of all the packages and their versions which were rele build of Extensions. Update this list when preparing for a new patch. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index 737115bd137..dbf97407ea7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 3 1 14 - false + true $(MajorVersion).$(MinorVersion).$(PatchVersion) servicing diff --git a/global.json b/global.json index 953730c4413..cfca96035a3 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": [ "$(MicrosoftNETCoreAppInternalPackageVersion)"