Skip to content

Commit a522e85

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240404.4 (#55062)
[release/6.0] Update dependencies from dotnet/arcade
1 parent 4d147b2 commit a522e85

13 files changed

+32
-33
lines changed

‎NuGet.config

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-34a1091" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-34a10914/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-runtime-34a1091-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-34a10914-2/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-34a1091-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-34a10914-1/nuget/v3/index.json" />
107
<!-- End: Package sources from dotnet-runtime -->
118
<!-- Begin: Package sources from dotnet-efcore -->
129
<!-- End: Package sources from dotnet-efcore -->
@@ -28,9 +25,6 @@
2825
<!-- Begin: Package sources from dotnet-efcore -->
2926
<!-- End: Package sources from dotnet-efcore -->
3027
<!-- Begin: Package sources from dotnet-runtime -->
31-
<add key="darc-int-dotnet-runtime-34a1091-1" value="true" />
32-
<add key="darc-int-dotnet-runtime-34a1091-2" value="true" />
33-
<add key="darc-int-dotnet-runtime-34a1091" value="true" />
3428
<!-- End: Package sources from dotnet-runtime -->
3529
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3630
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>34a109148c7d8a2c8e6431e83e4bce5712dd8083</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24163.13">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24204.4">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
285+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24163.13">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24204.4">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
290+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24163.13">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24204.4">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
294+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24163.13">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24204.4">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
298+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.28</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.28</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

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

Lines changed: 2 additions & 1 deletion
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/job/onelocbuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
# If it's not devdiv, it's dnceng
4444
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
4545
name: NetCore1ESPool-Svc-Internal
46-
image: 1es-windows-2022-pt
46+
image: 1es-windows-2022
4747
os: windows
4848

4949
variables:

‎eng/common/templates-official/job/publish-build-assets.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,16 @@ jobs:
8080
inputs:
8181
targetType: inline
8282
script: |
83-
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
84-
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
85-
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
83+
New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force
84+
$filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt"
85+
Add-Content -Path $filePath -Value $(BARBuildId)
86+
Add-Content -Path $filePath -Value "$(DefaultChannels)"
87+
Add-Content -Path $filePath -Value $(IsStableBuild)
8688
8789
- task: 1ES.PublishBuildArtifacts@1
8890
displayName: Publish ReleaseConfigs Artifact
8991
inputs:
90-
PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
92+
PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
9193
PublishLocation: Container
9294
ArtifactName: ReleaseConfigs
9395

‎eng/common/templates-official/job/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
5151
${{ if eq(variables['System.TeamProject'], 'internal') }}:
5252
name: NetCore1ESPool-Svc-Internal
53-
image: 1es-mariner-2-pt
53+
image: 1es-mariner-2
5454
os: linux
5555
${{ if ne(parameters.platform.pool, '') }}:
5656
pool: ${{ parameters.platform.pool }}

‎eng/common/templates-official/job/source-index-stage1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
binlogPath: artifacts/log/Debug/Build.binlog
88
pool:
99
name: NetCore1ESPool-Svc-Internal
10-
image: 1es-windows-2022-pt
10+
image: 1es-windows-2022
1111
os: windows
1212
condition: ''
1313
dependsOn: ''

‎eng/common/templates-official/jobs/jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
# If it's not devdiv, it's dnceng
9393
${{ else }}:
9494
name: NetCore1ESPool-Svc-Internal
95-
image: 1es-windows-2022-pt
95+
image: 1es-windows-2022
9696
os: windows
9797

9898
runAsPublic: ${{ parameters.runAsPublic }}

‎eng/common/templates-official/post-build/post-build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ stages:
103103
# If it's not devdiv, it's dnceng
104104
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
105105
name: NetCore1ESPool-Svc-Internal
106-
image: 1es-windows-2022-pt
106+
image: 1es-windows-2022
107107
os: windows
108108

109109
steps:
@@ -137,12 +137,13 @@ stages:
137137
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
138138
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
139139
name: AzurePipelines-EO
140+
image: 1ESPT-Windows2022
140141
demands: Cmd
141142
os: windows
142143
# If it's not devdiv, it's dnceng
143144
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
144145
name: NetCore1ESPool-Svc-Internal
145-
image: 1es-windows-2022-pt
146+
image: 1es-windows-2022
146147
os: windows
147148
steps:
148149
- template: setup-maestro-vars.yml
@@ -205,7 +206,7 @@ stages:
205206
# If it's not devdiv, it's dnceng
206207
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
207208
name: NetCore1ESPool-Svc-Internal
208-
image: 1es-windows-2022-pt
209+
image: 1es-windows-2022
209210
os: windows
210211
steps:
211212
- template: setup-maestro-vars.yml
@@ -251,12 +252,13 @@ stages:
251252
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
252253
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
253254
name: AzurePipelines-EO
255+
image: 1ESPT-Windows2022
254256
demands: Cmd
255257
os: windows
256258
# If it's not devdiv, it's dnceng
257259
${{ else }}:
258260
name: NetCore1ESPool-Svc-Internal
259-
image: 1es-windows-2022-pt
261+
image: 1es-windows-2022
260262
os: windows
261263
steps:
262264
- template: setup-maestro-vars.yml

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

Lines changed: 1 addition & 1 deletion
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/steps/component-governance.yml

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.19",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24163.13",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24163.13"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24204.4"
3434
}
3535
}

0 commit comments

Comments
 (0)