Skip to content

[main] Update dependencies from dotnet/arcade #624

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 2 commits into from
Aug 4, 2025
Merged

[main] Update dependencies from dotnet/arcade #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
035f8fa
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jul 29, 2025
2f9d562
Update GivenThatIWantToInstallDotnetFromAScript.cs
mmitche Aug 4, 2025
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
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25366.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25378.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a73c08ec0de5a6e5e2a8668837df67edecb3a3da</Sha>
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25366.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25378.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a73c08ec0de5a6e5e2a8668837df67edecb3a3da</Sha>
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
10 changes: 6 additions & 4 deletions eng/common/templates-official/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ parameters:
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
artifacts: ''
enableMicrobuild: false
microbuildUseESRP: true
enablePublishBuildArtifacts: false
enablePublishBuildAssets: false
enablePublishTestResults: false
Expand Down Expand Up @@ -135,10 +136,11 @@ jobs:
signType: $(_SignType)
zipSources: false
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
${{ else }}:
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
${{ if eq(parameters.microbuildUseESRP, true) }}:
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
${{ else }}:
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
env:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dotnet": "8.0.117"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25366.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25366.2"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25378.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25378.1"
}
}
6 changes: 5 additions & 1 deletion tests/Install-Scripts.Test/GivenThatIWantToInstallDotnetFromAScript.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,10 @@ public void Dispose()
{
// Directory to cleanup may not be there if installation fails. Not an issue. Ignore the exception.
}
catch (UnauthorizedAccessException e)
{
throw new Exception($"Failed to remove {_sdkInstallationDirectory}");
}
}

[Theory]
Expand Down Expand Up @@ -663,4 +667,4 @@ private static IEnumerable<string> GetQualityOptionsFromFlags(Quality flags)
}
}
}
}
}