From dfd4b576c97ce8503d3fd118d4480d0c618d93be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Jan 2025 05:01:25 +0000 Subject: [PATCH 01/19] Update dependencies from https://github.com/dotnet/arcade build 20250115.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25065.4 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/tools.ps1 | 4 ++-- eng/common/tools.sh | 4 ++-- global.json | 6 +++--- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2529216bf542..4c4fece8d1e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -600,34 +600,34 @@ - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 612bd6f952dbd1eea3548bec0b87b44fa506e348 - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 612bd6f952dbd1eea3548bec0b87b44fa506e348 - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 612bd6f952dbd1eea3548bec0b87b44fa506e348 - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 612bd6f952dbd1eea3548bec0b87b44fa506e348 - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 612bd6f952dbd1eea3548bec0b87b44fa506e348 - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 612bd6f952dbd1eea3548bec0b87b44fa506e348 - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 612bd6f952dbd1eea3548bec0b87b44fa506e348 diff --git a/eng/Versions.props b/eng/Versions.props index 56e45f18bc19..b626dabb169e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -266,10 +266,10 @@ - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 + 10.0.0-beta.25065.4 + 10.0.0-beta.25065.4 + 10.0.0-beta.25065.4 + 10.0.0-beta.25065.4 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 853c63849626..80f9130b1508 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -42,7 +42,7 @@ [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1 +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' } # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - $uri = "https://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/dotnet-install.ps1" + $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 84ab5f124acc..df203b517842 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true} use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -295,7 +295,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/dotnet-install.sh" + local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index 7d56494ca0cf..6ebe97898d9f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "10.0.100-alpha.1.24573.1", + "dotnet": "10.0.100-alpha.1.25064.3", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)" @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25061.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25061.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25065.4", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25065.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From c878e33d870b5753204cd7336ff811cef7096ee7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Jan 2025 05:01:43 +0000 Subject: [PATCH 02/19] Update dependencies from https://github.com/dotnet/arcade build 20250116.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25066.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c4fece8d1e9..68c87cf77527 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -600,34 +600,34 @@ - + https://github.com/dotnet/arcade - 612bd6f952dbd1eea3548bec0b87b44fa506e348 + 0c4a0fd523decdd2a1f39bee8499cd977697cd21 - + https://github.com/dotnet/arcade - 612bd6f952dbd1eea3548bec0b87b44fa506e348 + 0c4a0fd523decdd2a1f39bee8499cd977697cd21 - + https://github.com/dotnet/arcade - 612bd6f952dbd1eea3548bec0b87b44fa506e348 + 0c4a0fd523decdd2a1f39bee8499cd977697cd21 - + https://github.com/dotnet/arcade - 612bd6f952dbd1eea3548bec0b87b44fa506e348 + 0c4a0fd523decdd2a1f39bee8499cd977697cd21 - + https://github.com/dotnet/arcade - 612bd6f952dbd1eea3548bec0b87b44fa506e348 + 0c4a0fd523decdd2a1f39bee8499cd977697cd21 - + https://github.com/dotnet/arcade - 612bd6f952dbd1eea3548bec0b87b44fa506e348 + 0c4a0fd523decdd2a1f39bee8499cd977697cd21 - + https://github.com/dotnet/arcade - 612bd6f952dbd1eea3548bec0b87b44fa506e348 + 0c4a0fd523decdd2a1f39bee8499cd977697cd21 diff --git a/eng/Versions.props b/eng/Versions.props index b626dabb169e..9323c0cc0300 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -266,10 +266,10 @@ - 10.0.0-beta.25065.4 - 10.0.0-beta.25065.4 - 10.0.0-beta.25065.4 - 10.0.0-beta.25065.4 + 10.0.0-beta.25066.1 + 10.0.0-beta.25066.1 + 10.0.0-beta.25066.1 + 10.0.0-beta.25066.1 diff --git a/global.json b/global.json index 6ebe97898d9f..323cd1938301 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25065.4", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25065.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25066.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25066.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 186d9b88c3cbbe2e2949d91faf5dee6b1dd5c10a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Jan 2025 05:02:09 +0000 Subject: [PATCH 03/19] Update dependencies from https://github.com/dotnet/arcade build 20250117.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25067.3 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68c87cf77527..5a9d29138697 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -600,34 +600,34 @@ - + https://github.com/dotnet/arcade - 0c4a0fd523decdd2a1f39bee8499cd977697cd21 + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 0c4a0fd523decdd2a1f39bee8499cd977697cd21 + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 0c4a0fd523decdd2a1f39bee8499cd977697cd21 + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 0c4a0fd523decdd2a1f39bee8499cd977697cd21 + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 0c4a0fd523decdd2a1f39bee8499cd977697cd21 + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 0c4a0fd523decdd2a1f39bee8499cd977697cd21 + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 0c4a0fd523decdd2a1f39bee8499cd977697cd21 + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb diff --git a/eng/Versions.props b/eng/Versions.props index 9323c0cc0300..3b617e526749 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -266,10 +266,10 @@ - 10.0.0-beta.25066.1 - 10.0.0-beta.25066.1 - 10.0.0-beta.25066.1 - 10.0.0-beta.25066.1 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 diff --git a/global.json b/global.json index 323cd1938301..e141d7a06123 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25066.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25066.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25067.3", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25067.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From ced45e7317db927a5c604bc0d9d6fe94a4636ea3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Jan 2025 05:01:41 +0000 Subject: [PATCH 04/19] Update dependencies from https://github.com/dotnet/arcade build 20250120.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25070.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a9d29138697..f375ecb466be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -600,34 +600,34 @@ - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + 0a21d8d2b1fb57289bd543b0fe90d3ed7621de78 - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + 0a21d8d2b1fb57289bd543b0fe90d3ed7621de78 - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + 0a21d8d2b1fb57289bd543b0fe90d3ed7621de78 - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + 0a21d8d2b1fb57289bd543b0fe90d3ed7621de78 - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + 0a21d8d2b1fb57289bd543b0fe90d3ed7621de78 - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + 0a21d8d2b1fb57289bd543b0fe90d3ed7621de78 - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + 0a21d8d2b1fb57289bd543b0fe90d3ed7621de78 diff --git a/eng/Versions.props b/eng/Versions.props index 3b617e526749..88c5c4c9aff0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -266,10 +266,10 @@ - 10.0.0-beta.25067.3 - 10.0.0-beta.25067.3 - 10.0.0-beta.25067.3 - 10.0.0-beta.25067.3 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 diff --git a/global.json b/global.json index e141d7a06123..a5af7f316931 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25067.3", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25067.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25070.2", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25070.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 1d6d17b96571fa52a6fa78ec56a076df74bd1b64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Jan 2025 05:02:24 +0000 Subject: [PATCH 05/19] Update dependencies from https://github.com/dotnet/arcade build 20250121.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25071.3 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f375ecb466be..cac43f61f480 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -600,34 +600,34 @@ - + https://github.com/dotnet/arcade - 0a21d8d2b1fb57289bd543b0fe90d3ed7621de78 + 02e2a71bd9c33ea333c9e3acc2404d6c061532bb - + https://github.com/dotnet/arcade - 0a21d8d2b1fb57289bd543b0fe90d3ed7621de78 + 02e2a71bd9c33ea333c9e3acc2404d6c061532bb - + https://github.com/dotnet/arcade - 0a21d8d2b1fb57289bd543b0fe90d3ed7621de78 + 02e2a71bd9c33ea333c9e3acc2404d6c061532bb - + https://github.com/dotnet/arcade - 0a21d8d2b1fb57289bd543b0fe90d3ed7621de78 + 02e2a71bd9c33ea333c9e3acc2404d6c061532bb - + https://github.com/dotnet/arcade - 0a21d8d2b1fb57289bd543b0fe90d3ed7621de78 + 02e2a71bd9c33ea333c9e3acc2404d6c061532bb - + https://github.com/dotnet/arcade - 0a21d8d2b1fb57289bd543b0fe90d3ed7621de78 + 02e2a71bd9c33ea333c9e3acc2404d6c061532bb - + https://github.com/dotnet/arcade - 0a21d8d2b1fb57289bd543b0fe90d3ed7621de78 + 02e2a71bd9c33ea333c9e3acc2404d6c061532bb diff --git a/eng/Versions.props b/eng/Versions.props index 88c5c4c9aff0..a96bb62b6cfd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -266,10 +266,10 @@ - 10.0.0-beta.25070.2 - 10.0.0-beta.25070.2 - 10.0.0-beta.25070.2 - 10.0.0-beta.25070.2 + 10.0.0-beta.25071.3 + 10.0.0-beta.25071.3 + 10.0.0-beta.25071.3 + 10.0.0-beta.25071.3 diff --git a/global.json b/global.json index a5af7f316931..5742c8e178e1 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25070.2", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25070.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25071.3", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25071.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 297f4955a6790b1dfaef939ea8a3159ff1a7a1a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Jan 2025 05:01:35 +0000 Subject: [PATCH 06/19] Update dependencies from https://github.com/dotnet/arcade build 20250122.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25072.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cac43f61f480..e16a456b6cd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -600,34 +600,34 @@ - + https://github.com/dotnet/arcade - 02e2a71bd9c33ea333c9e3acc2404d6c061532bb + 2ac4034732f0dbb9781beae751cf15b65aff1bcd - + https://github.com/dotnet/arcade - 02e2a71bd9c33ea333c9e3acc2404d6c061532bb + 2ac4034732f0dbb9781beae751cf15b65aff1bcd - + https://github.com/dotnet/arcade - 02e2a71bd9c33ea333c9e3acc2404d6c061532bb + 2ac4034732f0dbb9781beae751cf15b65aff1bcd - + https://github.com/dotnet/arcade - 02e2a71bd9c33ea333c9e3acc2404d6c061532bb + 2ac4034732f0dbb9781beae751cf15b65aff1bcd - + https://github.com/dotnet/arcade - 02e2a71bd9c33ea333c9e3acc2404d6c061532bb + 2ac4034732f0dbb9781beae751cf15b65aff1bcd - + https://github.com/dotnet/arcade - 02e2a71bd9c33ea333c9e3acc2404d6c061532bb + 2ac4034732f0dbb9781beae751cf15b65aff1bcd - + https://github.com/dotnet/arcade - 02e2a71bd9c33ea333c9e3acc2404d6c061532bb + 2ac4034732f0dbb9781beae751cf15b65aff1bcd diff --git a/eng/Versions.props b/eng/Versions.props index a96bb62b6cfd..1cc8b83be804 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -266,10 +266,10 @@ - 10.0.0-beta.25071.3 - 10.0.0-beta.25071.3 - 10.0.0-beta.25071.3 - 10.0.0-beta.25071.3 + 10.0.0-beta.25072.2 + 10.0.0-beta.25072.2 + 10.0.0-beta.25072.2 + 10.0.0-beta.25072.2 diff --git a/global.json b/global.json index 5742c8e178e1..b46fa68bec64 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25071.3", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25071.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25072.2", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25072.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 11461748b1e67911de0099ff2863c32c4eda41b1 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 23 Jan 2025 08:26:13 +0100 Subject: [PATCH 07/19] Update .NET SDK version in global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index b46fa68bec64..2aed11d640ce 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "10.0.100-alpha.1.25064.3", + "dotnet": "10.0.100-alpha.1.25072.17", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)" From b4f79451478816a829bda0cfbbb243558db037ea Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 23 Jan 2025 08:33:30 +0100 Subject: [PATCH 08/19] Delete src/SourceBuild/patches/arcade/0001-Use-hardlinks-during-local-file-publishing-if-possib.patch --- ...ring-local-file-publishing-if-possib.patch | 168 ------------------ 1 file changed, 168 deletions(-) delete mode 100644 src/SourceBuild/patches/arcade/0001-Use-hardlinks-during-local-file-publishing-if-possib.patch diff --git a/src/SourceBuild/patches/arcade/0001-Use-hardlinks-during-local-file-publishing-if-possib.patch b/src/SourceBuild/patches/arcade/0001-Use-hardlinks-during-local-file-publishing-if-possib.patch deleted file mode 100644 index 86f14e38c43e..000000000000 --- a/src/SourceBuild/patches/arcade/0001-Use-hardlinks-during-local-file-publishing-if-possib.patch +++ /dev/null @@ -1,168 +0,0 @@ -From 497d1fdfb20324e9a9fc41a8d7d19f50d5b32a5c Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Tue, 21 Jan 2025 10:50:44 +0100 -Subject: [PATCH] Use hardlinks during local file publishing if possible - -Backport: https://github.com/dotnet/arcade/pull/15433 - ---- - .../tools/Publish.proj | 3 +- - .../Microsoft.DotNet.Build.Tasks.Feed.csproj | 1 + - .../src/PushToBuildStorage.cs | 32 +++++++++++-- - .../src/common/NativeMethods.cs | 48 +++++++++++++++++++ - 4 files changed, 79 insertions(+), 5 deletions(-) - create mode 100644 src/Microsoft.DotNet.Build.Tasks.Feed/src/common/NativeMethods.cs - -diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj -index 907d3d876..3b3e4d98e 100644 ---- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj -+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj -@@ -274,7 +274,8 @@ - ShippingPackagesLocalStorageDir="$(SourceBuiltShippingPackagesDir)" - NonShippingPackagesLocalStorageDir="$(SourceBuiltNonShippingPackagesDir)" - AssetManifestsLocalStorageDir="$(SourceBuiltAssetManifestsDir)" -- ArtifactVisibilitiesToPublish="@(ArtifactVisibilityToPublish)" /> -+ ArtifactVisibilitiesToPublish="@(ArtifactVisibilityToPublish)" -+ UseHardlinksIfPossible="$(PublishingUseHardlinksIfPossible)" /> - - - + https://github.com/dotnet/arcade - 2ac4034732f0dbb9781beae751cf15b65aff1bcd + ba09eddf11e81ff604c3118eddb86517cfcd4969 diff --git a/eng/Versions.props b/eng/Versions.props index 1cc8b83be804..c3f39450ba27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -266,10 +266,10 @@ - 10.0.0-beta.25072.2 - 10.0.0-beta.25072.2 - 10.0.0-beta.25072.2 - 10.0.0-beta.25072.2 + 10.0.0-beta.25073.5 + 10.0.0-beta.25073.5 + 10.0.0-beta.25073.5 + 10.0.0-beta.25073.5 diff --git a/global.json b/global.json index fe129718d869..bb4a9066938a 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25072.2", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25072.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25073.5", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25073.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 6e8c00ccd0090222f61076b6d622d6d2fa7321c4 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 24 Jan 2025 08:46:42 +0100 Subject: [PATCH 18/19] Delete src/SourceBuild/patches/arcade/0001-set-rid-for-project-for-live-runtime.patch --- ...set-rid-for-project-for-live-runtime.patch | 150 ------------------ 1 file changed, 150 deletions(-) delete mode 100644 src/SourceBuild/patches/arcade/0001-set-rid-for-project-for-live-runtime.patch diff --git a/src/SourceBuild/patches/arcade/0001-set-rid-for-project-for-live-runtime.patch b/src/SourceBuild/patches/arcade/0001-set-rid-for-project-for-live-runtime.patch deleted file mode 100644 index 54d57dab139a..000000000000 --- a/src/SourceBuild/patches/arcade/0001-set-rid-for-project-for-live-runtime.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 0b326d7d0d266808c6109282c6417d26835ef648 Mon Sep 17 00:00:00 2001 -From: Jeremy Koritzinsky -Date: Thu, 2 Jan 2025 12:19:02 -0800 -Subject: [PATCH] Infer the projects runtime identifier as the vertical's RID - when doing a vertical build and filter down RID lists to the target RID in - such a scenario. - -Backport: https://github.com/dotnet/arcade/pull/15371 - ---- - .../UnifiedBuild/Unified-Build-Controls.md | 1 + - .../tools/BeforeNETSdkTargets.targets | 4 + - ...ifierInference.BeforeNETSdkTargets.targets | 79 +++++++++++++++++++ - .../tools/Settings.props | 1 + - .../SourceBuildArcadeBuild.targets | 1 + - 5 files changed, 86 insertions(+) - create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/BeforeNETSdkTargets.targets - create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/RuntimeIdentifierInference.BeforeNETSdkTargets.targets - -diff --git a/Documentation/UnifiedBuild/Unified-Build-Controls.md b/Documentation/UnifiedBuild/Unified-Build-Controls.md -index 809d94443..872e14167 100644 ---- a/Documentation/UnifiedBuild/Unified-Build-Controls.md -+++ b/Documentation/UnifiedBuild/Unified-Build-Controls.md -@@ -135,6 +135,7 @@ These controls may be used for **infrastructure or product purposes**. - | -------- | -------- | -------- | -------- | - | DotNetBuildWithOnlineSources | "true", "false", "" | "false" by default when `SourceOnly` switch is active. | When "true", do not remove non-local input sources. Infrastructure switch only. This switch is only exposed at the orchestrator level.
This replaces the existing `DotNetBuildOffline` switch. | - | DotNetBuildSourceOnly | "true", "false", "" | "" | When "true", build only from source. Online sources may remain unless `DotNetBuildOffline` is set to true. This is both an infrastructure and a product switch.
This is roughly equivalent to `DotNetBuildFromSource` in the current infrastructure, though other controls may be better suited. | -+| DotNetBuildTargetRidOnly | "true", "false", "" | "" | When not set, defaults to "true" if the repository build transitively depends on dotnet/runtime and `DotNetBuildOrchestrator` == "true"; otherwise "false". When "true", builds projects for the current `TargetRid` instead of using the current runtime identifier. | - - ### Output Controls - -diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/BeforeNETSdkTargets.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/BeforeNETSdkTargets.targets -new file mode 100644 -index 000000000..84b2020b6 ---- /dev/null -+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/BeforeNETSdkTargets.targets -@@ -0,0 +1,4 @@ -+ -+ -+ -+ -diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/RuntimeIdentifierInference.BeforeNETSdkTargets.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/RuntimeIdentifierInference.BeforeNETSdkTargets.targets -new file mode 100644 -index 000000000..9eba3fad9 ---- /dev/null -+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/RuntimeIdentifierInference.BeforeNETSdkTargets.targets -@@ -0,0 +1,79 @@ -+ -+ -+ -+ <_EnableArcadeRuntimeIdentifierInference Condition="'$(_EnableArcadeRuntimeIdentifierInference)' == ''">$(EnableArcadeRuntimeIdentifierInference) -+ -+ -+ <_EnableArcadeRuntimeIdentifierInference Condition="'$(_EnableArcadeRuntimeIdentifierInference)' == '' and '$(RuntimeIdentifier)' != ''">false -+ -+ -+ <_RidAgnosticProject Condition="('$(OutputType)' == 'Library' or '$(IsTestProject)' == 'true') and '$(RuntimeIdentifiers)' == ''">true -+ -+ -+ <_EnableArcadeRuntimeIdentifierInference Condition="'$(_EnableArcadeRuntimeIdentifierInference)' == '' and ('$(IsRidAgnostic)' == 'true' or '$(_RidAgnosticProject)' == 'true')">false -+ -+ -+ <_BuildFlavorRequiredRid -+ Condition=" -+ '$(SelfContained)' == 'true' or -+ ('$(_IsPublishing)' == 'true' and -+ ( -+ '$(PublishReadyToRun)' == 'true' or -+ '$(PublishSingleFile)' == 'true' or -+ '$(PublishAot)' == 'true' -+ ) -+ )">true -+ <_EnableArcadeRuntimeIdentifierInference Condition="'$(_EnableArcadeRuntimeIdentifierInference)' == '' and '$(_BuildFlavorRequiredRid)' != 'true'">false -+ -+ -+ <_EnableArcadeRuntimeIdentifierInference Condition="'$(_EnableArcadeRuntimeIdentifierInference)' == '' and '$(DotNetBuildTargetRidOnly)' == 'true'">true -+ -+ <_EnableArcadeRuntimeIdentifierFilters Condition="'$(EnableArcadeRuntimeIdentifierFilters)' != ''">$(EnableArcadeRuntimeIdentifierFilters) -+ -+ -+ <_EnableArcadeRuntimeIdentifierFilters Condition="'$(_EnableArcadeRuntimeIdentifierFilters)' == '' and '$(_EnableArcadeRuntimeIdentifierInference)' == 'true'">$(_EnableArcadeRuntimeIdentifierFilters) -+ -+ -+ -+ -+ false -+ $(TargetRid) -+ -+ -+ true -+ -+ -+ -+ -+ <_ExplicitlySpecifiedRuntimeIdentifiers>;$(RuntimeIdentifiers); -+ -+ -+ <_FilterRuntimeIdentifier>$(TargetRid) -+ -+ <_FilterRuntimeIdentifier Condition="'$(BaseOS)' != ''">$(BaseOS) -+ -+ -+ <_SuppressAllTargets Condition="'$(DisableArcadeExcludeFromBuildSupport)' != 'true' and $(_ExplicitlySpecifiedRuntimeIdentifiers).Contains(';$(_FilterRuntimeIdentifier);')) == 'false'">true -+ -+ -+ $(RuntimeIdentifier) -+ -+ -diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props -index b19ed1c3e..0b1d6c41d 100644 ---- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props -+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props -@@ -6,6 +6,7 @@ - <_ArcadeOverriddenCustomBeforeMicrosoftCommonCrossTargetingTargets>$(CustomBeforeMicrosoftCommonCrossTargetingTargets) - $(MSBuildThisFileDirectory)BeforeCommonTargets.targets - $(MSBuildThisFileDirectory)BeforeCommonTargets.CrossTargeting.targets -+ $(BeforeMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)BeforeNETSdkTargets.targets - -diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets -index 76e314d1f..a94d4e5ac 100644 ---- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets -+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcadeBuild.targets -@@ -55,6 +55,7 @@ - - DotNetBuildSourceOnly - Build from source only. Pass through outer build value if present. --> - $(InnerBuildArgs) /p:DotNetBuildInnerRepo=true - $(InnerBuildArgs) /p:DotNetBuildSourceOnly=$(DotNetBuildSourceOnly) -+ $(InnerBuildArgs) /p:DotNetBuildTargetRidOnly=$(DotNetBuildTargetRidOnly) - - $(InnerBuildArgs) /p:RepoRoot="$(InnerSourceBuildRepoRoot)$(_DirSeparatorEscapedCharForExecArg)" - From 842f73e90429ffbebe09b1632aa07cf3f253c56c Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 24 Jan 2025 11:04:57 +0100 Subject: [PATCH 19/19] wpf templates are still behind --- test/EndToEnd.Tests/ProjectBuildTests.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/EndToEnd.Tests/ProjectBuildTests.cs b/test/EndToEnd.Tests/ProjectBuildTests.cs index d640b0bf44e9..e683e1e6efd2 100644 --- a/test/EndToEnd.Tests/ProjectBuildTests.cs +++ b/test/EndToEnd.Tests/ProjectBuildTests.cs @@ -409,6 +409,11 @@ private static string DetectExpectedDefaultFramework(string template = "") int latestMajorVersion = runtimeFolders.Select(folder => int.Parse(Path.GetFileName(folder).Split('.').First())).Max(); if (latestMajorVersion == 10) { + // TODO: This block need to be updated when every template updates their default tfm. + if (template.StartsWith("wpf")) + { + return $"net9.0"; + } return $"net{latestMajorVersion}.0"; }