Skip to content

[main] Update dependencies from dotnet/arcade #59643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 27, 2024
Merged

[main] Update dependencies from dotnet/arcade #59643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,39 +388,39 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>208b974f93c0ee35a171eba374ca36aa9a78e930</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24622.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24626.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24622.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24626.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24622.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24626.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24622.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24626.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24622.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24626.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</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.24626.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24622.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24626.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24622.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24626.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8589bd2a216025d753b5f107081bfa28a2d51bb8</Sha>
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.24620.1">
<Uri>https://github.com/dotnet/extensions</Uri>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24622.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24622.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24622.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24622.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24622.1</MicrosoftSourceBuildIntermediatearcadeVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24626.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24626.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24626.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24626.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24626.1</MicrosoftSourceBuildIntermediatearcadeVersion>
<!-- Packages from dotnet/source-build-externals -->
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.561902</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
<!-- Packages from dotnet/source-build-reference-packages -->
Expand Down
6 changes: 2 additions & 4 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +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://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
# Pre-flighting new install script
$uri = "https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.ps1"
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"

Retry({
Write-Host "GET $uri"
Expand Down Expand Up @@ -322,7 +320,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
6 changes: 2 additions & 4 deletions eng/common/tools.sh
View file
Open in desktop
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 Expand Up @@ -295,9 +295,7 @@ function with_retries {
function GetDotNetInstallScript {
local root=$1
local install_script="$root/dotnet-install.sh"
# local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
# Pre-flight install script
local install_script_url="https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.sh"
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"

if [[ ! -a "$install_script" ]]; then
mkdir -p "$root"
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
"jdk": "11.0.24"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24622.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24622.1",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24622.1",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24626.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24626.1",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24626.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0"
}
Expand Down
Loading