From 8d2464a0adc41ce2e125f6cac3dd6099ad0dfcab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 22:32:51 +0000 Subject: [PATCH 01/14] [release/3.1.1xx] Update dependencies from dotnet/aspnetcore (#7516) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200518.7 Microsoft.AspNetCore.App.Runtime.win-x64 , dotnet-watch , dotnet-user-secrets , dotnet-dev-certs , Microsoft.AspNetCore.DeveloperCertificates.XPlat From Version 3.1.4 -> To Version 3.1.5 * remove darc -int feeds * remove darc pub feeds * add back darc-pub feeds * Merge branches Co-authored-by: dotnet-maestro[bot] Co-authored-by: Anirudh Agnihotry Co-authored-by: Will Godbe --- NuGet.config | 1 + eng/Version.Details.xml | 30 +++++++++++------------ eng/Versions.props | 11 +++++---- src/redist/targets/GenerateLayout.targets | 3 ++- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 32a229378577..ea2112086ef5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41e71b96c211..b67e03248f33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,25 +45,25 @@ https://github.com/dotnet/aspnetcore e81033e094d4663ffd227bb4aed30b76b0631e6d - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 35628a67800a3e269eb375989d2fffa9d67b8dbf + + https://github.com/dotnet/aspnetcore + a9449cd20c2150917355d8ba7a30fa19b47569f7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 35628a67800a3e269eb375989d2fffa9d67b8dbf + + https://github.com/dotnet/aspnetcore + a9449cd20c2150917355d8ba7a30fa19b47569f7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 35628a67800a3e269eb375989d2fffa9d67b8dbf + + https://github.com/dotnet/aspnetcore + a9449cd20c2150917355d8ba7a30fa19b47569f7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 35628a67800a3e269eb375989d2fffa9d67b8dbf + + https://github.com/dotnet/aspnetcore + a9449cd20c2150917355d8ba7a30fa19b47569f7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 35628a67800a3e269eb375989d2fffa9d67b8dbf + + https://github.com/dotnet/aspnetcore + a9449cd20c2150917355d8ba7a30fa19b47569f7 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ba7e57e7473c..278c7b9b0b82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,13 @@ - 3.1.4 + 3.1.5 3.1.3 - 3.1.4-servicing.20222.19 - 3.1.4-servicing.20222.19 - 3.1.4-servicing.20222.19 - 3.1.4-servicing.20222.19 + 3.1.3 + 3.1.5-servicing.20268.7 + 3.1.5-servicing.20268.7 + 3.1.5-servicing.20268.7 + 3.1.5-servicing.20268.7 diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 43ea706d47cc..86fe995afab3 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -77,10 +77,11 @@ x64 aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-runtime-$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension) - aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension) aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension) aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) From 28621cd3e8c3b873c683de0105f2f99a0658f126 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 23:59:37 +0000 Subject: [PATCH 02/14] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#7526) * Update dependencies from https://github.com/dotnet/core-setup build 20200519.1 Microsoft.WindowsDesktop.App.Runtime.win-x64 , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Internal , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver From Version 3.1.4 -> To Version 3.1.5 * Update dependencies from https://github.com/dotnet/core-setup build 20200519.2 Microsoft.WindowsDesktop.App.Runtime.win-x64 , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Internal , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver From Version 3.1.4 -> To Version 3.1.5 Co-authored-by: dotnet-maestro[bot] Co-authored-by: William Godbe --- NuGet.config | 1 + eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index ea2112086ef5..77d83708e06d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b67e03248f33..743d4e207a75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0c2e69caa609d5164e16df91d6d646eb9ed74640 + + https://github.com/dotnet/core-setup + 67792c2738156567bc0f00608dec29a1812ba6be - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0c2e69caa609d5164e16df91d6d646eb9ed74640 + + https://github.com/dotnet/core-setup + 67792c2738156567bc0f00608dec29a1812ba6be - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0c2e69caa609d5164e16df91d6d646eb9ed74640 + + https://github.com/dotnet/core-setup + 67792c2738156567bc0f00608dec29a1812ba6be - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0c2e69caa609d5164e16df91d6d646eb9ed74640 + + https://github.com/dotnet/core-setup + 67792c2738156567bc0f00608dec29a1812ba6be - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0c2e69caa609d5164e16df91d6d646eb9ed74640 + + https://github.com/dotnet/core-setup + 67792c2738156567bc0f00608dec29a1812ba6be diff --git a/eng/Versions.props b/eng/Versions.props index 278c7b9b0b82..c7926563ff8d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,12 +62,12 @@ - 3.1.4-servicing.20221.3 - 3.1.4 - 3.1.4 + 3.1.5-servicing.20269.2 + 3.1.5 + 3.1.5 3.1.0 - 3.1.4 - 3.1.4 + 3.1.5 + 3.1.5 3.1.0 2.1.0 From 50fe3adb94406264091d7d11cf12ab421ca0a55a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 21:28:23 -0700 Subject: [PATCH 03/14] [release/3.1.1xx] Update dependencies from dotnet/toolset (#7538) * Update dependencies from https://github.com/dotnet/toolset build 20200519.8 Microsoft.Dotnet.Toolset.Internal From Version 3.1.104-servicing.20223.10 -> To Version 3.1.105-servicing.20269.8 * Update NuGet.config * Update dependencies from https://github.com/dotnet/toolset build 20200519.12 Microsoft.Dotnet.Toolset.Internal From Version 3.1.104-servicing.20223.10 -> To Version 3.1.105-servicing.20269.12 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.DotNet.MSBuildSdkResolver From Version 3.1.4 -> To Version 3.1.5 (parent: Microsoft.Dotnet.Toolset.Internal * Update NuGet.config Co-authored-by: dotnet-maestro[bot] Co-authored-by: William Godbe --- NuGet.config | 1 + eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 77d83708e06d..b8b50be5bfa4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 743d4e207a75..20c74f39c0d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,21 +69,21 @@ https://github.com/dotnet/test-templates 2720fcade72d709a5d2fe80d0b80fbdac54213f6 - - https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d503e3a0aeafd9cd580d44495aafc116b5f71588 + + https://github.com/dotnet/templating + 7de8a5796512f85463e6f0149949574d80c2a120 - - https://dev.azure.com/dnceng/internal/_git/dotnet-toolset - 91f740fe926973a5ffefbddbfb9db61a737022dd + + https://github.com/dotnet/toolset + b2c1df0ddade430db29339edc0fc59b77f7de59b https://dev.azure.com/dnceng/internal/_git/dotnet-sdk 99d7f3290a766fe288678650bd1f2af760b44212 - - https://dev.azure.com/dnceng/internal/_git/dotnet-cli - 1afb98ab831b1a5c52675a2391365f999aeb9859 + + https://github.com/dotnet/cli + 2b8a762005b1aec237fe3e4d2713603fef28dc50 diff --git a/eng/Versions.props b/eng/Versions.props index c7926563ff8d..a9e8ee58b031 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.104-servicing.20223.10 + 3.1.105-servicing.20269.12 @@ -24,7 +24,7 @@ - 3.1.4 + 3.1.5 @@ -46,7 +46,7 @@ - 3.1.104-servicing.20223.4 + 3.1.105-servicing.20269.2 0.2.0 From ac109275a1393e911f1bd212fd385a4b63c411d4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 20 May 2020 17:56:23 +0000 Subject: [PATCH 04/14] Merge pull request 8030 from darc-internal/release/3.1.1xx-e99d76e0-44a6-43ca-b331-c4c9c9353a60 into internal/release/3.1.1xx --- NuGet.config | 1 + eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index b8b50be5bfa4..df595aeeb766 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,6 +11,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20c74f39c0d0..0f993cdbc8b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 7de8a5796512f85463e6f0149949574d80c2a120 - + https://github.com/dotnet/toolset - b2c1df0ddade430db29339edc0fc59b77f7de59b + 515d867f71a97bce917956e2623f799b6d70ac5a https://dev.azure.com/dnceng/internal/_git/dotnet-sdk diff --git a/eng/Versions.props b/eng/Versions.props index a9e8ee58b031..e9011b66f2f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.105-servicing.20269.12 + 3.1.105-servicing.20270.6 From c000a2048c3cab54e25f2a2799d9779b247a5cb9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 20 May 2020 19:18:25 +0000 Subject: [PATCH 05/14] Merge pull request 8043 from darc-internal/release/3.1.1xx-fb0d78e2-223e-47c4-b2a4-419e6f4c2b8e into internal/release/3.1.1xx --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f993cdbc8b9..65554adbba9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,17 +73,17 @@ https://github.com/dotnet/templating 7de8a5796512f85463e6f0149949574d80c2a120 - + https://github.com/dotnet/toolset - 515d867f71a97bce917956e2623f799b6d70ac5a + ae90f951936e99bb85f916b83603ad0eb3affbb1 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk 99d7f3290a766fe288678650bd1f2af760b44212 - + https://github.com/dotnet/cli - 2b8a762005b1aec237fe3e4d2713603fef28dc50 + c536a8b63f7007a4eb85cf8e059d1116f0a8779f diff --git a/eng/Versions.props b/eng/Versions.props index e9011b66f2f9..2c23d6acd4c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.105-servicing.20270.6 + 3.1.105-servicing.20270.9 @@ -46,7 +46,7 @@ - 3.1.105-servicing.20269.2 + 3.1.105-servicing.20269.5 0.2.0 From ee5301267780a84979cf4f93ef92ce2aa2ab8f01 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 21 May 2020 01:20:36 +0000 Subject: [PATCH 06/14] Merge pull request 8064 from darc-internal/release/3.1.1xx-30c029a4-fc06-449d-b0fb-36db84b596dc into internal/release/3.1.1xx --- NuGet.config | 2 +- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index df595aeeb766..e31262bbfafa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,9 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65554adbba9e..97aa8a6faec9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,24 +2,24 @@ - https://github.com/dotnet/core-setup - 67792c2738156567bc0f00608dec29a1812ba6be + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 65cd7897774a464b5991c1962f7a0d476bb63101 - - https://github.com/dotnet/core-setup - 67792c2738156567bc0f00608dec29a1812ba6be + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 65cd7897774a464b5991c1962f7a0d476bb63101 - https://github.com/dotnet/core-setup - 67792c2738156567bc0f00608dec29a1812ba6be + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 65cd7897774a464b5991c1962f7a0d476bb63101 - https://github.com/dotnet/core-setup - 67792c2738156567bc0f00608dec29a1812ba6be + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 65cd7897774a464b5991c1962f7a0d476bb63101 - https://github.com/dotnet/core-setup - 67792c2738156567bc0f00608dec29a1812ba6be + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 65cd7897774a464b5991c1962f7a0d476bb63101 diff --git a/eng/Versions.props b/eng/Versions.props index 2c23d6acd4c9..a315fb6cbf0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ - 3.1.5-servicing.20269.2 + 3.1.5-servicing.20270.5 3.1.5 3.1.5 3.1.0 From 19cac0ff7aea32b7f0ba98f0645397cfff4dfeaa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 21 May 2020 20:00:14 +0000 Subject: [PATCH 07/14] Merge pull request 8121 from darc-internal/release/3.1.1xx-4d09dcdd-cb65-4d1d-bd1f-7bb9d697aadb into internal/release/3.1.1xx --- NuGet.config | 2 +- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index e31262bbfafa..468b79cc74c0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,9 +9,9 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97aa8a6faec9..78277489ab24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,24 +46,24 @@ e81033e094d4663ffd227bb4aed30b76b0631e6d - https://github.com/dotnet/aspnetcore - a9449cd20c2150917355d8ba7a30fa19b47569f7 + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 1f637e703157912f3b607dd7a77662f1123caaae - - https://github.com/dotnet/aspnetcore - a9449cd20c2150917355d8ba7a30fa19b47569f7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 1f637e703157912f3b607dd7a77662f1123caaae - - https://github.com/dotnet/aspnetcore - a9449cd20c2150917355d8ba7a30fa19b47569f7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 1f637e703157912f3b607dd7a77662f1123caaae - - https://github.com/dotnet/aspnetcore - a9449cd20c2150917355d8ba7a30fa19b47569f7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 1f637e703157912f3b607dd7a77662f1123caaae - - https://github.com/dotnet/aspnetcore - a9449cd20c2150917355d8ba7a30fa19b47569f7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 1f637e703157912f3b607dd7a77662f1123caaae https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index a315fb6cbf0f..114601a0bec3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,10 +39,10 @@ 3.1.5 3.1.3 3.1.3 - 3.1.5-servicing.20268.7 - 3.1.5-servicing.20268.7 - 3.1.5-servicing.20268.7 - 3.1.5-servicing.20268.7 + 3.1.5-servicing.20271.2 + 3.1.5-servicing.20271.2 + 3.1.5-servicing.20271.2 + 3.1.5-servicing.20271.2 From de4e840e92d68fc927995f37c59e3816d85f62e3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 May 2020 01:50:52 +0000 Subject: [PATCH 08/14] Merge pull request 8135 from darc-internal/release/3.1.1xx-19e67f32-f082-44ae-90b8-7b53deea0782 into internal/release/3.1.1xx --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 468b79cc74c0..59ef3b8025c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78277489ab24..ecbb998e926b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,23 +47,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f637e703157912f3b607dd7a77662f1123caaae + 844a82e37cae48af2ab2ee4f39b41283e6bb4f0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f637e703157912f3b607dd7a77662f1123caaae + 844a82e37cae48af2ab2ee4f39b41283e6bb4f0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f637e703157912f3b607dd7a77662f1123caaae + 844a82e37cae48af2ab2ee4f39b41283e6bb4f0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f637e703157912f3b607dd7a77662f1123caaae + 844a82e37cae48af2ab2ee4f39b41283e6bb4f0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f637e703157912f3b607dd7a77662f1123caaae + 844a82e37cae48af2ab2ee4f39b41283e6bb4f0e https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 114601a0bec3..df8c296443b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,10 +39,10 @@ 3.1.5 3.1.3 3.1.3 - 3.1.5-servicing.20271.2 - 3.1.5-servicing.20271.2 - 3.1.5-servicing.20271.2 - 3.1.5-servicing.20271.2 + 3.1.5-servicing.20271.5 + 3.1.5-servicing.20271.5 + 3.1.5-servicing.20271.5 + 3.1.5-servicing.20271.5 From 3e999ce6c3db659756e24e9a9a5e4e95b222190e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 May 2020 17:08:19 +0000 Subject: [PATCH 09/14] Merged PR 8049: [internal/release/3.1.1xx] Update dependencies from dnceng/internal/dotnet-toolset This pull request updates the following dependencies [marker]: <> (Begin:09e3bc2d-823c-446b-1ac3-08d7d0ed185e) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-toolset - **Subscription**: 09e3bc2d-823c-446b-1ac3-08d7d0ed185e - **Build**: 20200521.18 - **Date Produced**: 5/22/2020 1:25 AM - **Commit**: cc5157e04db69f06bcbbf50bc0093d92ee6eceaf - **Branch**: refs/heads/internal/release/3.1.1xx - **Updates**: - **Microsoft.Dotnet.Toolset.Internal**: from 3.1.105-servicing.20270.9 to 3.1.105-servicing.20271.18 - **Microsoft.DotNet.Common.ItemTemplates**: from 3.1.5 to 3.1.5 - **Microsoft.NET.Sdk**: from 3.1.104-servicing.20223.11 to 3.1.105-servicing.20270.18 - **Microsoft.DotNet.MSBuildSdkResolver**: from 3.1.105-servicing.20269.5 to 3.1.105-servicing.20271.8 [marker]: <> (End:09e3bc2d-823c-446b-1ac3-08d7d0ed185e) [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) - **Microsoft.DotNet.Common.ItemTemplates**: from 3.1.5 to 3.1.5 (parent: Microsoft.Dotnet.Toolset.Internal) - **Microsoft.NET.Sdk**: from 3.1.104-servicing.20223.11 to 3.1.105-servicing.20270.18 (parent: Microsoft.Dotnet.Toolset.Internal) - **Microsoft.DotNet.MSBuildSdkResolver**: from 3.1.105-servicing.20269.5 to 3.1.105-servicing.20271.8 (parent: Microsoft.Dotnet.Toolset.Internal) [marker]: <> (End:Coherency Updates) --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59ef3b8025c3..6b761048983f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ecbb998e926b..0e5b3a1f2e48 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -70,20 +70,20 @@ 2720fcade72d709a5d2fe80d0b80fbdac54213f6 - https://github.com/dotnet/templating - 7de8a5796512f85463e6f0149949574d80c2a120 + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + fefccd4c1edee4f9e3cfe4377e00592fb5fe172b - - https://github.com/dotnet/toolset - ae90f951936e99bb85f916b83603ad0eb3affbb1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-toolset + cc5157e04db69f06bcbbf50bc0093d92ee6eceaf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 99d7f3290a766fe288678650bd1f2af760b44212 + 46e19481c7a7c4ebff15828344d30f3568a23bb1 - - https://github.com/dotnet/cli - c536a8b63f7007a4eb85cf8e059d1116f0a8779f + + https://dev.azure.com/dnceng/internal/_git/dotnet-cli + a5c7ba66c6d060e46af1e0b01612eda8b9556411 diff --git a/eng/Versions.props b/eng/Versions.props index df8c296443b3..baca83f99de1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.105-servicing.20270.9 + 3.1.105-servicing.20271.18 @@ -46,14 +46,14 @@ - 3.1.105-servicing.20269.5 + 3.1.105-servicing.20271.8 0.2.0 - 3.1.104-servicing.20223.11 + 3.1.105-servicing.20270.18 $(MicrosoftNETSdkPackageVersion) From 99c9707ea83d05c20b31be39cfd373fd0929ed3e Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 26 May 2020 17:33:08 +0000 Subject: [PATCH 10/14] Merged PR 8172: Update implicit versions to 2.1.19 --- src/redist/targets/GenerateBundledVersions.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index c91f0fb12c26..34fb15857a85 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -92,7 +92,7 @@ + LatestVersion="2.1.19" /> + LatestVersion="2.1.19"/> + LatestVersion="2.1.19"/> Date: Sun, 12 Apr 2020 20:47:01 -0700 Subject: [PATCH 11/14] Correct tool path append --- src/redist/targets/packaging/windows/clisdk/dotnet.wxs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs index e3be35ecea24..0474cb9e088e 100644 --- a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs +++ b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs @@ -14,6 +14,7 @@ + @@ -59,4 +60,11 @@ + + + + + + + From 694c9550172533dbdc20cd427466c8637b26a3d0 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 10 Jun 2020 16:00:32 -0700 Subject: [PATCH 12/14] Remove internal feed --- NuGet.config | 4 ---- 1 file changed, 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6b761048983f..32a229378577 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,11 +7,7 @@ - - - - From 14d9e021f595b9a9acf0b14b3ba1985b59bc874e Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 10 Jun 2020 16:09:35 -0700 Subject: [PATCH 13/14] Update branding to 3.1.106 --- src/redist/targets/Versions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index d65f3b7c528f..3039e18430e0 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -3,7 +3,7 @@ 3 1 1 - 05 + 06 servicing