From 284c65ce9dbfe63f9ac6ae79b9cdf624f695a0cd Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Thu, 17 Jun 2021 21:36:20 -0700 Subject: [PATCH 01/25] Update Windows SDK projection (#10913) --- eng/ManualVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index de3923ade..5826e1bd4 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.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 From 9fc0421b8f582aa92ae5f33dd20a6be4745daf6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 21 Jun 2021 18:35:28 +0000 Subject: [PATCH 02/25] Update dependencies from https://github.com/dotnet/sdk build 20210621.7 (#10938) [release/5.0.4xx] 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 b2b8d39e3..cc332c1b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 406c3f8fc3652aaffc6bb53e27a20f0e1a515bb6 + 9a38a7b9366de4c970e338b8795207ed7bdce027 - + https://github.com/dotnet/sdk - 406c3f8fc3652aaffc6bb53e27a20f0e1a515bb6 + 9a38a7b9366de4c970e338b8795207ed7bdce027 diff --git a/eng/Versions.props b/eng/Versions.props index 57956f09c..0a3f29e0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21317.28 - 5.0.400-preview.21317.28 + 5.0.400-preview.21321.7 + 5.0.400-preview.21321.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a4eb05bcdfe6c78bc7cb3b9109bb4c5dd0187334 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 20:48:37 +0000 Subject: [PATCH 03/25] Update dependencies from https://github.com/dotnet/sdk build 20210622.7 (#10948) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.11.0-preview-21317-10 to 16.11.0-preview-21318-04 (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 cc332c1b9..ac0b94d89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 9a38a7b9366de4c970e338b8795207ed7bdce027 + fdee91f03a269781caf0975826dd898c526d7a24 - + https://github.com/dotnet/sdk - 9a38a7b9366de4c970e338b8795207ed7bdce027 + fdee91f03a269781caf0975826dd898c526d7a24 @@ -121,9 +121,9 @@ https://github.com/dotnet/roslyn b0b49a859a7f7ba09aaf5388859ecb12d6d3e357 - + https://github.com/dotnet/msbuild - eb30e0569ba7029f23490fa70638f762537b1ce3 + 2eb4b8616665c7adb4ae8f5c7a3b85838d025d20 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 0a3f29e0b..a41062626 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21321.7 - 5.0.400-preview.21321.7 + 5.0.400-preview.21322.7 + 5.0.400-preview.21322.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 203804478eb1a5158eae77997845ecdde46e0701 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 21:39:22 +0000 Subject: [PATCH 04/25] Update dependencies from https://github.com/dotnet/sdk build 20210622.10 (#10951) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21316.5 to 3.11.0-3.21321.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 ac0b94d89..fed8b5730 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - fdee91f03a269781caf0975826dd898c526d7a24 + 50aa265308969f37434c9768fb1c34a7f7321b7a - + https://github.com/dotnet/sdk - fdee91f03a269781caf0975826dd898c526d7a24 + 50aa265308969f37434c9768fb1c34a7f7321b7a @@ -117,9 +117,9 @@ e6a47c70b7878b346ff0858085eb8a6379f6f0bb linker - + https://github.com/dotnet/roslyn - b0b49a859a7f7ba09aaf5388859ecb12d6d3e357 + 998323c5d83de7424e2628db43456e6f0212c34a https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index a41062626..970184b8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21322.7 - 5.0.400-preview.21322.7 + 5.0.400-preview.21322.10 + 5.0.400-preview.21322.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c81bb3a6e79b53ae2be9447d024e66ffcb1562f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Jun 2021 15:32:59 +0000 Subject: [PATCH 05/25] Update dependencies from https://github.com/dotnet/sdk build 20210623.4 (#10960) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-3.21321.10 to 3.11.0-3.21322.28 (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 fed8b5730..15a9273df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 50aa265308969f37434c9768fb1c34a7f7321b7a + a54672d2050d1cf38d2c93f5d20a2364354552bb - + https://github.com/dotnet/sdk - 50aa265308969f37434c9768fb1c34a7f7321b7a + a54672d2050d1cf38d2c93f5d20a2364354552bb @@ -117,9 +117,9 @@ e6a47c70b7878b346ff0858085eb8a6379f6f0bb linker - + https://github.com/dotnet/roslyn - 998323c5d83de7424e2628db43456e6f0212c34a + 6252f00b16a27c8fc8f6a6371a2ad4112eab6bc1 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 970184b8a..f7baa0fed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21322.10 - 5.0.400-preview.21322.10 + 5.0.400-preview.21323.4 + 5.0.400-preview.21323.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3650c11cb0b15433cb3aecd892ac56b774594884 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Jun 2021 23:59:34 +0000 Subject: [PATCH 06/25] Update dependencies from https://github.com/dotnet/sdk build 20210623.15 (#10966) [release/5.0.4xx] 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 15a9273df..80d12d2f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - a54672d2050d1cf38d2c93f5d20a2364354552bb + 7557111ebfc214b6c39b58793bbb7caaa3b4cb5e - + https://github.com/dotnet/sdk - a54672d2050d1cf38d2c93f5d20a2364354552bb + 7557111ebfc214b6c39b58793bbb7caaa3b4cb5e diff --git a/eng/Versions.props b/eng/Versions.props index f7baa0fed..139b9155f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21323.4 - 5.0.400-preview.21323.4 + 5.0.400-preview.21323.15 + 5.0.400-preview.21323.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d222e771caa2ed01f8ba45398922fa96236d3a3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Jun 2021 18:17:35 +0000 Subject: [PATCH 07/25] Update dependencies from https://github.com/dotnet/sdk build 20210624.5 (#10971) [release/5.0.4xx] 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 80d12d2f1..cb15c9e91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 7557111ebfc214b6c39b58793bbb7caaa3b4cb5e + fe78534b347e921556443e25f54649cf5a4a48bd - + https://github.com/dotnet/sdk - 7557111ebfc214b6c39b58793bbb7caaa3b4cb5e + fe78534b347e921556443e25f54649cf5a4a48bd diff --git a/eng/Versions.props b/eng/Versions.props index 139b9155f..9597b7457 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21323.15 - 5.0.400-preview.21323.15 + 5.0.400-preview.21324.5 + 5.0.400-preview.21324.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c0ee31311a667666b896c2f5f0ce470f0d54c9ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 25 Jun 2021 05:23:24 +0000 Subject: [PATCH 08/25] Update dependencies from https://github.com/dotnet/sdk build 20210624.23 (#10979) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-3.21322.28 to 3.11.0-3.21323.16 (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 cb15c9e91..86154fcb1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - fe78534b347e921556443e25f54649cf5a4a48bd + 221fedc86057ba6a7d6e01dbda965d1cc2799220 - + https://github.com/dotnet/sdk - fe78534b347e921556443e25f54649cf5a4a48bd + 221fedc86057ba6a7d6e01dbda965d1cc2799220 @@ -117,9 +117,9 @@ e6a47c70b7878b346ff0858085eb8a6379f6f0bb linker - + https://github.com/dotnet/roslyn - 6252f00b16a27c8fc8f6a6371a2ad4112eab6bc1 + d06030765f47e328431a3a71f643d8d0251ec702 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 9597b7457..715cf4f71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21324.5 - 5.0.400-preview.21324.5 + 5.0.400-preview.21324.23 + 5.0.400-preview.21324.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b8844a3254da803cdfd3852784ed5728bd006671 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 25 Jun 2021 06:32:45 +0000 Subject: [PATCH 09/25] Update dependencies from https://github.com/dotnet/sdk build 20210624.25 (#10980) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.4.2-beta.21262.7 to 11.4.2-beta.21322.6 (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 86154fcb1..3eec310b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 221fedc86057ba6a7d6e01dbda965d1cc2799220 + b0153610af0bc02a788366b9949d8aa0768efa24 - + https://github.com/dotnet/sdk - 221fedc86057ba6a7d6e01dbda965d1cc2799220 + b0153610af0bc02a788366b9949d8aa0768efa24 @@ -104,9 +104,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf fe9dd395134709b5a53883b71c01447b5f132a06 - + https://github.com/dotnet/fsharp - 1b23bbeda88ea3cb9be9af777f4c99fa8663df81 + 488cc578cafcd261d90d748d8aaa7b8b091232dc https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 715cf4f71..0684b7352 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21324.23 - 5.0.400-preview.21324.23 + 5.0.400-preview.21324.25 + 5.0.400-preview.21324.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e285a4eeb5bafff10405554be9c38c11e43f87f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 25 Jun 2021 15:18:43 +0000 Subject: [PATCH 10/25] Update dependencies from https://github.com/dotnet/sdk build 20210625.2 (#10983) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-3.21323.16 to 3.11.0-3.21324.6 (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 3eec310b3..f01048383 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - b0153610af0bc02a788366b9949d8aa0768efa24 + 75d365139bd8540621353227637616a769513391 - + https://github.com/dotnet/sdk - b0153610af0bc02a788366b9949d8aa0768efa24 + 75d365139bd8540621353227637616a769513391 @@ -117,9 +117,9 @@ e6a47c70b7878b346ff0858085eb8a6379f6f0bb linker - + https://github.com/dotnet/roslyn - d06030765f47e328431a3a71f643d8d0251ec702 + ac1878d7b9abf47e65475fa5eabeec6d9a79049c https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 0684b7352..6b5a8fd44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21324.25 - 5.0.400-preview.21324.25 + 5.0.400-preview.21325.2 + 5.0.400-preview.21325.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 24074d9fa07a54f03533a0276acab3b2caeda17f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 26 Jun 2021 15:53:52 +0000 Subject: [PATCH 11/25] Update dependencies from https://github.com/dotnet/sdk build 20210626.1 (#10989) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-3.21324.6 to 3.11.0-3.21325.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 f01048383..d65d51e77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 75d365139bd8540621353227637616a769513391 + a438fac51c749e7421c44e00d777baa00ded42bc - + https://github.com/dotnet/sdk - 75d365139bd8540621353227637616a769513391 + a438fac51c749e7421c44e00d777baa00ded42bc @@ -117,9 +117,9 @@ e6a47c70b7878b346ff0858085eb8a6379f6f0bb linker - + https://github.com/dotnet/roslyn - ac1878d7b9abf47e65475fa5eabeec6d9a79049c + 8c13f49cb86fb0ab25c974d34b5b38f9e0c212cc https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 6b5a8fd44..d3d87a9e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21325.2 - 5.0.400-preview.21325.2 + 5.0.400-preview.21326.1 + 5.0.400-preview.21326.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8c50333715ec0051e61505fee1a27a752b6f5c2e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 26 Jun 2021 19:32:31 +0000 Subject: [PATCH 12/25] Update dependencies from https://github.com/dotnet/sdk build 20210626.4 (#10991) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 16.10.0-release-20210511-06 to 16.11.0-release-20210626-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 d65d51e77..88c9d7bad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - a438fac51c749e7421c44e00d777baa00ded42bc + 1e3454abdc2793e0c99a058c48722f9a0fab9f4e - + https://github.com/dotnet/sdk - a438fac51c749e7421c44e00d777baa00ded42bc + 1e3454abdc2793e0c99a058c48722f9a0fab9f4e @@ -108,9 +108,9 @@ https://github.com/dotnet/fsharp 488cc578cafcd261d90d748d8aaa7b8b091232dc - + https://github.com/microsoft/vstest - 9b8fac9e1dd2a1a1d7604ec38df6a8b1002c516e + b58f6c4f4626bdf44df40f2064ab6a80a466115c https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index d3d87a9e7..55ed158cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21326.1 - 5.0.400-preview.21326.1 + 5.0.400-preview.21326.4 + 5.0.400-preview.21326.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -129,7 +129,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.10.0-release-20210511-06 + 16.11.0-release-20210626-04 From 3b2537ffe76a72206cfc38a1027ff41af91758ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 28 Jun 2021 18:50:43 +0000 Subject: [PATCH 13/25] Update dependencies from https://github.com/dotnet/sdk build 20210628.4 (#10996) [release/5.0.4xx] 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 88c9d7bad..b008d90bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 1e3454abdc2793e0c99a058c48722f9a0fab9f4e + b8d132665f63da3c566e6528bb0fe86dbe230600 - + https://github.com/dotnet/sdk - 1e3454abdc2793e0c99a058c48722f9a0fab9f4e + b8d132665f63da3c566e6528bb0fe86dbe230600 diff --git a/eng/Versions.props b/eng/Versions.props index 55ed158cd..af1fdd3af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21326.4 - 5.0.400-preview.21326.4 + 5.0.400-preview.21328.4 + 5.0.400-preview.21328.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 82888062fb9ecb0b7584fe5ec70d1199db8db899 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 30 Jun 2021 16:37:49 +0000 Subject: [PATCH 14/25] [release/5.0.4xx] Update dependencies from dotnet/sdk (#11017) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-3.21325.7 to 3.11.0-3.21329.24 (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 b008d90bd..dbc382ca5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - b8d132665f63da3c566e6528bb0fe86dbe230600 + 66be77d4b8197eccdc72018448075fbccad5cd73 - + https://github.com/dotnet/sdk - b8d132665f63da3c566e6528bb0fe86dbe230600 + 66be77d4b8197eccdc72018448075fbccad5cd73 @@ -117,9 +117,9 @@ e6a47c70b7878b346ff0858085eb8a6379f6f0bb linker - + https://github.com/dotnet/roslyn - 8c13f49cb86fb0ab25c974d34b5b38f9e0c212cc + 68b0bfff8118bf76b54afd5893ae2078a99d9a14 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index af1fdd3af..4e9e21fb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21328.4 - 5.0.400-preview.21328.4 + 5.0.400-preview.21330.12 + 5.0.400-preview.21330.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a7c1c9bd218337f35f6a18acdbce6c799d6365eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 1 Jul 2021 16:53:38 +0000 Subject: [PATCH 15/25] Update dependencies from https://github.com/dotnet/sdk build 20210701.6 (#11028) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.11.0-preview-21318-04 to 16.11.0-preview-21330-03 (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 dbc382ca5..ffebb593e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 66be77d4b8197eccdc72018448075fbccad5cd73 + 35c64c2d94d8112365e555f0d05d72a22025d670 - + https://github.com/dotnet/sdk - 66be77d4b8197eccdc72018448075fbccad5cd73 + 35c64c2d94d8112365e555f0d05d72a22025d670 @@ -121,9 +121,9 @@ https://github.com/dotnet/roslyn 68b0bfff8118bf76b54afd5893ae2078a99d9a14 - + https://github.com/dotnet/msbuild - 2eb4b8616665c7adb4ae8f5c7a3b85838d025d20 + bbde2b8c40d1daf14f1ebdd5f404f588c70506af https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 4e9e21fb7..56506959b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21330.12 - 5.0.400-preview.21330.12 + 5.0.400-preview.21351.6 + 5.0.400-preview.21351.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1808aba46ba142404b0958af3ba9cf8255c6d64b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Jul 2021 23:08:23 +0000 Subject: [PATCH 16/25] Update dependencies from https://github.com/dotnet/sdk build 20210702.9 (#11036) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-3.21329.24 to 3.11.0-3.21351.9 (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 ffebb593e..63ebe860c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 35c64c2d94d8112365e555f0d05d72a22025d670 + 2a5775cdd1db7130110c97227ee179c0891fbedb - + https://github.com/dotnet/sdk - 35c64c2d94d8112365e555f0d05d72a22025d670 + 2a5775cdd1db7130110c97227ee179c0891fbedb @@ -117,9 +117,9 @@ e6a47c70b7878b346ff0858085eb8a6379f6f0bb linker - + https://github.com/dotnet/roslyn - 68b0bfff8118bf76b54afd5893ae2078a99d9a14 + 49a655e40d938aa74b1d149b407c30cbb2287d71 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 56506959b..5beeeed6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21351.6 - 5.0.400-preview.21351.6 + 5.0.400-preview.21352.9 + 5.0.400-preview.21352.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7338f6d6c8b585f3aa16b0fafb9d705f5c808a1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 5 Jul 2021 05:23:32 +0000 Subject: [PATCH 17/25] [release/5.0.4xx] Update dependencies from dotnet/sdk (#11045) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-3.21351.9 to 3.11.0-3.21352.9 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.11.0-preview-21330-03 to 16.11.0-preview-21351-03 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 63ebe860c..e8cbf334e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 2a5775cdd1db7130110c97227ee179c0891fbedb + 347bc4a4fb84e13c7fdb38ffe2f38807cc180b21 - + https://github.com/dotnet/sdk - 2a5775cdd1db7130110c97227ee179c0891fbedb + 347bc4a4fb84e13c7fdb38ffe2f38807cc180b21 @@ -117,13 +117,13 @@ e6a47c70b7878b346ff0858085eb8a6379f6f0bb linker - + https://github.com/dotnet/roslyn - 49a655e40d938aa74b1d149b407c30cbb2287d71 + e73cf0139ea53178948e869dc1b322a0d2a890dd - + https://github.com/dotnet/msbuild - bbde2b8c40d1daf14f1ebdd5f404f588c70506af + 1d7ed8e3d8394d0effaee6d3395c28d9322aa9bb https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 5beeeed6e..0f2334894 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21352.9 - 5.0.400-preview.21352.9 + 5.0.400-preview.21354.10 + 5.0.400-preview.21354.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 281097689b9d08e7ab85257e511c89b87166c1c9 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 6 Jul 2021 11:32:54 -0700 Subject: [PATCH 18/25] Stabilize final branding before release --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0f2334894..3b0477786 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,11 +10,11 @@ 4 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - preview + servicing $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release From 4ed27616e47c56eae7bc84b9c5035f2a7198cec3 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 6 Jul 2021 11:35:05 -0700 Subject: [PATCH 19/25] Update GenerateBundledVersions.targets --- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 1ffa5daac..657c88fc2 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -24,8 +24,8 @@ - $([MSBuild]::Add($(VersionFeature), 26)) - $([MSBuild]::Add($(VersionFeature), 15)) + $([MSBuild]::Add($(VersionFeature), 29)) + $([MSBuild]::Add($(VersionFeature), 18)) From 9f12c508afa89508748451e474c653bfb2b2786e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Jul 2021 05:34:46 +0000 Subject: [PATCH 20/25] Update dependencies from https://github.com/dotnet/sdk build 20210706.12 (#11057) [release/5.0.4xx] 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 e8cbf334e..291ab8c3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 347bc4a4fb84e13c7fdb38ffe2f38807cc180b21 + fdc48d5787355746c06f9a637df83ed754347d04 - + https://github.com/dotnet/sdk - 347bc4a4fb84e13c7fdb38ffe2f38807cc180b21 + fdc48d5787355746c06f9a637df83ed754347d04 diff --git a/eng/Versions.props b/eng/Versions.props index 0f2334894..3b905a876 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21354.10 - 5.0.400-preview.21354.10 + 5.0.400-preview.21356.12 + 5.0.400-preview.21356.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fc6376046e4c73f7bf9c5fbd7b0f79fecbeed413 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Jul 2021 18:09:27 +0000 Subject: [PATCH 21/25] Update dependencies from https://github.com/dotnet/arcade build 20210628.3 (#11066) [release/5.0.4xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- eng/common/generate-locproject.ps1 | 14 +++++++------- eng/common/templates/job/onelocbuild.yml | 14 ++++++++++++-- eng/common/tools.ps1 | 13 +++++++++++-- global.json | 2 +- 6 files changed, 36 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 291ab8c3d..800ff959f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - dad4f3c62e24b94b1514427674af8ca899cddd5f + 5266aa9856457785b84739fda2616f21da7ee6b4 - + https://github.com/dotnet/arcade - dad4f3c62e24b94b1514427674af8ca899cddd5f + 5266aa9856457785b84739fda2616f21da7ee6b4 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3b905a876..46093a119 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21262.2 + 5.0.0-beta.21328.3 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 2907f916d..de348a2e2 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -14,7 +14,7 @@ $ErrorActionPreference = "Stop" Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') -$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json" +$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json" $exclusions = @{ Exclusions = @() } if (Test-Path -Path $exclusionsFilePath) { @@ -38,7 +38,7 @@ if ($allXlfFiles) { $langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf" } $langXlfFiles | ForEach-Object { - $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf' + $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf" $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru @@ -92,14 +92,14 @@ 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 + New-Item "$SourcesDirectory\eng\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\eng\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 + New-Item "$SourcesDirectory\eng\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\eng\Localize\LocProject-generated.json" $json - if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) { + if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\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 diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index b27d6faf3..e8bc77d2e 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -12,11 +12,15 @@ parameters: SourcesDirectory: $(Build.SourcesDirectory) CreatePr: true AutoCompletePr: false + UseLfLineEndings: true UseCheckedInLocProjectJson: false LanguageSet: VS_Main_Languages LclSource: lclFilesInRepo LclPackageId: '' RepoType: gitHub + GitHubOrg: dotnet + MirrorRepo: '' + MirrorBranch: main condition: '' jobs: @@ -52,18 +56,24 @@ jobs: env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) inputs: - locProj: Localize/LocProject.json + locProj: eng/Localize/LocProject.json outDir: $(Build.ArtifactStagingDirectory) lclSource: ${{ parameters.LclSource }} lclPackageId: ${{ parameters.LclPackageId }} isCreatePrSelected: ${{ parameters.CreatePr }} ${{ if eq(parameters.CreatePr, true) }}: isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} packageSourceAuth: patAuth patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: repoType: ${{ parameters.RepoType }} gitHubPatVariable: "${{ parameters.GithubPat }}" + ${{ if ne(parameters.MirrorRepo, '') }}: + isMirrorRepoSelected: true + gitHubOrganization: ${{ parameters.GitHubOrg }} + mirrorRepo: ${{ parameters.MirrorRepo }} + mirrorBranch: ${{ parameters.MirrorBranch }} condition: ${{ parameters.condition }} - task: PublishBuildArtifacts@1 @@ -77,7 +87,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish LocProject.json inputs: - PathtoPublish: '$(Build.SourcesDirectory)/Localize/' + PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' PublishLocation: Container ArtifactName: Loc condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 60eb601c8..eba7ed49d 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -371,7 +371,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" } - return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe" + + $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin" + $local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false } + if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) { + $global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe" + } else { + $global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe" + } + + return $global:_MSBuildExe } function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) { @@ -527,7 +536,7 @@ function GetDefaultMSBuildEngine() { function GetNuGetPackageCachePath() { if ($env:NUGET_PACKAGES -eq $null) { - # Use local cache on CI to ensure deterministic build. + # Use local cache on CI to ensure deterministic build. # Avoid using the http cache as workaround for https://github.com/NuGet/Home/issues/3116 # use global cache in dev builds to avoid cost of downloading packages. # For directory normalization, see also: https://github.com/NuGet/Home/issues/7968 diff --git a/global.json b/global.json index edebab60f..a0a164ac3 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21262.2" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21328.3" } } From b520810a5daa8f7d7c7427c73d4cd4fe1b586453 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Jul 2021 10:25:45 +0000 Subject: [PATCH 22/25] Update dependencies from https://github.com/dotnet/sdk build 20210708.2 (#11076) [release/5.0.4xx] 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 800ff959f..b2a4cf850 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - fdc48d5787355746c06f9a637df83ed754347d04 + f1311c060caa49258a9be6984825110c321d8f57 - + https://github.com/dotnet/sdk - fdc48d5787355746c06f9a637df83ed754347d04 + f1311c060caa49258a9be6984825110c321d8f57 diff --git a/eng/Versions.props b/eng/Versions.props index 46093a119..0b814b101 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21356.12 - 5.0.400-preview.21356.12 + 5.0.400-preview.21358.2 + 5.0.400-preview.21358.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a9b72801a01cab8f46cef685b19cf80d7a02bebe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Jul 2021 11:20:55 +0000 Subject: [PATCH 23/25] [release/5.0.4xx] Update dependencies from dotnet/sdk (#11101) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-3.21352.9 to 3.11.0-3.21359.6 (parent: Microsoft.NET.Sdk) - Update Docker imports to new MCR source. (#11096) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- eng/docker/alpine.3.6/Dockerfile | 2 +- eng/docker/centos/Dockerfile | 2 +- eng/docker/fedora.29/Dockerfile | 4 ++-- eng/docker/rhel/Dockerfile | 2 +- eng/docker/ubuntu.18.04/Dockerfile | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2a4cf850..04e7504b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - f1311c060caa49258a9be6984825110c321d8f57 + 0537716e2a62b457062019bf3235c5d51e85d560 - + https://github.com/dotnet/sdk - f1311c060caa49258a9be6984825110c321d8f57 + 0537716e2a62b457062019bf3235c5d51e85d560 @@ -117,9 +117,9 @@ e6a47c70b7878b346ff0858085eb8a6379f6f0bb linker - + https://github.com/dotnet/roslyn - e73cf0139ea53178948e869dc1b322a0d2a890dd + c7ab50623cb6843cbb6e75c38c026f0c8be04f01 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 0b814b101..c0328f683 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21358.2 - 5.0.400-preview.21358.2 + 5.0.400-preview.21360.3 + 5.0.400-preview.21360.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) diff --git a/eng/docker/alpine.3.6/Dockerfile b/eng/docker/alpine.3.6/Dockerfile index 9f9461690..315e11e2a 100644 --- a/eng/docker/alpine.3.6/Dockerfile +++ b/eng/docker/alpine.3.6/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM microsoft/dotnet-buildtools-prereqs:alpine-3.6-3148f11-20171119021156 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.6-3148f11-20171119021156 RUN apk update && apk upgrade && apk add --no-cache curl ncurses diff --git a/eng/docker/centos/Dockerfile b/eng/docker/centos/Dockerfile index eec66c48c..49b3abede 100644 --- a/eng/docker/centos/Dockerfile +++ b/eng/docker/centos/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM microsoft/dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-b46d863-20180719033416 RUN yum -q -y install sudo diff --git a/eng/docker/fedora.29/Dockerfile b/eng/docker/fedora.29/Dockerfile index a58f30b74..925bd8564 100644 --- a/eng/docker/fedora.29/Dockerfile +++ b/eng/docker/fedora.29/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM microsoft/dotnet-buildtools-prereqs:fedora-29-2f0798a-20181105183801 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-29-2f0798a-20181105183801 RUN dnf install -y nss @@ -27,4 +27,4 @@ USER ${USER_ID} # Set working directory ARG WORK_DIR -WORKDIR ${WORK_DIR} \ No newline at end of file +WORKDIR ${WORK_DIR} diff --git a/eng/docker/rhel/Dockerfile b/eng/docker/rhel/Dockerfile index cd5ec2d15..14fef0e6c 100644 --- a/eng/docker/rhel/Dockerfile +++ b/eng/docker/rhel/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM microsoft/dotnet-buildtools-prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359 # Setup User to match Host User, and give superuser permissions ARG USER_ID=0 diff --git a/eng/docker/ubuntu.18.04/Dockerfile b/eng/docker/ubuntu.18.04/Dockerfile index 39a9c0327..0ba3da86b 100644 --- a/eng/docker/ubuntu.18.04/Dockerfile +++ b/eng/docker/ubuntu.18.04/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM microsoft/dotnet-buildtools-prereqs:ubuntu-18.04-f90bc20-20180320154721 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-f90bc20-20180320154721 RUN apt-get update && \ apt-get -qqy install \ @@ -29,4 +29,4 @@ USER ${USER_ID} # Set working directory ARG WORK_DIR -WORKDIR ${WORK_DIR} \ No newline at end of file +WORKDIR ${WORK_DIR} From a0e11e150bb2ee2e9aa15797db5262b9a36e4f02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Jul 2021 18:35:57 +0000 Subject: [PATCH 24/25] Update dependencies from https://github.com/dotnet/sdk build 20210714.19 (#11124) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-rtm.21310.1 to 5.0.0-rtm.21364.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 04e7504b7..0130e6520 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 0537716e2a62b457062019bf3235c5d51e85d560 + 753a0d4f66c7c4310eb8b3790e9b72dc9e671cf2 - + https://github.com/dotnet/sdk - 0537716e2a62b457062019bf3235c5d51e85d560 + 753a0d4f66c7c4310eb8b3790e9b72dc9e671cf2 @@ -112,9 +112,9 @@ https://github.com/microsoft/vstest b58f6c4f4626bdf44df40f2064ab6a80a466115c - + https://github.com/mono/linker - e6a47c70b7878b346ff0858085eb8a6379f6f0bb + dc2ca1a2089983aa027e475998aa3a335bc247b7 linker diff --git a/eng/Versions.props b/eng/Versions.props index c0328f683..8f17b8311 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21360.3 - 5.0.400-preview.21360.3 + 5.0.400-preview.21364.19 + 5.0.400-preview.21364.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From db26915ea8505cc051af81b5cd2e6ec8ccaef38e Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 14 Jul 2021 12:15:09 -0700 Subject: [PATCH 25/25] Update aspnetcore 3.1 template versions (#11085) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8f17b8311..b505295de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.16 + 3.1.17 3.2.1 4.8.0-rc2.19462.10