From c29c6dd48c843920122f1c83ca4213d8546e0411 Mon Sep 17 00:00:00 2001 From: Shen Chen Date: Wed, 18 Sep 2024 15:20:58 -0700 Subject: [PATCH 1/3] Update STJ --- NuGet.config | 2 +- .../Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd8c19b99d9dd..8e992c88a3ec8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + diff --git a/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj b/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj index b0e92b2189f66..5404b0c270927 100644 --- a/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj +++ b/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj @@ -29,7 +29,7 @@ - + From 7642cb7ade2bfc9817caaaa92b35f79126250412 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 10 Oct 2024 11:04:47 -0700 Subject: [PATCH 2/3] Update NuGet.config --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 8e992c88a3ec8..26a2f6f90d445 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,6 @@ - From e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 15:28:34 -0700 Subject: [PATCH 3/3] [release/dev17.10] Update dependencies from dotnet/arcade (#75252) * Update dependencies from https://github.com/dotnet/arcade build 20240925.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24470.2 -> To Version 8.0.0-beta.24475.3 * Update dependencies from https://github.com/dotnet/arcade build 20241004.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24504.2 * Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24504.2 -> To Version 8.0.0-beta.24508.1 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Ankita Khera <40616383+akhera99@users.noreply.github.com> --- eng/Version.Details.xml | 12 ++++++------ eng/common/tools.ps1 | 2 +- global.json | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65256d84d3855..376ca8334f95d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -114,14 +114,14 @@ - + https://github.com/dotnet/arcade - 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 + e5b13e054339e41d422212a0ecaf24fec20cb5a1 @@ -148,9 +148,9 @@ https://github.com/dotnet/roslyn 5d10d428050c0d6afef30a072c4ae68776621877 - + https://github.com/dotnet/arcade - 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 + e5b13e054339e41d422212a0ecaf24fec20cb5a1 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index eb188cfda415b..a2dedaa5297a7 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 89d2fb265f6c3..19bb1cb06c5e7 100644 --- a/global.json +++ b/global.json @@ -1,19 +1,19 @@ { "sdk": { - "version": "8.0.108", + "version": "8.0.110", "allowPrerelease": false, "rollForward": "patch" }, "tools": { - "dotnet": "8.0.108", + "dotnet": "8.0.110", "vs": { "version": "17.8.0" }, "xcopy-msbuild": "17.8.1-2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24475.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24475.3", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1", "Microsoft.Build.Traversal": "3.4.0" } }