Skip to content

Commit 64f9f4b

Browse files
[release/10.0] Source code updates from dotnet/dotnet (#311)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 9e293c9 commit 64f9f4b

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

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-976695d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-976695d4/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-a924d65" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-a924d65b/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-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

eng/Version.Details.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26062.108</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<SystemCommandLinePackageVersion>2.0.3</SystemCommandLinePackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26081.105</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<SystemCommandLinePackageVersion>2.0.4</SystemCommandLinePackageVersion>
1111
</PropertyGroup>
1212
<!--Property group for alternate package version names-->
1313
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 5 additions & 5 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 Mapping="scenario-tests" Uri="https://github.com/dotnet/dotnet" Sha="976695d40cfde0801c78b8fed85ca80e997da085" BarId="297004" />
3+
<Source Mapping="scenario-tests" Uri="https://github.com/dotnet/dotnet" Sha="a924d65b28ad47c3659ec718dc7f1e3b566f813d" BarId="299659" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="System.CommandLine" Version="2.0.3">
7+
<Dependency Name="System.CommandLine" Version="2.0.4">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
9+
<Sha>a924d65b28ad47c3659ec718dc7f1e3b566f813d</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26062.108">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26081.105">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
13+
<Sha>a924d65b28ad47c3659ec718dc7f1e3b566f813d</Sha>
1414
</Dependency>
1515
</ToolsetDependencies>
1616
</Dependencies>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
demands: ImageOverride -equals build.ubuntu.2004.amd64
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: Azure-Linux-3-Amd64
6767
os: linux
6868
${{ else }}:
6969
pool:

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.101",
3+
"dotnet": "10.0.102",
44
"runtimes": {
55
"dotnet": [
66
"8.0.0",
@@ -10,6 +10,6 @@
1010
}
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26062.108"
13+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26081.105"
1414
}
1515
}

0 commit comments

Comments
 (0)