From 69459735fbc1c6397d95c554c6af59e334f9541a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 31 Aug 2022 13:09:27 +0000 Subject: [PATCH 01/30] [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 12bf3543c..6a32b7c94 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -18,9 +19,11 @@ + + @@ -39,14 +42,17 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34b38836f..86b8156c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/source-build-reference-packages - fdbbfadcaa5804038ad0a3f67c33f489cbeda65c + e45e6e20c7c079c96f4dc8c35d6346ab9b2d745f From 956a61ea043939ddc703a562d63df492f1fcfee4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 1 Sep 2022 18:00:10 +0000 Subject: [PATCH 02/30] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220901.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.304-servicing.22451.9 --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6a32b7c94..ad2f8ae6c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -19,10 +20,12 @@ + + @@ -43,16 +46,19 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86b8156c0..54b864de2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 092f7d6f55df8dd0e5e88058aeb7f831679112d3 + 9cff9ad9aa309210b0f98d50793b0d77d60db2a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 092f7d6f55df8dd0e5e88058aeb7f831679112d3 + 9cff9ad9aa309210b0f98d50793b0d77d60db2a9 diff --git a/eng/Versions.props b/eng/Versions.props index 33a74cb2a..e0008f96d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.304-servicing.22421.4 - 6.0.304-servicing.22421.4 + 6.0.304-servicing.22451.9 + 6.0.304-servicing.22451.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 24a4bb58f05c131655604a5af3f146102df2a6f8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 6 Sep 2022 21:34:39 +0000 Subject: [PATCH 03/30] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220906.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22456.40 --- 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 54b864de2..3b89085e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9cff9ad9aa309210b0f98d50793b0d77d60db2a9 + d226374650a977614902a2ddea8e589deb32e44b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9cff9ad9aa309210b0f98d50793b0d77d60db2a9 + d226374650a977614902a2ddea8e589deb32e44b diff --git a/eng/Versions.props b/eng/Versions.props index e0008f96d..ad12381ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.304-servicing.22451.9 - 6.0.304-servicing.22451.9 + 6.0.305-servicing.22456.40 + 6.0.305-servicing.22456.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d10c9b78712fcf73b71a40f5056a4ccdc2d91a61 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Sep 2022 08:49:12 +0000 Subject: [PATCH 04/30] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220907.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22457.5 --- 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 3b89085e4..ed786cda7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d226374650a977614902a2ddea8e589deb32e44b + 7f19abf7f493242f40ab396b90062021906fa006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d226374650a977614902a2ddea8e589deb32e44b + 7f19abf7f493242f40ab396b90062021906fa006 diff --git a/eng/Versions.props b/eng/Versions.props index ad12381ec..5151a7cf6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22456.40 - 6.0.305-servicing.22456.40 + 6.0.305-servicing.22457.5 + 6.0.305-servicing.22457.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7a7236272ebb20a6e7216078ac076319e5726c18 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 8 Sep 2022 22:07:13 +0000 Subject: [PATCH 05/30] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220908.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22458.13 --- 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 ed786cda7..b7c9003dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f19abf7f493242f40ab396b90062021906fa006 + 1c570494e29a40805eb76981495879001a9f888a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f19abf7f493242f40ab396b90062021906fa006 + 1c570494e29a40805eb76981495879001a9f888a diff --git a/eng/Versions.props b/eng/Versions.props index 5151a7cf6..2ead6c535 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22457.5 - 6.0.305-servicing.22457.5 + 6.0.305-servicing.22458.13 + 6.0.305-servicing.22458.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4ba209a45acc8e407d607a4a0a066df5c1584b6b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 13 Sep 2022 00:20:00 +0000 Subject: [PATCH 06/30] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220912.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22462.31 --- 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 b7c9003dd..1a66bf53d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c570494e29a40805eb76981495879001a9f888a + 4f67b114acf888f646ad8c9f58e0c14069d8daf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c570494e29a40805eb76981495879001a9f888a + 4f67b114acf888f646ad8c9f58e0c14069d8daf3 diff --git a/eng/Versions.props b/eng/Versions.props index 2ead6c535..aca8dc7f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22458.13 - 6.0.305-servicing.22458.13 + 6.0.305-servicing.22462.31 + 6.0.305-servicing.22462.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 05ac09da1c2c439a594e9e8903619691b698efbd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 13 Sep 2022 23:54:36 +0000 Subject: [PATCH 07/30] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220913.34 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22463.34 --- NuGet.config | 2 -- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad2f8ae6c..ec93b2fb5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,6 @@ - @@ -50,7 +49,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a66bf53d..2a6ef293f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f67b114acf888f646ad8c9f58e0c14069d8daf3 + 0e4434b5bf3a705168fa40e9c5246e9382e5c623 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f67b114acf888f646ad8c9f58e0c14069d8daf3 + 0e4434b5bf3a705168fa40e9c5246e9382e5c623 diff --git a/eng/Versions.props b/eng/Versions.props index aca8dc7f6..e27cf69e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22462.31 - 6.0.305-servicing.22462.31 + 6.0.305-servicing.22463.34 + 6.0.305-servicing.22463.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b45ac4a743f7ff12a1a11e75e6dcb73c1926542f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 00:56:34 +0000 Subject: [PATCH 08/30] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220913.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22463.41 --- 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 2a6ef293f..6b62df2cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e4434b5bf3a705168fa40e9c5246e9382e5c623 + 93fa53773217a253adce7ea28a794ba7920a5919 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e4434b5bf3a705168fa40e9c5246e9382e5c623 + 93fa53773217a253adce7ea28a794ba7920a5919 diff --git a/eng/Versions.props b/eng/Versions.props index e27cf69e7..444ee8c72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22463.34 - 6.0.305-servicing.22463.34 + 6.0.305-servicing.22463.41 + 6.0.305-servicing.22463.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 952fd4a43af24fff86fdced90561871c95459ac1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 16:08:36 +0000 Subject: [PATCH 09/30] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220914.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22464.21 Dependency coherency updates NuGet.Build.Tasks From Version 6.2.1-rc.7 -> To Version 6.2.2-rc.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ------------ eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index ec93b2fb5..71373bd88 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,14 +18,8 @@ - - - - - - @@ -50,14 +44,8 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b62df2cb..b1f270b6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93fa53773217a253adce7ea28a794ba7920a5919 + 2336f3adc98fface4160b2265684b302bf642fbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93fa53773217a253adce7ea28a794ba7920a5919 + 2336f3adc98fface4160b2265684b302bf642fbd @@ -151,9 +151,9 @@ 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b - - https://github.com/nuget/nuget.client - 4be14ee6b6587a02f05337505bd840fbcbe898f6 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 027ca8b8ef4b4dc94995f87b9c441d2bcf742c1d diff --git a/eng/Versions.props b/eng/Versions.props index 444ee8c72..a59824852 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22463.41 - 6.0.305-servicing.22463.41 + 6.0.305-servicing.22464.21 + 6.0.305-servicing.22464.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 62d0b8c97fcb18d33b37442131c8daf49a94961d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 19:03:04 +0000 Subject: [PATCH 10/30] Update dependencies from https://github.com/dotnet/arcade build 20220913.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22412.2 -> To Version 6.0.0-beta.22463.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/source-build.yml | 4 ++-- eng/common/templates/jobs/jobs.yml | 2 +- eng/common/templates/post-build/post-build.yml | 8 ++++---- global.json | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1f270b6c..1155b51b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b5bc60221..29f8395ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22412.2 + 6.0.0-beta.22463.7 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 9ff6a10a6..aaeb83b4d 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -53,7 +53,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 88f6f75a6..b6137f44a 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -46,10 +46,10 @@ jobs: # source-build builds run in Docker, including the default managed platform. pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 48918df74..9c4becbc8 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -89,7 +89,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 270607126..fc022ca9b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -100,7 +100,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -137,7 +137,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -197,7 +197,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -254,7 +254,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml diff --git a/global.json b/global.json index 0aaa96317..9d1e2d901 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.108", + "dotnet": "6.0.109", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22412.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22463.7" } } From 5736f0f20f8af4b7e478cc94da161f4d261cd30a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 15:12:44 +0000 Subject: [PATCH 11/30] Merged PR 25462: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220919.14 - **Date Produced**: September 19, 2022 7:24:58 PM UTC - **Commit**: 020b4fda1c3cf81307d8f13689d63bb3c09c91a8 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23] - **Microsoft.NET.Sdk**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.9 to 6.0.10][24] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24] - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.10][25] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.6][26] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.9 to 6.0.10][27] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][27] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **dotnet-dev-certs**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **dotnet-user-secrets**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.109 to 6.0.110][28] - **Microsoft.TemplateEngine.Cli**: [from 6.0.109-servicing.22420.11 to 6.0.110-servicing.22464.25][28] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.109 to 6.0.110][28] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.9-servicing.22420.4 to 6.0.10-servicing.22456.13][29] - **Microsoft.Build**: [from 17.0.0 to 17.0.1][30] - **NuGet.Build.Tasks**: [from 6.0.2-rc.5 to 6.0.3-rc.1][31] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25] [23]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7fffe6d&targetVersion=GC020b4fd&_a=files [24]: https://dev.azure.com/dnceng/inte... --- NuGet.config | 23 ++-- eng/Version.Details.xml | 104 +++++++++--------- eng/Versions.props | 44 ++++---- ...ed-source-build-patches-and-re-patch.patch | 13 +-- 4 files changed, 93 insertions(+), 91 deletions(-) diff --git a/NuGet.config b/NuGet.config index 064b33cd4..c0cde394f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,22 @@ - + - + + - + - + - + @@ -42,15 +43,19 @@ - + + + + + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1590bda3d..9f9041c32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 00ae92888ed9fec29636897b0dca996dc8c57356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 00ae92888ed9fec29636897b0dca996dc8c57356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 00ae92888ed9fec29636897b0dca996dc8c57356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 00ae92888ed9fec29636897b0dca996dc8c57356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 00ae92888ed9fec29636897b0dca996dc8c57356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 00ae92888ed9fec29636897b0dca996dc8c57356 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 00ae92888ed9fec29636897b0dca996dc8c57356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2410d6496db6fd9153ffac85eedfd80f57390999 + 91c300fc9d5214eff6830ea3ec3c83930aea7236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2410d6496db6fd9153ffac85eedfd80f57390999 + 91c300fc9d5214eff6830ea3ec3c83930aea7236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2410d6496db6fd9153ffac85eedfd80f57390999 + 91c300fc9d5214eff6830ea3ec3c83930aea7236 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7fffe6d57cecdb3a726b915334d1add560bd6134 + 020b4fda1c3cf81307d8f13689d63bb3c09c91a8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7fffe6d57cecdb3a726b915334d1add560bd6134 + 020b4fda1c3cf81307d8f13689d63bb3c09c91a8 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c + ee8dec2e3ed2d73d8f7b7bea5662c2222d1fd182 https://github.com/dotnet/fsharp @@ -146,14 +146,14 @@ 487283bcd8d66693091f2800dcf1c8ae37cccdee - - https://github.com/dotnet/msbuild - c9eb9dd64e9a2e8a433900a1a626d65a2bce4428 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + b177f8fa703370c80b2e56469208c2bb099efba0 - - https://github.com/nuget/nuget.client - 75551652b352f860ea0b29095b64fa63715dd672 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + c60eee85ec0109bdda894806b167bb4d55f75183 diff --git a/eng/Versions.props b/eng/Versions.props index c083f75ae..1fa06c07a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,11 +27,11 @@ - 6.0.9-servicing.22420.4 + 6.0.10-servicing.22456.13 - 6.0.109 + 6.0.110 @@ -44,44 +44,44 @@ - 6.0.9 - 6.0.9 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 + 6.0.10 + 6.0.10 + 6.0.10-servicing.22464.7 + 6.0.10-servicing.22464.7 + 6.0.10-servicing.22464.7 + 6.0.10-servicing.22464.7 0.2.0 - 6.0.109-servicing.22421.3 - 6.0.109-servicing.22421.3 + 6.0.110-servicing.22469.14 + 6.0.110-servicing.22469.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.5 + 6.0.6 - 6.0.9-servicing.22419.5 - 6.0.9-servicing.22419.5 - 6.0.9 - 6.0.9 - 6.0.9 - 6.0.9 + 6.0.10-servicing.22463.20 + 6.0.10-servicing.22463.20 + 6.0.10 + 6.0.10 + 6.0.10 + 6.0.10 2.1.0 - 6.0.9-servicing.22420.3 - 6.0.9-servicing.22420.3 - 6.0.9 - 6.0.9 + 6.0.10-servicing.22464.9 + 6.0.10-servicing.22464.9 + 6.0.10 + 6.0.10 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.109 + 6.0.110 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch index 34d37ba0b..e1497020f 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch @@ -1,4 +1,4 @@ -From 157de59d479f2ed179b9b777eaf2b769871e3bf6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Sat, 23 Oct 2021 16:41:24 -0700 Subject: [PATCH] Remove uneeded source build patches and re-patch @@ -22,7 +22,7 @@ Subject: [PATCH] Remove uneeded source build patches and re-patch 15 files changed, 25 insertions(+), 28 deletions(-) diff --git a/build/common.project.props b/build/common.project.props -index 79a935391..65e482b83 100644 +index 47b5a6b60..50c40bac5 100644 --- a/build/common.project.props +++ b/build/common.project.props @@ -10,24 +10,20 @@ @@ -57,7 +57,7 @@ index 79a935391..65e482b83 100644 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ $(RepositoryRootDirectory)build\ diff --git a/build/packages.targets b/build/packages.targets -index c11557248..0e7dd7861 100644 +index d9b3006e9..99cb24a16 100644 --- a/build/packages.targets +++ b/build/packages.targets @@ -10,6 +10,7 @@ @@ -68,8 +68,8 @@ index c11557248..0e7dd7861 100644 -@@ -33,7 +34,7 @@ - +@@ -34,7 +35,7 @@ + - @@ -291,6 +291,3 @@ index 180293944..8498664b9 100644 NuGet's implementation of Semantic Versioning. semver;semantic versioning --- -2.31.1 - From ba3be673e17014b831f7f059c6f872fc5e9b62a8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 15:57:48 +0000 Subject: [PATCH 12/30] Merged PR 25512: [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages This pull request updates the following dependencies [marker]: <> (Begin:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) ## From https://github.com/dotnet/source-build-reference-packages - **Subscription**: 4fe19a4b-6691-493a-bfdf-08da32c0fb1e - **Build**: 20220914.1 - **Date Produced**: September 14, 2022 8:48:10 PM UTC - **Commit**: 59e601c150793f6a32cd39e598ba6fe94edfe21d - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22426.1 to 6.0.0-servicing.22464.1][5] [5]: https://github.com/dotnet/source-build-reference-packages/compare/e45e6e2...59e601c [DependencyUpdate]: <> (End) [marker]: <> (End:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2aebca1c2..d0db176cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/source-build-reference-packages - e45e6e20c7c079c96f4dc8c35d6346ab9b2d745f + 59e601c150793f6a32cd39e598ba6fe94edfe21d From ef06dab37f96319e1b09a6828945b6efea8f843b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 18:04:39 +0000 Subject: [PATCH 13/30] Merged PR 25953: [internal/release/6.0.3xx] 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.Build**: from 17.2.0 to 17.2.2 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220919.16 - **Date Produced**: September 19, 2022 7:26:24 PM UTC - **Commit**: edd49c1bacac9342e15445a777722858e7f5fddf - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22464.21 to 6.0.305-servicing.22469.16][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22464.21 to 6.0.305-servicing.22469.16][1] - **Microsoft.Build**: [from 17.2.0 to 17.2.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2336f3a&targetVersion=GCedd49c1&_a=files [2]: https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted/branches?baseVersion=GC41abc56&targetVersion=GC038f9ba&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 71373bd88..36197c18e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,12 @@ - - - + + @@ -37,10 +36,11 @@ + + + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0db176cc..5128fedf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2336f3adc98fface4160b2265684b302bf642fbd + edd49c1bacac9342e15445a777722858e7f5fddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2336f3adc98fface4160b2265684b302bf642fbd + edd49c1bacac9342e15445a777722858e7f5fddf @@ -146,9 +146,9 @@ 432d17a83aa5623e4581756f4d642997048056bd - - https://github.com/dotnet/msbuild - 41abc5629965e3f9e41f1e67fdf78345c0c5cc4b + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 038f9bae9b34d1cca653360a46c5ce1eba4c2ac8 diff --git a/eng/Versions.props b/eng/Versions.props index 29f8395ed..58f127efe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22464.21 - 6.0.305-servicing.22464.21 + 6.0.305-servicing.22469.16 + 6.0.305-servicing.22469.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1e97ca8042e6c35aa6a4365e8ee92eaadc846d4d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 22:44:00 +0000 Subject: [PATCH 14/30] Merged PR 26033: [internal/release/6.0.3xx] 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.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.304 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.304-servicing.22420.10 to 6.0.305-servicing.22470.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.304 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win... --- NuGet.config | 8 ++++ eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 79 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36197c18e..e0141f88e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -15,10 +16,13 @@ + + + @@ -41,11 +45,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5128fedf6..c9216ca47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 3bd501a063af406167e0195844048a3c222afd29 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b3a1bf29b9888fb2ae25df25be9f5231606c66f + a596312f285b849740c070b3b9f0825dc0ba84cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b3a1bf29b9888fb2ae25df25be9f5231606c66f + a596312f285b849740c070b3b9f0825dc0ba84cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b3a1bf29b9888fb2ae25df25be9f5231606c66f + a596312f285b849740c070b3b9f0825dc0ba84cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edd49c1bacac9342e15445a777722858e7f5fddf + fea45187a3648a964eb48f1c3cbbac1f59ae8a85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edd49c1bacac9342e15445a777722858e7f5fddf + fea45187a3648a964eb48f1c3cbbac1f59ae8a85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c + 24d64ba63551a0f0457d62b834d043292d090815 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c + bbe6a9e6d0da0f80a57f80914177691fd1f1b97e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 58f127efe..4c2e4948f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.9-servicing.22419.10 + 6.0.10-servicing.22470.3 - 6.0.9-servicing.22420.4 + 6.0.10-servicing.22470.7 - 6.0.304 + 6.0.305 @@ -44,44 +44,44 @@ - 6.0.9 - 6.0.9 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 + 6.0.10 + 6.0.10 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 0.2.0 - 6.0.305-servicing.22469.16 - 6.0.305-servicing.22469.16 + 6.0.305-servicing.22470.36 + 6.0.305-servicing.22470.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.5 + 6.0.6 - 6.0.9-servicing.22419.5 - 6.0.9-servicing.22419.5 - 6.0.9 - 6.0.9 - 6.0.9 - 6.0.9 + 6.0.10-servicing.22469.10 + 6.0.10-servicing.22469.10 + 6.0.10 + 6.0.10 + 6.0.10 + 6.0.10 2.1.0 - 6.0.9-servicing.22420.3 - 6.0.9-servicing.22420.3 - 6.0.9 - 6.0.9 + 6.0.10-servicing.22470.9 + 6.0.10-servicing.22470.9 + 6.0.10 + 6.0.10 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.304 + 6.0.305 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From db430494a1e10a40e504d0ab10001bd0ac046bb5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 23:16:41 +0000 Subject: [PATCH 15/30] Merged PR 26041: [internal/release/6.0.1xx] 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.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22463.20 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22464.25 to 6.0.110-servicing.22470.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22456... --- NuGet.config | 17 ++++----- eng/Version.Details.xml | 78 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 61 insertions(+), 60 deletions(-) diff --git a/NuGet.config b/NuGet.config index c0cde394f..811cea214 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,23 @@ - + + - + - + - + @@ -43,19 +44,19 @@ + - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f9041c32..e680f6eaa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 91c300fc9d5214eff6830ea3ec3c83930aea7236 + e974c52ac3a074586f4be165c1ba00618dca95dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 91c300fc9d5214eff6830ea3ec3c83930aea7236 + e974c52ac3a074586f4be165c1ba00618dca95dc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 91c300fc9d5214eff6830ea3ec3c83930aea7236 + e974c52ac3a074586f4be165c1ba00618dca95dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 020b4fda1c3cf81307d8f13689d63bb3c09c91a8 + aa67ae078f3df70e5b3d6b77b07af9f77ebc2e13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 020b4fda1c3cf81307d8f13689d63bb3c09c91a8 + aa67ae078f3df70e5b3d6b77b07af9f77ebc2e13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c + 24d64ba63551a0f0457d62b834d043292d090815 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ee8dec2e3ed2d73d8f7b7bea5662c2222d1fd182 + bbe6a9e6d0da0f80a57f80914177691fd1f1b97e https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3f6c45a2580cd9387b643163de8136a9691764c8 + c3fc739ca5a38641fe021f94c3986465296c71e0 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 1fa06c07a..42e7f9fe4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22419.10 + 6.0.10-servicing.22470.3 - 6.0.10-servicing.22456.13 + 6.0.10-servicing.22470.7 @@ -46,18 +46,18 @@ 6.0.10 6.0.10 - 6.0.10-servicing.22464.7 - 6.0.10-servicing.22464.7 - 6.0.10-servicing.22464.7 - 6.0.10-servicing.22464.7 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 0.2.0 - 6.0.110-servicing.22469.14 - 6.0.110-servicing.22469.14 + 6.0.110-servicing.22470.38 + 6.0.110-servicing.22470.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.10-servicing.22463.20 - 6.0.10-servicing.22463.20 + 6.0.10-servicing.22469.10 + 6.0.10-servicing.22469.10 6.0.10 6.0.10 6.0.10 @@ -78,8 +78,8 @@ - 6.0.10-servicing.22464.9 - 6.0.10-servicing.22464.9 + 6.0.10-servicing.22470.9 + 6.0.10-servicing.22470.9 6.0.10 6.0.10 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.9 + 6.0.10 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From ac35c5ce79798a350a5d175ce50ce873e72d8b79 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 01:07:17 +0000 Subject: [PATCH 16/30] Merged PR 26213: [internal/release/6.0.1xx] 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.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220926.22 - **Date Produced**: September 26, 2022 11:14:22 PM UTC - **Commit**: 4041520e714b4334789706bde25e61ff91cf6c2b - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12][3] - **Microsoft.DotNet.Common.ProjectTemplates.6.0*... --- NuGet.config | 26 ++++++++++++++++++++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 8 ++++---- 3 files changed, 43 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 811cea214..ea43ed595 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,22 +8,32 @@ + + + + + + + + - + - + + + @@ -44,18 +54,26 @@ + + + + + + - + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e680f6eaa..7081c5123 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e974c52ac3a074586f4be165c1ba00618dca95dc + 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e974c52ac3a074586f4be165c1ba00618dca95dc + 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e974c52ac3a074586f4be165c1ba00618dca95dc + 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aa67ae078f3df70e5b3d6b77b07af9f77ebc2e13 + 4041520e714b4334789706bde25e61ff91cf6c2b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aa67ae078f3df70e5b3d6b77b07af9f77ebc2e13 + 4041520e714b4334789706bde25e61ff91cf6c2b diff --git a/eng/Versions.props b/eng/Versions.props index 42e7f9fe4..e00ae53b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.110-servicing.22470.38 - 6.0.110-servicing.22470.38 + 6.0.110-servicing.22476.22 + 6.0.110-servicing.22476.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.10-servicing.22469.10 - 6.0.10-servicing.22469.10 + 6.0.10-servicing.22476.5 + 6.0.10-servicing.22476.5 6.0.10 6.0.10 6.0.10 From a7f3165e1276bbb1b8154e1a587fd81246105545 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 01:07:35 +0000 Subject: [PATCH 17/30] Merged PR 26214: [internal/release/6.0.3xx] 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.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.305 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.305-servicing.22470.3 to 6.0.305-servicing.22476.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.305 to 6.0.305 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220926.23 - **Date Produced**: September 26, 2022 11:16:43 PM UTC - **Commit**: 5d8812a013856b4d818578302844a7add0f675f9 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22470.36 to 6.0.305-servicing.22476.23][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22470.36 to 6.0.305-servicing.22476.23][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.305 to 6.0.305][3] - **Microsoft.TemplateEngine.Cl... --- NuGet.config | 24 ++++++++++++++++++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 8 ++++---- 3 files changed, 41 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0141f88e..19736d26e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,29 @@ + + + + + + - + - + + + @@ -42,17 +50,25 @@ + + + + + + - + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9216ca47..b2d2a53f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a596312f285b849740c070b3b9f0825dc0ba84cf + 13826b7b41995f89808a7b7644b41a89f81b33b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a596312f285b849740c070b3b9f0825dc0ba84cf + 13826b7b41995f89808a7b7644b41a89f81b33b6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a596312f285b849740c070b3b9f0825dc0ba84cf + 13826b7b41995f89808a7b7644b41a89f81b33b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fea45187a3648a964eb48f1c3cbbac1f59ae8a85 + 5d8812a013856b4d818578302844a7add0f675f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fea45187a3648a964eb48f1c3cbbac1f59ae8a85 + 5d8812a013856b4d818578302844a7add0f675f9 diff --git a/eng/Versions.props b/eng/Versions.props index 4c2e4948f..f3390961a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.305-servicing.22470.36 - 6.0.305-servicing.22470.36 + 6.0.305-servicing.22476.23 + 6.0.305-servicing.22476.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.10-servicing.22469.10 - 6.0.10-servicing.22469.10 + 6.0.10-servicing.22476.5 + 6.0.10-servicing.22476.5 6.0.10 6.0.10 6.0.10 From 7160f0679472c0a7dda71a1a129419db5418aba5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 02:11:30 +0000 Subject: [PATCH 18/30] Merged PR 26229: [internal/release/6.0.1xx] 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.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22476.12 to 6.0.110-servicing.22476.19 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220926.31 - **Date Produced**: September 27, 2022 1:37:52 AM UTC - **Commit**: cb11e73629ffbf6eee418a40fc602ceb752794fa - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-dev-certs**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-user-secrets**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22476.12 to 6.0.110-servicing.2247... --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index ea43ed595..f723aa707 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -28,7 +26,7 @@ - + @@ -54,9 +52,7 @@ - - - + @@ -69,7 +65,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7081c5123..6e95ba73e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 + abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 + abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 + abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4041520e714b4334789706bde25e61ff91cf6c2b + cb11e73629ffbf6eee418a40fc602ceb752794fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4041520e714b4334789706bde25e61ff91cf6c2b + cb11e73629ffbf6eee418a40fc602ceb752794fa diff --git a/eng/Versions.props b/eng/Versions.props index e00ae53b9..f632ef8fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.10 6.0.10 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 0.2.0 - 6.0.110-servicing.22476.22 - 6.0.110-servicing.22476.22 + 6.0.110-servicing.22476.31 + 6.0.110-servicing.22476.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ee01434eb368e7c21e0d8cfdf5fc7149ddc886e3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 02:11:34 +0000 Subject: [PATCH 19/30] Merged PR 26230: [internal/release/6.0.3xx] 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.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.305 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.305-servicing.22476.13 to 6.0.305-servicing.22476.20 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.305 to 6.0.305 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220926.32 - **Date Produced**: September 27, 2022 1:41:11 AM UTC - **Commit**: 5fd3362390628630252507a10e451f4877afe1c2 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22476.23 to 6.0.305-servicing.22476.32][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22476.23 to 6.0.305-servicing.22476.32][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-dev-certs**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-user-secrets**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.305 to 6.0.305][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.305-servicing.22476.13 to 6.0.305-servicing.2247... --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 19736d26e..6ad4589ff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -25,7 +23,7 @@ - + @@ -57,14 +55,12 @@ - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2d2a53f7..313ce9492 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 13826b7b41995f89808a7b7644b41a89f81b33b6 + 4c6436d0fb4378537a091f06432b306ea8ef383e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 13826b7b41995f89808a7b7644b41a89f81b33b6 + 4c6436d0fb4378537a091f06432b306ea8ef383e https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 13826b7b41995f89808a7b7644b41a89f81b33b6 + 4c6436d0fb4378537a091f06432b306ea8ef383e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d8812a013856b4d818578302844a7add0f675f9 + 5fd3362390628630252507a10e451f4877afe1c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d8812a013856b4d818578302844a7add0f675f9 + 5fd3362390628630252507a10e451f4877afe1c2 diff --git a/eng/Versions.props b/eng/Versions.props index f3390961a..0b89a0a15 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.10 6.0.10 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 0.2.0 - 6.0.305-servicing.22476.23 - 6.0.305-servicing.22476.23 + 6.0.305-servicing.22476.32 + 6.0.305-servicing.22476.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ce0a42998a3d2a725f5bd08413b140d907f48177 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 04:17:12 +0000 Subject: [PATCH 20/30] Merged PR 26243: [internal/release/6.0.1xx] 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.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22470.3 to 6.0.10-servicing.22476.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22470.7 to 6.0.10-servicing.22476.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220926.46 - **Date Produced**: September 27, 2022 3:39:36 AM UTC - **Commit**: a886cd6214c92f6a5d955c056014820c35591e7b - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-... --- NuGet.config | 12 ++++------- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index f723aa707..3e6d96c15 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -29,9 +29,7 @@ - - - + @@ -52,7 +50,7 @@ - + @@ -68,9 +66,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e95ba73e..6696e6070 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cb11e73629ffbf6eee418a40fc602ceb752794fa + a886cd6214c92f6a5d955c056014820c35591e7b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cb11e73629ffbf6eee418a40fc602ceb752794fa + a886cd6214c92f6a5d955c056014820c35591e7b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24d64ba63551a0f0457d62b834d043292d090815 + 729cc7ccdec38bb23e6216a371293bb5ce738b5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bbe6a9e6d0da0f80a57f80914177691fd1f1b97e + 3bbc77257e3d51a2e19195523eafd262da1f5459 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f632ef8fb..a52e53cca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.10-servicing.22470.3 + 6.0.10-servicing.22476.6 - 6.0.10-servicing.22470.7 + 6.0.10-servicing.22476.4 @@ -46,18 +46,18 @@ 6.0.10 6.0.10 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 0.2.0 - 6.0.110-servicing.22476.31 - 6.0.110-servicing.22476.31 + 6.0.110-servicing.22476.46 + 6.0.110-servicing.22476.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.10-servicing.22470.9 - 6.0.10-servicing.22470.9 + 6.0.10-servicing.22476.6 + 6.0.10-servicing.22476.6 6.0.10 6.0.10 From de9a4b2f4b9f62cdf5b4a94cb66f9125e37b2a5c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 04:17:31 +0000 Subject: [PATCH 21/30] Merged PR 26244: [internal/release/6.0.3xx] 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.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22470.3 to 6.0.10-servicing.22476.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22470.7 to 6.0.10-servicing.22476.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220926.47 - **Date Produced**: September 27, 2022 3:41:49 AM UTC - **Commit**: 0c33071e5eddb592a4b2122ec86afb2163873b6e - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22476.32 to 6.0.305-servicing.22476.47][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22476.32 to 6.0.305-servicing.22476.47][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-... --- NuGet.config | 12 ++++------- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6ad4589ff..02c6d9de0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -26,9 +26,7 @@ - - - + @@ -55,7 +53,7 @@ - + @@ -63,9 +61,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 313ce9492..75778c857 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4c6436d0fb4378537a091f06432b306ea8ef383e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5fd3362390628630252507a10e451f4877afe1c2 + 0c33071e5eddb592a4b2122ec86afb2163873b6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5fd3362390628630252507a10e451f4877afe1c2 + 0c33071e5eddb592a4b2122ec86afb2163873b6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24d64ba63551a0f0457d62b834d043292d090815 + 729cc7ccdec38bb23e6216a371293bb5ce738b5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bbe6a9e6d0da0f80a57f80914177691fd1f1b97e + 3bbc77257e3d51a2e19195523eafd262da1f5459 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0b89a0a15..822921a85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.10-servicing.22470.3 + 6.0.10-servicing.22476.6 - 6.0.10-servicing.22470.7 + 6.0.10-servicing.22476.4 @@ -46,18 +46,18 @@ 6.0.10 6.0.10 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 0.2.0 - 6.0.305-servicing.22476.32 - 6.0.305-servicing.22476.32 + 6.0.305-servicing.22476.47 + 6.0.305-servicing.22476.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.10-servicing.22470.9 - 6.0.10-servicing.22470.9 + 6.0.10-servicing.22476.6 + 6.0.10-servicing.22476.6 6.0.10 6.0.10 From 5700aea798f6940ad4a713b0bc3b31bdf6e8efd8 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 20 Oct 2022 08:18:44 -0500 Subject: [PATCH 22/30] Update source-build tarball CI to utilize faster build agents (#14795) --- .../common/templates/job/source-build-run-tarball-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 471f00e27..e9891a82c 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -17,12 +17,12 @@ parameters: fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b poolInternalAmd64: - name: NetCore1ESPool-Svc-Internal + name: NetCore1ESPool-Internal-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 poolInternalArm64: name: Docker-Linux-Arm-Internal poolPublicAmd64: - name: NetCore-Svc-Public + name: NetCore-Public-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open jobs: From 5b327454b9793ba3b371af1c0e6ea4444767f6d1 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 21 Oct 2022 06:16:04 -0700 Subject: [PATCH 23/30] [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#14807) * Merged PR 25462: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220919.14 - **Date Produced**: September 19, 2022 7:24:58 PM UTC - **Commit**: 020b4fda1c3cf81307d8f13689d63bb3c09c91a8 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23] - **Microsoft.NET.Sdk**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.9 to 6.0.10][24] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24] - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.10][25] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.6][26] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.9 to 6.0.10][27] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][27] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **dotnet-dev-certs**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **dotnet-user-secrets**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.109 to 6.0.110][28] - **Microsoft.TemplateEngine.Cli**: [from 6.0.109-servicing.22420.11 to 6.0.110-servicing.22464.25][28] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.109 to 6.0.110][28] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.9-servicing.22420.4 to 6.0.10-servicing.22456.13][29] - **Microsoft.Build**: [from 17.0.0 to 17.0.1][30] - **NuGet.Build.Tasks**: [from 6.0.2-rc.5 to 6.0.3-rc.1][31] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25] [23]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7fffe6d&targetVersion=GC020b4fd&_a=files [24]: https://dev.azure.com/dnceng/inte... * Merged PR 26041: [internal/release/6.0.1xx] 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.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22463.20 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22464.25 to 6.0.110-servicing.22470.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22456... * Merged PR 26213: [internal/release/6.0.1xx] 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.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220926.22 - **Date Produced**: September 26, 2022 11:14:22 PM UTC - **Commit**: 4041520e714b4334789706bde25e61ff91cf6c2b - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12][3] - **Microsoft.DotNet.Common.ProjectTemplates.6.0*... * Merged PR 26229: [internal/release/6.0.1xx] 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.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22476.12 to 6.0.110-servicing.22476.19 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220926.31 - **Date Produced**: September 27, 2022 1:37:52 AM UTC - **Commit**: cb11e73629ffbf6eee418a40fc602ceb752794fa - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-dev-certs**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-user-secrets**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22476.12 to 6.0.110-servicing.2247... * Merged PR 26243: [internal/release/6.0.1xx] 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.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22470.3 to 6.0.10-servicing.22476.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22470.7 to 6.0.10-servicing.22476.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220926.46 - **Date Produced**: September 27, 2022 3:39:36 AM UTC - **Commit**: a886cd6214c92f6a5d955c056014820c35591e7b - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-... * Update source-build tarball CI to utilize faster build agents (#14795) Co-authored-by: dotnet-bot Co-authored-by: DotNet Bot Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: Matt Mitchell Co-authored-by: Jason Zhai Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Michael Simons --- .../common/templates/job/source-build-run-tarball-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 13bcd2497..d927b3a86 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -17,12 +17,12 @@ parameters: fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b poolInternalAmd64: - name: NetCore1ESPool-Svc-Internal + name: NetCore1ESPool-Internal-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 poolInternalArm64: name: Docker-Linux-Arm-Internal poolPublicAmd64: - name: NetCore-Svc-Public + name: NetCore-Public-XL demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open jobs: From 306e6009b3bdb0092a0302485a70c7fbf49024ee Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 25 Oct 2022 10:58:48 -0700 Subject: [PATCH 24/30] Fix to final 3.1 build --- 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 f98379cb9..580dd9423 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,7 +26,7 @@ 30 - $([MSBuild]::Add($(VersionFeature), 20)) + 32 17 From 55f53174febea11bc9f9156b36b6010ec7b417d1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 25 Oct 2022 14:32:46 -0700 Subject: [PATCH 25/30] Enable codeql --- .vsts-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 7eca85c35..2a9e08d43 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -15,6 +15,8 @@ variables: - name: PostBuildSign value: true - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: Codeql.Enabled + value: true - group: DotNet-DotNetCli-Storage - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines From 319ac0113e7513c635434122e30aa00ba589b3d8 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Wed, 26 Oct 2022 21:24:13 -0700 Subject: [PATCH 26/30] Ensure finalizer only runs when no matching SDK feature bands are installed --- src/finalizer/finalizer.cpp | 17 ++++++-- .../packaging/windows/clisdk/bundle.wxs | 41 ++++++++++++------- 2 files changed, 40 insertions(+), 18 deletions(-) diff --git a/src/finalizer/finalizer.cpp b/src/finalizer/finalizer.cpp index ecb6e1fa9..58bf9e1bd 100644 --- a/src/finalizer/finalizer.cpp +++ b/src/finalizer/finalizer.cpp @@ -396,7 +396,17 @@ extern "C" HRESULT DetectSdk(LPWSTR sczSdkFeatureBandVersion, LPWSTR sczArchitec LogStringLine(REPORT_STANDARD, "Scanning %ls", sczInstalledSdkVersionsKeyName); hr = RegOpen(HKEY_LOCAL_MACHINE, sczInstalledSdkVersionsKeyName, KEY_READ, &hkInstalledSdkVersionsKey); - ExitOnFailure(hr, "Failed to read installed versions key."); + + // When the last SDK is removed the registry key should no longer exist so we can just exit + if (E_FILENOTFOUND == hr) + { + LogStringLine(REPORT_STANDARD, "Registry key not found: %ls.", sczInstalledSdkVersionsKeyName); + hr = S_OK; + *pbInstalled = FALSE; + goto LExit; + } + + ExitOnFailure(hr, "Failed to open registry key: %ls.", sczInstalledSdkVersionsKeyName); for (DWORD dwSdkVersionsValueIndex = 0;; ++dwSdkVersionsValueIndex) { @@ -460,9 +470,10 @@ int wmain(int argc, wchar_t* argv[]) hr = ::DetectSdk(sczFeatureBandVersion, argv[3], &bSdkFeatureBandInstalled); ExitOnFailure(hr, "Failed to detect installed SDKs."); - if (!bSdkFeatureBandInstalled) + // If the feature band is still present, do not remove workloads. + if (bSdkFeatureBandInstalled) { - LogStringLine(REPORT_STANDARD, "SDK with feature band %ls could not be found.", sczFeatureBandVersion); + LogStringLine(REPORT_STANDARD, "Detected SDK with feature band %ls.", sczFeatureBandVersion); goto LExit; } diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index c58c6a194..148487bde 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -151,7 +151,31 @@ - + + + + + @@ -208,20 +232,7 @@ - - + From 55ad44502451bb39317d2a8a2c1189e7f247f4e1 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Nov 2022 14:17:40 -0700 Subject: [PATCH 27/30] Update branding to 6.0.112 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f1b28ff88..b5a9289dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 11 + 12 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 8ffa10fe479a2fa97f2f5cae18e955928b09b3f6 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Nov 2022 14:17:44 -0700 Subject: [PATCH 28/30] Update branding to 6.0.307 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b9cd43f20..bc7a5c3a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 06 + 07 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From c7fe18c3f80d4379f3620f5770f6e60b85437e6c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Nov 2022 14:17:48 -0700 Subject: [PATCH 29/30] Update branding to 6.0.404 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 266fd059c..d227a0641 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 6e5661babc2e25ce26ec46af95386c0cffee60b5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 4 Nov 2022 16:50:32 -0700 Subject: [PATCH 30/30] Quick fix to unblock codeflow while I investigate further --- test/EndToEnd/TelemetryOptOutDefaultTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/EndToEnd/TelemetryOptOutDefaultTests.cs b/test/EndToEnd/TelemetryOptOutDefaultTests.cs index 1a08d49b0..b0346c6e5 100644 --- a/test/EndToEnd/TelemetryOptOutDefaultTests.cs +++ b/test/EndToEnd/TelemetryOptOutDefaultTests.cs @@ -10,7 +10,7 @@ namespace EndToEnd.Tests [Fact] public void TelemetryOptOutDefaultAttribute() { - var dotnetdir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk", "7.0.100"); + var dotnetdir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk", "7.0.101"); var result = AssemblyInfo.Get(Path.Combine(dotnetdir, "dotnet.dll"), "AssemblyMetadataAttribute"); result.Should().Contain("TelemetryOptOutDefault:False"); }