diff --git a/NuGet.config b/NuGet.config index 330e3711badd..0f82e2442416 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,12 +5,31 @@ + + + + + + + + + + + + + + + + + + + @@ -23,7 +42,7 @@ - + @@ -35,6 +54,16 @@ + + + + + + + + + + @@ -66,8 +95,24 @@ + + + + + + + + + + + + + + + + @@ -77,7 +122,7 @@ - + @@ -85,6 +130,16 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da6771fdfcc5..6ac0a0619f76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + 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 - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index a124c0ccc7ae..e4f86c6ce1f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.24504.2 + 8.0.0-beta.24508.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24504.2 + 8.0.0-beta.24508.1 4.18.4 1.3.2 8.0.0-beta.23607.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 57d319093292..955cc21472ea 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.108", + "dotnet": "8.0.110", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24504.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24504.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1" } } diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsRuntimeComponent.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsRuntimeComponent.cs index 72f300908ea3..1433d5b1efa5 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsRuntimeComponent.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsRuntimeComponent.cs @@ -101,7 +101,7 @@ public void ManagedWinRTComponentCanBeReferenced() managedWinRTComponent.AdditionalProperties.Add("PlatformTarget", "x64"); // TODO: Update to latest (currently 1.2.5) once it shows up on dotnet-public feed - managedWinRTComponent.PackageReferences.Add(new TestPackageReference("Microsoft.Windows.CsWinRT", "1.2.3")); + managedWinRTComponent.PackageReferences.Add(new TestPackageReference("Microsoft.Windows.CsWinRT", "2.1.1")); managedWinRTComponent.SourceFiles["Coords.cs"] = @"using System;