Skip to content

Commit e1a0c64

Browse files
[main] Source code updates from dotnet/dotnet (#1444)
* Update dependencies from https://github.com/dotnet/dotnet build 288405 Updated Dependencies: Microsoft.Build, Microsoft.Build.Utilities.Core (Version 18.1.0-preview-25522-101 -> 18.1.0-preview-25523-109) Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25522.101 -> 11.0.0-beta.25523.109) Microsoft.DotNet.GenAPI.Task (Version 10.0.100-rc.2.25522.101 -> 10.0.100-rc.2.25523.109) Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm (Version 10.0.0-rc.1.25522.101 -> 10.0.0-rc.1.25523.109) * Update dependencies from https://github.com/dotnet/dotnet build 288511 Updated Dependencies: Microsoft.Build, Microsoft.Build.Utilities.Core (Version 18.1.0-preview-25523-109 -> 18.1.0-preview-25524-105) Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25523.109 -> 11.0.0-beta.25524.105) Microsoft.DotNet.GenAPI.Task (Version 10.0.100-rc.2.25523.109 -> 10.0.100-rc.2.25524.105) Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm (Version 10.0.0-rc.1.25523.109 -> 10.0.0-rc.1.25524.105) * Update dependencies from https://github.com/dotnet/dotnet build 288571 Updated Dependencies: Microsoft.Build, Microsoft.Build.Utilities.Core (Version 18.1.0-preview-25524-105 -> 18.1.0-preview-25524-106) Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25524.105 -> 11.0.0-beta.25524.106) Microsoft.DotNet.GenAPI.Task (Version 10.0.100-rc.2.25524.105 -> 10.0.100-rc.2.25524.106) Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm (Version 10.0.0-rc.1.25524.105 -> 10.0.0-rc.1.25524.106) * Update dependencies from https://github.com/dotnet/dotnet build 288768 Updated Dependencies: Microsoft.Build, Microsoft.Build.Utilities.Core (Version 18.1.0-preview-25524-106 -> 18.1.0-preview-25527-104) Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25524.106 -> 11.0.0-beta.25527.104) Microsoft.DotNet.GenAPI.Task (Version 10.0.100-rc.2.25524.106 -> 10.0.100-rc.2.25527.104) Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm (Version 10.0.0-rc.1.25524.106 -> 10.0.0-rc.1.25527.104) * Update dependencies from https://github.com/dotnet/dotnet build 288891 Updated Dependencies: Microsoft.Build, Microsoft.Build.Utilities.Core (Version 18.1.0-preview-25527-104 -> 18.1.0-preview-25528-102) Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25527.104 -> 11.0.0-beta.25528.102) Microsoft.DotNet.GenAPI.Task (Version 10.0.100-rc.2.25527.104 -> 10.0.100-rc.2.25528.102) Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm (Version 10.0.0-rc.1.25527.104 -> 10.0.0-rc.1.25528.102) * Update dependencies from https://github.com/dotnet/dotnet build 288940 Updated Dependencies: Microsoft.Build, Microsoft.Build.Utilities.Core (Version 18.1.0-preview-25528-102 -> 18.1.0-preview-25529-101) Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25528.102 -> 11.0.0-beta.25529.101) Microsoft.DotNet.GenAPI.Task (Version 10.0.100-rc.2.25528.102 -> 10.0.100-rc.2.25529.101) Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm (Version 10.0.0-rc.1.25528.102 -> 10.0.0-rc.1.25529.101) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Michael Simons <[email protected]>
1 parent 1a7981f commit e1a0c64

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

eng/Version.Details.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftBuildPackageVersion>18.1.0-preview-25522-101</MicrosoftBuildPackageVersion>
10-
<MicrosoftBuildUtilitiesCorePackageVersion>18.1.0-preview-25522-101</MicrosoftBuildUtilitiesCorePackageVersion>
11-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25522.101</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-rc.2.25522.101</MicrosoftDotNetGenAPITaskPackageVersion>
13-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25522.101</MicrosoftNETCoreILAsmPackageVersion>
14-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.1.25522.101</MicrosoftNETCoreILDAsmPackageVersion>
9+
<MicrosoftBuildPackageVersion>18.1.0-preview-25529-101</MicrosoftBuildPackageVersion>
10+
<MicrosoftBuildUtilitiesCorePackageVersion>18.1.0-preview-25529-101</MicrosoftBuildUtilitiesCorePackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25529.101</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-rc.2.25529.101</MicrosoftDotNetGenAPITaskPackageVersion>
13+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25529.101</MicrosoftNETCoreILAsmPackageVersion>
14+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.1.25529.101</MicrosoftNETCoreILDAsmPackageVersion>
1515
</PropertyGroup>
1616
<!--Property group for alternate package version names-->
1717
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="2e13727a96e95d0856ff9fa35bb896b1c1b633e6" BarId="288109" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="cdc420f453860b662a76fcc72672ed2a65243146" BarId="288940" />
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25522-101">
5+
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25529-101">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
7+
<Sha>cdc420f453860b662a76fcc72672ed2a65243146</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25522-101">
9+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25529-101">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
11+
<Sha>cdc420f453860b662a76fcc72672ed2a65243146</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25522.101">
13+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25529.101">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
15+
<Sha>cdc420f453860b662a76fcc72672ed2a65243146</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-rc.2.25522.101">
17+
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-rc.2.25529.101">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
19+
<Sha>cdc420f453860b662a76fcc72672ed2a65243146</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25522.101">
21+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25529.101">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
23+
<Sha>cdc420f453860b662a76fcc72672ed2a65243146</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.1.25522.101">
25+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.1.25529.101">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>2e13727a96e95d0856ff9fa35bb896b1c1b633e6</Sha>
27+
<Sha>cdc420f453860b662a76fcc72672ed2a65243146</Sha>
2828
</Dependency>
2929
</ToolsetDependencies>
3030
</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.100-rc.1.25420.111",
3+
"version": "10.0.100-rc.2.25502.107",
44
"allowPrerelease": true,
55
"rollForward": "latestPatch",
66
"paths": [
@@ -10,11 +10,11 @@
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.100-rc.1.25420.111"
13+
"dotnet": "10.0.100-rc.2.25502.107"
1414
},
1515
"msbuild-sdks": {
1616
"Microsoft.Build.NoTargets": "3.7.0",
1717
"Microsoft.Build.Traversal": "3.4.0",
18-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25522.101"
18+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25529.101"
1919
}
2020
}

0 commit comments

Comments
 (0)