From 7d7baad284ae696a0219d8378cea94e286369ed3 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 16 Sep 2024 14:20:54 -0700 Subject: [PATCH 1/8] Backport one specific package upgrade that was missed --- eng/Versions.props | 1 + src/core-sdk-tasks/core-sdk-tasks.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props index e21270bac706..6a4cc864f56a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,6 +74,7 @@ 6.0.33 6.0.33 2.1.0 + 6.0.1 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 5fc33672afb5..12e2266cc477 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -17,6 +17,7 @@ + From 090be33b6fd069c2302c16d85bb5a691e690fef9 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Oct 2024 15:55:32 -0700 Subject: [PATCH 2/8] Update branding to 6.0.428 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e21270bac706..2f8bc3e2ad31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 27 + 28 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 92bbf39b6786854af23381def9faa8b6b2068adb Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 2 Oct 2024 15:42:51 -0700 Subject: [PATCH 3/8] Try using macos 13 --- .vsts-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index daac9010733d..96a917f920c9 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -345,7 +345,7 @@ stages: parameters: agentOs: Darwin pool: - vmImage: 'macOS-latest' + vmImage: 'macos-13' timeoutInMinutes: 180 strategy: matrix: From c6430ee02939be8e1f995d77cea4afd9d64b9a9c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 2 Oct 2024 15:43:07 -0700 Subject: [PATCH 4/8] Use macos 13 instead --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index bee286311814..a1303ce1edde 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -392,7 +392,7 @@ extends: agentOs: Darwin pool: name: Azure Pipelines - image: macOS-latest + image: macos-13 os: macOS timeoutInMinutes: 180 strategy: From e6574cc0ce43f85cc5dd0c98502af6343e7a7ab2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 16:33:16 +0000 Subject: [PATCH 5/8] [release/6.0.4xx] Update dependencies from dotnet/arcade (#20137) [release/6.0.4xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3f2882e14c7..924d40876a29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 685008547318b269dbbb82cfc9ca968126301bbe + 51df77c8fcd7893066f14eab382ef95c5faed6cf - + https://github.com/dotnet/arcade - 685008547318b269dbbb82cfc9ca968126301bbe + 51df77c8fcd7893066f14eab382ef95c5faed6cf - + https://github.com/dotnet/arcade - 685008547318b269dbbb82cfc9ca968126301bbe + 51df77c8fcd7893066f14eab382ef95c5faed6cf https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2f8bc3e2ad31..019073ac68db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24459.5 + 6.0.0-beta.24463.1 diff --git a/global.json b/global.json index 4a13cd368bea..147e4f245934 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24459.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24459.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24463.1", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24463.1" } } From d0c177b92d853dd4412ab2cb68e04a3636b01edb Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 7 Oct 2024 23:43:30 -0700 Subject: [PATCH 6/8] [release/8.0.1xx] Remove 6.0 template --- eng/Versions.props | 15 --------------- src/redist/targets/BundledTemplates.targets | 18 ------------------ 2 files changed, 33 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9135e4b6f030..2630c3ad7575 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,7 +56,6 @@ - 1.1.0-rc.23410.2 1.1.0-rc.23410.2 @@ -154,13 +153,6 @@ $(VersionFeature60) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) - - - 6.0.302 - 6.0.14 - 6.0.7-servicing.22322.3 - 6.0.7-servicing.22322.2 - $(MicrosoftNETCoreAppRuntimePackageVersion) $(MicrosoftNETCoreAppRuntimePackageVersion) @@ -173,13 +165,6 @@ $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftAspNetCoreAppRuntimePackageVersion) - - $(MicrosoftWinFormsProjectTemplates60PackageVersion) - $(MicrosoftWPFProjectTemplates60PackageVersion) - $(NUnit3DotNetNewTemplatePackageVersion) - $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.$(AspNetCoreTemplateFeature60) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index d6e428bb3eb2..028eac3bc25b 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -32,30 +32,12 @@ - - - - - - - - - - - - - - - - - - From c746d673b8aeec7e4d01259a1c46583d55af80d5 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 8 Oct 2024 01:47:12 -0700 Subject: [PATCH 7/8] Remove more template packages --- eng/Versions.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2630c3ad7575..0caad9ed3e5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,9 +149,6 @@ true true true - $([MSBuild]::Subtract($(VersionFeature60), 2)) - $(VersionFeature60) - $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) $(MicrosoftNETCoreAppRuntimePackageVersion) From 0935ff850a9e08e3d08035a94b2917fa87020897 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Oct 2024 12:26:06 +0000 Subject: [PATCH 8/8] Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24504.2 -> To Version 8.0.0-beta.24508.1 --- NuGet.config | 62 +++++++++++++++++++++++++++++++++++++++-- eng/Version.Details.xml | 12 ++++---- eng/Versions.props | 2 +- eng/common/tools.ps1 | 2 +- global.json | 6 ++-- 5 files changed, 71 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 40cbed19faf5..d2b6101c2691 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,15 +8,35 @@ + + + + + + + + + + + + + + + + + + + + @@ -24,14 +44,26 @@ - + + + + + + + + + + + + + @@ -52,22 +84,48 @@ + + + + + + - + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1c03f232e03..a3a56fe3e0b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index cb71b73adbb2..d5791dded3d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24504.2 + 8.0.0-beta.24508.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index eb188cfda415..a2dedaa5297a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -892,7 +892,7 @@ function IsWindowsPlatform() { } function Get-Darc($version) { - $darcPath = "$TempDir\darc\$(New-Guid)" + $darcPath = "$TempDir\darc\$([guid]::NewGuid())" if ($version -ne $null) { & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host } else { diff --git a/global.json b/global.json index 8320b3ded24a..4f310b2c43ab 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.108", + "dotnet": "8.0.110", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24504.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24504.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24508.1" } }