Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20250…
Browse files Browse the repository at this point in the history
…117.3 (#2719)

[release/2.1] Update dependencies from dotnet/arcade
  • Loading branch information
dotnet-maestro[bot] authored Jan 20, 2025
1 parent c026ca2 commit 35f3c30
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25061.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25067.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
<Sha>12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25061.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25067.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
<Sha>12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25061.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25067.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
<Sha>12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
<PropertyGroup>
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
<MicrosoftBclTimeProviderVersion>8.0.0</MicrosoftBclTimeProviderVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25061.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25067.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "10.0.100-alpha.1.24573.1"
"version": "10.0.100-alpha.1.25064.3"
},
"tools": {
"dotnet": "10.0.100-alpha.1.24573.1",
"dotnet": "10.0.100-alpha.1.25064.3",
"runtimes": {
"dotnet": [
"6.0.36",
Expand All @@ -20,7 +20,7 @@
}
},
"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.25067.3",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25067.3"
}
}

0 comments on commit 35f3c30

Please sign in to comment.