Skip to content

Commit 6e63626

Browse files
[main] Update dependencies from dotnet/arcade (#4428)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 08a7e37 commit 6e63626

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@
1616
</Dependency>
1717
</ProductDependencies>
1818
<ToolsetDependencies>
19-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23224.1">
19+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23226.4">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>d14c4adbdbb8c7ee060f9e333883fc9890939b66</Sha>
21+
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
2222
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2323
</Dependency>
24-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23224.1">
24+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23226.4">
2525
<Uri>https://github.com/dotnet/arcade</Uri>
26-
<Sha>d14c4adbdbb8c7ee060f9e333883fc9890939b66</Sha>
26+
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23224.1">
28+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23226.4">
2929
<Uri>https://github.com/dotnet/arcade</Uri>
30-
<Sha>d14c4adbdbb8c7ee060f9e333883fc9890939b66</Sha>
30+
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23224.1">
32+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23226.4">
3333
<Uri>https://github.com/dotnet/arcade</Uri>
34-
<Sha>d14c4adbdbb8c7ee060f9e333883fc9890939b66</Sha>
34+
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.23224.1">
36+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.23226.4">
3737
<Uri>https://github.com/dotnet/arcade</Uri>
38-
<Sha>d14c4adbdbb8c7ee060f9e333883fc9890939b66</Sha>
38+
<Sha>469dcc0cbcba5221727c8a5b9eec4a478e24a780</Sha>
3939
</Dependency>
4040
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
4141
<Uri>https://github.com/dotnet/arcade-services</Uri>

eng/common/cross/build-rootfs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ while :; do
330330
;;
331331
freebsd13)
332332
__CodeName=freebsd
333-
__FreeBSDBase="13.0-RELEASE"
333+
__FreeBSDBase="13.2-RELEASE"
334334
__FreeBSDABI="13"
335335
__SkipUnmount=1
336336
;;

eng/common/templates/job/job.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,12 @@ jobs:
158158
- template: /eng/common/templates/steps/component-governance.yml
159159
parameters:
160160
${{ if eq(parameters.disableComponentGovernance, '') }}:
161-
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
161+
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
162162
disableComponentGovernance: false
163163
${{ else }}:
164164
disableComponentGovernance: true
165+
${{ else }}:
166+
disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
165167
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
166168

167169
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"dotnet": "8.0.100-preview.3.23178.7"
3333
},
3434
"msbuild-sdks": {
35-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.1",
36-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23224.1"
35+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23226.4",
36+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23226.4"
3737
}
3838
}

0 commit comments

Comments
 (0)