Skip to content

Commit 9cc9d52

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/6.0.1xx] Update dependencies from dotnet/arcade (#39924)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 51240da commit 9cc9d52

File tree

7 files changed

+22
-35
lines changed

7 files changed

+22
-35
lines changed

‎NuGet.config

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,14 @@
66
<!-- Begin: Package sources from dotnet-aspnetcore -->
77
<!-- End: Package sources from dotnet-aspnetcore -->
88
<!-- Begin: Package sources from dotnet-runtime -->
9-
<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" />
10-
<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" />
11-
<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" />
129
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
1310
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1411
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1512
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1613
<!-- End: Package sources from dotnet-runtime -->
1714
<!-- Begin: Package sources from dotnet-templating -->
18-
<add key="darc-int-dotnet-templating-5603759" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-56037591/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-templating-5603759-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-56037591-2/nuget/v3/index.json" />
20-
<add key="darc-int-dotnet-templating-5603759-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-56037591-1/nuget/v3/index.json" />
2115
<!-- End: Package sources from dotnet-templating -->
2216
<!-- Begin: Package sources from dotnet-windowsdesktop -->
23-
<add key="darc-int-dotnet-windowsdesktop-c4a33f2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c4a33f22/nuget/v3/index.json" />
24-
<add key="darc-int-dotnet-windowsdesktop-c4a33f2-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c4a33f22-2/nuget/v3/index.json" />
25-
<add key="darc-int-dotnet-windowsdesktop-c4a33f2-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c4a33f22-1/nuget/v3/index.json" />
2617
<!-- End: Package sources from dotnet-windowsdesktop -->
2718
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2819
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -43,19 +34,10 @@
4334
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
4435
<!-- End: Package sources from DotNet-msbuild-Trusted -->
4536
<!-- Begin: Package sources from dotnet-runtime -->
46-
<add key="darc-int-dotnet-runtime-34a1091-1" value="true" />
47-
<add key="darc-int-dotnet-runtime-34a1091-2" value="true" />
48-
<add key="darc-int-dotnet-runtime-34a1091" value="true" />
4937
<!-- End: Package sources from dotnet-runtime -->
5038
<!-- Begin: Package sources from dotnet-templating -->
51-
<add key="darc-int-dotnet-templating-5603759-1" value="true" />
52-
<add key="darc-int-dotnet-templating-5603759-2" value="true" />
53-
<add key="darc-int-dotnet-templating-5603759" value="true" />
5439
<!-- End: Package sources from dotnet-templating -->
5540
<!-- Begin: Package sources from dotnet-windowsdesktop -->
56-
<add key="darc-int-dotnet-windowsdesktop-c4a33f2-1" value="true" />
57-
<add key="darc-int-dotnet-windowsdesktop-c4a33f2-2" value="true" />
58-
<add key="darc-int-dotnet-windowsdesktop-c4a33f2" value="true" />
5941
<!-- End: Package sources from dotnet-windowsdesktop -->
6042
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6143
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -292,22 +292,22 @@
292292
</Dependency>
293293
</ProductDependencies>
294294
<ToolsetDependencies>
295-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24163.13">
295+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24176.9">
296296
<Uri>https://github.com/dotnet/arcade</Uri>
297-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
297+
<Sha>e438144bbffb29ed5d7c113dc4947b51650344dc</Sha>
298298
<SourceBuild RepoName="arcade" ManagedOnly="true" />
299299
</Dependency>
300-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24163.13">
300+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24176.9">
301301
<Uri>https://github.com/dotnet/arcade</Uri>
302-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
302+
<Sha>e438144bbffb29ed5d7c113dc4947b51650344dc</Sha>
303303
</Dependency>
304-
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24163.13">
304+
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24176.9">
305305
<Uri>https://github.com/dotnet/arcade</Uri>
306-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
306+
<Sha>e438144bbffb29ed5d7c113dc4947b51650344dc</Sha>
307307
</Dependency>
308-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24163.13">
308+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24176.9">
309309
<Uri>https://github.com/dotnet/arcade</Uri>
310-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
310+
<Sha>e438144bbffb29ed5d7c113dc4947b51650344dc</Sha>
311311
</Dependency>
312312
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0">
313313
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
2828
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
2929
<SystemSecurityCryptographyPkcsPackageVersion>6.0.4</SystemSecurityCryptographyPkcsPackageVersion>
30-
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24163.13</MicrosoftDotNetSignToolVersion>
30+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24176.9</MicrosoftDotNetSignToolVersion>
3131
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
3232
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
3333
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -166,7 +166,7 @@
166166
<PropertyGroup>
167167
<FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
168168
<FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
169-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24163.13</MicrosoftDotNetXUnitExtensionsVersion>
169+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24176.9</MicrosoftDotNetXUnitExtensionsVersion>
170170
<MoqPackageVersion>4.8.2</MoqPackageVersion>
171171
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.21376.2</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
172172
</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)