Skip to content

Commit 06093a3

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20240409.2 (#33507)
[release/7.0] Update dependencies from dotnet/arcade
1 parent 4a9c483 commit 06093a3

File tree

7 files changed

+16
-15
lines changed

7 files changed

+16
-15
lines changed

eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@
3939
</Dependency>
4040
</ProductDependencies>
4141
<ToolsetDependencies>
42-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24171.6">
42+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24209.2">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
44+
<Sha>91f852db39356b3f8fd9efa00a3dee82a9a7c2b3</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24171.6">
46+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24209.2">
4747
<Uri>https://github.com/dotnet/arcade</Uri>
48-
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
48+
<Sha>91f852db39356b3f8fd9efa00a3dee82a9a7c2b3</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24171.6">
50+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24209.2">
5151
<Uri>https://github.com/dotnet/arcade</Uri>
52-
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
52+
<Sha>91f852db39356b3f8fd9efa00a3dee82a9a7c2b3</Sha>
5353
</Dependency>
5454
</ToolsetDependencies>
5555
</Dependencies>

eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<MicrosoftExtensionsLoggingVersion>7.0.0</MicrosoftExtensionsLoggingVersion>
2626
</PropertyGroup>
2727
<PropertyGroup Label="Dependencies from dotnet/arcade">
28-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24171.6</MicrosoftDotNetBuildTasksTemplatingVersion>
28+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24209.2</MicrosoftDotNetBuildTasksTemplatingVersion>
2929
</PropertyGroup>
3030
<PropertyGroup Label="Other dependencies">
3131
<!-- NB: Roslyn version affects the minimum required Visual Studio version -->

eng/common/templates-official/job/job.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,15 @@ jobs:
116116

117117
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
118118
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
119-
- task: MicroBuildSigningPlugin@3
119+
- task: MicroBuildSigningPlugin@4
120120
displayName: Install MicroBuild plugin
121121
inputs:
122122
signType: $(_SignType)
123123
zipSources: false
124124
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
125125
env:
126126
TeamName: $(_TeamName)
127+
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
127128
continueOnError: ${{ parameters.continueOnError }}
128129
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
129130

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33

44
steps:
55
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
6-
- script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
6+
- script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
77
displayName: Set skipComponentGovernanceDetection variable
88
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
99
- task: ComponentGovernanceComponentDetection@0

eng/common/templates-official/variables/pool-providers.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
# pool:
2525
# name: $(DncEngInternalBuildPool)
26-
# image: 1es-windows-2022-pt
26+
# image: 1es-windows-2022
2727

2828
variables:
2929
# Coalesce the target and source branches so we know when a PR targets a release branch

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33

44
steps:
55
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
6-
- script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
6+
- script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
77
displayName: Set skipComponentGovernanceDetection variable
88
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
99
- task: ComponentGovernanceComponentDetection@0

global.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"tools": {
3-
"dotnet": "7.0.117"
3+
"dotnet": "7.0.118"
44
},
55
"sdk": {
6-
"version": "7.0.117",
6+
"version": "7.0.118",
77
"allowPrerelease": true,
88
"rollForward": "latestMajor"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.6",
12-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24171.6"
11+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24209.2",
12+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24209.2"
1313
}
1414
}

0 commit comments

Comments
 (0)