Skip to content

Commit 87111bc

Browse files
[release/10.0.1xx] Source code updates from dotnet/dotnet (#1586)
* Backflow from https://github.com/dotnet/dotnet / 3628157 build 301172 [[ commit created by automation ]] * Update dependencies from build 301172 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26105.106 -> To Version 10.0.0-beta.26110.106 (parent: ) System.CommandLine From Version 2.0.4 -> To Version 2.0.4 (parent: ) [[ commit created by automation ]] --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 59ef729 commit 87111bc

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-3f106e5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-3f106e53/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-3628157" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-36281576/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-dotnet -->
99
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1010
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />

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.26105.106</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26110.106</MicrosoftDotNetArcadeSdkPackageVersion>
1010
<SystemCommandLinePackageVersion>2.0.4</SystemCommandLinePackageVersion>
1111
</PropertyGroup>
1212
<!--Property group for alternate package version names-->

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="3f106e53de8994cbe931ddb9bcec1f095586f089" BarId="300469" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="36281576f371e437e9fafe7ac0732979a2c2ba30" BarId="301172" />
44
<ProductDependencies>
55
<Dependency Name="System.CommandLine" Version="2.0.4">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>3f106e53de8994cbe931ddb9bcec1f095586f089</Sha>
7+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26105.106">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26110.106">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>3f106e53de8994cbe931ddb9bcec1f095586f089</Sha>
13+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
1414
</Dependency>
1515
</ToolsetDependencies>
1616
</Dependencies>

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 Azure-Linux-3-Amd64-Public
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: Azure-Linux-3-Amd64
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 Azure-Linux-3-Amd64-Public
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 Azure-Linux-3-Amd64
75+
demands: ImageOverride -equals build.azurelinux.3.amd64
7676
${{ if ne(parameters.platform.pool, '') }}:
7777
pool: ${{ parameters.platform.pool }}
7878

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.26105.106",
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26110.106",
1717
"Microsoft.Build.NoTargets": "3.7.0"
1818
}
1919
}

0 commit comments

Comments
 (0)