Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (dotnet#12678)
Browse files Browse the repository at this point in the history
[main] Update dependencies from dotnet/arcade
  • Loading branch information
dotnet-maestro[bot] authored Dec 24, 2024
1 parent 55020fc commit 2a5cad7
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24622.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24623.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
<Sha>ae0923d109be7ddf2a5d99e3bf685f72132edeaf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24622.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24623.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
<Sha>ae0923d109be7ddf2a5d99e3bf685f72132edeaf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.24622.1">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.24623.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
<Sha>ae0923d109be7ddf2a5d99e3bf685f72132edeaf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24622.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24623.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
<Sha>ae0923d109be7ddf2a5d99e3bf685f72132edeaf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24622.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24623.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
<Sha>ae0923d109be7ddf2a5d99e3bf685f72132edeaf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24622.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24623.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
<Sha>ae0923d109be7ddf2a5d99e3bf685f72132edeaf</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.24622.1</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24622.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24622.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.24623.1</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24623.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24623.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ function InstallDotNet([string] $dotnetRoot,
$variations += @($installParameters)

$dotnetBuilds = $installParameters.Clone()
$dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public"
$dotnetbuilds.AzureFeed = "https://ci.dot.net/public"
$variations += @($dotnetBuilds)

if ($runtimeSourceFeed) {
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ function InstallDotNet {
local public_location=("${installParameters[@]}")
variations+=(public_location)

local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public")
local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public")
variations+=(dotnetbuilds)

if [[ -n "${6:-}" ]]; then
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"version": "10.0.100-alpha.1.24573.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24622.1",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.24622.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24622.1",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24623.1",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.24623.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24623.1",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.24622.1"
},
Expand Down

0 comments on commit 2a5cad7

Please sign in to comment.