From 05eccf2790c927235a61d65a4ba91dbba643e034 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 27 Feb 2021 02:35:11 +0000 Subject: [PATCH 01/10] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-6.21123.28 to 3.9.0-6.21126.12 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 421995e80..cd21d036a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 51ff67bd457ca07bab44409a3f58b9bb68997f2f + 65d520e2cf220458a34194a218c26fac75d41b30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 51ff67bd457ca07bab44409a3f58b9bb68997f2f + 65d520e2cf220458a34194a218c26fac75d41b30 @@ -121,9 +121,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 0ffb65777acd74de98f6faef0ade9a14211475c2 + dc0eaac24c61809533ab7b4c6eddf141683c9e12 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index c069d443e..d84aa4442 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.201-servicing.21123.24 - 5.0.201-servicing.21123.24 + 5.0.201-servicing.21126.16 + 5.0.201-servicing.21126.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fadd4e80e37d7a022049965352ee4f128bece388 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Mar 2021 13:12:56 +0000 Subject: [PATCH 02/10] Merged PR 13526: [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk 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.DotNet.Common.ItemTemplates**: from 5.0.200-preview.21109.7 to 5.0.202-preview.21160.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Test.Sdk**: from 16.9.1 to 16.9.1-release-20210308-01 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 3.9.0-6.21126.12 to 3.9.0-6.21160.10 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a - **Build**: 20210311.12 - **Date Produced**: 3/11/2021 5:52 PM - **Commit**: 11c6481f7999454c4ae775a5965da43aec349092 - **Branch**: refs/heads/internal/release/5.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.201-servicing.21126.16 to 5.0.202-servicing.21161.12][1] - **Microsoft.NET.Sdk**: [from 5.0.201-servicing.21126.16 to 5.0.202-servicing.21161.12][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 5.0.200-preview.21109.7 to 5.0.202-preview.21160.5][2] - **Microsoft.NET.Test.Sdk**: [from 16.9.1 to 16.9.1-release-20210308-01][3] - **Microsoft.Net.Compilers.Toolset**: [from 3.9.0-6.21126.12 to 3.9.0-6.21160.10][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC65d520e&targetVersion=GC11c6481&_a=files [2]: https://github.com/dotnet/templating/compare/ce1a4cd...b906108 [3]: https://github.com/microsoft/vstest/compare/6a858a3...6a858a3 [4]: https://github.com/dotnet/roslyn/compare/dc0eaac...59eedc3 [DependencyUpdate]: <> (End) [marker]: <> (End:fec1f9ef-909e-4396-5b7d-08d8d784082a) --- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a6d3ee4f..4ad21115e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,17 +87,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda + b906108c90b3e15cfff7bb401a9c536c58284d68 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 65d520e2cf220458a34194a218c26fac75d41b30 + 11c6481f7999454c4ae775a5965da43aec349092 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 65d520e2cf220458a34194a218c26fac75d41b30 + 11c6481f7999454c4ae775a5965da43aec349092 @@ -112,7 +112,7 @@ https://github.com/dotnet/fsharp 7ce7132f1459095e635194d09d6f73265352029a - + https://github.com/microsoft/vstest 6a858a323caa439115e9e3cf1c958b04f4ff9993 @@ -121,9 +121,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - dc0eaac24c61809533ab7b4c6eddf141683c9e12 + 59eedc33d35754759994155ea2f4e1012a9951e3 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index ea0fc78f0..61fac2df8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.200-preview.21109.7 + 5.0.202-preview.21160.5 @@ -55,8 +55,8 @@ - 5.0.201-servicing.21126.16 - 5.0.201-servicing.21126.16 + 5.0.202-servicing.21161.12 + 5.0.202-servicing.21161.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.9.1 + 16.9.1-release-20210308-01 From a7de7897f7507d67f3f4c15a731dd41a71e886ea Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Mar 2021 14:48:00 +0000 Subject: [PATCH 03/10] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.202-preview.21160.5 to 5.0.202 (parent: Microsoft.NET.Sdk) --- NuGet.config | 3 +++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index e66336daa..60087d47c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ad21115e..7c20a3e58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,17 +87,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - b906108c90b3e15cfff7bb401a9c536c58284d68 + 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 11c6481f7999454c4ae775a5965da43aec349092 + 5478cd132f799303e30ad4aaccec8d15ea4a3146 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 11c6481f7999454c4ae775a5965da43aec349092 + 5478cd132f799303e30ad4aaccec8d15ea4a3146 diff --git a/eng/Versions.props b/eng/Versions.props index 61fac2df8..3158458b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.202-preview.21160.5 + 5.0.202 @@ -55,8 +55,8 @@ - 5.0.202-servicing.21161.12 - 5.0.202-servicing.21161.12 + 5.0.202-servicing.21166.2 + 5.0.202-servicing.21166.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3757bb5e64cfa52224dca0997e1e02280f6e3618 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Mar 2021 04:54:52 +0000 Subject: [PATCH 04/10] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.Build: from 16.9.0 to 16.9.0 (parent: Microsoft.NET.Sdk) --- NuGet.config | 3 +++ eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 60087d47c..9bf796464 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c20a3e58..b81bdd659 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5478cd132f799303e30ad4aaccec8d15ea4a3146 + aff722214d21d01c1abce2d168bf9a8bb6473fe6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5478cd132f799303e30ad4aaccec8d15ea4a3146 + aff722214d21d01c1abce2d168bf9a8bb6473fe6 @@ -127,7 +127,7 @@ https://github.com/dotnet/msbuild - 57a23d249aafe6409b3e24836a486f769cb74c2c + 5e4b48a27efce55a613664b58d353ab4c8d1f6c1 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 3158458b8..e11f48c08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.202-servicing.21166.2 - 5.0.202-servicing.21166.2 + 5.0.202-servicing.21167.21 + 5.0.202-servicing.21167.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ec1985f6fde09ccc0b3d6d16784fe3e415dcbf51 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Mar 2021 17:02:26 +0000 Subject: [PATCH 05/10] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - NuGet.Build.Tasks: from 5.9.0-rc.7122 to 5.9.1-rc.1 (parent: Microsoft.NET.Sdk) - Port dotnet-tools-internal --- NuGet.config | 1 - eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- eng/common/SetupNugetSources.ps1 | 5 +++++ eng/common/SetupNugetSources.sh | 14 ++++++++++++++ 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9bf796464..0b235c25d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b81bdd659..1f000402d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aff722214d21d01c1abce2d168bf9a8bb6473fe6 + 5742a78782052538603f91507bf5d276f51e7300 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aff722214d21d01c1abce2d168bf9a8bb6473fe6 + 5742a78782052538603f91507bf5d276f51e7300 @@ -129,9 +129,9 @@ https://github.com/dotnet/msbuild 5e4b48a27efce55a613664b58d353ab4c8d1f6c1 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - abf0ba0638070af16427cea69bd47a9945fd5d7a + fad4343fa8ba919bb8a1b86bb22310824bf14268 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index e11f48c08..9bc93242d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.202-servicing.21167.21 - 5.0.202-servicing.21167.21 + 5.0.202-servicing.21168.6 + 5.0.202-servicing.21168.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index a0b5fc37f..a6d188f1f 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -158,4 +158,9 @@ if ($dotnet5Source -ne $null) { AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } +$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']") +if ($dotnetToolsSource -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password +} + $doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 2734601c1..81d7913e6 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -129,6 +129,20 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet5-internal-transport') fi +# Ensure dotnet-tools-internal is in the packageSources if the public dotnet-tools feed is present +grep -i "" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet-tools-internal') +fi + # I want things split line by line PrevIFS=$IFS IFS=$'\n' From f8976a91b24ae9bb06c7eefe6b60b63a141bad83 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Mar 2021 20:36:51 +0000 Subject: [PATCH 06/10] Merged PR 13715: [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk 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.WindowsDesktop.App**: from 5.0.4-servicing.21117.9 to 5.0.5-servicing.21167.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Internal**: from 5.0.4-servicing.21116.14 to 5.0.5-servicing.21166.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 5.0.1 to 5.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: from 5.0.4-servicing.21118.15 to 5.0.5-servicing.21167.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.EntityFrameworkCore**: from 5.0.4 to 5.0.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - **dotnet-dev-certs**: from 5.0.4-servicing.21118.15 to 5.0.5-servicing.21167.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 5.0.4-servicing.21118.15 to 5.0.5-servicing.21167.8 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 5.0.4-servicing.21117.2 to 5.0.5-servicing.21167.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 5.0.4-servicing.21117.5 to 5.0.5-servicing.21167.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a - **Build**: 20210318.16 - **Date Produced**: 3/18/2021 5:55 PM - **Commit**: acd467496cf41224b70e0e25aa05bb8cde28c5eb - **Branch**: refs/heads/internal/release/5.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.202-servicing.21168.6 to 5.0.202-servicing.21168.16][1] - **Microsoft.NET.Sdk**: [from 5.0.202-servicing.21168.6 to 5.0.202-servicing.21168.16][1] - **Microsoft.WindowsDesktop.App**: [from 5.0.4-servicing.21117.9 to 5.... --- NuGet.config | 23 +++++++++++++++ eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 3 files changed, 70 insertions(+), 47 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b235c25d..53f355d24 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,11 +6,23 @@ + + + + + + + + + + + + @@ -24,6 +36,17 @@ + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f000402d..1878833cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e708867037ec6edbe7965b8f0f1193999785037e + 951b1ad8c1ade424930ec5697fd9b46d1d170db4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e708867037ec6edbe7965b8f0f1193999785037e + 951b1ad8c1ade424930ec5697fd9b46d1d170db4 https://github.com/dotnet/windowsdesktop @@ -25,21 +25,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 2f740adc1457e8a28c1c072993b66f515977eb51 @@ -47,9 +47,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + 2f740adc1457e8a28c1c072993b66f515977eb51 https://github.com/dotnet/aspnetcore @@ -59,25 +59,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e882394a7bb38930da748291fe2c2ceaa6a80588 + b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e882394a7bb38930da748291fe2c2ceaa6a80588 + b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e882394a7bb38930da748291fe2c2ceaa6a80588 + b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e882394a7bb38930da748291fe2c2ceaa6a80588 + b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb https://github.com/dotnet/test-templates @@ -91,22 +91,22 @@ https://github.com/dotnet/templating 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5742a78782052538603f91507bf5d276f51e7300 + acd467496cf41224b70e0e25aa05bb8cde28c5eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5742a78782052538603f91507bf5d276f51e7300 + acd467496cf41224b70e0e25aa05bb8cde28c5eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3991c2606be14a6faf29eeafe824bd4444e85ea1 + b47cabfdc9c35f9b3305e5e11c2957d81fee26af - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5d6364723197e917e11c0d442545287c27754aa5 + 2a2301468b4a483e4c11f763ff7f131c6ff70bc2 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9bc93242d..b1c6a513a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.4-servicing.21117.2 + 5.0.5-servicing.21167.1 - 5.0.4-servicing.21117.5 + 5.0.5-servicing.21167.2 @@ -43,39 +43,39 @@ - 5.0.4 + 5.0.5 5.0.0 5.0.0-rtm.20526.5 - 5.0.4-servicing.21118.15 - 5.0.4-servicing.21118.15 - 5.0.4-servicing.21118.15 + 5.0.5-servicing.21167.8 + 5.0.5-servicing.21167.8 + 5.0.5-servicing.21167.8 0.2.0 - 5.0.202-servicing.21168.6 - 5.0.202-servicing.21168.6 + 5.0.202-servicing.21168.16 + 5.0.202-servicing.21168.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.4-servicing.21116.14 - 5.0.4 - 5.0.4 + 5.0.5-servicing.21166.9 + 5.0.5 + 5.0.5 5.0.0 - 5.0.4 - 5.0.1 + 5.0.5 + 5.0.2 2.1.0 5.0.0-rtm.20519.4 - 5.0.4-servicing.21117.9 - 5.0.4 + 5.0.5-servicing.21167.2 + 5.0.5 5.0.0 5.0.0-rtm.20520.1 From 748f5c681b8bcb7ec9ef65de459239973d48f70f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 20 Mar 2021 02:20:19 +0000 Subject: [PATCH 07/10] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-rtm.20604.1 to 5.0.0-rtm.21161.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1878833cc..82043fa4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - acd467496cf41224b70e0e25aa05bb8cde28c5eb + a72246a718539102e538d046e60ef93072370898 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - acd467496cf41224b70e0e25aa05bb8cde28c5eb + a72246a718539102e538d046e60ef93072370898 @@ -116,9 +116,9 @@ https://github.com/microsoft/vstest 6a858a323caa439115e9e3cf1c958b04f4ff9993 - + https://github.com/mono/linker - 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d + c43f981eec336c1dc4fd0ead84b5e09db9377d9e linker diff --git a/eng/Versions.props b/eng/Versions.props index b1c6a513a..06674acdc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.202-servicing.21168.16 - 5.0.202-servicing.21168.16 + 5.0.202-servicing.21169.9 + 5.0.202-servicing.21169.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3346fa974fffdbb431685520cce0ff793568499a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 Mar 2021 21:46:56 +0000 Subject: [PATCH 08/10] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk --- 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 82043fa4d..bdb03e260 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a72246a718539102e538d046e60ef93072370898 + 461a94d08054f1b683ef2855c18acf9de0e1175c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a72246a718539102e538d046e60ef93072370898 + 461a94d08054f1b683ef2855c18acf9de0e1175c diff --git a/eng/Versions.props b/eng/Versions.props index 06674acdc..f6952f2ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.202-servicing.21169.9 - 5.0.202-servicing.21169.9 + 5.0.202-servicing.21172.7 + 5.0.202-servicing.21172.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From db7cc87d512335808e3806067f2bf9b31379e1db Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Apr 2021 22:02:02 +0000 Subject: [PATCH 09/10] Merged PR 13895: [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk 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.NET.Test.Sdk**: from 16.9.1-release-20210308-01 to 16.9.4 (parent: Microsoft.NET.Sdk) - **NuGet.Build.Tasks**: from 5.9.1-rc.1 to 5.9.1-rc.8 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a - **Build**: 20210401.17 - **Date Produced**: 4/1/2021 9:22 PM - **Commit**: 51369266643769f9f0c1184e89715cd1045126d0 - **Branch**: refs/heads/internal/release/5.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.202-servicing.21172.7 to 5.0.202-servicing.21201.17][1] - **Microsoft.NET.Sdk**: [from 5.0.202-servicing.21172.7 to 5.0.202-servicing.21201.17][1] - **Microsoft.NET.Test.Sdk**: [from 16.9.1-release-20210308-01 to 16.9.4][2] - **NuGet.Build.Tasks**: [from 5.9.1-rc.1 to 5.9.1-rc.8][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC461a94d&targetVersion=GC5136926&_a=files [2]: https://github.com/microsoft/vstest/compare/6a858a3...99b911a [3]: https://github.com/nuget/nuget.client/compare/fad4343...d525b0e [DependencyUpdate]: <> (End) [marker]: <> (End:fec1f9ef-909e-4396-5b7d-08d8d784082a) --- NuGet.config | 14 ++++++++++++++ eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 53f355d24..8b3db04dc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,17 +10,26 @@ + + + + + + + + + @@ -42,9 +51,14 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bdb03e260..b1bd24113 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 461a94d08054f1b683ef2855c18acf9de0e1175c + 51369266643769f9f0c1184e89715cd1045126d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 461a94d08054f1b683ef2855c18acf9de0e1175c + 51369266643769f9f0c1184e89715cd1045126d0 @@ -112,9 +112,9 @@ https://github.com/dotnet/fsharp 7ce7132f1459095e635194d09d6f73265352029a - + https://github.com/microsoft/vstest - 6a858a323caa439115e9e3cf1c958b04f4ff9993 + 99b911a57a02fc5d2eeef23e9ab8cbea4505678b https://github.com/mono/linker @@ -129,9 +129,9 @@ https://github.com/dotnet/msbuild 5e4b48a27efce55a613664b58d353ab4c8d1f6c1 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - fad4343fa8ba919bb8a1b86bb22310824bf14268 + + https://github.com/nuget/nuget.client + d525b0e670f3b6cbd5c73a35f04730a9f658c852 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index f6952f2ca..76ed00f75 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.202-servicing.21172.7 - 5.0.202-servicing.21172.7 + 5.0.202-servicing.21201.17 + 5.0.202-servicing.21201.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.9.1-release-20210308-01 + 16.9.4 From ca9be29c87064da28527fba3989a97979a04f9d7 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 13 Apr 2021 11:34:06 -0700 Subject: [PATCH 10/10] Remove internal feed --- NuGet.config | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b3db04dc..3d19a63c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -15,8 +14,6 @@ - - @@ -26,11 +23,6 @@ - - - - - @@ -47,18 +39,10 @@ - - - - - - - -