Skip to content

Commit 749976c

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20230424.1 (#47852)
[main] Update dependencies from dotnet/arcade
1 parent f1590bf commit 749976c

File tree

6 files changed

+38
-22
lines changed

6 files changed

+38
-22
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -306,26 +306,26 @@
306306
<Uri>https://github.com/dotnet/runtime</Uri>
307307
<Sha>ab2b80d06dd4d997df5ffa72a3c4a99cb36ccbff</Sha>
308308
</Dependency>
309-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23217.1">
309+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23224.1">
310310
<Uri>https://github.com/dotnet/arcade</Uri>
311-
<Sha>cb54ca21431ee8d96f91abfbc42237bcb001f9d1</Sha>
311+
<Sha>d14c4adbdbb8c7ee060f9e333883fc9890939b66</Sha>
312312
<SourceBuild RepoName="arcade" ManagedOnly="true" />
313313
</Dependency>
314-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23217.1">
314+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23224.1">
315315
<Uri>https://github.com/dotnet/arcade</Uri>
316-
<Sha>cb54ca21431ee8d96f91abfbc42237bcb001f9d1</Sha>
316+
<Sha>d14c4adbdbb8c7ee060f9e333883fc9890939b66</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23217.1">
318+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23224.1">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>cb54ca21431ee8d96f91abfbc42237bcb001f9d1</Sha>
320+
<Sha>d14c4adbdbb8c7ee060f9e333883fc9890939b66</Sha>
321321
</Dependency>
322-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23217.1">
322+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23224.1">
323323
<Uri>https://github.com/dotnet/arcade</Uri>
324-
<Sha>cb54ca21431ee8d96f91abfbc42237bcb001f9d1</Sha>
324+
<Sha>d14c4adbdbb8c7ee060f9e333883fc9890939b66</Sha>
325325
</Dependency>
326-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23217.1">
326+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23224.1">
327327
<Uri>https://github.com/dotnet/arcade</Uri>
328-
<Sha>cb54ca21431ee8d96f91abfbc42237bcb001f9d1</Sha>
328+
<Sha>d14c4adbdbb8c7ee060f9e333883fc9890939b66</Sha>
329329
</Dependency>
330330
</ToolsetDependencies>
331331
</Dependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@
136136
<MicrosoftEntityFrameworkCoreVersion>8.0.0-preview.4.23212.3</MicrosoftEntityFrameworkCoreVersion>
137137
<MicrosoftEntityFrameworkCoreDesignVersion>8.0.0-preview.4.23212.3</MicrosoftEntityFrameworkCoreDesignVersion>
138138
<!-- Packages from dotnet/arcade -->
139-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23217.1</MicrosoftDotNetBuildTasksInstallersVersion>
140-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23217.1</MicrosoftDotNetBuildTasksTemplatingVersion>
141-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23217.1</MicrosoftDotNetRemoteExecutorVersion>
139+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23224.1</MicrosoftDotNetBuildTasksInstallersVersion>
140+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23224.1</MicrosoftDotNetBuildTasksTemplatingVersion>
141+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23224.1</MicrosoftDotNetRemoteExecutorVersion>
142142
<!-- Packages from dotnet/source-build-externals -->
143143
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23221.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
144144
<!-- Packages from dotnet/xdt -->

‎eng/common/cross/build-rootfs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ __AlpinePackages+=" krb5-dev"
7070
__AlpinePackages+=" openssl-dev"
7171
__AlpinePackages+=" zlib-dev"
7272

73-
__FreeBSDBase="12.3-RELEASE"
73+
__FreeBSDBase="12.4-RELEASE"
7474
__FreeBSDPkg="1.17.0"
7575
__FreeBSDABI="12"
7676
__FreeBSDPackages="libunwind"

‎eng/common/templates/job/job.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ parameters:
2525
enablePublishTestResults: false
2626
enablePublishUsingPipelines: false
2727
enableBuildRetry: false
28-
disableComponentGovernance: false
28+
disableComponentGovernance: ''
2929
componentGovernanceIgnoreDirectories: ''
3030
mergeTestResults: false
3131
testRunTitle: ''
@@ -155,11 +155,14 @@ jobs:
155155
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
156156
continueOnError: true
157157

158-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
159-
- task: ComponentGovernanceComponentDetection@0
160-
continueOnError: true
161-
inputs:
162-
ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
158+
- template: /eng/common/templates/steps/component-governance.yml
159+
parameters:
160+
${{ 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'))) }}:
162+
disableComponentGovernance: false
163+
${{ else }}:
164+
disableComponentGovernance: true
165+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
163166

164167
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
165168
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

‎eng/common/templates/steps/component-governance.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
parameters:
2+
disableComponentGovernance: false
3+
componentGovernanceIgnoreDirectories: ''
4+
5+
steps:
6+
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
7+
- script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
8+
displayName: Set skipComponentGovernanceDetection variable
9+
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
10+
- task: ComponentGovernanceComponentDetection@0
11+
continueOnError: true
12+
inputs:
13+
ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23217.1",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23217.1"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.1",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23224.1"
3232
}
3333
}

0 commit comments

Comments
 (0)