From 7137ea6553bcff9c47bf615f033f5474518b852b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Feb 2021 22:58:46 +0000 Subject: [PATCH 001/112] Update dependencies from https://github.com/dotnet/sdk build 20210202.13 (#9598) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.2.0-beta.21067.2 to 11.3.2-beta.21102.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 efb87e1d0..671b95ded 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - f9d6307ccd2c2249524bb2b2ace9167dc1a635fc + 2193517a515dbc471d0eadff1fd4ec73ad7bf474 - + https://github.com/dotnet/sdk - f9d6307ccd2c2249524bb2b2ace9167dc1a635fc + 2193517a515dbc471d0eadff1fd4ec73ad7bf474 @@ -104,9 +104,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 89936f5f8d7ac99e04123f8f48754f252dfd9973 - + https://github.com/dotnet/fsharp - 9904179c94c41d5d7f9008975d523d807b2a19c6 + a2533e85336268d60dfd35a1e22d4428b57c5c1c https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 0850f2f08..f550dbc13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21079.24 - 5.0.200-preview.21079.24 + 5.0.200-preview.21102.13 + 5.0.200-preview.21102.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5e79110ad5a9425191fec595a6beb5ca0fa648fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Feb 2021 00:51:17 +0000 Subject: [PATCH 002/112] Update dependencies from https://github.com/dotnet/sdk build 20210202.14 (#9600) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.3.2-beta.21102.4 to 11.3.2-beta.21102.7 (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 671b95ded..f876a6e9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - 2193517a515dbc471d0eadff1fd4ec73ad7bf474 + ab5e925dc66e767a75022804a37eb71544c537dc - + https://github.com/dotnet/sdk - 2193517a515dbc471d0eadff1fd4ec73ad7bf474 + ab5e925dc66e767a75022804a37eb71544c537dc @@ -104,9 +104,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 89936f5f8d7ac99e04123f8f48754f252dfd9973 - + https://github.com/dotnet/fsharp - a2533e85336268d60dfd35a1e22d4428b57c5c1c + 7ce7132f1459095e635194d09d6f73265352029a https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index f550dbc13..bf1c6b431 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21102.13 - 5.0.200-preview.21102.13 + 5.0.200-preview.21102.14 + 5.0.200-preview.21102.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2041c910e8b77338fcbe5740ff3692bd1a5c67ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Feb 2021 02:10:38 +0000 Subject: [PATCH 003/112] Update dependencies from https://github.com/dotnet/sdk build 20210202.17 (#9602) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 5.9.0-rc.7046 to 5.9.0-rc.7097 (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 f876a6e9f..a814edbc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - ab5e925dc66e767a75022804a37eb71544c537dc + 5b62e19b79c671c66445b8fd45fcaf764ba2fb3a - + https://github.com/dotnet/sdk - ab5e925dc66e767a75022804a37eb71544c537dc + 5b62e19b79c671c66445b8fd45fcaf764ba2fb3a @@ -125,9 +125,9 @@ https://github.com/dotnet/msbuild 968042dd0751542e52f8bae910f834d6e6379227 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - e90588d4ec63e966360eec817c80d0758ff05b30 + ed9af679b4425c1ff4d41d2302d73f6e580a2839 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index bf1c6b431..ea8e8416d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21102.14 - 5.0.200-preview.21102.14 + 5.0.200-preview.21102.17 + 5.0.200-preview.21102.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 78ab467c570dfd0cb6159877d116b53faa02b1ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Feb 2021 02:47:31 +0000 Subject: [PATCH 004/112] Update dependencies from https://github.com/dotnet/sdk build 20210202.21 (#9603) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.3.2-beta.21102.7 to 11.3.2-beta.21102.9 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a814edbc9..252204ba4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - 5b62e19b79c671c66445b8fd45fcaf764ba2fb3a + 33b070e925f8c122645479f50814570165346ffe - + https://github.com/dotnet/sdk - 5b62e19b79c671c66445b8fd45fcaf764ba2fb3a + 33b070e925f8c122645479f50814570165346ffe @@ -104,7 +104,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 89936f5f8d7ac99e04123f8f48754f252dfd9973 - + https://github.com/dotnet/fsharp 7ce7132f1459095e635194d09d6f73265352029a diff --git a/eng/Versions.props b/eng/Versions.props index ea8e8416d..dfaecc092 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21102.17 - 5.0.200-preview.21102.17 + 5.0.200-preview.21102.21 + 5.0.200-preview.21102.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b94b9ee9eef0479f9adacabe1c604cc00998dbb8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Feb 2021 03:29:13 +0000 Subject: [PATCH 005/112] [release/5.0.2xx] Update dependencies from dotnet/sdk (#9623) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-4.21080.10 to 3.9.0-4.21102.8 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.9.0-preview-21078-04 to 16.9.0 (parent: Microsoft.NET.Sdk) --- NuGet.config | 5 +++++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 80a8ed6b9..92d415e6c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 252204ba4..982c7b7ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - 33b070e925f8c122645479f50814570165346ffe + 2ab5fa253ac9aa3397abe78481a24fe8bab59639 - + https://github.com/dotnet/sdk - 33b070e925f8c122645479f50814570165346ffe + 2ab5fa253ac9aa3397abe78481a24fe8bab59639 @@ -117,13 +117,13 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 3f54551d64817ec41c571b60cd512bd4e5902431 + ed0671d9d28cd6c748f5ce8805f650f986979d58 - + https://github.com/dotnet/msbuild - 968042dd0751542e52f8bae910f834d6e6379227 + 663c136fcd9b4015abba52e9a99890d005adfa0e https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index dfaecc092..72e63faa6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21102.21 - 5.0.200-preview.21102.21 + 5.0.200-preview.21103.10 + 5.0.200-preview.21103.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e158ba0b91c26b92be5e6a617c8f3e950c37e1a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Feb 2021 04:13:15 +0000 Subject: [PATCH 006/112] Update dependencies from https://github.com/dotnet/sdk build 20210203.14 (#9625) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-4.21102.8 to 3.9.0-4.21103.10 (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 982c7b7ed..099d978a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - 2ab5fa253ac9aa3397abe78481a24fe8bab59639 + 7d0579b2196c60b74bd368498d18fd7a3d960206 - + https://github.com/dotnet/sdk - 2ab5fa253ac9aa3397abe78481a24fe8bab59639 + 7d0579b2196c60b74bd368498d18fd7a3d960206 @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - ed0671d9d28cd6c748f5ce8805f650f986979d58 + 427a350442ab054957a7d4ab374e9430ea89d6c5 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 72e63faa6..1ec547881 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21103.10 - 5.0.200-preview.21103.10 + 5.0.200-preview.21103.14 + 5.0.200-preview.21103.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2582e39f27374145c064db52da2a5824db5e1f63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Feb 2021 06:20:06 +0000 Subject: [PATCH 007/112] Update dependencies from https://github.com/dotnet/sdk build 20210203.15 (#9626) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.9.0 to 16.9.0 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 92d415e6c..1a198aa60 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 099d978a2..9c5ea93c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - 7d0579b2196c60b74bd368498d18fd7a3d960206 + 43960002890614c4e01880e48820b4c2b9c60cc7 - + https://github.com/dotnet/sdk - 7d0579b2196c60b74bd368498d18fd7a3d960206 + 43960002890614c4e01880e48820b4c2b9c60cc7 @@ -123,7 +123,7 @@ https://github.com/dotnet/msbuild - 663c136fcd9b4015abba52e9a99890d005adfa0e + ffd6bbc28bd71d509e0f0c639d963852a23945b1 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 1ec547881..26949edd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21103.14 - 5.0.200-preview.21103.14 + 5.0.200-preview.21103.15 + 5.0.200-preview.21103.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7870eddff2d318505a5b57e5d3653d15eaed8154 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Feb 2021 10:42:29 +0000 Subject: [PATCH 008/112] Update dependencies from https://github.com/dotnet/sdk build 20210204.3 (#9628) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-4.21103.10 to 3.9.0-4.21104.8 (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 9c5ea93c4..2922310d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - 43960002890614c4e01880e48820b4c2b9c60cc7 + ba0af1496358cbc8f41b7084ab84af51abf03916 - + https://github.com/dotnet/sdk - 43960002890614c4e01880e48820b4c2b9c60cc7 + ba0af1496358cbc8f41b7084ab84af51abf03916 @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 427a350442ab054957a7d4ab374e9430ea89d6c5 + 2fc92d84e746c3aab75f0930278ea6675cd5bb5c https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 26949edd4..a1c0d4e01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21103.15 - 5.0.200-preview.21103.15 + 5.0.200-preview.21104.3 + 5.0.200-preview.21104.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84425bc8a4d6d9125d7dbf56f482965e1c94fbb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Feb 2021 00:37:03 +0000 Subject: [PATCH 009/112] Update dependencies from https://github.com/dotnet/sdk build 20210204.13 (#9632) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.9.0 to 16.9.0 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1a198aa60..094adcd60 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2922310d4..43de74ce2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - ba0af1496358cbc8f41b7084ab84af51abf03916 + 126f21b12c9ff03db4bc065335cd7fd2cfd23dc1 - + https://github.com/dotnet/sdk - ba0af1496358cbc8f41b7084ab84af51abf03916 + 126f21b12c9ff03db4bc065335cd7fd2cfd23dc1 @@ -123,7 +123,7 @@ https://github.com/dotnet/msbuild - ffd6bbc28bd71d509e0f0c639d963852a23945b1 + 663c136fcd9b4015abba52e9a99890d005adfa0e https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index a1c0d4e01..38637b5c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21104.3 - 5.0.200-preview.21104.3 + 5.0.200-preview.21104.13 + 5.0.200-preview.21104.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8d038c5aa83ba650c54b80eff22b4ff24b65cd55 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 6 Feb 2021 14:50:43 +0000 Subject: [PATCH 010/112] Update dependencies from https://github.com/dotnet/sdk build 20210206.5 (#9639) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 16.9.0-release-20201130-02 to 16.9.0-release-20210205-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43de74ce2..57ec0052d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - 126f21b12c9ff03db4bc065335cd7fd2cfd23dc1 + dd9d107c46da5e72a9fa84ed6e6d0d9e76acb139 - + https://github.com/dotnet/sdk - 126f21b12c9ff03db4bc065335cd7fd2cfd23dc1 + dd9d107c46da5e72a9fa84ed6e6d0d9e76acb139 @@ -108,9 +108,9 @@ https://github.com/dotnet/fsharp 7ce7132f1459095e635194d09d6f73265352029a - + https://github.com/microsoft/vstest - 0a56da68da5f466d32606bba8b7d8260ad9d2a43 + 5f09e3c10bd503134f277c257b635f37a6c0be64 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 38637b5c1..f6c0c3ee9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21104.13 - 5.0.200-preview.21104.13 + 5.0.200-preview.21106.5 + 5.0.200-preview.21106.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -129,7 +129,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.9.0-release-20201130-02 + 16.9.0-release-20210205-02 From 118978636e8849ea893469bb899263c2e5266797 Mon Sep 17 00:00:00 2001 From: Cristiano Suzuki Date: Mon, 8 Feb 2021 17:54:42 -0800 Subject: [PATCH 011/112] Loc update --- .../windows/clisdk/LCID/1028/bundle.wxl | 24 +++++++------- .../windows/clisdk/LCID/1029/bundle.wxl | 20 ++++++------ .../windows/clisdk/LCID/1031/bundle.wxl | 26 +++++++-------- .../windows/clisdk/LCID/1036/bundle.wxl | 20 ++++++------ .../windows/clisdk/LCID/1040/bundle.wxl | 14 ++++---- .../windows/clisdk/LCID/1041/bundle.wxl | 8 ++--- .../windows/clisdk/LCID/1042/bundle.wxl | 16 +++++----- .../windows/clisdk/LCID/1045/bundle.wxl | 8 ++--- .../windows/clisdk/LCID/1046/bundle.wxl | 16 +++++----- .../windows/clisdk/LCID/1049/bundle.wxl | 32 +++++++++---------- .../windows/clisdk/LCID/1055/bundle.wxl | 26 +++++++-------- .../windows/clisdk/LCID/2052/bundle.wxl | 22 ++++++------- .../windows/clisdk/LCID/3082/bundle.wxl | 10 +++--- 13 files changed, 121 insertions(+), 121 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl index 079520921..085b9146c 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl @@ -19,7 +19,7 @@ 安裝(&I) 關閉(&C) 安裝進度 - 處理中: + 正在處理: 正在初始化... 取消(&C) 修改安裝 @@ -38,7 +38,7 @@ 解除安裝失敗 修復失敗 有一個或多個問題導致安裝程式失敗。請解決問題，然後重試一次安裝。如需詳細資訊，請參閱<a href="#">記錄檔</a>。 - 必須重新啟動電腦，才能完成軟體的復原。 + 必須重新啟動電腦才可完成軟體復原。 重新啟動(&R) 關閉(&C) 使用中的檔案 @@ -67,17 +67,17 @@ 下列項目已安裝在: '[DOTNETHOME]' • .NET SDK [DOTNETSDKVERSION] - • .NET Runtime [DOTNETRUNTIMEVERSION] - • ASP.NET Core Runtime [ASPNETCOREVERSION] + • .NET 執行階段 [DOTNETRUNTIMEVERSION] + • ASP.NET Core 執行階段 [ASPNETCOREVERSION] -此產品會收集使用方式資料 - • 如需詳細資訊並退出，請前往 https://aka.ms/dotnet-cli-telemetry +此產品會收集使用量資料 + • 詳細資訊與退出功能 https://aka.ms/dotnet-cli-telemetry 資源 - • 如需 .NET 文件，請前往 https://aka.ms/dotnet-docs - • 如需 SDK 文件，請前往 https://aka.ms/dotnet-sdk-docs - • 如需版本資訊，請前往 https://aka.ms/dotnet5-release-notes - • 如需教學課程，請前往 https://aka.ms/dotnet-tutorials + • .NET 文件 https://aka.ms/dotnet-docs + • SDK 文件 https://aka.ms/dotnet-sdk-docs + • 版本資訊 https://aka.ms/dotnet5-release-notes + • 教學課程 https://aka.ms/dotnet-tutorials .NET SDK .NET SDK 可用於建置、執行及測試 .NET 應用程式。您可以選擇多種語言、編輯器以及開發人員工具，並可利用程式庫的大型生態系統，來建置 Web、行動裝置、桌面、遊戲及 IoT 的應用程式。希望您會喜歡! @@ -87,11 +87,11 @@ <A HREF="https://aka.ms/dotnet-cli-docs">SDK 文件</A> <A HREF="https://aka.ms/dev-privacy">隱私權聲明</A> <A HREF="https://aka.ms/dotnet-license-windows">.NET 的授權資訊</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetry collection and opt-out</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">遙測集合與退出功能</A> 安裝附註 安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。 - 若預計要併用 Visual Studio 與 .NET 5.0，需要 Visual Studio 2019 16.8 或更新版本。<A HREF="https://aka.ms/dotnet5-release-notes">深入了解</A>。 + 若預計要搭配 Visual Studio 使用 .NET 5.0，需要 Visual Studio 2019 16.8 或更新版本。<A HREF="https://aka.ms/dotnet5-release-notes">深入了解</A>. 按一下 [\[]安裝[\[] 即表示您同意下列條款。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl index 32a3a8db7..138de35d9 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl @@ -15,20 +15,20 @@ /log [\[]"log.txt"[\]] – Uloží protokol do konkrétního souboru. Ve výchozím nastavení se soubor protokolu vytvoří v adresáři %TEMP%. &Zavřít Souhl&asím s licenčními podmínkami. - M&ožnosti - &Instalovat + &Možnosti + &Nainstalovat &Zavřít Průběh instalace Zpracování: Inicializuje se... - &Storno + &Zrušit Změnit instalaci Op&ravit - O&dinstalovat + Odi&nstalovat &Zavřít Oprava se úspěšně dokončila. Odinstalace se úspěšně dokončila. - Instalace byla úspěšná. + Nastavení proběhlo úspěšně. &Spustit Aby bylo možné dokončit instalaci softwaru, je nutné restartovat počítač. &Restartovat @@ -37,7 +37,7 @@ Instalace se nepovedla. Odinstalace se nepovedla. Oprava se nepovedla. - Instalace se nepovedla kvůli jednomu nebo více problémům. Opravte prosím tyto problémy a zkuste software nainstalovat znovu. Další informace najdete v <a href="#">souboru protokolu</a>. + Instalace se nepovedla kvůli jednomu nebo víc problémům. Opravte tyto problémy a zkuste software znovu nainstalovat. Další informace najdete v <a href="#">souboru protokolu</a>. Pro dokončení vrácení změn tohoto softwaru je potřeba restartovat počítač. &Restartovat &Zavřít @@ -46,7 +46,7 @@ Zavřete &aplikace a zkuste je restartovat. A&plikace nezavírejte. Bude potřeba provést restart. &OK - &Storno + &Zrušit Instalace proběhla úspěšně. Do [DOTNETHOME] byly nainstalovány tyto součásti: @@ -63,7 +63,7 @@ Zdroje informací • Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs • Zpráva k vydání verze: https://aka.ms/dotnet5-release-notes • Kurzy: https://aka.ms/dotnet-tutorials - Instalace proběhla úspěšně. +Instalace proběhla úspěšně. Do [DOTNETHOME] byly nainstalovány tyto součásti: • Sada .NET SDK [DOTNETSDKVERSION] @@ -87,11 +87,11 @@ Zdroje informací <A HREF="https://aka.ms/dotnet-cli-docs">Dokumentace k sadě SDK</A> <A HREF="https://aka.ms/dev-privacy">Prohlášení o zásadách ochrany osobních údajů</A> <A HREF="https://aka.ms/dotnet-license-windows">Informace o licencování pro .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetry collection and opt-out</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Kolekce telemetrie a výslovný nesouhlas</A> Poznámka k instalaci Během procesu instalace se spustí příkaz, který zlepší rychlost obnovení projektu a povolí offline přístup. Akce se dokončí přibližně za minutu. - Pokud plánujete používat .NET 5.0 se sadou Visual Studio, potřebujete Visual Studio 2019 16.8 nebo novější. <A HREF="https://aka.ms/dotnet5-release-notes">Další informace</A> + Pokud se chystáte používat .NET 5.0 se sadou Visual Studio, potřebujete Visual Studio 2019 16.8 nebo novější. <A HREF="https://aka.ms/dotnet5-release-notes">Další informace</A>. Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl index c6307315b..2c1534aed 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl @@ -13,32 +13,32 @@ /norestart: Unterdrückt alle Neustartversuche. Standardmäßig fordert die Benutzeroberfläche zum Bestätigen eines Neustarts auf. /log [\[]"log.txt"[\]]: Erstellt das Protokoll in einer bestimmten Datei. Standardmäßig wird die Protokolldatei in %TEMP% erstellt. - S&chließen + &Schließen Ich &stimme den Lizenzbedingungen zu. &Optionen &Installieren - S&chließen + &Schließen Setupstatus - Wird verarbeitet: + Verarbeitung: Initialisierung... &Abbrechen Setup ändern &Reparieren &Deinstallieren - S&chließen + &Schließen Die Reparatur wurde erfolgreich abgeschlossen. Die Deinstallation wurde erfolgreich abgeschlossen. Setup wurde erfolgreich abgeschlossen &Starten Sie müssen den Computer neu starten, um die Installation der Software abzuschließen. &Neu starten - S&chließen + &Schließen Setupfehler Setupfehler Deinstallationsfehler Reparaturfehler Setup ist aufgrund eines oder mehrerer Probleme fehlgeschlagen. Beheben Sie die Probleme, und führen Sie das Setup erneut aus. Weitere Informationen finden Sie in der <a href="#">Protokolldatei</a>. - Sie müssen den Computer neu starten, um das Zurücksetzen der Software abzuschließen. + Sie müssen Ihren Computer neu starten, um den Rollback der Software abzuschließen. &Neu starten &Schließen Verwendete Dateien @@ -51,9 +51,9 @@ Folgende Komponenten wurden unter [DOTNETHOME] installiert: • .NET SDK [DOTNETSDKVERSION] - • .NET-Runtime [DOTNETRUNTIMEVERSION] - • ASP.NET Core-Runtime [ASPNETCOREVERSION] - • .NET Windows Desktop-Runtime [WINFORMSANDWPFVERSION] + • .NET Runtime [DOTNETRUNTIMEVERSION] + • ASP.NET Core Runtime [ASPNETCOREVERSION] + • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION] Dieses Produkt erfasst Nutzungsdaten. • Weitere Informationen und Deaktivieren der Erfassung: https://aka.ms/dotnet-cli-telemetry @@ -70,7 +70,7 @@ Folgende Komponenten wurden unter [DOTNETHOME] installiert: • .NET-Runtime [DOTNETRUNTIMEVERSION] • ASP.NET Core-Runtime [ASPNETCOREVERSION] -Dieses Produkt erfasst Nutzungsdaten. +Dieses Produkt sammelt Nutzungsdaten. • Weitere Informationen und Deaktivieren der Erfassung: https://aka.ms/dotnet-cli-telemetry Ressourcen @@ -87,11 +87,11 @@ Ressourcen <A HREF="https://aka.ms/dotnet-cli-docs">SDK-Dokumentation</A> <A HREF="https://aka.ms/dev-privacy">Datenschutzerklärung</A> <A HREF="https://aka.ms/dotnet-license-windows">Lizenzierungsinformationen für .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetry collection and opt-out</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Sammlung von Telemetriedaten und Deaktivieren der Telemetriefunktion</A> Installationshinweis Während des Installationsvorgangs wird ein Befehl ausgeführt, durch den die Geschwindigkeit der Projektwiederherstellung verbessert und der Offlinezugriff aktiviert wird. Der Vorgang dauert bis zu einer Minute. - Wenn Sie .NET 5.0 mit Visual Studio verwenden möchten, ist Visual Studio 2019 16.8 oder höher erforderlich. <A HREF="https://aka.ms/dotnet5-release-notes">Erfahren Sie mehr</A>. - + Wenn Sie .NET 5.0 mit Visual Studio verwenden möchten, ist Visual Studio 2019 16.8 oder höher erforderlich. <A HREF="https://aka.ms/dotnet5-release-notes">Weitere Informationen</A> + Durch Klicken auf "Installieren" stimmen Sie den nachstehenden Bedingungen zu. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl index dded2d083..b070d950e 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl @@ -18,8 +18,8 @@ &Options &Installer &Fermer - Progression de l'installation - En cours : + Avancement de l'installation + En cours : Initialisation... &Annuler Modifier l'installation @@ -29,7 +29,7 @@ Réparation terminée avec succès Désinstallation terminée avec succès Installation/désinstallation réussie - &Démarrer + &Lancer Vous devez redémarrer l'ordinateur pour achever l'installation du logiciel. &Redémarrer &Fermer @@ -38,12 +38,12 @@ Échec de la désinstallation Échec de la réparation Un ou plusieurs problèmes sont à l'origine de l'échec de l'installation. Corrigez ces problèmes, puis recommencez l'installation. Pour plus d'informations, voir le <a href="#">fichier journal</a>. - Vous devez redémarrer votre ordinateur pour terminer l'opération de restauration du logiciel. + Vous devez redémarrer votre ordinateur afin de terminer la restauration du logiciel. &Redémarrer &Fermer Fichiers en cours d'utilisation Les applications suivantes utilisent des fichiers nécessitant une mise à jour : - &Fermez les applications, puis essayez de les redémarrer. + &Fermer les applications essayez de les ouvrir de nouveau. &Ne pas fermer les applications. Un redémarrage sera nécessaire. &OK &Annuler @@ -63,7 +63,7 @@ Ressources • Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs • Notes de publication sur https://aka.ms/dotnet5-release-notes • Tutoriels sur https://aka.ms/dotnet-tutorials - L'installation a réussi. +L'installation a réussi. Les éléments suivants ont été installés sur : '[DOTNETHOME]' • Kit SDK .NET [DOTNETSDKVERSION] @@ -71,14 +71,14 @@ Les éléments suivants ont été installés sur : '[DOTNETHOME]' • Runtime ASP.NET Core [ASPNETCOREVERSION] Ce produit collecte des données d'utilisation - • Plus informations et refus d'adhésion sur https://aka.ms/dotnet-cli-telemetry + • Pour plus d'informations ou pour vous y opposer, accédez à https://aka.ms/dotnet-cli-telemetry Ressources • Documentation .NET sur https://aka.ms/dotnet-docs • Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs • Notes de publication sur https://aka.ms/dotnet5-release-notes • Tutoriels sur https://aka.ms/dotnet-tutorials - SDK .NET + Kit SDK .NET Le kit SDK .NET permet de générer, d'exécuter et de tester des applications .NET. Vous pouvez choisir parmi plusieurs langages, éditeurs et outils de développement. De plus, vous pouvez bénéficier d'un vaste écosystème de bibliothèques afin de générer des applications pour le web, les appareils mobiles, les ordinateurs de bureau, les jeux et l'IoT. Nous espérons que vous l'apprécierez ! En savoir plus sur .NET @@ -87,11 +87,11 @@ Ressources <A HREF="https://aka.ms/dotnet-cli-docs">Documentation du kit SDK</A> <A HREF="https://aka.ms/dev-privacy">Déclaration de confidentialité</A> <A HREF="https://aka.ms/dotnet-license-windows">Informations de licence pour .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetry collection and opt-out</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Collecte et désactivation de la télémétrie</A> Note d'installation Une commande va être exécutée pendant le processus d'installation, ce qui va améliorer la vitesse de restauration du projet et permettre l'accès hors connexion. L'opération va prendre environ une minute. - Si vous comptez utiliser .NET 5.0 avec Visual Studio, Visual Studio 2019 16.8 ou version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet5-release-notes">En savoir plus</A>. + Si vous comptez utiliser .NET 5.0 avec Visual Studio, Visual Studio 2019 16.8 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet5-release-notes">En savoir plus</A>. En cliquant sur Installer, vous acceptez les conditions suivantes. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl index 3440357d7..b83eb35d4 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl @@ -11,7 +11,7 @@ /passive | /quiet - visualizza un'interfaccia utente minima senza prompt oppure non visualizza alcuna interfaccia utente né prompt. Per impostazione predefinita, viene visualizzata l'intera interfaccia utente e tutti i prompt. -/norestart - annulla qualsiasi tentativo di riavvio. Per impostazione predefinita, l'interfaccia utente visualizza una richiesta prima del riavvio. +/norestart - annulla qualsiasi tentativo di riavvio. Per impostazione predefinita, l'interfaccia utente visualizza una richiesta prima del riavvio. /log [\[]"log.txt"[\]] - registra il log in un file specifico. Per impostazione predefinita, viene creato un file di log in %TEMP%. &Chiudi &Accetto i termini e le condizioni di licenza @@ -21,19 +21,19 @@ Stato installazione Elaborazione di: Inizializzazione in corso... - &Annulla + Ann&ulla Modifica installazione &Ripristina &Disinstalla &Chiudi La riparazione è stata completata La disinstallazione è stata completata - L'installazione è stata completata + Installazione completata &Avvia Per completare l'installazione del software, è necessario riavviare il computer. &Riavvia &Chiudi - L'installazione non è riuscita + Installazione non riuscita L'installazione non è riuscita La disinstallazione non è riuscita La riparazione non è riuscita @@ -46,7 +46,7 @@ Chiudere le &applicazioni e provare a riavviarle. &Non chiudere le applicazioni; sarà necessario riavviare il sistema &OK - &Annulla + Ann&ulla L'installazione è riuscita. I componenti seguenti sono stati installati in '[DOTNETHOME]' @@ -63,7 +63,7 @@ Risorse • Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs • Note sulla versione https://aka.ms/dotnet5-release-notes • Esercitazioni https://aka.ms/dotnet-tutorials - L'installazione è riuscita. +L'installazione è riuscita. I componenti seguenti sono stati installati in '[DOTNETHOME]' • .NET SDK [DOTNETSDKVERSION] @@ -87,7 +87,7 @@ Risorse <A HREF="https://aka.ms/dotnet-cli-docs">Documentazione dell'SDK</A> <A HREF="https://aka.ms/dev-privacy">Informativa sulla privacy</A> <A HREF="https://aka.ms/dotnet-license-windows">Informazioni sulla licenza per .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetry collection and opt-out</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Raccolta e rifiuto esplicito dei dati di telemetria</A> Nota sull'installazione Durante il processo di installazione verrà eseguito un comando che migliorerà la velocità di ripristino del progetto e abiliterà l'accesso offline. Il completamento del comando richiederà un minuto. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl index b96aa7b1d..10b0e3d24 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl @@ -33,7 +33,7 @@ ソフトウェアのインストールを完了するには、コンピューターを再起動する必要があります。 再起動(&R) 閉じる(&C) - セットアップ失敗 + セットアップに失敗しました セットアップに失敗しました アンインストールに失敗しました 修復に失敗しました @@ -63,7 +63,7 @@ • SDK ドキュメント https://aka.ms/dotnet-sdk-docs • リリース ノート https://aka.ms/dotnet5-release-notes • チュートリアル https://aka.ms/dotnet-tutorials - インストールが成功しました。 +インストールが成功しました。 '[DOTNETHOME]' に以下がインストールされました • .NET SDK [DOTNETSDKVERSION] @@ -87,11 +87,11 @@ <A HREF="https://aka.ms/dotnet-cli-docs">SDK ドキュメント</A> <A HREF="https://aka.ms/dev-privacy">プライバシーに関する声明</A> <A HREF="https://aka.ms/dotnet-license-windows">.NET のライセンス情報</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetry collection and opt-out</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">テレメトリ コレクションおよびオプトアウト</A> インストール メモ コマンドはインストール処理中に実行されるので、プロジェクトの復元速度が向上し、オフラインでアクセスできます。完了するまでに最大 1 分かかります。 - .NET 5.0 を Visual Studio と共に使用する場合は、Visual Studio 2019 16.8 以降が必要です。<A HREF="https://aka.ms/dotnet5-release-notes">詳細情報</A>。 + .NET 5.0 を Visual Studio で使用する場合は、Visual Studio 2019 16.8 以降が必要です。<A HREF="https://aka.ms/dotnet5-release-notes">詳細情報</A>。 [インストール] をクリックすると、次の条項に同意したものと見なされます。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl index c129000a7..a030bb6d1 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl @@ -8,10 +8,10 @@ /install | /repair | /uninstall | /layout [\[]"directory"[\]] - 디렉터리에 번들의 전체 로컬 복사본을 설치, 복구, 제거 또는 작성합니다. '/install'이 기본값입니다. -/passive | /quiet - 프롬프트 없이 최소 UI를 표시하거나 UI 및 +/passive | /quiet - 프롬프트 없이 최소 UI를 표시하거나 UI 및 프롬프트를 표시하지 않습니다. 기본적으로 UI와 모든 프롬프트가 표시됩니다. -/norestart - 다시 시작하지 않게 합니다. 기본적으로 UI에서는 다시 시작하기 전에 묻는 메시지를 표시합니다. +/norestart - 다시 시작하지 않게 합니다. 기본적으로 UI에서는 다시 시작하기 전에 묻는 메시지를 표시합니다. /log [\[]"log.txt"[\]] - 특정 파일에 기록합니다. 기본적으로 로그 파일은 %TEMP%에 만들어집니다. 닫기(&C) 동의함(&A) @@ -19,7 +19,7 @@ 설치(&I) 닫기(&C) 설치 진행률 - 처리 중: + 진행 중: 초기화 중... 취소(&C) 설치 수정 @@ -38,12 +38,12 @@ 제거 실패 복구 실패 하나 이상의 문제가 발생하여 설치하지 못했습니다. 문제를 해결한 다음 설치를 다시 시도하십시오. 자세한 내용은 <a href="#">로그 파일</a>을 참조하십시오. - 소프트웨어 롤백을 완료하려면 컴퓨터를 다시 시작해야 합니다. + 소프트웨어 롤백을 완료하려면 먼저 컴퓨터를 다시 시작해야 합니다. 다시 시작(&R) 닫기(&C) 사용 중인 파일 - 다음의 애플리케이션이 업데이트해야 할 파일을 사용 중입니다. - 애플리케이션을 닫고 다시 시작합니다(&A). + 다음의 응용 프로그램이 업데이트해야 할 파일을 사용 중입니다. + 응용 프로그램을 닫고 다시 시작합니다(&A). 애플리케이션을 닫지 않습니다(&D). 다시 부팅해야 합니다. 확인(&O) 취소(&C) @@ -63,7 +63,7 @@ • SDK 설명서 https://aka.ms/dotnet-sdk-docs • 릴리스 정보 https://aka.ms/dotnet5-release-notes • 자습서 https://aka.ms/dotnet-tutorials - 설치가 완료되었습니다. +설치가 완료되었습니다. 다음이 '[DOTNETHOME]'에 설치되었습니다. • .NET SDK [DOTNETSDKVERSION] @@ -87,7 +87,7 @@ <A HREF="https://aka.ms/dotnet-cli-docs">SDK 설명서</A> <A HREF="https://aka.ms/dev-privacy">개인정보처리방침</A> <A HREF="https://aka.ms/dotnet-license-windows">.NET에 대한 라이선스 정보</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetry collection and opt-out</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">원격 분석 수집 및 옵트아웃</A> 설치 정보 프로젝트 복원 속도를 향상하고 오프라인 액세스를 사용할 수 있도록 하는 설치 프로세스 중 명령이 실행됩니다. 완료하는 데 최대 1분이 걸립니다. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl index d9ac4f9dd..9921cc036 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl @@ -28,7 +28,7 @@ &Zamknij Pomyślnie ukończono naprawę Pomyślnie ukończono dezinstalację - Pomyślnie ukończono instalację + Instalacja powiodła się. &Uruchom Aby zakończyć instalację oprogramowania, należy ponownie uruchomić komputer. &Uruchom ponownie @@ -38,7 +38,7 @@ Dezinstalacja nie powiodła się Naprawa nie powiodła się Co najmniej jeden problem spowodował niepowodzenie instalacji. Rozwiąż problemy, a następnie ponów próbę instalacji. Aby uzyskać więcej informacji, zobacz <a href="#">plik dziennika</a>. - Aby ukończyć wycofywanie oprogramowania, musisz uruchomić ponownie komputer. + Aby zakończyć wycofywanie oprogramowania, musisz uruchomić ponownie komputer. &Uruchom ponownie &Zamknij Pliki w użyciu @@ -63,7 +63,7 @@ Zasoby • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs • Informacje o wersji: https://aka.ms/dotnet5-release-notes • Samouczki: https://aka.ms/dotnet-tutorials - Instalacja zakończyła się pomyślnie. +Instalacja zakończyła się pomyślnie. Następujące elementy zostały zainstalowane w: „[DOTNETHOME]” • Zestaw .NET SDK [DOTNETSDKVERSION] @@ -87,7 +87,7 @@ Zasoby <A HREF="https://aka.ms/dotnet-cli-docs">Dokumentacja zestawu SDK</A> <A HREF="https://aka.ms/dev-privacy">Zasady zachowania poufności informacji</A> <A HREF="https://aka.ms/dotnet-license-windows">Informacje o licencjonowaniu dla platformy .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetry collection and opt-out</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Zbieranie telemetrii i rezygnacja</A> Uwaga dotycząca instalacji W trakcie procesu instalacji zostanie uruchomione polecenie, które zwiększy szybkość przywracania projektu i umożliwi dostęp do trybu offline. Zajmie to maksymalnie minutę. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl index ee416909f..5fdab767a 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -14,7 +14,7 @@ /norestart – suprime qualquer tentativa de reiniciar. Por padrão, a interface do usuário perguntará antes de reiniciar. /log [\[]"log.txt"[\]] – registra em um arquivo específico. Por padrão, um arquivo de log é criado em %TEMP%. &Fechar - &Concordo com os termos e condições da licença + Eu &concordo com os termos e condições da licença &Opções &Instalar &Fechar @@ -38,7 +38,7 @@ Falha na Desinstalação Falha na Reparação Um ou mais problemas causaram falha na instalação. Corrija-os e tente instalar novamente. Para obter mais informações, consulte o <a href="#">arquivo de log</a>. - Você deve reiniciar seu computador para concluir a reversão do software. + Você deve reiniciar o computador para concluir a reversão do software. &Reiniciar &Fechar Arquivos em Uso @@ -61,9 +61,9 @@ Este produto coleta dados de uso Recursos • Documentação do .NET: https://aka.ms/dotnet-docs • Documentação do SDK: https://aka.ms/dotnet-sdk-docs - • Notas sobre a Versão: https://aka.ms/netcore3releasenotes + • Notas sobre a Versão: https://aka.ms/dotnet5-release-notes • Tutoriais: https://aka.ms/dotnet-tutorials - A instalação foi bem-sucedida. +A instalação foi bem-sucedida. O seguinte foi instalado em: '[DOTNETHOME]' • SDK do .NET [DOTNETSDKVERSION] @@ -76,7 +76,7 @@ Este produto coleta dados de uso Recursos • Documentação do .NET: https://aka.ms/dotnet-docs • Documentação do SDK: https://aka.ms/dotnet-sdk-docs - • Notas sobre a Versão: https://aka.ms/netcore3releasenotes + • Notas sobre a Versão: https://aka.ms/dotnet5-release-notes • Tutoriais: https://aka.ms/dotnet-tutorials SDK do .NET @@ -86,12 +86,12 @@ Recursos <A HREF="https://aka.ms/dotnet-docs">Documentação do .NET</A> <A HREF="https://aka.ms/dotnet-cli-docs">Documentação do SDK</A> <A HREF="https://aka.ms/dev-privacy">Política de Privacidade</A> - <A HREF="https://aka.ms/dotnet-License-Windows">Informações de licenciamento para .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetry collection and opt-out</A> + <A HREF="https://aka.ms/dotnet-license-windows">Informações de licenciamento para .NET</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Coleção e recusa de telemetria</A> Nota de instalação Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído. Se você planeja usar o .NET 5.0 com o Visual Studio, é necessário usar o Visual Studio 2019 16.8 ou mais recente. <A HREF="https://aka.ms/dotnet5-release-notes">Saiba mais</A>. - + Ao clicar em instalar, você concorda com os termos a seguir. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl index dc554524f..333843310 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl @@ -13,40 +13,40 @@ /norestart — подавление всех попыток перезагрузки. По умолчанию в пользовательском интерфейсе перед перезагрузкой отображается запрос. /log [\[]"log.txt"[\]] — запись журнала в указанный файл. По умолчанию файл журнала создается в папке %TEMP%. - &Закрыть + З&акрыть Я &принимаю условия лицензии &Параметры &Установить - &Закрыть + З&акрыть Ход установки Обработка: Идет инициализация... - Отм&ена - Изменение установки - &Исправить - &Удалить - &Закрыть + От&мена + Изменить установку + &Восстановить + Уда&лить + З&акрыть Восстановление успешно завершено Удаление успешно завершено Установка успешно завершена &Запустить Для завершения установки программного обеспечения нужно перезагрузить компьютер. - &Перезапустить - &Закрыть - Настройка не завершена + Переза&грузить + З&акрыть + Сбой установки Сбой установки Сбой удаления Сбой восстановления Одна или несколько проблем вызывали сбой программы установки. Исправьте эти проблемы и попробуйте повторить установку. Дополнительные сведения см. в <a href="#">файле журнала</a>. - Необходимо перезагрузить компьютер, чтобы завершить откат программного обеспечения. - &Перезапустить + Необходимо перезагрузить компьютер перед тем, как выполнять откат программного обеспечения. + Переза&грузить З&акрыть Используемые файлы Следующие приложения используют файлы, которые следует обновить: Закрыть &приложения и попытаться перезапустить их. &Не закрывать приложения. Потребуется перезагрузка. - &ОК - Отм&ена + О&К + От&мена Установка выполнена. В "[DOTNETHOME]" установлены следующие компоненты: @@ -63,7 +63,7 @@ • Документация по SDK: https://aka.ms/dotnet-sdk-docs • Заметки о выпуске: https://aka.ms/dotnet5-release-notes • Учебники: https://aka.ms/dotnet-tutorials - Установка выполнена. +Установка выполнена. В "[DOTNETHOME]" установлены следующие компоненты: • Пакет SDK для .NET [DOTNETSDKVERSION] @@ -87,7 +87,7 @@ <A HREF="https://aka.ms/dotnet-cli-docs">Документация по пакету SDK</A> <A HREF="https://aka.ms/dev-privacy">Заявление о конфиденциальности</A> <A HREF="https://aka.ms/dotnet-license-windows">Сведения о лицензировании .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetry collection and opt-out</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Сбор данных телеметрии и отказ от использования</A> Примечание по установке В процессе установки будет выполнена команда, которая увеличит скорость восстановления проекта и обеспечит автономный доступ. Выполнение займет до минуты. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl index a30931b25..b836d588e 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl @@ -8,30 +8,30 @@ /install | /repair | /uninstall | /layout [\[]"dizin"[\]] - dizinde bir paketi yükler, onarır, kaldırır ya da paketin tam bir yerel kopyasını oluşturur. Varsayılan '/install' değeridir. -/passive | /quiet - istem olmadan en az düzeyde UI gösterir ya da hiç UI ve +/passive | /quiet - istem olmadan en az düzeyde UI gösterir ya da hiç UI ve istem göstermez. Varsayılan olarak UI ve tüm istemler görüntülenir. -/norestart - yeniden başlama denemelerini engeller. Varsayılan olarak UI yeniden başlatılmadan önce sorar. +/norestart - yeniden başlama denemelerini engeller. Varsayılan olarak UI yeniden başlatılmadan önce sorar. /log [\[]"günlük.txt"[\]] - belirli bir günlük dosyası tutar. Varsayılan olarak %TEMP% içinde bir günlük dosyası oluşturulur. &Kapat - Lisans &hüküm ve koşullarını kabul ediyorum + &Lisans hüküm ve koşullarını kabul ediyorum &Seçenekler - &Yükle + Yü&kle &Kapat Kurulum İlerleme Durumu İşleniyor: Başlatılıyor... - İ&ptal + &İptal Kurulumu Değiştir &Onar - K&aldır + &Kaldır &Kapat Onarım Başarıyla Tamamlandı Kaldırma Başarıyla Tamamlandı Kurulum Başarılı &Başlat Yazılım yükleme işlemini tamamlamak için bilgisayarınızı yeniden başlatmanız gerekir. - Yeniden &Başlat + &Yeniden Başlat &Kapat Kurulum Başarısız Kurulum Başarısız @@ -39,14 +39,14 @@ Onarım Başarısız En az bir sorun nedeniyle kurulum başarısız oldu. Lütfen bu sorunları düzeltin ve kurulumu yeniden deneyin. Daha fazla bilgi için <a href="#">günlük dosyasına</a> bakın. Yazılımın geri alınmasını tamamlamak için bilgisayarınızı yeniden başlatmanız gerekiyor. - Yeniden &Başlat + &Yeniden Başlat &Kapat Kullanımda Olan Dosyalar Şu uygulamalar güncelleştirilmesi gereken dosyaları kullanıyor: &Uygulamaları kapatın ve yeniden başlatmayı deneyin. &Uygulamaları kapatmayın. Sistemi yeniden başlatmanız gerekir. &Tamam - İ&ptal + &İptal Yükleme başarılı oldu. Aşağıdakiler şu konumda yüklü: '[DOTNETHOME]' @@ -63,7 +63,7 @@ Kaynaklar • SDK Belgeleri https://aka.ms/dotnet-sdk-docs • Sürüm Notları https://aka.ms/dotnet5-release-notes • Öğreticiler https://aka.ms/dotnet-tutorials - Yükleme başarılı oldu. +Yükleme başarılı oldu. Aşağıdakiler şu konumda yüklü: '[DOTNETHOME]' • .NET SDK [DOTNETSDKVERSION] @@ -78,7 +78,7 @@ Kaynaklar • SDK Belgeleri https://aka.ms/dotnet-sdk-docs • Sürüm Notları https://aka.ms/dotnet5-release-notes • Öğreticiler https://aka.ms/dotnet-tutorials - .NET SDK'sı + .NET SDK .NET SDK, .NET uygulamalarını derlemek, çalıştırmak ve test etmek için kullanılır. Birden çok dil, düzenleyici ve geliştirici aracı arasından seçim yapabilirsiniz ve web, mobil, masaüstü, oyun ve IoT uygulamaları oluşturmak için büyük bir kitaplık ekosisteminden yararlanabilirsiniz. Beğeneceğinizi umuyoruz! .NET hakkında daha fazla bilgi edinin @@ -87,11 +87,11 @@ Kaynaklar <A HREF="https://aka.ms/dotnet-cli-docs">SDK Belgeleri</A> <A HREF="https://aka.ms/dev-privacy">Gizlilik Bildirimi</A> <A HREF="https://aka.ms/dotnet-license-windows">.NET için Lisans Bilgileri</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetry collection and opt-out</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetri koleksiyonu ve katılmamayı seçme</A> Yükleme notu Yükleme işlemi sırasında, proje geri yükleme hızını artıran ve çevrimdışı erişimi etkinleştiren bir komut çalıştırılır. Tamamlanması bir dakikanızı alır. - Visual Studio ile .NET 5.0 kullanmayı planlıyorsanız Visual Studio 2019 16.8 veya daha yeni bir sürüm gerekir. <A HREF="https://aka.ms/dotnet5-release-notes">Daha Fazla Bilgi</A>. + Visual Studio ile .NET 5.0 kullanmayı planlıyorsanız Visual Studio 2019 16.8 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet5-release-notes">Daha Fazla Bilgi</A>. Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl index e36109992..d595427f4 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl @@ -8,10 +8,10 @@ /install | /repair | /uninstall | /layout [\[]"directory"[\]] - 安装、修复、卸载 目录中的安装包或创建其完整本地副本。Install 为默认选择。 -/passive | /quiet - 显示最少的 UI 且无提示，或不显示 UI 且 +/passive | /quiet - 显示最少的 UI 且无提示，或不显示 UI 且 无提示。默认显示 UI 及全部提示。 -/norestart - 禁止任何重新启动。默认在重启前显示提示 UI。 +/norestart - 禁止任何重新启动。默认在重启前显示提示 UI。 /log [\[]"log.txt"[\]] - 向特定文件写入日志。默认在 %TEMP% 中创建日志文件。 关闭(&C) 我同意许可条款和条件(&A) @@ -33,7 +33,7 @@ 必须重启计算机才能完成软件安装。 重新启动(&R) 关闭(&C) - 设置失败 + 安装失败 安装失败 卸载失败 修复失败 @@ -51,9 +51,9 @@ 下列项安装于: "[DOTNETHOME]" • .NET SDK [DOTNETSDKVERSION] - • .NET 运行时 [DOTNETRUNTIMEVERSION] - • ASP.NET Core 运行时 [ASPNETCOREVERSION] - • .NET Windows Desktop 运行时 [WINFORMSANDWPFVERSION] + • .NET Runtime [DOTNETRUNTIMEVERSION] + • ASP.NET Core Runtime [ASPNETCOREVERSION] + • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION] 此产品会收集用法数据 • 详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry @@ -67,10 +67,10 @@ 下列项安装于: "[DOTNETHOME]" • .NET SDK [DOTNETSDKVERSION] - • .NET 运行时 [DOTNETRUNTIMEVERSION] - • ASP.NET Core 运行时 [ASPNETCOREVERSION] + • .NET Runtime [DOTNETRUNTIMEVERSION] + • ASP.NET Core Runtime [ASPNETCOREVERSION] -此产品会收集用法数据 +此产品会收集使用情况数据 • 详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry 资源 @@ -87,11 +87,11 @@ <A HREF="https://aka.ms/dotnet-cli-docs">SDK 文档</A> <A HREF="https://aka.ms/dev-privacy">隐私声明</A> <A HREF="https://aka.ms/dotnet-license-windows">.NET 的许可信息</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetry collection and opt-out</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">遥测集合和选择退出选项</A> 安装说明 将在要提升项目还原速度并实现脱机访问的安装进程期间运行命令。此操作最多 1 分钟即可完成。 - 如果计划结合使用 .NET 5.0 和 Visual Studio，需要 Visual Studio 2019 16.8 或更高版本。<A HREF="https://aka.ms/dotnet5-release-notes">了解详细信息</A>。 + 如果打算结合使用 .NET 5.0 和 Visual Studio，需要 Visual Studio 2019 16.8 或更高版本。<A HREF="https://aka.ms/dotnet5-release-notes">了解详细信息</A>。 单击“安装”即表示你同意以下条款。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl index 26c3d6262..7884e286a 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl @@ -22,7 +22,7 @@ Procesando: Inicializando... &Cancelar - Modificar instalación + Modificar la instalación &Reparar &Desinstalar &Cerrar @@ -33,7 +33,7 @@ Debe reiniciar el equipo para finalizar la instalación del software. &Reiniciar &Cerrar - Error de instalación + No se pudo instalar No se pudo instalar No se pudo desinstalar No se pudo reparar @@ -63,7 +63,7 @@ Recursos • Documentación del SDK https://aka.ms/dotnet-sdk-docs • Notas de la versión https://aka.ms/dotnet5-release-notes • Tutoriales https://aka.ms/dotnet-tutorials - La instalación se realizó correctamente. +La instalación se realizó correctamente. Se instaló lo siguiente en: "[DOTNETHOME]" • SDK de .NET [DOTNETSDKVERSION] @@ -87,11 +87,11 @@ Recursos <A HREF="https://aka.ms/dotnet-cli-docs">Documentación del SDK</A> <A HREF="https://aka.ms/dev-privacy">Declaración de privacidad</A> <A HREF="https://aka.ms/dotnet-license-windows">Información de licencias de .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetry collection and opt-out</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">Recopilación de telemetría y cómo desactivarla</A> Nota de instalación Se ejecutará un comando durante el proceso de instalación que mejorará la velocidad de restauración del proyecto y permitirá el acceso sin conexión. La operación tardará hasta un minuto en completarse. - Si tiene previsto usar .NET 5.0 con Visual Studio, se requiere Visual Studio 2019 16.8 o una versión más reciente. <A HREF="https://aka.ms/dotnet5-release-notes">Más información</A>. + Si tiene previsto usar .NET 5.0 con Visual Studio, se requiere Visual Studio 2019 16.8 o una versión más reciente. <A HREF="https://aka.ms/dotnet5-release-notes">Obtenga más información</A>. Al hacer clic en Instalar, acepta los términos siguientes. From a6421a977b4ef308b012006e2e4ec70a14a4832d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 9 Feb 2021 20:42:54 +0000 Subject: [PATCH 012/112] Update dependencies from https://github.com/dotnet/sdk build 20210209.3 (#9674) [release/5.0.2xx] Update dependencies from 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 57ec0052d..22d544389 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - dd9d107c46da5e72a9fa84ed6e6d0d9e76acb139 + 6c67b41e42d7f0b6a076af3fd96882e5d8a08f07 - + https://github.com/dotnet/sdk - dd9d107c46da5e72a9fa84ed6e6d0d9e76acb139 + 6c67b41e42d7f0b6a076af3fd96882e5d8a08f07 diff --git a/eng/Versions.props b/eng/Versions.props index f6c0c3ee9..d4ad57e81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21106.5 - 5.0.200-preview.21106.5 + 5.0.200-preview.21109.3 + 5.0.200-preview.21109.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7ce93c56f44cc1fe9b4f6fae3ed9e762dc1156fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Feb 2021 00:27:29 +0000 Subject: [PATCH 013/112] Update dependencies from https://github.com/dotnet/sdk build 20210209.7 (#9683) [release/5.0.2xx] Update dependencies from 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 22d544389..0d0853880 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - 6c67b41e42d7f0b6a076af3fd96882e5d8a08f07 + fef5caa9a0edb1f49453fc59214375010f706e97 - + https://github.com/dotnet/sdk - 6c67b41e42d7f0b6a076af3fd96882e5d8a08f07 + fef5caa9a0edb1f49453fc59214375010f706e97 diff --git a/eng/Versions.props b/eng/Versions.props index d4ad57e81..4ecbab05b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21109.3 - 5.0.200-preview.21109.3 + 5.0.200-preview.21109.7 + 5.0.200-preview.21109.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4671751a3c4219897b256665d44725c192d7c8da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Feb 2021 04:28:46 +0000 Subject: [PATCH 014/112] Update dependencies from https://github.com/dotnet/sdk build 20210209.9 (#9685) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 16.9.0-release-20210205-02 to 16.9.0-release-20210209-03 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d0853880..12b85b4ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 7a9de3bd9680522874b2081280df3f971673cd87 - + https://github.com/dotnet/sdk - fef5caa9a0edb1f49453fc59214375010f706e97 + fd407695d5bfd4386286a25130ce8bd2a84b4907 - + https://github.com/dotnet/sdk - fef5caa9a0edb1f49453fc59214375010f706e97 + fd407695d5bfd4386286a25130ce8bd2a84b4907 @@ -108,9 +108,9 @@ https://github.com/dotnet/fsharp 7ce7132f1459095e635194d09d6f73265352029a - + https://github.com/microsoft/vstest - 5f09e3c10bd503134f277c257b635f37a6c0be64 + bae1c7e3de5a7eab8d9264189ec47cd4539866c5 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 4ecbab05b..9533e8796 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21109.7 - 5.0.200-preview.21109.7 + 5.0.200-preview.21109.9 + 5.0.200-preview.21109.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -129,7 +129,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.9.0-release-20210205-02 + 16.9.0-release-20210209-03 From 65bcdd5620f638c6cc892fbe06d76fcce2390dc8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Feb 2021 11:01:58 +0000 Subject: [PATCH 015/112] [release/5.0.2xx] Update dependencies from dotnet/sdk (#9689) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.200-preview.21062.2 to 5.0.200-preview.21109.7 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12b85b4ca..7087fc7ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,17 +83,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - 7a9de3bd9680522874b2081280df3f971673cd87 + ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - fd407695d5bfd4386286a25130ce8bd2a84b4907 + 0177b963bd9251a9ba036354c3180ab21582f73f - + https://github.com/dotnet/sdk - fd407695d5bfd4386286a25130ce8bd2a84b4907 + 0177b963bd9251a9ba036354c3180ab21582f73f diff --git a/eng/Versions.props b/eng/Versions.props index 9533e8796..ee3ef9d92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.200-preview.21062.2 + 5.0.200-preview.21109.7 @@ -55,8 +55,8 @@ - 5.0.200-preview.21109.9 - 5.0.200-preview.21109.9 + 5.0.200-preview.21110.2 + 5.0.200-preview.21110.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5b1efb3cb2199f2e4824b031f6371b665a39520e Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 10 Feb 2021 09:10:53 -0800 Subject: [PATCH 016/112] Fixup feeds (#9670) Co-authored-by: Matt Mitchell --- NuGet.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 094adcd60..3abdc9e49 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + From 9f55d21d451530d7dce86d255db5fa57f8260211 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Feb 2021 19:03:29 +0000 Subject: [PATCH 017/112] Update dependencies from https://github.com/dotnet/sdk build 20210210.9 (#9695) [release/5.0.2xx] Update dependencies from 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 7087fc7ce..56c084ff1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 0177b963bd9251a9ba036354c3180ab21582f73f + e6501a4c0a510055c57877ce22a26f4b9603f606 - + https://github.com/dotnet/sdk - 0177b963bd9251a9ba036354c3180ab21582f73f + e6501a4c0a510055c57877ce22a26f4b9603f606 diff --git a/eng/Versions.props b/eng/Versions.props index ee3ef9d92..fc3b8ee94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21110.2 - 5.0.200-preview.21110.2 + 5.0.200-preview.21110.9 + 5.0.200-preview.21110.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 46fabb5da4e28689d11081591bcda991bcc3a759 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 10 Feb 2021 14:32:35 -0800 Subject: [PATCH 018/112] Update 2.1 & 3.1 aspnetcore template versions (#9679) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index fc3b8ee94..7eaf259fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ 3.1.10 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.10 + 3.1.12 3.2.1 4.8.0-rc2.19462.10 @@ -123,7 +123,7 @@ 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 1.0.2-beta4.20420.1 - 2.1.23 + 2.1.25 From 6f7341bf207c336c771ae751c2b76ac92aca97a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Feb 2021 08:33:14 +0000 Subject: [PATCH 019/112] Update dependencies from https://github.com/dotnet/sdk build 20210210.34 (#9703) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-4.21104.8 to 3.9.0-5.21111.10 (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 56c084ff1..cd4e81384 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - e6501a4c0a510055c57877ce22a26f4b9603f606 + ecf1ba07eba12d9872b9ed5f4eebbd5873886e70 - + https://github.com/dotnet/sdk - e6501a4c0a510055c57877ce22a26f4b9603f606 + ecf1ba07eba12d9872b9ed5f4eebbd5873886e70 @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 2fc92d84e746c3aab75f0930278ea6675cd5bb5c + 1c02b891f2693c33bc61ceea2319b52e13e6a521 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 7eaf259fd..be7c93cfe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21110.9 - 5.0.200-preview.21110.9 + 5.0.200-preview.21110.34 + 5.0.200-preview.21110.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48a68472d9ca2e569598d0dae309cdde79264c7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Feb 2021 17:42:31 +0000 Subject: [PATCH 020/112] Update dependencies from https://github.com/dotnet/sdk build 20210212.6 (#9714) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.2-servicing.20613.4 to 5.0.3-servicing.21073.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.2-servicing.20611.20 to 5.0.3-servicing.21072.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0 to 5.0.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.2-servicing.20613.2 to 5.0.3-servicing.21073.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.EntityFrameworkCore: from 5.0.2 to 5.0.3 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - dotnet-dev-certs: from 5.0.2-servicing.20613.2 to 5.0.3-servicing.21073.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.2-servicing.20613.2 to 5.0.3-servicing.21073.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.2-servicing.20613.1 to 5.0.3-servicing.21073.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.2 to 5.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.2-servicing.20613.2 to 5.0.3-servicing.21073.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd4e81384..7101d2a62 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 - c0f71846fb6ea631ffd2b4f6d3a9974c0897b901 + f8d26ae79a212ae4e64f2fac177a013f4e82307e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0f71846fb6ea631ffd2b4f6d3a9974c0897b901 + f8d26ae79a212ae4e64f2fac177a013f4e82307e https://github.com/dotnet/windowsdesktop @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb @@ -43,9 +43,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb https://github.com/dotnet/aspnetcore @@ -55,25 +55,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2670c128d522473e146ff9f8159bfffdfe694cd9 + d827c653b787c07de908240b7746ce34d3e6271e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2670c128d522473e146ff9f8159bfffdfe694cd9 + d827c653b787c07de908240b7746ce34d3e6271e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + efc2924e6e36db17611c7da480d5bc97a4514cb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2670c128d522473e146ff9f8159bfffdfe694cd9 + d827c653b787c07de908240b7746ce34d3e6271e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2670c128d522473e146ff9f8159bfffdfe694cd9 + d827c653b787c07de908240b7746ce34d3e6271e https://github.com/dotnet/test-templates @@ -87,22 +87,22 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - ecf1ba07eba12d9872b9ed5f4eebbd5873886e70 + 7cfa42cb906812d6e514ed96df5624ee18e24637 - + https://github.com/dotnet/sdk - ecf1ba07eba12d9872b9ed5f4eebbd5873886e70 + 7cfa42cb906812d6e514ed96df5624ee18e24637 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1a7d925a270d4eaca6e801de8b88b34b535091de + ea25334307fb11be0b03c56ce767f25faf5259c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 89936f5f8d7ac99e04123f8f48754f252dfd9973 + 3a3d1e582344146190e9815e79cd5c8a29361b3d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index be7c93cfe..d3ec8d588 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.2-servicing.20613.1 + 5.0.3-servicing.21073.2 - 5.0.2-servicing.20613.2 + 5.0.3-servicing.21073.2 @@ -43,41 +43,41 @@ - 5.0.2 + 5.0.3 5.0.0 5.0.0-rtm.20526.5 - 5.0.2-servicing.20613.2 - 5.0.2-servicing.20613.2 - 5.0.2-servicing.20613.2 + 5.0.3-servicing.21073.3 + 5.0.3-servicing.21073.3 + 5.0.3-servicing.21073.3 0.2.0 - 5.0.200-preview.21110.34 - 5.0.200-preview.21110.34 + 5.0.200-preview.21112.6 + 5.0.200-preview.21112.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0 + 5.0.1 - 5.0.2-servicing.20611.20 - 5.0.2 - 5.0.2 + 5.0.3-servicing.21072.12 + 5.0.3 + 5.0.3 5.0.0 - 5.0.2 + 5.0.3 2.1.0 - 5.0.2-servicing.20613.4 - 5.0.2 + 5.0.3-servicing.21073.2 + 5.0.3 5.0.0 5.0.0-rtm.20520.1 From c9ef6841c94016e0694cd215479cac81766b1839 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Feb 2021 21:08:37 +0000 Subject: [PATCH 021/112] Update dependencies from https://github.com/dotnet/sdk build 20210212.11 (#9717) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21111.10 to 3.9.0-5.21112.8 (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 7101d2a62..fc91ae857 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 7cfa42cb906812d6e514ed96df5624ee18e24637 + 5a4f6d2c97e683b5c51418166e8537e7d781c43b - + https://github.com/dotnet/sdk - 7cfa42cb906812d6e514ed96df5624ee18e24637 + 5a4f6d2c97e683b5c51418166e8537e7d781c43b @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 1c02b891f2693c33bc61ceea2319b52e13e6a521 + f3ff04378c972d435826e6181de364b3c0db8d14 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index d3ec8d588..17d9a49e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21112.6 - 5.0.200-preview.21112.6 + 5.0.200-preview.21112.11 + 5.0.200-preview.21112.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d190d386bb2541ed51c864ea0080fb8ee3e73f4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Feb 2021 21:50:03 +0000 Subject: [PATCH 022/112] Update dependencies from https://github.com/dotnet/arcade build 20210212.3 (#9720) [release/5.0.2xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++-- eng/Versions.props | 2 +- eng/common/internal-feed-operations.ps1 | 2 - eng/common/internal-feed-operations.sh | 2 - eng/common/sdl/init-sdl.ps1 | 13 +------ eng/common/sdl/packages.config | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- .../templates/post-build/post-build.yml | 37 +++++++++++++++++-- global.json | 2 +- 9 files changed, 43 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc91ae857..9814bd652 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - f73f462f75b5fa21805f0b3c477b11277c5da556 + d8c68c834bcca3f721ad1550404807e301ba7afe - + https://github.com/dotnet/arcade - f73f462f75b5fa21805f0b3c477b11277c5da556 + d8c68c834bcca3f721ad1550404807e301ba7afe https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 17d9a49e2..16fcfef37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21063.3 + 5.0.0-beta.21112.3 diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index b8f6529fd..418c09930 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -63,8 +63,6 @@ function SetupCredProvider { } if (($endpoints | Measure-Object).Count -gt 0) { - # [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Endpoint code example with no real credentials.")] - # Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}' $endpointCredentials = @{endpointCredentials=$endpoints} | ConvertTo-Json -Compress # Create the environment variables the AzDo way diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh index 9ed225e7e..343054b3a 100755 --- a/eng/common/internal-feed-operations.sh +++ b/eng/common/internal-feed-operations.sh @@ -62,8 +62,6 @@ function SetupCredProvider { endpoints+=']' if [ ${#endpoints} -gt 2 ]; then - # [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Endpoint code example with no real credentials.")] - # Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}' local endpointCredentials="{\"endpointCredentials\": "$endpoints"}" echo "##vso[task.setvariable variable=VSS_NUGET_EXTERNAL_FEED_ENDPOINTS]$endpointCredentials" diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index a68bf0b88..bb6a42971 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -29,18 +29,7 @@ $zipFile = "$WorkingDirectory/gdn.zip" Add-Type -AssemblyName System.IO.Compression.FileSystem $gdnFolder = (Join-Path $WorkingDirectory '.gdn') -try { - # We try to download the zip; if the request fails (e.g. the file doesn't exist), we catch it and init guardian instead - Write-Host 'Downloading gdn folder from internal config repostiory...' - Invoke-WebRequest -Headers @{ "Accept"="application/zip"; "Authorization"="Basic $encodedPat" } -Uri $uri -OutFile $zipFile - if (Test-Path $gdnFolder) { - # Remove the gdn folder if it exists (it shouldn't unless there's too much caching; this is just in case) - Remove-Item -Force -Recurse $gdnFolder - } - [System.IO.Compression.ZipFile]::ExtractToDirectory($zipFile, $WorkingDirectory) - Write-Host $gdnFolder - ExitWithExitCode 0 -} catch [System.Net.WebException] { } # Catch and ignore webexception + try { # if the folder does not exist, we'll do a guardian init and push it to the remote repository Write-Host 'Initializing Guardian...' diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 968b39bef..3bd8b29eb 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index c64c4f568..53c100222 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -83,7 +83,7 @@ jobs: continueOnError: ${{ parameters.sdlContinueOnError }} - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 - -GuardianPackageName Microsoft.Guardian.Cli.win10-x64.0.20.1 + -GuardianPackageName Microsoft.Guardian.Cli.0.53.3 -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 761fb1a29..1b0af40d5 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -65,7 +65,9 @@ parameters: VS167ChannelId: 1011 VS168ChannelId: 1154 VSMasterChannelId: 1012 - + VS169ChannelId: 1473 + VS1610ChannelId: 1692 + stages: - ${{ if or(and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')), eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - stage: Validate @@ -94,8 +96,7 @@ stages: inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 arguments: -PromoteToChannels "$(TargetChannels)" - -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.Net5RC2ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}} - + -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.Net5RC2ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}},${{parameters.VS169ChannelId}},${{parameters.VS1610ChannelId}} - job: displayName: NuGet Validation dependsOn: setupMaestroVars @@ -608,3 +609,33 @@ stages: transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS_16_9_Publishing' + channelName: 'VS 16.9' + channelId: ${{ parameters.VS169ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS_16_10_Publishing' + channelName: 'VS 16.10' + channelId: ${{ parameters.VS1610ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' diff --git a/global.json b/global.json index 1a93f9a81..2d311e487 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21063.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21112.3" } } From b16002eb8878cfdc405fe5c14d1adb1880df7995 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Feb 2021 01:07:47 +0000 Subject: [PATCH 023/112] Update dependencies from https://github.com/dotnet/sdk build 20210212.21 (#9722) [release/5.0.2xx] Update dependencies from 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 9814bd652..97e191199 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 5a4f6d2c97e683b5c51418166e8537e7d781c43b + b3eda42b76cc7e491d154e1a1514431bbd0e2839 - + https://github.com/dotnet/sdk - 5a4f6d2c97e683b5c51418166e8537e7d781c43b + b3eda42b76cc7e491d154e1a1514431bbd0e2839 diff --git a/eng/Versions.props b/eng/Versions.props index 16fcfef37..4cb2b4329 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21112.11 - 5.0.200-preview.21112.11 + 5.0.200-preview.21112.21 + 5.0.200-preview.21112.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2157b6d16f28d45604ca6a747a07957d343f78eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Feb 2021 01:53:48 +0000 Subject: [PATCH 024/112] Update dependencies from https://github.com/dotnet/sdk build 20210212.23 (#9723) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21112.8 to 3.9.0-5.21112.20 (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 97e191199..54d3d74e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - b3eda42b76cc7e491d154e1a1514431bbd0e2839 + 675f9869c6b53737a8d7bb6fe286e4c02a9a5809 - + https://github.com/dotnet/sdk - b3eda42b76cc7e491d154e1a1514431bbd0e2839 + 675f9869c6b53737a8d7bb6fe286e4c02a9a5809 @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - f3ff04378c972d435826e6181de364b3c0db8d14 + 9178f0d178266e004ceb4da029e9f21bc431fe31 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 4cb2b4329..c1d476a39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21112.21 - 5.0.200-preview.21112.21 + 5.0.200-preview.21112.23 + 5.0.200-preview.21112.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 98a9b7f4ee7010483fb5fe879d452f5e0adb8db7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Feb 2021 21:08:06 +0000 Subject: [PATCH 025/112] Update dependencies from https://github.com/dotnet/sdk build 20210215.11 (#9732) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.9.0 to 16.9.0 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3abdc9e49..ed61ab0c8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54d3d74e2..523bd2b9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 675f9869c6b53737a8d7bb6fe286e4c02a9a5809 + b513c17d738d8fe4452ae5f06879d6c8c00441db - + https://github.com/dotnet/sdk - 675f9869c6b53737a8d7bb6fe286e4c02a9a5809 + b513c17d738d8fe4452ae5f06879d6c8c00441db @@ -123,7 +123,7 @@ https://github.com/dotnet/msbuild - 663c136fcd9b4015abba52e9a99890d005adfa0e + 57a23d249aafe6409b3e24836a486f769cb74c2c https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index c1d476a39..d1636a7a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21112.23 - 5.0.200-preview.21112.23 + 5.0.200-preview.21115.11 + 5.0.200-preview.21115.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ceb2977a744ed9d573a19dc8a667226563ae1897 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Feb 2021 10:27:40 +0000 Subject: [PATCH 026/112] Update dependencies from https://github.com/dotnet/sdk build 20210216.2 (#9733) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 5.9.0-rc.7097 to 5.9.0-rc.7121 (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 523bd2b9b..0cdd545b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - b513c17d738d8fe4452ae5f06879d6c8c00441db + 81f9ac36b6ffc754647ac8cc15f01a29aa724f4d - + https://github.com/dotnet/sdk - b513c17d738d8fe4452ae5f06879d6c8c00441db + 81f9ac36b6ffc754647ac8cc15f01a29aa724f4d @@ -125,9 +125,9 @@ https://github.com/dotnet/msbuild 57a23d249aafe6409b3e24836a486f769cb74c2c - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - ed9af679b4425c1ff4d41d2302d73f6e580a2839 + 5596ad8221369990f634a3d01f8c334e0ccb2b3d https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index d1636a7a1..333d6403e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21115.11 - 5.0.200-preview.21115.11 + 5.0.200-preview.21116.2 + 5.0.200-preview.21116.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 533a174fe07a39d06c56b4bce62701ab0265e490 Mon Sep 17 00:00:00 2001 From: Michelle McDaniel Date: Tue, 16 Feb 2021 09:22:48 -0800 Subject: [PATCH 027/112] Duplicate productVersion.txt with repo-specific name (#9666) (#9709) In our efforts to unify the build access story using aka.ms links, we have found that there are certain files that share the same name in multiple different repositories, most importantly, productVersion.txt. As part of the work to move to aka.ms links, we will be flattening the short link paths, so rather than having a runtime-specific, aspnetcore-specific, etc. full path to the files generated by each of the repos, they will all go to the same short link location. This means that the path to productVersion.txt will collide in the aka.ms links (the backing locations are not changing and will be unaffected). To combat this, we will add a duplicate of each of the product repos productVersion.txt, renamed to indicate which product repo it came from, in this case installer-productVersion.txt. The original will remane so that we do not break existing scenarios that do not use the aka.ms links. --- eng/Publishing.props | 3 +++ src/redist/targets/GenerateBundledVersions.targets | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/eng/Publishing.props b/eng/Publishing.props index e34b66cc2..4ef1c204b 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -76,6 +76,8 @@ + @@ -86,6 +88,7 @@ + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 18fc1ea27..31e587227 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -8,6 +8,12 @@ Lines="$(PackageVersion)" Overwrite="true" Encoding="ASCII" /> + + Date: Tue, 16 Feb 2021 14:12:36 -0800 Subject: [PATCH 028/112] Update branding to servicing --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 333d6403e..d8c8e7979 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - preview + servicing $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From ac4b7d95d97be6a5656a96a10511ac99b48546d0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 16 Dec 2020 11:01:44 -0800 Subject: [PATCH 029/112] Automatically calculate the implicit version number based on the current version. This will need to be updated any time 2.1 or 3.1 don't ship. --- .../targets/GenerateBundledVersions.targets | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 31e587227..de45cc97b 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -23,12 +23,16 @@ + + $([MSBuild]::Add($(VersionFeature), 25)) + $([MSBuild]::Add($(VersionFeature), 12)) + + Microsoft.NETCoreSdk.BundledVersions.props - - + <_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppRuntimePackageVersion) <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) @@ -37,20 +41,20 @@ <_NETCoreApp30RuntimePackVersion>3.0.3 <_NETCoreApp30TargetingPackVersion>3.0.0 - <_NETCoreApp31RuntimePackVersion>3.1.9 + <_NETCoreApp31RuntimePackVersion>3.1.$(VersionFeature31) <_NETCoreApp31TargetingPackVersion>3.1.0 <_WindowsDesktop30RuntimePackVersion>3.0.3 <_WindowsDesktop30TargetingPackVersion>3.0.0 - <_WindowsDesktop31RuntimePackVersion>3.1.9 + <_WindowsDesktop31RuntimePackVersion>3.1.$(VersionFeature31) <_WindowsDesktop31TargetingPackVersion>3.1.0 <_AspNet30RuntimePackVersion>3.0.3 <_AspNet30TargetingPackVersion>3.0.1 - <_AspNet31RuntimePackVersion>3.1.10 - <_AspNet31TargetingPackVersion>3.1.10 + <_AspNet31RuntimePackVersion>3.1.$(VersionFeature31) + <_AspNet31TargetingPackVersion>3.1.$(VersionFeature31) <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) @@ -154,7 +158,7 @@ + LatestVersion="2.1.$(VersionFeature21)" /> + LatestVersion="2.1.$(VersionFeature21)"/> + LatestVersion="2.1.$(VersionFeature21)"/> Date: Wed, 17 Feb 2021 08:33:38 +0000 Subject: [PATCH 030/112] Update dependencies from https://github.com/dotnet/sdk build 20210216.9 (#9734) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 16.9.0-release-20210209-03 to 16.9.0-release-20210216-04 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0cdd545b5..82b179633 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 81f9ac36b6ffc754647ac8cc15f01a29aa724f4d + 14e0e93285da96070e2f1acc5fb7768fbc21783d - + https://github.com/dotnet/sdk - 81f9ac36b6ffc754647ac8cc15f01a29aa724f4d + 14e0e93285da96070e2f1acc5fb7768fbc21783d @@ -108,9 +108,9 @@ https://github.com/dotnet/fsharp 7ce7132f1459095e635194d09d6f73265352029a - + https://github.com/microsoft/vstest - bae1c7e3de5a7eab8d9264189ec47cd4539866c5 + 27786c21f7f586214b5721d2aa6380e69079b072 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 333d6403e..553b98fc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21116.2 - 5.0.200-preview.21116.2 + 5.0.200-preview.21116.9 + 5.0.200-preview.21116.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -129,7 +129,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.9.0-release-20210209-03 + 16.9.0-release-20210216-04 From ad7e175e66b0694aee23a29bab842f82cda4e785 Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 17 Feb 2021 09:12:52 -0800 Subject: [PATCH 031/112] aspnet targeting pack does not move every release --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index de45cc97b..2328c7bc0 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -54,7 +54,7 @@ <_AspNet30TargetingPackVersion>3.0.1 <_AspNet31RuntimePackVersion>3.1.$(VersionFeature31) - <_AspNet31TargetingPackVersion>3.1.$(VersionFeature31) + <_AspNet31TargetingPackVersion>3.1.10 <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) From 808d111fd21916c3b4a89296465b7383eedaee58 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Wed, 17 Feb 2021 14:31:27 -0800 Subject: [PATCH 032/112] Update Windows SDK projection --- eng/ManualVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index f41f4965e..e89f3da42 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,8 +9,8 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.13 - 10.0.18362.13 - 10.0.19041.13 + 10.0.17763.14 + 10.0.18362.14 + 10.0.19041.14 From e146fe631ae2238b45d3e43c7cc83af21fa59505 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Feb 2021 23:34:30 +0000 Subject: [PATCH 033/112] [release/5.0.2xx] Update dependencies from dotnet/sdk (#9737) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21112.20 to 3.9.0-5.21116.10 (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 82b179633..b08f9d133 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 14e0e93285da96070e2f1acc5fb7768fbc21783d + 4ead43bc3c528ab046655a6466c4ef824af02f8c - + https://github.com/dotnet/sdk - 14e0e93285da96070e2f1acc5fb7768fbc21783d + 4ead43bc3c528ab046655a6466c4ef824af02f8c @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 9178f0d178266e004ceb4da029e9f21bc431fe31 + 7a63d79b60ffb33e919bee8056816f8f449d00ce https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index f28ffd018..04bdbe56c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21116.9 - 5.0.200-preview.21116.9 + 5.0.200-preview.21116.22 + 5.0.200-preview.21116.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5767330bf6b19adf190f438e64fffa322443711b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Feb 2021 03:53:36 +0000 Subject: [PATCH 034/112] Update dependencies from https://github.com/dotnet/sdk build 20210217.28 (#9742) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21116.10 to 3.9.0-5.21117.36 (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 b08f9d133..46a788ddf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 4ead43bc3c528ab046655a6466c4ef824af02f8c + ffd9511f95878b0f22ef50f2b2858a007651a6f2 - + https://github.com/dotnet/sdk - 4ead43bc3c528ab046655a6466c4ef824af02f8c + ffd9511f95878b0f22ef50f2b2858a007651a6f2 @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 7a63d79b60ffb33e919bee8056816f8f449d00ce + 27b636fe5edc14e8b4199ea5464b8879529615bf https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 04bdbe56c..d3bc92368 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-preview.21116.22 - 5.0.200-preview.21116.22 + 5.0.200-servicing.21117.28 + 5.0.200-servicing.21117.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3a7f1714438e27681266bb7b3c2796ad78d62ec8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Feb 2021 05:03:16 +0000 Subject: [PATCH 035/112] Update dependencies from https://github.com/dotnet/sdk build 20210217.30 (#9743) [release/5.0.2xx] Update dependencies from 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 46a788ddf..699153aee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - ffd9511f95878b0f22ef50f2b2858a007651a6f2 + 8d7d0a0a03881dbc3a9a55bb72537468279fbd40 - + https://github.com/dotnet/sdk - ffd9511f95878b0f22ef50f2b2858a007651a6f2 + 8d7d0a0a03881dbc3a9a55bb72537468279fbd40 diff --git a/eng/Versions.props b/eng/Versions.props index d3bc92368..f15f8914c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-servicing.21117.28 - 5.0.200-servicing.21117.28 + 5.0.200-servicing.21117.30 + 5.0.200-servicing.21117.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a31a45c2e76b9ed2921c9a412edba9f83b13f6b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Feb 2021 06:51:47 +0000 Subject: [PATCH 036/112] Update dependencies from https://github.com/dotnet/sdk build 20210217.34 (#9744) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21117.36 to 3.9.0-5.21117.38 (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 699153aee..6ae62f44d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 8d7d0a0a03881dbc3a9a55bb72537468279fbd40 + 3df7d03c173a539729f58d759fcf48ee29320291 - + https://github.com/dotnet/sdk - 8d7d0a0a03881dbc3a9a55bb72537468279fbd40 + 3df7d03c173a539729f58d759fcf48ee29320291 @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 27b636fe5edc14e8b4199ea5464b8879529615bf + 8d78fb5ec0d751ee8c27b911870b088e9f15501a https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index f15f8914c..1bf535d28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-servicing.21117.30 - 5.0.200-servicing.21117.30 + 5.0.200-servicing.21117.34 + 5.0.200-servicing.21117.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 131ba21cbe5f186b715e565ce4086497ce5ff133 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Feb 2021 10:21:13 +0000 Subject: [PATCH 037/112] Update dependencies from https://github.com/dotnet/sdk build 20210218.3 (#9748) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 5.9.0-rc.7121 to 5.9.0-rc.7122 (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 6ae62f44d..5c69c9431 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 3df7d03c173a539729f58d759fcf48ee29320291 + c040f1fcaf1b81959fd07360e629cfbc9ffdfb40 - + https://github.com/dotnet/sdk - 3df7d03c173a539729f58d759fcf48ee29320291 + c040f1fcaf1b81959fd07360e629cfbc9ffdfb40 @@ -125,9 +125,9 @@ https://github.com/dotnet/msbuild 57a23d249aafe6409b3e24836a486f769cb74c2c - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 5596ad8221369990f634a3d01f8c334e0ccb2b3d + abf0ba0638070af16427cea69bd47a9945fd5d7a https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 1bf535d28..ba4cc8c89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-servicing.21117.34 - 5.0.200-servicing.21117.34 + 5.0.200-servicing.21118.3 + 5.0.200-servicing.21118.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 72a15606742bc76e4548451615dd87876ae856e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 20 Feb 2021 03:20:40 +0000 Subject: [PATCH 038/112] Update dependencies from https://github.com/dotnet/sdk build 20210218.32 (#9763) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21117.38 to 3.9.0-5.21118.46 (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 5c69c9431..65fbc1fd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - c040f1fcaf1b81959fd07360e629cfbc9ffdfb40 + 965b1f96df3dfd549a3af9f54203ee36b255afba - + https://github.com/dotnet/sdk - c040f1fcaf1b81959fd07360e629cfbc9ffdfb40 + 965b1f96df3dfd549a3af9f54203ee36b255afba @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 8d78fb5ec0d751ee8c27b911870b088e9f15501a + cf6270bf910a7397947b5f539827b8282b48f252 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index ba4cc8c89..a12f4525b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-servicing.21118.3 - 5.0.200-servicing.21118.3 + 5.0.200-servicing.21118.32 + 5.0.200-servicing.21118.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 930412ccb0519fbbba953c519b844cef980715eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 20 Feb 2021 20:43:18 +0000 Subject: [PATCH 039/112] Update dependencies from https://github.com/dotnet/sdk build 20210220.4 (#9777) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21118.46 to 3.9.0-5.21120.8 (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 65fbc1fd8..24ff4d021 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 965b1f96df3dfd549a3af9f54203ee36b255afba + 01a01aa760490465f7949b27512b191972bf36e2 - + https://github.com/dotnet/sdk - 965b1f96df3dfd549a3af9f54203ee36b255afba + 01a01aa760490465f7949b27512b191972bf36e2 @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - cf6270bf910a7397947b5f539827b8282b48f252 + accdcb77007e801eabcb2c221bad9ef837b64ee3 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index a12f4525b..c6d274868 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-servicing.21118.32 - 5.0.200-servicing.21118.32 + 5.0.200-servicing.21120.4 + 5.0.200-servicing.21120.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2e22c92fbd0e60d098341b392c263b3b5f7f553a Mon Sep 17 00:00:00 2001 From: William Li Date: Sun, 21 Feb 2021 11:46:15 -0800 Subject: [PATCH 040/112] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c6d274868..00a39d000 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,7 +14,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release From 887809fbf343392f8728eecd3feef16123560f4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Feb 2021 15:04:13 +0000 Subject: [PATCH 041/112] Update dependencies from https://github.com/dotnet/sdk build 20210223.3 (#9779) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 16.9.0-release-20210216-04 to 16.9.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24ff4d021..30f217db7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 01a01aa760490465f7949b27512b191972bf36e2 + 1679bd5a2093db54f04f6a3c900ea3c511f1d8cf - + https://github.com/dotnet/sdk - 01a01aa760490465f7949b27512b191972bf36e2 + 1679bd5a2093db54f04f6a3c900ea3c511f1d8cf @@ -108,9 +108,9 @@ https://github.com/dotnet/fsharp 7ce7132f1459095e635194d09d6f73265352029a - + https://github.com/microsoft/vstest - 27786c21f7f586214b5721d2aa6380e69079b072 + 6a858a323caa439115e9e3cf1c958b04f4ff9993 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 00a39d000..107bfe842 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-servicing.21120.4 - 5.0.200-servicing.21120.4 + 5.0.200-servicing.21123.3 + 5.0.200-servicing.21123.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -129,7 +129,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.9.0-release-20210216-04 + 16.9.1 From b5c628e773880d37c8e01d0ae725ddf8ca52e2c8 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 23 Feb 2021 13:50:18 -0800 Subject: [PATCH 042/112] Update branding to 5.0.201 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 107bfe842..ad65fddb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 2 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 8db26e114b8b3ee44946aba7b15dc3574f031eb6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 23 Feb 2021 22:57:43 +0000 Subject: [PATCH 043/112] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210223.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-servicing.21123.3 -> To Version 5.0.201-servicing.21123.16 Dependency coherency updates Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.EntityFrameworkCore,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.3-servicing.21073.2 -> To Version 5.0.4-servicing.21117.6 (parent: Microsoft.NET.Sdk --- NuGet.config | 26 ++++++++++++++++ eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++--------- 3 files changed, 73 insertions(+), 47 deletions(-) diff --git a/NuGet.config b/NuGet.config index ed61ab0c8..eee169958 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,9 +6,21 @@ + + + + + + + + + + + + @@ -22,6 +34,20 @@ + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30f217db7..91435b3dc 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 - f8d26ae79a212ae4e64f2fac177a013f4e82307e + e708867037ec6edbe7965b8f0f1193999785037e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f8d26ae79a212ae4e64f2fac177a013f4e82307e + e708867037ec6edbe7965b8f0f1193999785037e https://github.com/dotnet/windowsdesktop @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + f27d33729518f5aa478aa818b7b4f54a4d50bef1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + f27d33729518f5aa478aa818b7b4f54a4d50bef1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + f27d33729518f5aa478aa818b7b4f54a4d50bef1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + f27d33729518f5aa478aa818b7b4f54a4d50bef1 @@ -55,25 +55,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d827c653b787c07de908240b7746ce34d3e6271e + e882394a7bb38930da748291fe2c2ceaa6a80588 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d827c653b787c07de908240b7746ce34d3e6271e + e882394a7bb38930da748291fe2c2ceaa6a80588 - - https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - efc2924e6e36db17611c7da480d5bc97a4514cb8 + + https://github.com/dotnet/efcore + cfd206aa4bc7c878dbbd91959f1c9edada70da93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d827c653b787c07de908240b7746ce34d3e6271e + e882394a7bb38930da748291fe2c2ceaa6a80588 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d827c653b787c07de908240b7746ce34d3e6271e + e882394a7bb38930da748291fe2c2ceaa6a80588 https://github.com/dotnet/test-templates @@ -87,22 +87,22 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - - https://github.com/dotnet/sdk - 1679bd5a2093db54f04f6a3c900ea3c511f1d8cf + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + eb87e99879e0d4f697c33b6d991af832d4345a06 - - https://github.com/dotnet/sdk - 1679bd5a2093db54f04f6a3c900ea3c511f1d8cf + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + eb87e99879e0d4f697c33b6d991af832d4345a06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ea25334307fb11be0b03c56ce767f25faf5259c1 + 3991c2606be14a6faf29eeafe824bd4444e85ea1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3a3d1e582344146190e9815e79cd5c8a29361b3d + 5d6364723197e917e11c0d442545287c27754aa5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ad65fddb7..f70153bfc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.3-servicing.21073.2 + 5.0.4-servicing.21117.2 - 5.0.3-servicing.21073.2 + 5.0.4-servicing.21117.5 @@ -43,20 +43,20 @@ - 5.0.3 + 5.0.4 5.0.0 5.0.0-rtm.20526.5 - 5.0.3-servicing.21073.3 - 5.0.3-servicing.21073.3 - 5.0.3-servicing.21073.3 + 5.0.4-servicing.21118.15 + 5.0.4-servicing.21118.15 + 5.0.4-servicing.21118.15 0.2.0 - 5.0.200-servicing.21123.3 - 5.0.200-servicing.21123.3 + 5.0.201-servicing.21123.16 + 5.0.201-servicing.21123.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,17 +67,17 @@ - 5.0.3-servicing.21072.12 - 5.0.3 - 5.0.3 + 5.0.4-servicing.21116.14 + 5.0.4 + 5.0.4 5.0.0 - 5.0.3 + 5.0.4 2.1.0 - 5.0.3-servicing.21073.2 - 5.0.3 + 5.0.4-servicing.21117.6 + 5.0.4 5.0.0 5.0.0-rtm.20520.1 From 38fc6a86428a396d9a99a56a8a081d264705e453 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 23 Feb 2021 16:27:49 -0800 Subject: [PATCH 044/112] Cherry-pick internal runtime download change --- eng/build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/eng/build.yml b/eng/build.yml index 1293e3764..6190e078b 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -43,10 +43,14 @@ phases: - _SignType: test - _BuildArgs: '/p:DotNetSignType=$(_SignType)' - _DOTNETCLIMSRC_READ_SAS_TOKEN: '' + - _InternalRuntimeDownloadArgs: '' - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNet-MSRC-Storage - _DOTNETCLIMSRC_READ_SAS_TOKEN: $(dotnetclimsrc-read-sas-token) + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet + /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs @@ -81,6 +85,7 @@ phases: -Architecture $(_BuildArchitecture) $(_BuildArgs) $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) displayName: Build env: DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE) @@ -107,6 +112,7 @@ phases: $(_RuntimeIdentifier) $(_BuildArgs) $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) displayName: Build env: DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN) @@ -119,6 +125,7 @@ phases: --configuration $(_BuildConfig) $(_BuildArgs) $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) displayName: Build env: DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN) From 23f416f8ded43697063d01f12e52bc4c9e957eef Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 23 Feb 2021 16:43:00 -0800 Subject: [PATCH 045/112] Cherry-pick internal runtime download change --- src/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index b317beac2..5476160e6 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -334,7 +334,7 @@ From c64c312424d79b201aff8cbbe422dc00f66dbf1a Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 23 Feb 2021 16:45:03 -0800 Subject: [PATCH 046/112] Fixup nuget.config --- NuGet.config | 5 ----- 1 file changed, 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index eee169958..0cd46b0c6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,8 +22,6 @@ - - @@ -48,8 +46,5 @@ - - - From 95ef7ddfd311bcba133b34ce62789f5d684cc31a Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 23 Feb 2021 17:12:42 -0800 Subject: [PATCH 047/112] Use VS redist targeting pack version for blob location --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 8 +++----- src/redist/targets/GenerateLayout.targets | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91435b3dc..52b5521ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,6 +21,10 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 + + https://github.com/dotnet/runtime + cf258a14b70ad9069470a108f13765e0e5988f51 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime f27d33729518f5aa478aa818b7b4f54a4d50bef1 diff --git a/eng/Versions.props b/eng/Versions.props index f70153bfc..04cd93aa1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,17 +62,15 @@ $(MicrosoftNETSdkPackageVersion) - - 5.0.1 - - - + 5.0.4-servicing.21116.14 5.0.4 5.0.4 5.0.0 5.0.4 + 5.0.1 2.1.0 + 5.0.0-rtm.20519.4 diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 5476160e6..8e50a8ff7 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -16,7 +16,7 @@ $(MicrosoftWindowsDesktopAppPackageVersion) - 5.0.0-rtm.20563.12 + $(VSRedistCommonNetCoreTargetingPackx6450PackageVersion) $(MicrosoftAspNetCoreAppRefInternalPackageVersion) $(VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion) 3.0.0 From d26f0db0825bfe8d94b3d11dda0f0ac489ac0bbf Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 10 Dec 2020 13:51:19 -0800 Subject: [PATCH 048/112] Update implicit versions Disable and fix tests do not work with non-existent LastRuntimeFrameworkVersion --- ...venWeWantToRequireWindowsForDesktopApps.cs | 20 ++++++++++++++- test/SdkTests/TestConfig.xml | 25 +++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs index f6d55f644..235e8a4cf 100644 --- a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs +++ b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs @@ -3,6 +3,7 @@ using System; using System.IO; +using System.Xml.Linq; using EndToEnd; using FluentAssertions; using Microsoft.DotNet.Tools.Test.Utilities; @@ -48,7 +49,24 @@ namespace Microsoft.DotNet.Tests.EndToEnd testProjectCreator.AdditionalProperties["OutputType"] = "exe"; testProjectCreator.AdditionalProperties["RuntimeIdentifier"] = Rid; - var testInstance = testProjectCreator.Create(); + // At certain point of the release cycle LatestRuntimeFrameworkVersion in eng folder may not exist on the nuget feed + static void overrideLastRuntimeFrameworkVersionToExistingOlderVersion(XDocument project) + { + XNamespace ns = project.Root.Name.Namespace; + var target = XElement.Parse(@" + + 3.1.10 + + + + 3.1.10 + + "); + target.Name = ns + target.Name.LocalName; + project.Root.Add(target); + } + TestFramework.TestAssetInstance testInstance + = testProjectCreator.Create().WithProjectChanges(overrideLastRuntimeFrameworkVersionToExistingOlderVersion); new PublishCommand() .WithWorkingDirectory(testInstance.Root.FullName) diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 794dd1478..b652d18ae 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -141,5 +141,30 @@ Skip="true" Issue="" Reason="Need all .NET core runtime"/> + + + + + + + From f0291202761dccd8b09db173be70dba43124f700 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 24 Feb 2021 02:37:12 +0000 Subject: [PATCH 049/112] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210223.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.201-servicing.21123.16 -> To Version 5.0.201-servicing.21123.23 --- 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 52b5521ed..8235613b4 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 - eb87e99879e0d4f697c33b6d991af832d4345a06 + 51ff67bd457ca07bab44409a3f58b9bb68997f2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eb87e99879e0d4f697c33b6d991af832d4345a06 + 51ff67bd457ca07bab44409a3f58b9bb68997f2f diff --git a/eng/Versions.props b/eng/Versions.props index 04cd93aa1..b799ab465 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.201-servicing.21123.16 - 5.0.201-servicing.21123.16 + 5.0.201-servicing.21123.23 + 5.0.201-servicing.21123.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1fec136e53e7d363139415f95e7c84d2368de910 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 24 Feb 2021 02:37:20 +0000 Subject: [PATCH 050/112] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210223.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.201-servicing.21123.23 -> To Version 5.0.201-servicing.21123.24 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8235613b4..a76fbcaee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,11 +91,11 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk 51ff67bd457ca07bab44409a3f58b9bb68997f2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk 51ff67bd457ca07bab44409a3f58b9bb68997f2f diff --git a/eng/Versions.props b/eng/Versions.props index b799ab465..453c5383c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.201-servicing.21123.23 - 5.0.201-servicing.21123.23 + 5.0.201-servicing.21123.24 + 5.0.201-servicing.21123.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 04de76ed9f1faefb4497f61f984d373fbe9caf57 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 24 Feb 2021 02:37:27 +0000 Subject: [PATCH 051/112] Dependency coherency updates Microsoft.WindowsDesktop.App,Microsoft.Net.Compilers.Toolset From Version 5.0.4-servicing.21117.6 -> To Version 5.0.4-servicing.21117.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a76fbcaee..421995e80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,7 +5,7 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop e708867037ec6edbe7965b8f0f1193999785037e @@ -121,9 +121,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - accdcb77007e801eabcb2c221bad9ef837b64ee3 + 0ffb65777acd74de98f6faef0ade9a14211475c2 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 453c5383c..c069d443e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ - 5.0.4-servicing.21117.6 + 5.0.4-servicing.21117.9 5.0.4 5.0.0 5.0.0-rtm.20520.1 From cea92349d3002ced48cc768cd35e5fb3472f6092 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 25 Feb 2021 11:30:48 -0800 Subject: [PATCH 052/112] Update branding for 5.0.2xx 5.0.2xx --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 107bfe842..48e2766dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 2 - 00 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 05eccf2790c927235a61d65a4ba91dbba643e034 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 27 Feb 2021 02:35:11 +0000 Subject: [PATCH 053/112] [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 beafdfb94215e62ab01f3b1825b7e810ef04f150 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 10 Dec 2020 13:51:19 -0800 Subject: [PATCH 054/112] Update implicit versions Disable and fix tests do not work with non-existent LastRuntimeFrameworkVersion --- ...venWeWantToRequireWindowsForDesktopApps.cs | 20 ++++++++++++++- test/SdkTests/TestConfig.xml | 25 +++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs index f6d55f644..235e8a4cf 100644 --- a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs +++ b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs @@ -3,6 +3,7 @@ using System; using System.IO; +using System.Xml.Linq; using EndToEnd; using FluentAssertions; using Microsoft.DotNet.Tools.Test.Utilities; @@ -48,7 +49,24 @@ namespace Microsoft.DotNet.Tests.EndToEnd testProjectCreator.AdditionalProperties["OutputType"] = "exe"; testProjectCreator.AdditionalProperties["RuntimeIdentifier"] = Rid; - var testInstance = testProjectCreator.Create(); + // At certain point of the release cycle LatestRuntimeFrameworkVersion in eng folder may not exist on the nuget feed + static void overrideLastRuntimeFrameworkVersionToExistingOlderVersion(XDocument project) + { + XNamespace ns = project.Root.Name.Namespace; + var target = XElement.Parse(@" + + 3.1.10 + + + + 3.1.10 + + "); + target.Name = ns + target.Name.LocalName; + project.Root.Add(target); + } + TestFramework.TestAssetInstance testInstance + = testProjectCreator.Create().WithProjectChanges(overrideLastRuntimeFrameworkVersionToExistingOlderVersion); new PublishCommand() .WithWorkingDirectory(testInstance.Root.FullName) diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 794dd1478..b652d18ae 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -141,5 +141,30 @@ Skip="true" Issue="" Reason="Need all .NET core runtime"/> + + + + + + + From 3e424c4d764eb581b21fa128255647a4120b1eb7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Mar 2021 07:06:21 +0000 Subject: [PATCH 055/112] Update dependencies from https://github.com/dotnet/arcade build 20210309.2 (#9897) [release/5.0.2xx] Update dependencies from dotnet/arcade --- NuGet.config | 1 - eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- global.json | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index ed61ab0c8..7bdc11768 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30f217db7..840cd2ea5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - d8c68c834bcca3f721ad1550404807e301ba7afe + f185e9dfcae59cf5024d3ce17884f03c8f8f4c70 - + https://github.com/dotnet/arcade - d8c68c834bcca3f721ad1550404807e301ba7afe + f185e9dfcae59cf5024d3ce17884f03c8f8f4c70 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 48e2766dc..fc50e949e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21112.3 + 5.0.0-beta.21159.2 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 650b13b08..a40ee827a 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -54,7 +54,7 @@ try { --id $buildId ` --publishing-infra-version $PublishingInfraVersion ` --default-channels ` - --source-branch master ` + --source-branch main ` --azdev-pat $AzdoToken ` --bar-uri $MaestroApiEndPoint ` --password $MaestroToken ` diff --git a/global.json b/global.json index 2d311e487..69256da0f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21112.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.2" } } From 9e521f7bf1433e51eadd7883a24794a94d4bb060 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Mar 2021 19:09:26 +0000 Subject: [PATCH 056/112] Update dependencies from https://github.com/dotnet/arcade build 20210309.7 (#9910) [release/5.0.2xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 840cd2ea5..aaa67b479 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - f185e9dfcae59cf5024d3ce17884f03c8f8f4c70 + 917ded6b428fc30b40f5ba4e35eb0c863d7f69e1 - + https://github.com/dotnet/arcade - f185e9dfcae59cf5024d3ce17884f03c8f8f4c70 + 917ded6b428fc30b40f5ba4e35eb0c863d7f69e1 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index fc50e949e..3545ac81f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21159.2 + 5.0.0-beta.21159.7 diff --git a/global.json b/global.json index 69256da0f..5760c69fc 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.2" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.7" } } From 3a2f084b9b68c376f4f9b91ed3878c28b8741377 Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Wed, 10 Mar 2021 11:47:01 -0800 Subject: [PATCH 057/112] Removing internal feeds --- NuGet.config | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index abe026c55..e66336daa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,21 +6,9 @@ - - - - - - - - - - - - - - + + @@ -31,19 +19,8 @@ - - - - - - - - - - - - - - + + + From 0c8356304d27fd4043512017385a7740f9ce3461 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 11 Mar 2021 09:26:52 -0800 Subject: [PATCH 058/112] Update Aspnetcore 2.1 & 3.1 template versions (#9820) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9d4cae42a..a63e7e202 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ 3.1.10 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.12 + 3.1.13 3.2.1 4.8.0-rc2.19462.10 @@ -121,7 +121,7 @@ 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 1.0.2-beta4.20420.1 - 2.1.25 + 2.1.26 From fadd4e80e37d7a022049965352ee4f128bece388 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Mar 2021 13:12:56 +0000 Subject: [PATCH 059/112] 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 060/112] [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 374dc98bd7ed8f1a1ed6a99004d4d3180417e935 Mon Sep 17 00:00:00 2001 From: Joshua Larkin <70237359+j0shuams@users.noreply.github.com> Date: Wed, 17 Mar 2021 12:45:17 -0700 Subject: [PATCH 061/112] Update ManualVersions.props --- eng/ManualVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index e89f3da42..7225dae04 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,8 +9,8 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.14 - 10.0.18362.14 - 10.0.19041.14 + 10.0.17763.15 + 10.0.18362.15 + 10.0.19041.15 From 3757bb5e64cfa52224dca0997e1e02280f6e3618 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Mar 2021 04:54:52 +0000 Subject: [PATCH 062/112] [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 063/112] [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 064/112] 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 065/112] [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 066/112] [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 e425b1dca0a7a9c800a1e739a6b7e7934ebc7bb7 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 30 Mar 2021 10:24:17 -0700 Subject: [PATCH 067/112] We were incorrectly includes .net core files and targets in the VS swr file. --- src/redist/targets/GenerateMSBuildExtensions.targets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/redist/targets/GenerateMSBuildExtensions.targets b/src/redist/targets/GenerateMSBuildExtensions.targets index 2936166f7..38bf5c09c 100644 --- a/src/redist/targets/GenerateMSBuildExtensions.targets +++ b/src/redist/targets/GenerateMSBuildExtensions.targets @@ -29,9 +29,14 @@ + + + + + From db7cc87d512335808e3806067f2bf9b31379e1db Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Apr 2021 22:02:02 +0000 Subject: [PATCH 068/112] 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 a5a666645966f125802b656333f7b16256c6421f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 6 Apr 2021 09:21:40 -0700 Subject: [PATCH 069/112] Update branding for 5.0.2xx 5.0.2xx --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a63e7e202..0d488c507 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 2 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 27a91459e07ec091fcfb89eb132a57037d066e42 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 8 Apr 2021 00:21:11 +0000 Subject: [PATCH 070/112] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 22 ---------------------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b3db04dc..770af0ccb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,30 +7,16 @@ - - - - - - - - - - - - - - @@ -47,18 +33,10 @@ - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1bd24113..5d7fe4832 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 - 51369266643769f9f0c1184e89715cd1045126d0 + 44e499a59bcca0444e0724cc73d3c576b12bc727 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 51369266643769f9f0c1184e89715cd1045126d0 + 44e499a59bcca0444e0724cc73d3c576b12bc727 diff --git a/eng/Versions.props b/eng/Versions.props index d26bbcc9a..120ee7a88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.202-servicing.21201.17 - 5.0.202-servicing.21201.17 + 5.0.203-servicing.21207.17 + 5.0.203-servicing.21207.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 78ad023e02f3915089a922385ab06379312aa968 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 9 Apr 2021 04:22:45 +0000 Subject: [PATCH 071/112] [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 5d7fe4832..0c4e2da4e 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 - 44e499a59bcca0444e0724cc73d3c576b12bc727 + d5e080154aebfd2cde43892175b75a486a9dd62c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 44e499a59bcca0444e0724cc73d3c576b12bc727 + d5e080154aebfd2cde43892175b75a486a9dd62c diff --git a/eng/Versions.props b/eng/Versions.props index 120ee7a88..a4c314282 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.203-servicing.21207.17 - 5.0.203-servicing.21207.17 + 5.0.203-servicing.21208.11 + 5.0.203-servicing.21208.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 32fb096a9db6e6b8f6840bf6b5186d1f5d48769d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 12 Apr 2021 12:20:08 +0000 Subject: [PATCH 072/112] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.202 to 5.0.203 (parent: Microsoft.NET.Sdk) --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 770af0ccb..0611db52f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,6 +15,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c4e2da4e..80b5e1cb2 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 - 8470ff317250d761c72f920b8ea1c0700b230eb3 + 6992e5df30f85b72ec7f3a3fd003f65e98c62b0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d5e080154aebfd2cde43892175b75a486a9dd62c + f2f7cd0b625c211ded10a6f223252770e9eb0e64 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d5e080154aebfd2cde43892175b75a486a9dd62c + f2f7cd0b625c211ded10a6f223252770e9eb0e64 diff --git a/eng/Versions.props b/eng/Versions.props index a4c314282..84262349f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.202 + 5.0.203 @@ -55,8 +55,8 @@ - 5.0.203-servicing.21208.11 - 5.0.203-servicing.21208.11 + 5.0.203-servicing.21209.7 + 5.0.203-servicing.21209.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b335e6569acae2cda624891b4fc6c1dce83297c2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 12 Apr 2021 23:32:45 +0000 Subject: [PATCH 073/112] [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 80b5e1cb2..ec1c9c699 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 6992e5df30f85b72ec7f3a3fd003f65e98c62b0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2f7cd0b625c211ded10a6f223252770e9eb0e64 + fa4a14a82c15e1fa02f0ff473c9b4a9d9f994af9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2f7cd0b625c211ded10a6f223252770e9eb0e64 + fa4a14a82c15e1fa02f0ff473c9b4a9d9f994af9 diff --git a/eng/Versions.props b/eng/Versions.props index 84262349f..a8929b79c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.203-servicing.21209.7 - 5.0.203-servicing.21209.7 + 5.0.203-servicing.21212.6 + 5.0.203-servicing.21212.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7751fb29960fdbfb46207f9027ca1425fafed14f Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 13 Apr 2021 11:08:13 -0700 Subject: [PATCH 074/112] Update aspnetcore 2.1 & 3.1 template versions (#10169) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0d488c507..9632193aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ 3.1.10 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.13 + 3.1.14 3.2.1 4.8.0-rc2.19462.10 @@ -121,7 +121,7 @@ 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 1.0.2-beta4.20420.1 - 2.1.26 + 2.1.27 From fd2fca7ba5db9082b8917f6f6e10b2b4b2d28e92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Apr 2021 18:13:34 +0000 Subject: [PATCH 075/112] Update dependencies from https://github.com/dotnet/arcade build 20210310.3 (#10201) [release/5.0.2xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b16b68bf..e6fa03d3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -148,13 +148,13 @@ - + https://github.com/dotnet/arcade - 917ded6b428fc30b40f5ba4e35eb0c863d7f69e1 + 670382be6a978ba401c21c57ba44311199d2682a - + https://github.com/dotnet/arcade - 917ded6b428fc30b40f5ba4e35eb0c863d7f69e1 + 670382be6a978ba401c21c57ba44311199d2682a https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9632193aa..f23b3c26a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21159.7 + 5.0.0-beta.21160.3 diff --git a/global.json b/global.json index 5760c69fc..33c984f8f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.7" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21160.3" } } From ca9be29c87064da28527fba3989a97979a04f9d7 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 13 Apr 2021 11:34:06 -0700 Subject: [PATCH 076/112] 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 @@ - - - - - - - - From cb7f067d43d2eb3f91e70471d5dd090b798ab367 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 13 Apr 2021 21:25:31 +0000 Subject: [PATCH 077/112] [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 c1c334088..ade825186 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 6992e5df30f85b72ec7f3a3fd003f65e98c62b0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fa4a14a82c15e1fa02f0ff473c9b4a9d9f994af9 + 770f6efa8f93e94d8b775fb3f99f96e1606d72fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fa4a14a82c15e1fa02f0ff473c9b4a9d9f994af9 + 770f6efa8f93e94d8b775fb3f99f96e1606d72fd diff --git a/eng/Versions.props b/eng/Versions.props index 65c32602e..3637963c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.203-servicing.21212.6 - 5.0.203-servicing.21212.6 + 5.0.203-servicing.21213.9 + 5.0.203-servicing.21213.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ee8601ef0640489f37445d553bed54d09ef7e247 Mon Sep 17 00:00:00 2001 From: Joshua Larkin <70237359+j0shuams@users.noreply.github.com> Date: Tue, 13 Apr 2021 16:00:33 -0700 Subject: [PATCH 078/112] Update Windows SDK Projection --- eng/ManualVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 7225dae04..0c9340dc6 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,8 +9,8 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.15 - 10.0.18362.15 - 10.0.19041.15 + 10.0.17763.16 + 10.0.18362.16 + 10.0.19041.16 From 8d820acefd1813d2c839626374c69da635bf14c4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 14 Apr 2021 01:49:07 +0000 Subject: [PATCH 079/112] [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 ade825186..a1be2d687 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 6992e5df30f85b72ec7f3a3fd003f65e98c62b0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 770f6efa8f93e94d8b775fb3f99f96e1606d72fd + d3ce1db41d4bba90dce9a8afb5c66f8f2f0f6708 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 770f6efa8f93e94d8b775fb3f99f96e1606d72fd + d3ce1db41d4bba90dce9a8afb5c66f8f2f0f6708 diff --git a/eng/Versions.props b/eng/Versions.props index 3637963c3..7c398dd4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.203-servicing.21213.9 - 5.0.203-servicing.21213.9 + 5.0.203-servicing.21213.20 + 5.0.203-servicing.21213.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 79cc44c283182d1986aee511d31e9c3813f423c6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 14 Apr 2021 11:07:56 +0000 Subject: [PATCH 080/112] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-rtm.21161.4 to 5.0.0-rtm.21213.1 (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 a1be2d687..fe343fe5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 6992e5df30f85b72ec7f3a3fd003f65e98c62b0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3ce1db41d4bba90dce9a8afb5c66f8f2f0f6708 + 6135be1d982b2e788e5bbe2247bdac778bea49f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3ce1db41d4bba90dce9a8afb5c66f8f2f0f6708 + 6135be1d982b2e788e5bbe2247bdac778bea49f4 @@ -116,9 +116,9 @@ https://github.com/microsoft/vstest 99b911a57a02fc5d2eeef23e9ab8cbea4505678b - + https://github.com/mono/linker - c43f981eec336c1dc4fd0ead84b5e09db9377d9e + 311102e38b4f925856f73af7a83da1ee4ded7af9 linker diff --git a/eng/Versions.props b/eng/Versions.props index 7c398dd4d..5ef47b730 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.203-servicing.21213.20 - 5.0.203-servicing.21213.20 + 5.0.203-servicing.21214.4 + 5.0.203-servicing.21214.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 31d21a27468a1c731c07c8d255fef2ca61bf7132 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 14 Apr 2021 12:06:18 +0000 Subject: [PATCH 081/112] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.5-servicing.21167.2 to 5.0.6-servicing.21213.7 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.5-servicing.21167.1 to 5.0.6-servicing.21213.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.5-servicing.21167.2 to 5.0.6-servicing.21213.16 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 2 ++ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0611db52f..3d9333e5a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,6 +18,7 @@ + @@ -38,6 +39,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe343fe5d..962dbaad1 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 - 951b1ad8c1ade424930ec5697fd9b46d1d170db4 + cfda81600ad554e8c9da7cad1a8311353c636e37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 951b1ad8c1ade424930ec5697fd9b46d1d170db4 + cfda81600ad554e8c9da7cad1a8311353c636e37 https://github.com/dotnet/windowsdesktop @@ -91,22 +91,22 @@ https://github.com/dotnet/templating 6992e5df30f85b72ec7f3a3fd003f65e98c62b0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6135be1d982b2e788e5bbe2247bdac778bea49f4 + c2a45c964b64f8ed42dcc7cc994da69d7c4b429b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6135be1d982b2e788e5bbe2247bdac778bea49f4 + c2a45c964b64f8ed42dcc7cc994da69d7c4b429b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b47cabfdc9c35f9b3305e5e11c2957d81fee26af + 7c6c603e2b02d7fca1798ca81f54b4d8a138ef76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2a2301468b4a483e4c11f763ff7f131c6ff70bc2 + 579c479f4eb426358932afdd62b695ea999de426 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5ef47b730..6137be45c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.5-servicing.21167.1 + 5.0.6-servicing.21213.9 - 5.0.5-servicing.21167.2 + 5.0.6-servicing.21213.16 @@ -55,8 +55,8 @@ - 5.0.203-servicing.21214.4 - 5.0.203-servicing.21214.4 + 5.0.203-servicing.21214.5 + 5.0.203-servicing.21214.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -74,8 +74,8 @@ - 5.0.5-servicing.21167.2 - 5.0.5 + 5.0.6-servicing.21213.7 + 5.0.6 5.0.0 5.0.0-rtm.20520.1 From 9e78852ef837c4e5e14d8923705489ae45137fc0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 16 Apr 2021 12:55:15 +0000 Subject: [PATCH 082/112] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.NETCore.App.Internal: from 5.0.5-servicing.21166.9 to 5.0.6-servicing.21209.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.5-servicing.21167.8 to 5.0.6-servicing.21213.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.5-servicing.21167.8 to 5.0.6-servicing.21213.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.5-servicing.21167.8 to 5.0.6-servicing.21213.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 5.0.203 to 5.0.203 (parent: Microsoft.NET.Sdk) --- NuGet.config | 6 +++++- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++++---------- 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d9333e5a..a528669d5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,15 +7,17 @@ + + - + @@ -35,8 +37,10 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 962dbaad1..b4917dbeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,21 +25,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f740adc1457e8a28c1c072993b66f515977eb51 + 84b30748fccccc0247181b615946aac10870364d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f740adc1457e8a28c1c072993b66f515977eb51 + 84b30748fccccc0247181b615946aac10870364d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f740adc1457e8a28c1c072993b66f515977eb51 + 84b30748fccccc0247181b615946aac10870364d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f740adc1457e8a28c1c072993b66f515977eb51 + 84b30748fccccc0247181b615946aac10870364d @@ -59,25 +59,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb + 150a0d45d3da3bf607115232fe229016cc52bac4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb + 150a0d45d3da3bf607115232fe229016cc52bac4 https://github.com/dotnet/efcore 54203510db732a088a3e7e58d49b98ada7c14227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb + 150a0d45d3da3bf607115232fe229016cc52bac4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb + 150a0d45d3da3bf607115232fe229016cc52bac4 https://github.com/dotnet/test-templates @@ -89,15 +89,15 @@ https://github.com/dotnet/templating - 6992e5df30f85b72ec7f3a3fd003f65e98c62b0a + 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2a45c964b64f8ed42dcc7cc994da69d7c4b429b + b4fcff665da1b63016780335179e0d5e302c7deb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2a45c964b64f8ed42dcc7cc994da69d7c4b429b + b4fcff665da1b63016780335179e0d5e302c7deb diff --git a/eng/Versions.props b/eng/Versions.props index 6137be45c..67a5c1fff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,31 +43,31 @@ - 5.0.5 + 5.0.6 5.0.0 5.0.0-rtm.20526.5 - 5.0.5-servicing.21167.8 - 5.0.5-servicing.21167.8 - 5.0.5-servicing.21167.8 + 5.0.6-servicing.21213.4 + 5.0.6-servicing.21213.4 + 5.0.6-servicing.21213.4 0.2.0 - 5.0.203-servicing.21214.5 - 5.0.203-servicing.21214.5 + 5.0.203-servicing.21216.5 + 5.0.203-servicing.21216.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.5-servicing.21166.9 - 5.0.5 - 5.0.5 + 5.0.6-servicing.21209.7 + 5.0.6 + 5.0.6 5.0.0 - 5.0.5 + 5.0.6 5.0.2 2.1.0 5.0.0-rtm.20519.4 From ff5e718c8bb1f39a880b5254924ac84759ada9d5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 16 Apr 2021 14:21:30 +0000 Subject: [PATCH 083/112] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.6-servicing.21213.4 to 5.0.6-servicing.21214.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.6-servicing.21213.4 to 5.0.6-servicing.21214.11 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.6-servicing.21213.4 to 5.0.6-servicing.21214.11 (parent: Microsoft.NET.Sdk) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index a528669d5..bc1db7644 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4917dbeb..fe020d9a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,23 +61,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 150a0d45d3da3bf607115232fe229016cc52bac4 + 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 150a0d45d3da3bf607115232fe229016cc52bac4 + 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 https://github.com/dotnet/efcore 54203510db732a088a3e7e58d49b98ada7c14227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 150a0d45d3da3bf607115232fe229016cc52bac4 + 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 150a0d45d3da3bf607115232fe229016cc52bac4 + 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 https://github.com/dotnet/test-templates @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b4fcff665da1b63016780335179e0d5e302c7deb + aeaa679b6eebd74eb26acb13457808cfe0892b18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b4fcff665da1b63016780335179e0d5e302c7deb + aeaa679b6eebd74eb26acb13457808cfe0892b18 diff --git a/eng/Versions.props b/eng/Versions.props index 67a5c1fff..f8d89112e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,17 +46,17 @@ 5.0.6 5.0.0 5.0.0-rtm.20526.5 - 5.0.6-servicing.21213.4 - 5.0.6-servicing.21213.4 - 5.0.6-servicing.21213.4 + 5.0.6-servicing.21214.11 + 5.0.6-servicing.21214.11 + 5.0.6-servicing.21214.11 0.2.0 - 5.0.203-servicing.21216.5 - 5.0.203-servicing.21216.5 + 5.0.203-servicing.21216.8 + 5.0.203-servicing.21216.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 60d5db0540e9f46bf9f961e12363c169532830c6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Apr 2021 15:40:47 +0000 Subject: [PATCH 084/112] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.NETCore.App.Internal: from 5.0.6-servicing.21209.7 to 5.0.6-servicing.21220.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) --- NuGet.config | 13 +++++++++++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index bc1db7644..7af97913d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,22 @@ + + + - + + + + @@ -38,9 +44,12 @@ + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe020d9a7..97b020a3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,21 +25,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 84b30748fccccc0247181b615946aac10870364d + 478b2f8c0e480665f6c52c95cd57830784dc9560 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 84b30748fccccc0247181b615946aac10870364d + 478b2f8c0e480665f6c52c95cd57830784dc9560 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 84b30748fccccc0247181b615946aac10870364d + 478b2f8c0e480665f6c52c95cd57830784dc9560 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 84b30748fccccc0247181b615946aac10870364d + 478b2f8c0e480665f6c52c95cd57830784dc9560 @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aeaa679b6eebd74eb26acb13457808cfe0892b18 + 38078c107fda315d87ab4c922ab45a4baa2bdea7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aeaa679b6eebd74eb26acb13457808cfe0892b18 + 38078c107fda315d87ab4c922ab45a4baa2bdea7 diff --git a/eng/Versions.props b/eng/Versions.props index f8d89112e..56ff5fa22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,15 +55,15 @@ - 5.0.203-servicing.21216.8 - 5.0.203-servicing.21216.8 + 5.0.203-servicing.21221.5 + 5.0.203-servicing.21221.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.6-servicing.21209.7 + 5.0.6-servicing.21220.11 5.0.6 5.0.6 5.0.0 From db8ff75c705e4c5db42bd55561c8bcd3aa73ea0f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Apr 2021 17:41:26 +0000 Subject: [PATCH 085/112] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.6-servicing.21214.11 to 5.0.6-servicing.21221.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.6-servicing.21214.11 to 5.0.6-servicing.21221.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.6-servicing.21214.11 to 5.0.6-servicing.21221.2 (parent: Microsoft.NET.Sdk) --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 10 +++++----- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7af97913d..5e1180481 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,7 @@ - - - - + @@ -43,10 +40,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97b020a3b..af7eb3792 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,23 +61,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 + f3eeec88e64270e9e783d713fea8503f28b1a932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 + f3eeec88e64270e9e783d713fea8503f28b1a932 https://github.com/dotnet/efcore 54203510db732a088a3e7e58d49b98ada7c14227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 + f3eeec88e64270e9e783d713fea8503f28b1a932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 + f3eeec88e64270e9e783d713fea8503f28b1a932 https://github.com/dotnet/test-templates @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38078c107fda315d87ab4c922ab45a4baa2bdea7 + 5dc9df7e7248f0e9ec80d29157914dc82e904080 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38078c107fda315d87ab4c922ab45a4baa2bdea7 + 5dc9df7e7248f0e9ec80d29157914dc82e904080 diff --git a/eng/Versions.props b/eng/Versions.props index 56ff5fa22..25d150f72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,17 +46,17 @@ 5.0.6 5.0.0 5.0.0-rtm.20526.5 - 5.0.6-servicing.21214.11 - 5.0.6-servicing.21214.11 - 5.0.6-servicing.21214.11 + 5.0.6-servicing.21221.2 + 5.0.6-servicing.21221.2 + 5.0.6-servicing.21221.2 0.2.0 - 5.0.203-servicing.21221.5 - 5.0.203-servicing.21221.5 + 5.0.203-servicing.21221.9 + 5.0.203-servicing.21221.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 16145475d871509500be175d7774ded4ec8d2a61 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Apr 2021 22:36:48 +0000 Subject: [PATCH 086/112] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.6-servicing.21213.7 to 5.0.6-servicing.21221.6 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.6-servicing.21213.9 to 5.0.6-servicing.21221.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.6-servicing.21213.16 to 5.0.6-servicing.21221.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5e1180481..61f217cfa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,7 +23,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af7eb3792..ad030ca15 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 - cfda81600ad554e8c9da7cad1a8311353c636e37 + 297185fc6039237591fb28a8a09fc01d2ea69ae6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cfda81600ad554e8c9da7cad1a8311353c636e37 + 297185fc6039237591fb28a8a09fc01d2ea69ae6 https://github.com/dotnet/windowsdesktop @@ -91,22 +91,22 @@ https://github.com/dotnet/templating 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dc9df7e7248f0e9ec80d29157914dc82e904080 + 61764b9eb3ba1699eec1f813a472b85de8186396 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dc9df7e7248f0e9ec80d29157914dc82e904080 + 61764b9eb3ba1699eec1f813a472b85de8186396 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7c6c603e2b02d7fca1798ca81f54b4d8a138ef76 + 3b86fe34ae2ef405a49c19997f9f01ed63a2ad70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 579c479f4eb426358932afdd62b695ea999de426 + fe9dd395134709b5a53883b71c01447b5f132a06 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 25d150f72..59b283c9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.6-servicing.21213.9 + 5.0.6-servicing.21221.3 - 5.0.6-servicing.21213.16 + 5.0.6-servicing.21221.8 @@ -55,8 +55,8 @@ - 5.0.203-servicing.21221.9 - 5.0.203-servicing.21221.9 + 5.0.203-servicing.21221.21 + 5.0.203-servicing.21221.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -74,7 +74,7 @@ - 5.0.6-servicing.21213.7 + 5.0.6-servicing.21221.6 5.0.6 5.0.0 5.0.0-rtm.20520.1 From b5f47e6c6aa198df48121dc3076c9626f50b116e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Apr 2021 18:10:07 +0000 Subject: [PATCH 087/112] Merged PR 14458: [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.ILLink.Tasks**: from 5.0.0-rtm.21213.1 to 5.0.0-rtm.21221.2 (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**: 20210422.11 - **Date Produced**: 4/22/2021 5:53 PM - **Commit**: b8025906f7463b6e477893c81238dc7003b353a3 - **Branch**: refs/heads/internal/release/5.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.203-servicing.21221.21 to 5.0.203-servicing.21222.11][1] - **Microsoft.NET.Sdk**: [from 5.0.203-servicing.21221.21 to 5.0.203-servicing.21222.11][1] - **Microsoft.NET.ILLink.Tasks**: [from 5.0.0-rtm.21213.1 to 5.0.0-rtm.21221.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC61764b9&targetVersion=GCb802590&_a=files [2]: https://github.com/mono/linker/compare/311102e...6a15056 [DependencyUpdate]: <> (End) [marker]: <> (End:fec1f9ef-909e-4396-5b7d-08d8d784082a) --- 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 ad030ca15..8a03e4e8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61764b9eb3ba1699eec1f813a472b85de8186396 + b8025906f7463b6e477893c81238dc7003b353a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61764b9eb3ba1699eec1f813a472b85de8186396 + b8025906f7463b6e477893c81238dc7003b353a3 @@ -116,9 +116,9 @@ https://github.com/microsoft/vstest 99b911a57a02fc5d2eeef23e9ab8cbea4505678b - + https://github.com/mono/linker - 311102e38b4f925856f73af7a83da1ee4ded7af9 + 6a15056a9d71169bf04d007301edfd558afcfa6a linker diff --git a/eng/Versions.props b/eng/Versions.props index 59b283c9c..1ec3a417b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.203-servicing.21221.21 - 5.0.203-servicing.21221.21 + 5.0.203-servicing.21222.11 + 5.0.203-servicing.21222.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 383637d63f76578633966bfa99d6ae38820e8dbd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 23 Apr 2021 22:29:51 +0000 Subject: [PATCH 088/112] Merged PR 14475: [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**: - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.EntityFrameworkCore**: from 5.0.5 to 5.0.6 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - **dotnet-dev-certs**: from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5 (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**: 20210423.17 - **Date Produced**: 4/23/2021 9:02 PM - **Commit**: 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9 - **Branch**: refs/heads/internal/release/5.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.203-servicing.21222.11 to 5.0.203-servicing.21223.17][1] - **Microsoft.NET.Sdk**: [from 5.0.203-servicing.21222.11 to 5.0.203-servicing.21223.17][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: [from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 5.0.6 to 5.0.6][2] - **Microsoft.EntityFrameworkCore**: [from 5.0.5 to 5.0.6][3] - **dotnet-dev-certs**: [from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5][2] - **dotnet-user-secrets**: [from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb802590&targetVersion=GC7cebab8&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCf3eeec8&targetVersion=GCdc5e11a&_a=files [3]: https://github.com/dotnet/efcore/compare/5420351...42e8143 [DependencyUpdate]: <> (End) [marker]: <> (End:fec1f9ef-909e-4396-5b7d-08d8d784082a) --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 10 +++++----- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 61f217cfa..be7ee6a60 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,29 @@ - + + + + + + + + @@ -40,13 +47,20 @@ - + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a03e4e8e..cc8272844 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,23 +61,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f3eeec88e64270e9e783d713fea8503f28b1a932 + dc5e11abdb05b322f4b74b3afbcfb352fe984b2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f3eeec88e64270e9e783d713fea8503f28b1a932 + dc5e11abdb05b322f4b74b3afbcfb352fe984b2e - + https://github.com/dotnet/efcore - 54203510db732a088a3e7e58d49b98ada7c14227 + 42e81439158d5884dab24326c84ed95cd4baaa21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f3eeec88e64270e9e783d713fea8503f28b1a932 + dc5e11abdb05b322f4b74b3afbcfb352fe984b2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f3eeec88e64270e9e783d713fea8503f28b1a932 + dc5e11abdb05b322f4b74b3afbcfb352fe984b2e https://github.com/dotnet/test-templates @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b8025906f7463b6e477893c81238dc7003b353a3 + 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b8025906f7463b6e477893c81238dc7003b353a3 + 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9 diff --git a/eng/Versions.props b/eng/Versions.props index 1ec3a417b..65a57890f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,17 +46,17 @@ 5.0.6 5.0.0 5.0.0-rtm.20526.5 - 5.0.6-servicing.21221.2 - 5.0.6-servicing.21221.2 - 5.0.6-servicing.21221.2 + 5.0.6-servicing.21223.5 + 5.0.6-servicing.21223.5 + 5.0.6-servicing.21223.5 0.2.0 - 5.0.203-servicing.21222.11 - 5.0.203-servicing.21222.11 + 5.0.203-servicing.21223.17 + 5.0.203-servicing.21223.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4b2717782395e7633f4c3ff9fb39fa378643eb1a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 4 May 2021 11:46:30 -0700 Subject: [PATCH 089/112] Update branding for 5.0.2xx 5.0.2xx --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index eb384403a..59a100f5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 2 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 6022619eaa97d92b388dbc71a0de75334f27f34c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 4 May 2021 14:47:35 -0700 Subject: [PATCH 090/112] Update sdl-tsa-vars.config --- eng/sdl-tsa-vars.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/sdl-tsa-vars.config b/eng/sdl-tsa-vars.config index 64aa69b44..433230ad5 100644 --- a/eng/sdl-tsa-vars.config +++ b/eng/sdl-tsa-vars.config @@ -3,7 +3,7 @@ -TsaProjectName DEVDIV -TsaNotificationEmail dotnetdevexcli@microsoft.com -TsaCodebaseAdmin REDMOND\marcpop --TsaBugAreaPath "DevDiv\NET Tools\CLI" +-TsaBugAreaPath "DevDiv\NET Tools\SDK" -TsaIterationPath DevDiv -TsaRepositoryName dotnet-installer -TsaCodebaseName dotnet-installer From 0c1b8bc1d70d0503f35637f632d11330964cee2d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 4 May 2021 23:44:05 +0000 Subject: [PATCH 091/112] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 20 +++++++++++++++++++- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index be7ee6a60..ffb8742a3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,12 +7,18 @@ + + + + + + @@ -20,6 +26,8 @@ + + @@ -28,6 +36,8 @@ + + @@ -47,20 +57,28 @@ + + + + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc8272844..69aa71cdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9 + b88b667c267847eaa9adca5c4ea4336e428e5545 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9 + b88b667c267847eaa9adca5c4ea4336e428e5545 diff --git a/eng/Versions.props b/eng/Versions.props index 65a57890f..c1eacc14a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.203-servicing.21223.17 - 5.0.203-servicing.21223.17 + 5.0.204-servicing.21254.16 + 5.0.204-servicing.21254.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From db6d94e0674ce48f6b359828ff7d70595f68b458 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 11 May 2021 11:40:33 -0700 Subject: [PATCH 092/112] Update aspnet 2.1/3.1 template version (#10484) --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 59a100f5b..bb8945d66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,10 +103,10 @@ 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 1.7.2 - 3.1.10 + 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.14 + 3.1.15 3.2.1 4.8.0-rc2.19462.10 @@ -121,7 +121,7 @@ 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 1.0.2-beta4.20420.1 - 2.1.27 + 2.1.28 From ccbf9e46d98199c5227e0fd59afdacde2eafc91e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 11 May 2021 13:27:54 -0700 Subject: [PATCH 093/112] Update NuGet.config --- NuGet.config | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1064db659..45e09c64d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,10 @@ -<<<<<<< HEAD -======= ->>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd -<<<<<<< HEAD -======= ->>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd @@ -29,9 +23,6 @@ -<<<<<<< HEAD -======= ->>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd @@ -48,19 +39,12 @@ -<<<<<<< HEAD - -======= - - - ->>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd From f9399e79adec387e7641b3131d58adb677502cf0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 12 May 2021 03:19:24 +0000 Subject: [PATCH 094/112] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.203 to 5.0.204 (parent: Microsoft.NET.Sdk) --- NuGet.config | 9 +-------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index ffb8742a3..fd1a511db 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,14 +26,7 @@ - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69aa71cdf..686c178b7 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 - 50e1aa014b0b35cb9aa2c5157d054ee654949dff + 3cdb1866b853838a7881187b994836b98d240d0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b88b667c267847eaa9adca5c4ea4336e428e5545 + c218ec378010c8ebca98d41cecb7b1b17e73c851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b88b667c267847eaa9adca5c4ea4336e428e5545 + c218ec378010c8ebca98d41cecb7b1b17e73c851 diff --git a/eng/Versions.props b/eng/Versions.props index c1eacc14a..b73172200 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.203 + 5.0.204 @@ -55,8 +55,8 @@ - 5.0.204-servicing.21254.16 - 5.0.204-servicing.21254.16 + 5.0.204-servicing.21261.22 + 5.0.204-servicing.21261.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2d88de2b5ab5a7eaa09509a1e08142ed5cd61464 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 13 May 2021 10:24:49 -0700 Subject: [PATCH 095/112] Update GenerateBundledVersions.targets --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 2328c7bc0..1c05c7213 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -24,7 +24,7 @@ - $([MSBuild]::Add($(VersionFeature), 25)) + $([MSBuild]::Add($(VersionFeature), 24)) $([MSBuild]::Add($(VersionFeature), 12)) From e0232bce5b4641e5e8992ca1d8f10c6d2b79b211 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 13 May 2021 10:33:31 -0700 Subject: [PATCH 096/112] Remove unneeded things from nuget.config (#10610) --- NuGet.config | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 45e09c64d..daf02ec43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,23 +10,15 @@ - - + + - - - - - - - - @@ -40,15 +32,14 @@ - - + + + + - - - From 29a0b6e22908a030d964230d91ba6ec56afeb798 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Thu, 13 May 2021 15:52:42 -0700 Subject: [PATCH 097/112] Update Windows SDK projection --- eng/ManualVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 0c9340dc6..a9c76ddc8 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,8 +9,8 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.16 - 10.0.18362.16 - 10.0.19041.16 + 10.0.17763.17 + 10.0.18362.17 + 10.0.19041.17 From 84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 14 May 2021 03:05:16 +0000 Subject: [PATCH 098/112] Merged PR 14981: [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.6-servicing.21221.6 to 5.0.7-servicing.21263.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Internal**: from 5.0.6-servicing.21220.11 to 5.0.7-servicing.21255.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: from 5.0.6-servicing.21223.5 to 5.0.7-servicing.21263.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.EntityFrameworkCore**: from 5.0.6 to 5.0.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - **dotnet-dev-certs**: from 5.0.6-servicing.21223.5 to 5.0.7-servicing.21263.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 5.0.6-servicing.21223.5 to 5.0.7-servicing.21263.9 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 5.0.6-servicing.21221.3 to 5.0.7-servicing.21263.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 5.0.6-servicing.21221.8 to 5.0.6-servicing.21263.3 (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**: 20210513.30 - **Date Produced**: 5/14/2021 2:39 AM - **Commit**: b4ddf0facd49caab999e4accd6cb82d5e599bf5e - **Branch**: refs/heads/internal/release/5.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.204-servicing.21261.22 to 5.0.204-servicing.21263.30][1] - **Microsoft.NET.Sdk**: [from 5.0.204-servicing.21261.22 to 5.0.204-servicing.21263.30][1] - **Microsoft.WindowsDesktop.App**: [from 5.0.6-servicing.21221.6 to 5.0.7-servicing.21263.4][2] - **Microsoft.NETCore.App.Internal**: [from 5.0.6-servicing.... --- NuGet.config | 9 +++++++ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 53 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index daf02ec43..64d79b4b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,21 @@ + + + + + @@ -31,14 +36,18 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 686c178b7..fca76c552 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 - 297185fc6039237591fb28a8a09fc01d2ea69ae6 + f87455227b7f349e26043daa2e1b5b86fb381627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 297185fc6039237591fb28a8a09fc01d2ea69ae6 + f87455227b7f349e26043daa2e1b5b86fb381627 https://github.com/dotnet/windowsdesktop @@ -25,21 +25,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e @@ -59,25 +59,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 https://github.com/dotnet/test-templates @@ -91,22 +91,22 @@ https://github.com/dotnet/templating 3cdb1866b853838a7881187b994836b98d240d0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c218ec378010c8ebca98d41cecb7b1b17e73c851 + b4ddf0facd49caab999e4accd6cb82d5e599bf5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c218ec378010c8ebca98d41cecb7b1b17e73c851 + b4ddf0facd49caab999e4accd6cb82d5e599bf5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3b86fe34ae2ef405a49c19997f9f01ed63a2ad70 + 3e5e4f7ca852c8b85899a18efcd114e7ed4ea163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fe9dd395134709b5a53883b71c01447b5f132a06 + 36ec7266b65ec578b5524c998a80e6a8848efb41 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5b31e66c0..63fa2a4ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.6-servicing.21221.3 + 5.0.7-servicing.21263.7 - 5.0.6-servicing.21221.8 + 5.0.6-servicing.21263.3 @@ -43,39 +43,39 @@ - 5.0.6 + 5.0.7 5.0.0 5.0.0-rtm.20526.5 - 5.0.6-servicing.21223.5 - 5.0.6-servicing.21223.5 - 5.0.6-servicing.21223.5 + 5.0.7-servicing.21263.9 + 5.0.7-servicing.21263.9 + 5.0.7-servicing.21263.9 0.2.0 - 5.0.204-servicing.21261.22 - 5.0.204-servicing.21261.22 + 5.0.204-servicing.21263.30 + 5.0.204-servicing.21263.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.6-servicing.21220.11 - 5.0.6 - 5.0.6 + 5.0.7-servicing.21255.8 + 5.0.7 + 5.0.7 5.0.0 - 5.0.6 + 5.0.7 5.0.2 2.1.0 5.0.0-rtm.20519.4 - 5.0.6-servicing.21221.6 - 5.0.6 + 5.0.7-servicing.21263.4 + 5.0.7 5.0.0 5.0.0-rtm.20520.1 From a33e46e202e88f81ee683806d87466ae0e843167 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 21 May 2021 06:37:54 +0000 Subject: [PATCH 099/112] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210520.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.301-servicing.21269.13 -> To Version 5.0.301-servicing.21270.41 Dependency coherency updates VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.EntityFrameworkCore,dotnet-dev-certs,dotnet-user-secrets,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 5.0.6-servicing.21223.5 -> To Version 5.0.7-servicing.21263.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 +++++++++++++++++++++- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------- 3 files changed, 52 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0781f7034..15a6e1498 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,8 +6,18 @@ + + + + + + + + + + - + @@ -22,6 +32,18 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6be3f618e..7d446518a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,25 +55,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 https://github.com/dotnet/test-templates @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 592742371da1df5b459c4bbf68e05968b5eb750d - - https://github.com/dotnet/sdk - 23b56ae2930ab04967d59485533230e97fe3c34a + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + a52c8e18b667d8d0ac2ef9818aec8730060290b5 - - https://github.com/dotnet/sdk - 23b56ae2930ab04967d59485533230e97fe3c34a + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + a52c8e18b667d8d0ac2ef9818aec8730060290b5 @@ -108,22 +108,22 @@ https://github.com/dotnet/fsharp 1b23bbeda88ea3cb9be9af777f4c99fa8663df81 - + https://github.com/microsoft/vstest - 9b8fac9e1dd2a1a1d7604ec38df6a8b1002c516e + 5c9abb2ae1b0318dc52729a3639e72089c79fb3c https://github.com/mono/linker 6a15056a9d71169bf04d007301edfd558afcfa6a linker - + https://github.com/dotnet/roslyn - dc0aff25e0ace6e6bf98269963612f9a67cdc897 + 029847714208ebe49668667c60ea5b0a294e0fcb - + https://github.com/dotnet/msbuild - 4242f381a90f77f483b123819759db1ff8eddf67 + 2fd48ab730134f7698a14fdd5752349737f0e3bd https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 683a1e541..0f9576c9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,20 +43,20 @@ - 5.0.6 + 5.0.7 5.0.0 5.0.0-rtm.20526.5 - 5.0.6-servicing.21223.5 - 5.0.6-servicing.21223.5 - 5.0.6-servicing.21223.5 + 5.0.7-servicing.21263.9 + 5.0.7-servicing.21263.9 + 5.0.7-servicing.21263.9 0.2.0 - 5.0.301-servicing.21269.13 - 5.0.301-servicing.21269.13 + 5.0.301-servicing.21270.41 + 5.0.301-servicing.21270.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -129,7 +129,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.10.0-release-20210511-06 + 16.10.0-release-20210520-03 From 4b800362b366da2e8847ce9c9717273629e2c06e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 21 May 2021 11:40:45 +0000 Subject: [PATCH 100/112] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210521.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.301-servicing.21269.13 -> To Version 5.0.301-servicing.21271.5 Dependency coherency updates Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.EntityFrameworkCore,dotnet-dev-certs,dotnet-user-secrets,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 5.0.6-servicing.21220.11 -> To Version 5.0.7-servicing.21255.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++++++++++ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 15a6e1498..551b73dfe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,6 +19,11 @@ + + + + + @@ -39,6 +44,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d446518a..6fb7451e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 592742371da1df5b459c4bbf68e05968b5eb750d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a52c8e18b667d8d0ac2ef9818aec8730060290b5 + 8e86aff63cbc2a14a24f321cef946cd435ef277d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a52c8e18b667d8d0ac2ef9818aec8730060290b5 + 8e86aff63cbc2a14a24f321cef946cd435ef277d diff --git a/eng/Versions.props b/eng/Versions.props index 0f9576c9a..7356c4be8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.301-servicing.21270.41 - 5.0.301-servicing.21270.41 + 5.0.301-servicing.21271.5 + 5.0.301-servicing.21271.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,11 +67,11 @@ - 5.0.6-servicing.21220.11 - 5.0.6 - 5.0.6 + 5.0.7-servicing.21255.8 + 5.0.7 + 5.0.7 5.0.0 - 5.0.6 + 5.0.7 2.1.0 From 57dc629f24739c07dfa0ceee111b829f421818e6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 21 May 2021 12:30:20 +0000 Subject: [PATCH 101/112] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210521.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.301-servicing.21269.13 -> To Version 5.0.301-servicing.21271.7 Dependency coherency updates Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.EntityFrameworkCore,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 5.0.6-servicing.21221.6 -> To Version 5.0.7-servicing.21263.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++++++++++--- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 551b73dfe..ce028f67b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,11 @@ + + + + + @@ -44,14 +49,19 @@ + + + + + + + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6fb7451e7..ee245dd20 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 - 297185fc6039237591fb28a8a09fc01d2ea69ae6 + f87455227b7f349e26043daa2e1b5b86fb381627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 297185fc6039237591fb28a8a09fc01d2ea69ae6 + f87455227b7f349e26043daa2e1b5b86fb381627 https://github.com/dotnet/windowsdesktop @@ -87,22 +87,22 @@ https://github.com/dotnet/templating 592742371da1df5b459c4bbf68e05968b5eb750d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e86aff63cbc2a14a24f321cef946cd435ef277d + 1555c5a76cb15abb5350aeeffc63d83c3fd2f70f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e86aff63cbc2a14a24f321cef946cd435ef277d + 1555c5a76cb15abb5350aeeffc63d83c3fd2f70f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3b86fe34ae2ef405a49c19997f9f01ed63a2ad70 + 3e5e4f7ca852c8b85899a18efcd114e7ed4ea163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fe9dd395134709b5a53883b71c01447b5f132a06 + 36ec7266b65ec578b5524c998a80e6a8848efb41 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7356c4be8..78fe44bbd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.6-servicing.21221.3 + 5.0.7-servicing.21263.7 - 5.0.6-servicing.21221.8 + 5.0.6-servicing.21263.3 @@ -55,8 +55,8 @@ - 5.0.301-servicing.21271.5 - 5.0.301-servicing.21271.5 + 5.0.301-servicing.21271.7 + 5.0.301-servicing.21271.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,8 +76,8 @@ - 5.0.6-servicing.21221.6 - 5.0.6 + 5.0.7-servicing.21263.4 + 5.0.7 5.0.0 5.0.0-rtm.20520.1 From f63f994967a520df7fc1dbaa0a3ae280b951a299 Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Fri, 21 May 2021 11:20:38 -0700 Subject: [PATCH 102/112] Remove VSRedistCommonNetCoreTargetingPackx6450PackageVersion property --- src/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 8e50a8ff7..5476160e6 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -16,7 +16,7 @@ $(MicrosoftWindowsDesktopAppPackageVersion) - $(VSRedistCommonNetCoreTargetingPackx6450PackageVersion) + 5.0.0-rtm.20563.12 $(MicrosoftAspNetCoreAppRefInternalPackageVersion) $(VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion) 3.0.0 From c2e3e267d43ea50689b3b0067ff433fb562f8042 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 1 Jun 2021 11:22:52 -0700 Subject: [PATCH 103/112] Update branding for 5.0.3xx to 302 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 683a1e541..9c208b65d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 3 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From d2bf7aed722a23f2fb2268f7403087fbc62cfa81 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 1 Jun 2021 11:23:12 -0700 Subject: [PATCH 104/112] Update branding for 5.0.2xx to 205 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 63ba0569e..252f2d11c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 2 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From bc6ab3374ba96d24b4476323499bc57143da40ab Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 8 Jun 2021 09:48:47 -0700 Subject: [PATCH 105/112] Update aspnetcore 3.1 template versions (#10831) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9c208b65d..edd177816 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.15 + 3.1.16 3.2.1 4.8.0-rc2.19462.10 From 605fba211f683eb1c2e13df5e7c8da4a0e1e55e0 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 8 Jun 2021 09:48:52 -0700 Subject: [PATCH 106/112] Update aspnetcore 3.1 template versions (#10825) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 252f2d11c..a7b179dce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.15 + 3.1.16 3.2.1 4.8.0-rc2.19462.10 From 7f54d010259de80972e25a35e46be8fdb45439a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Jun 2021 17:02:16 +0000 Subject: [PATCH 107/112] Update dependencies from https://github.com/dotnet/arcade build 20210512.2 (#10871) [release/5.0.2xx] Update dependencies from dotnet/arcade --- NuGet.config | 9 -- eng/Version.Details.xml | 8 +- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 5 -- eng/common/SetupNugetSources.sh | 14 --- eng/common/generate-locproject.ps1 | 110 +++++++++++++++++++++++ eng/common/templates/job/onelocbuild.yml | 83 +++++++++++++++++ global.json | 2 +- 8 files changed, 199 insertions(+), 34 deletions(-) create mode 100644 eng/common/generate-locproject.ps1 create mode 100644 eng/common/templates/job/onelocbuild.yml diff --git a/NuGet.config b/NuGet.config index 64d79b4b4..daf02ec43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,16 @@ - - - - - @@ -36,18 +31,14 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fca76c552..8693dec47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -148,13 +148,13 @@ - + https://github.com/dotnet/arcade - 670382be6a978ba401c21c57ba44311199d2682a + dad4f3c62e24b94b1514427674af8ca899cddd5f - + https://github.com/dotnet/arcade - 670382be6a978ba401c21c57ba44311199d2682a + dad4f3c62e24b94b1514427674af8ca899cddd5f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 66dd8ac34..e84403f82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21160.3 + 5.0.0-beta.21262.2 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index a6d188f1f..a0b5fc37f 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -158,9 +158,4 @@ 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 81d7913e6..2734601c1 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -129,20 +129,6 @@ 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' diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 new file mode 100644 index 000000000..2907f916d --- /dev/null +++ b/eng/common/generate-locproject.ps1 @@ -0,0 +1,110 @@ +Param( + [Parameter(Mandatory=$true)][string] $SourcesDirectory, # Directory where source files live; if using a Localize directory it should live in here + [string] $LanguageSet = 'VS_Main_Languages', # Language set to be used in the LocProject.json + [switch] $UseCheckedInLocProjectJson, # When set, generates a LocProject.json and compares it to one that already exists in the repo; otherwise just generates one + [switch] $CreateNeutralXlfs # Creates neutral xlf files. Only set to false when running locally +) + +# Generates LocProject.json files for the OneLocBuild task. OneLocBuildTask is described here: +# https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task + +Set-StrictMode -Version 2.0 +$ErrorActionPreference = "Stop" +. $PSScriptRoot\tools.ps1 + +Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') + +$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json" +$exclusions = @{ Exclusions = @() } +if (Test-Path -Path $exclusionsFilePath) +{ + $exclusions = Get-Content "$exclusionsFilePath" | ConvertFrom-Json +} + +Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to work + +# Template files +$jsonFiles = @() +$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern +$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern + +$xlfFiles = @() + +$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf" +$langXlfFiles = @() +if ($allXlfFiles) { + $null = $allXlfFiles[0].FullName -Match "\.([\w-]+)\.xlf" # matches '[langcode].xlf' + $firstLangCode = $Matches.1 + $langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf" +} +$langXlfFiles | ForEach-Object { + $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf' + + $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf" + $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru +} + +$locFiles = $jsonFiles + $xlfFiles + +$locJson = @{ + Projects = @( + @{ + LanguageSet = $LanguageSet + LocItems = @( + $locFiles | ForEach-Object { + $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($outputPath.Contains($exclusion)) + { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if (!$CreateNeutralXlfs -and $_.Extension -eq '.xlf') { + Remove-Item -Path $sourceFile + } + if ($continue) + { + if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\" + } + } + else { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnName" + OutputPath = $outputPath + } + } + } + } + ) + } + ) +} + +$json = ConvertTo-Json $locJson -Depth 5 +Write-Host "LocProject.json generated:`n`n$json`n`n" +Pop-Location + +if (!$UseCheckedInLocProjectJson) { + New-Item "$SourcesDirectory\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\Localize\LocProject.json" $json +} +else { + New-Item "$SourcesDirectory\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json + + if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) { + Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." + + exit 1 + } + else { + Write-Host "Generated LocProject.json and current LocProject.json are identical." + } +} \ No newline at end of file diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml new file mode 100644 index 000000000..b27d6faf3 --- /dev/null +++ b/eng/common/templates/job/onelocbuild.yml @@ -0,0 +1,83 @@ +parameters: + # Optional: dependencies of the job + dependsOn: '' + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: + vmImage: vs2017-win2016 + + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex + GithubPat: $(BotAccount-dotnet-bot-repo-PAT) + + SourcesDirectory: $(Build.SourcesDirectory) + CreatePr: true + AutoCompletePr: false + UseCheckedInLocProjectJson: false + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + condition: '' + +jobs: +- job: OneLocBuild + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild + + pool: ${{ parameters.pool }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + + + steps: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} + + - task: OneLocBuild@2 + displayName: OneLocBuild + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: Localize/LocProject.json + outDir: $(Build.ArtifactStagingDirectory) + lclSource: ${{ parameters.LclSource }} + lclPackageId: ${{ parameters.LclPackageId }} + isCreatePrSelected: ${{ parameters.CreatePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + packageSourceAuth: patAuth + patVariable: ${{ parameters.CeapexPat }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + repoType: ${{ parameters.RepoType }} + gitHubPatVariable: "${{ parameters.GithubPat }}" + condition: ${{ parameters.condition }} + + - task: PublishBuildArtifacts@1 + displayName: Publish Localization Files + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} + + - task: PublishBuildArtifacts@1 + displayName: Publish LocProject.json + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/Localize/' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/global.json b/global.json index 33c984f8f..edebab60f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21160.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21262.2" } } From c3e0fa6d7b0e148b4c4f73015a88c83636d7da03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Jun 2021 17:11:43 +0000 Subject: [PATCH 108/112] Update dependencies from https://github.com/dotnet/arcade build 20210512.2 (#10872) [release/5.0.3xx] Update dependencies from dotnet/arcade --- NuGet.config | 24 ----- eng/Version.Details.xml | 8 +- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 5 -- eng/common/SetupNugetSources.sh | 14 --- eng/common/generate-locproject.ps1 | 110 +++++++++++++++++++++++ eng/common/templates/job/onelocbuild.yml | 83 +++++++++++++++++ global.json | 2 +- 8 files changed, 199 insertions(+), 49 deletions(-) create mode 100644 eng/common/generate-locproject.ps1 create mode 100644 eng/common/templates/job/onelocbuild.yml diff --git a/NuGet.config b/NuGet.config index ce028f67b..315197afb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,27 +7,15 @@ - - - - - - - - - - - - @@ -44,23 +32,11 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee245dd20..978f05eaf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - 670382be6a978ba401c21c57ba44311199d2682a + dad4f3c62e24b94b1514427674af8ca899cddd5f - + https://github.com/dotnet/arcade - 670382be6a978ba401c21c57ba44311199d2682a + dad4f3c62e24b94b1514427674af8ca899cddd5f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 44481b15f..fe0d74bf3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21160.3 + 5.0.0-beta.21262.2 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index a6d188f1f..a0b5fc37f 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -158,9 +158,4 @@ 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 81d7913e6..2734601c1 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -129,20 +129,6 @@ 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' diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 new file mode 100644 index 000000000..2907f916d --- /dev/null +++ b/eng/common/generate-locproject.ps1 @@ -0,0 +1,110 @@ +Param( + [Parameter(Mandatory=$true)][string] $SourcesDirectory, # Directory where source files live; if using a Localize directory it should live in here + [string] $LanguageSet = 'VS_Main_Languages', # Language set to be used in the LocProject.json + [switch] $UseCheckedInLocProjectJson, # When set, generates a LocProject.json and compares it to one that already exists in the repo; otherwise just generates one + [switch] $CreateNeutralXlfs # Creates neutral xlf files. Only set to false when running locally +) + +# Generates LocProject.json files for the OneLocBuild task. OneLocBuildTask is described here: +# https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task + +Set-StrictMode -Version 2.0 +$ErrorActionPreference = "Stop" +. $PSScriptRoot\tools.ps1 + +Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') + +$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json" +$exclusions = @{ Exclusions = @() } +if (Test-Path -Path $exclusionsFilePath) +{ + $exclusions = Get-Content "$exclusionsFilePath" | ConvertFrom-Json +} + +Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to work + +# Template files +$jsonFiles = @() +$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern +$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern + +$xlfFiles = @() + +$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf" +$langXlfFiles = @() +if ($allXlfFiles) { + $null = $allXlfFiles[0].FullName -Match "\.([\w-]+)\.xlf" # matches '[langcode].xlf' + $firstLangCode = $Matches.1 + $langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf" +} +$langXlfFiles | ForEach-Object { + $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf' + + $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf" + $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru +} + +$locFiles = $jsonFiles + $xlfFiles + +$locJson = @{ + Projects = @( + @{ + LanguageSet = $LanguageSet + LocItems = @( + $locFiles | ForEach-Object { + $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($outputPath.Contains($exclusion)) + { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if (!$CreateNeutralXlfs -and $_.Extension -eq '.xlf') { + Remove-Item -Path $sourceFile + } + if ($continue) + { + if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\" + } + } + else { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnName" + OutputPath = $outputPath + } + } + } + } + ) + } + ) +} + +$json = ConvertTo-Json $locJson -Depth 5 +Write-Host "LocProject.json generated:`n`n$json`n`n" +Pop-Location + +if (!$UseCheckedInLocProjectJson) { + New-Item "$SourcesDirectory\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\Localize\LocProject.json" $json +} +else { + New-Item "$SourcesDirectory\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json + + if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) { + Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." + + exit 1 + } + else { + Write-Host "Generated LocProject.json and current LocProject.json are identical." + } +} \ No newline at end of file diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml new file mode 100644 index 000000000..b27d6faf3 --- /dev/null +++ b/eng/common/templates/job/onelocbuild.yml @@ -0,0 +1,83 @@ +parameters: + # Optional: dependencies of the job + dependsOn: '' + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: + vmImage: vs2017-win2016 + + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex + GithubPat: $(BotAccount-dotnet-bot-repo-PAT) + + SourcesDirectory: $(Build.SourcesDirectory) + CreatePr: true + AutoCompletePr: false + UseCheckedInLocProjectJson: false + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + condition: '' + +jobs: +- job: OneLocBuild + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild + + pool: ${{ parameters.pool }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + + + steps: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} + + - task: OneLocBuild@2 + displayName: OneLocBuild + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: Localize/LocProject.json + outDir: $(Build.ArtifactStagingDirectory) + lclSource: ${{ parameters.LclSource }} + lclPackageId: ${{ parameters.LclPackageId }} + isCreatePrSelected: ${{ parameters.CreatePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + packageSourceAuth: patAuth + patVariable: ${{ parameters.CeapexPat }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + repoType: ${{ parameters.RepoType }} + gitHubPatVariable: "${{ parameters.GithubPat }}" + condition: ${{ parameters.condition }} + + - task: PublishBuildArtifacts@1 + displayName: Publish Localization Files + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} + + - task: PublishBuildArtifacts@1 + displayName: Publish LocProject.json + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/Localize/' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/global.json b/global.json index 33c984f8f..edebab60f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21160.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21262.2" } } From ca7710905474110ae730876a152c3cbaabafacba Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 11 Jun 2021 10:58:45 -0700 Subject: [PATCH 109/112] Add Windows targeting information in new format, bump package versions, add 20348 as targetable version --- eng/ManualVersions.props | 7 ++++--- src/redist/targets/GenerateBundledVersions.targets | 9 +++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index a9c76ddc8..5826e1bd4 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,8 +9,9 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.17 - 10.0.18362.17 - 10.0.19041.17 + 10.0.17763.18 + 10.0.18362.18 + 10.0.19041.18 + 10.0.20348.18 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 1c05c7213..93c7b0d9d 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -480,6 +480,15 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackName="NETStandard.Library.Ref" TargetingPackVersion="$(NETStandardLibraryRefPackageVersion)" /> + + + + + + + + + ]]> From 39d41c1eb2fbe9634c2164cea22c17fd4124306e Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 11 Jun 2021 12:32:36 -0700 Subject: [PATCH 110/112] Revert to Windows SDK package versions that are currently published --- eng/ManualVersions.props | 6 +++--- test/EndToEnd/GivenWindows50App.cs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 5826e1bd4..de3923ade 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,9 +9,9 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.18 - 10.0.18362.18 - 10.0.19041.18 + 10.0.17763.17 + 10.0.18362.17 + 10.0.19041.17 10.0.20348.18 diff --git a/test/EndToEnd/GivenWindows50App.cs b/test/EndToEnd/GivenWindows50App.cs index 51a814fe7..06ae6c147 100644 --- a/test/EndToEnd/GivenWindows50App.cs +++ b/test/EndToEnd/GivenWindows50App.cs @@ -16,6 +16,7 @@ namespace EndToEnd [InlineData("10.0.17763.0")] [InlineData("10.0.18362.0")] [InlineData("10.0.19041.0")] + [InlineData("10.0.20348.0", Skip = "Package not published yet")] public void ItCanBuildAndRun(string targetPlatformVersion) { var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt") From aae22b05c41b66edcde2da38c99049f1fb4c8352 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 14 Jun 2021 13:24:27 -0700 Subject: [PATCH 111/112] Decrement 2.1 patch version To account for 2.1 not building this month --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 5a2fb8170..aa2691f11 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -24,7 +24,7 @@ - $([MSBuild]::Add($(VersionFeature), 27)) + $([MSBuild]::Add($(VersionFeature), 26)) $([MSBuild]::Add($(VersionFeature), 15)) From 9ad65fcd08e1a7e0969e87298ef1500e1af1e3e0 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 14 Jun 2021 14:31:26 -0700 Subject: [PATCH 112/112] Decrement 2.1 patch version (#10897) --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 1c05c7213..b86c228f1 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -24,7 +24,7 @@ - $([MSBuild]::Add($(VersionFeature), 24)) + $([MSBuild]::Add($(VersionFeature), 23)) $([MSBuild]::Add($(VersionFeature), 12))