Skip to content

Commit ef50f42

Browse files
Update dependencies from build 301816 (#1591)
On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26110.110 -> To Version 10.0.0-beta.26113.113 (parent: ) [[ commit created by automation ]] Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent ad0ea06 commit ef50f42

File tree

8 files changed

+23
-16
lines changed

8 files changed

+23
-16
lines changed

eng/Version.Details.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26110.110</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26113.113</MicrosoftDotNetArcadeSdkPackageVersion>
1010
<SystemCommandLinePackageVersion>2.0.0</SystemCommandLinePackageVersion>
1111
<SystemIOHashingPackageVersion>10.0.0-rc.2.25502.107</SystemIOHashingPackageVersion>
1212
</PropertyGroup>

eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="24f66fec875855c1e7bcddebf0703b2fcab1ee3e" BarId="301163" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="05d9490471fb4b10d7ef4faa32c423e1b5adcaee" BarId="301816" />
44
<ProductDependencies>
55
<Dependency Name="System.CommandLine" Version="2.0.0">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -12,9 +12,9 @@
1212
</Dependency>
1313
</ProductDependencies>
1414
<ToolsetDependencies>
15-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26110.110">
15+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26113.113">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>24f66fec875855c1e7bcddebf0703b2fcab1ee3e</Sha>
17+
<Sha>05d9490471fb4b10d7ef4faa32c423e1b5adcaee</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
# If it's not devdiv, it's dnceng
8181
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
8282
name: NetCore1ESPool-Publishing-Internal
83-
image: windows.vs2019.amd64
83+
image: windows.vs2022.amd64
8484
os: windows
8585
steps:
8686
- ${{ if eq(parameters.is1ESPipeline, '') }}:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,19 @@ jobs:
6060
pool:
6161
${{ if eq(variables['System.TeamProject'], 'public') }}:
6262
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
63-
demands: ImageOverride -equals build.ubuntu.2004.amd64
63+
demands: ImageOverride -equals build.azurelinux.3.amd64.open
6464
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6565
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')]
66-
image: 1es-mariner-2
66+
image: build.azurelinux.3.amd64
6767
os: linux
6868
${{ else }}:
6969
pool:
7070
${{ if eq(variables['System.TeamProject'], 'public') }}:
7171
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
72-
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
72+
demands: ImageOverride -equals build.azurelinux.3.amd64.open
7373
${{ if eq(variables['System.TeamProject'], 'internal') }}:
7474
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')]
75-
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
75+
demands: ImageOverride -equals build.azurelinux.3.amd64
7676
${{ if ne(parameters.platform.pool, '') }}:
7777
pool: ${{ parameters.platform.pool }}
7878

eng/common/core-templates/post-build/post-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,11 @@ stages:
293293
${{ else }}:
294294
${{ if eq(parameters.is1ESPipeline, true) }}:
295295
name: NetCore1ESPool-Publishing-Internal
296-
image: windows.vs2019.amd64
296+
image: windows.vs2022.amd64
297297
os: windows
298298
${{ else }}:
299299
name: NetCore1ESPool-Publishing-Internal
300-
demands: ImageOverride -equals windows.vs2019.amd64
300+
demands: ImageOverride -equals windows.vs2022.amd64
301301
steps:
302302
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
303303
parameters:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
# pool:
2525
# name: $(DncEngInternalBuildPool)
26-
# demands: ImageOverride -equals windows.vs2019.amd64
26+
# demands: ImageOverride -equals windows.vs2022.amd64
2727
variables:
2828
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
2929
- template: /eng/common/templates-official/variables/pool-providers.yml

eng/common/tools.ps1

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -560,19 +560,26 @@ function LocateVisualStudio([object]$vsRequirements = $null){
560560
})
561561
}
562562

563-
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
563+
if (!$vsRequirements) {
564+
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
565+
$vsRequirements = $GlobalJson.tools.vs
566+
} else {
567+
$vsRequirements = $null
568+
}
569+
}
570+
564571
$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
565572

566573
if (!$excludePrereleaseVS) {
567574
$args += '-prerelease'
568575
}
569576

570-
if (Get-Member -InputObject $vsRequirements -Name 'version') {
577+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
571578
$args += '-version'
572579
$args += $vsRequirements.version
573580
}
574581

575-
if (Get-Member -InputObject $vsRequirements -Name 'components') {
582+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
576583
foreach ($component in $vsRequirements.components) {
577584
$args += '-requires'
578585
$args += $component

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"dotnet": "10.0.102"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26110.110",
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26113.113",
1717
"Microsoft.Build.NoTargets": "3.7.0"
1818
}
1919
}

0 commit comments

Comments
 (0)