Skip to content

Commit c2b4fc3

Browse files
dotnet-maestro[bot]marcpopMSFT
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20251120.4
On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25563.4 -> To Version 8.0.0-beta.25570.4
1 parent fff951b commit c2b4fc3

File tree

5 files changed

+18
-24
lines changed

5 files changed

+18
-24
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25563.4">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25570.4">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>952abb7faea30d565b847d31411d019904a613a0</Sha>
496+
<Sha>b03a7214ed5a36d5267894adf9f8f55067962fdb</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25563.4">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25570.4">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>952abb7faea30d565b847d31411d019904a613a0</Sha>
501+
<Sha>b03a7214ed5a36d5267894adf9f8f55067962fdb</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25563.4">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25570.4">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>952abb7faea30d565b847d31411d019904a613a0</Sha>
505+
<Sha>b03a7214ed5a36d5267894adf9f8f55067962fdb</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25563.4">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25570.4">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>952abb7faea30d565b847d31411d019904a613a0</Sha>
509+
<Sha>b03a7214ed5a36d5267894adf9f8f55067962fdb</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25563.4</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25570.4</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -214,7 +214,7 @@
214214
<PropertyGroup>
215215
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
216216
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
217-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25563.4</MicrosoftDotNetXUnitExtensionsVersion>
217+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25570.4</MicrosoftDotNetXUnitExtensionsVersion>
218218
<MoqPackageVersion>4.18.4</MoqPackageVersion>
219219
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
220220
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161

6262
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6363
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
64-
image: 1es-mariner-2
64+
image: 1es-azurelinux-3
6565
os: linux
6666

6767
${{ if ne(parameters.platform.pool, '') }}:

eng/common/tools.ps1

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ function InstallDotNet([string] $dotnetRoot,
296296
if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" }
297297
if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" }
298298
$runtimePath = $runtimePath + "\" + $version
299-
299+
300300
$dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'"
301301

302302
if (Test-Path $runtimePath) {
@@ -545,25 +545,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){
545545
})
546546
}
547547

548-
if (!$vsRequirements) {
549-
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
550-
$vsRequirements = $GlobalJson.tools.vs
551-
} else {
552-
$vsRequirements = $null
553-
}
554-
}
548+
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
555549
$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
556550

557551
if (!$excludePrereleaseVS) {
558552
$args += '-prerelease'
559553
}
560554

561-
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
555+
if (Get-Member -InputObject $vsRequirements -Name 'version') {
562556
$args += '-version'
563557
$args += $vsRequirements.version
564558
}
565559

566-
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
560+
if (Get-Member -InputObject $vsRequirements -Name 'components') {
567561
foreach ($component in $vsRequirements.components) {
568562
$args += '-requires'
569563
$args += $component
@@ -960,4 +954,4 @@ function Enable-Nuget-EnhancedRetry() {
960954
Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000'
961955
Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true'
962956
}
963-
}
957+
}

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25563.4",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25563.4"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25570.4",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25570.4"
1919
}
2020
}

0 commit comments

Comments
 (0)