Skip to content

Commit 7095698

Browse files
[main] Update dependencies from dotnet/arcade (#8933)
[main] Update dependencies from dotnet/arcade
1 parent 11a4e36 commit 7095698

File tree

4 files changed

+19
-9
lines changed

4 files changed

+19
-9
lines changed

Diff for: eng/Version.Details.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
</Dependency>
2020
</ProductDependencies>
2121
<ToolsetDependencies>
22-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25210.1">
22+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25212.1">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>490307dc9bb09caf016b2fa96005ac8aaa89c4e7</Sha>
24+
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
2525
</Dependency>
2626
<!-- Intermediate is necessary for source build. -->
27-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25210.1">
27+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25212.1">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
29-
<Sha>490307dc9bb09caf016b2fa96005ac8aaa89c4e7</Sha>
29+
<Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
3030
<SourceBuild RepoName="arcade" ManagedOnly="true" />
3131
</Dependency>
3232
<!-- Dependencies required for source build. We'll still update manually -->

Diff for: eng/common/core-templates/steps/install-microbuild.yml

+12-2
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,18 @@ steps:
9191
script: |
9292
Write-Host "Copying Linux Path"
9393
$MBSIGN_APPFOLDER = '$(MBSIGN_APPFOLDER)'
94-
$MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER -replace '/build', ''
95-
$MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER + '/1.1.1032' + '/build'
94+
$MBSIGN_APPFOLDER = ($MBSIGN_APPFOLDER -replace '/build', '')
95+
96+
$versionRegex = '\d+\.\d+\.\d+'
97+
$package = Get-ChildItem -Path $MBSIGN_APPFOLDER -Directory |
98+
Where-Object { $_.Name -match $versionRegex }
99+
100+
if ($package.Count -ne 1) {
101+
Write-Host "There should be exactly one matching subfolder, but found $($package.Count)."
102+
exit 1
103+
}
104+
105+
$MBSIGN_APPFOLDER = $package[0].FullName + '/build'
96106
$MBSIGN_APPFOLDER | Write-Host
97107
$SignConfigPath = $MBSIGN_APPFOLDER + '/signconfig.xml'
98108
Copy-Item -Path "$(MBSIGN_APPFOLDER)/signconfig.xml" -Destination $SignConfigPath -Force

Diff for: eng/common/sdl/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
3+
<package id="Microsoft.Guardian.Cli" version="0.199.0"/>
44
</packages>

Diff for: global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-preview.3.25167.3"
3+
"dotnet": "10.0.100-preview.3.25201.16"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25210.1"
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25212.1"
77
}
88
}

0 commit comments

Comments
 (0)