Skip to content

Commit f46c7cc

Browse files
[release/10.0.2xx] Source code updates from dotnet/dotnet (#1622)
* Update dependencies from build 305203 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26154.108 -> 10.0.0-beta.26159.104) [[ commit created by automation ]] * Update dependencies from build 305491 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26159.104 -> 10.0.0-beta.26160.106) [[ commit created by automation ]] * Backflow from https://github.com/dotnet/dotnet / 5433049 build 305986 [[ commit created by automation ]] * Update dependencies from build 305986 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26160.106 -> 10.0.0-beta.26162.117) System.CommandLine (Version 2.0.0 -> 2.0.4) System.IO.Hashing (Version 10.0.0-rc.2.25502.107 -> 10.0.4) [[ commit created by automation ]] * Update dependencies from build 306140 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26162.117 -> 10.0.0-beta.26163.114) [[ commit created by automation ]] * Update dependencies from build 306236 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26163.114 -> 10.0.0-beta.26165.105) [[ commit created by automation ]] * Update dependencies from build 306392 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26165.105 -> 10.0.0-beta.26166.107) [[ commit created by automation ]] * Update dependencies from build 306501 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26166.107 -> 10.0.0-beta.26167.101) [[ commit created by automation ]] * Update dependencies from build 306748 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26167.101 -> 10.0.0-beta.26168.103) [[ commit created by automation ]] --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent adae29f commit f46c7cc

4 files changed

Lines changed: 25 additions & 17 deletions

File tree

NuGet.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,20 @@
22
<configuration>
33
<packageSources>
44
<clear />
5+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6+
<!-- Begin: Package sources from dotnet-dotnet -->
7+
<!-- End: Package sources from dotnet-dotnet -->
8+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
59
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
610
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
711
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
812
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
913
</packageSources>
1014
<disabledPackageSources>
1115
<clear />
16+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
17+
<!-- Begin: Package sources from dotnet-dotnet -->
18+
<!-- End: Package sources from dotnet-dotnet -->
19+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1220
</disabledPackageSources>
1321
</configuration>

eng/Version.Details.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ This file should be imported by eng/Versions.props
55
-->
66
<Project>
77
<PropertyGroup>
8-
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26154.108</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<SystemCommandLinePackageVersion>2.0.0</SystemCommandLinePackageVersion>
11-
<SystemIOHashingPackageVersion>10.0.0-rc.2.25502.107</SystemIOHashingPackageVersion>
8+
<!-- dotnet-dotnet dependencies -->
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26168.103</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<SystemCommandLinePackageVersion>2.0.4</SystemCommandLinePackageVersion>
11+
<SystemIOHashingPackageVersion>10.0.4</SystemIOHashingPackageVersion>
1212
</PropertyGroup>
1313
<!--Property group for alternate package version names-->
1414
<PropertyGroup>
15-
<!-- dotnet/dotnet dependencies -->
15+
<!-- dotnet-dotnet dependencies -->
1616
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
1717
<SystemCommandLineVersion>$(SystemCommandLinePackageVersion)</SystemCommandLineVersion>
1818
<SystemIOHashingVersion>$(SystemIOHashingPackageVersion)</SystemIOHashingVersion>

eng/Version.Details.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="4ab01111b06a13386ff3a0fb3616bf28d7931cea" BarId="304527" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="326f53c34d4d3e0dbc61e42ad2d0a459d5402ce4" BarId="306748" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="2.0.0">
6-
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>3a0c62bf027fbcb8683a13e78a5b21ae19028ca3</Sha>
5+
<Dependency Name="System.CommandLine" Version="2.0.4">
6+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
7+
<Sha>80d3e14f5e08b4888f464e3cd0d0b2445b63ec46</Sha>
88
</Dependency>
9-
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.2.25502.107">
10-
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
9+
<Dependency Name="System.IO.Hashing" Version="10.0.4">
10+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
11+
<Sha>80d3e14f5e08b4888f464e3cd0d0b2445b63ec46</Sha>
1212
</Dependency>
1313
</ProductDependencies>
1414
<ToolsetDependencies>
15-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26154.108">
15+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26168.103">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>4ab01111b06a13386ff3a0fb3616bf28d7931cea</Sha>
17+
<Sha>326f53c34d4d3e0dbc61e42ad2d0a459d5402ce4</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.103",
3+
"version": "10.0.201",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature",
66
"paths": [
@@ -10,10 +10,10 @@
1010
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
1111
},
1212
"tools": {
13-
"dotnet": "10.0.103"
13+
"dotnet": "10.0.201"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26154.108",
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26168.103",
1717
"Microsoft.Build.NoTargets": "3.7.0"
1818
}
1919
}

0 commit comments

Comments
 (0)