Skip to content

Commit cc8b20d

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/6.0.4xx] Update dependencies from dotnet/arcade (#39925)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 72b5a9b commit cc8b20d

File tree

6 files changed

+22
-18
lines changed

6 files changed

+22
-18
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -291,22 +291,22 @@
291291
</Dependency>
292292
</ProductDependencies>
293293
<ToolsetDependencies>
294-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24163.13">
294+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24176.9">
295295
<Uri>https://github.com/dotnet/arcade</Uri>
296-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
296+
<Sha>e438144bbffb29ed5d7c113dc4947b51650344dc</Sha>
297297
<SourceBuild RepoName="arcade" ManagedOnly="true" />
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24163.13">
299+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24176.9">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
301+
<Sha>e438144bbffb29ed5d7c113dc4947b51650344dc</Sha>
302302
</Dependency>
303-
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24163.13">
303+
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24176.9">
304304
<Uri>https://github.com/dotnet/arcade</Uri>
305-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
305+
<Sha>e438144bbffb29ed5d7c113dc4947b51650344dc</Sha>
306306
</Dependency>
307-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24163.13">
307+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24176.9">
308308
<Uri>https://github.com/dotnet/arcade</Uri>
309-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
309+
<Sha>e438144bbffb29ed5d7c113dc4947b51650344dc</Sha>
310310
</Dependency>
311311
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0">
312312
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3131
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
3232
<SystemSecurityCryptographyPkcsPackageVersion>6.0.4</SystemSecurityCryptographyPkcsPackageVersion>
33-
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24163.13</MicrosoftDotNetSignToolVersion>
33+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24176.9</MicrosoftDotNetSignToolVersion>
3434
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
3535
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
3636
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
@@ -41,7 +41,6 @@
4141
<SystemCommandLineVersion>2.0.0-beta4.22363.1</SystemCommandLineVersion>
4242
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview5.1.22263.1</MicrosoftDeploymentDotNetReleasesVersion>
4343
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
44-
4544
</PropertyGroup>
4645
<PropertyGroup>
4746
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -175,7 +174,7 @@
175174
<PropertyGroup>
176175
<FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
177176
<FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
178-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24163.13</MicrosoftDotNetXUnitExtensionsVersion>
177+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24176.9</MicrosoftDotNetXUnitExtensionsVersion>
179178
<MoqPackageVersion>4.8.2</MoqPackageVersion>
180179
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.22262.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
181180
</PropertyGroup>

‎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/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/post-build/post-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ 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
@@ -251,6 +252,7 @@ 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

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24163.13",
15-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24163.13"
14+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24176.9",
15+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24176.9"
1616
}
1717
}

0 commit comments

Comments
 (0)