Skip to content

Commit de5715f

Browse files
Merge pull request #376 from dotnet/darc-release/10.0-ffc62edd-704e-4b09-b4c8-755c11f1a11f
[release/10.0] Source code updates from dotnet/dotnet
2 parents 1536a1c + 5fd9ddd commit de5715f

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
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.25563.104</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25578.106</MicrosoftDotNetArcadeSdkPackageVersion>
1010
</PropertyGroup>
1111
<!--Property group for alternate package version names-->
1212
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="symreader" Sha="93970af2dae989c795efb703be9a25ff95079f25" BarId="290774" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="symreader" Sha="ba5cda19aa70d59758a74b7d36c90e009b32f6f0" BarId="292661" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25563.104">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25578.106">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
9+
<Sha>ba5cda19aa70d59758a74b7d36c90e009b32f6f0</Sha>
1010
</Dependency>
1111
</ToolsetDependencies>
1212
</Dependencies>

eng/Versions.props

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
<Import Project="Version.Details.props" />
44

55
<PropertyGroup>
6-
<VersionPrefix>2.2.1</VersionPrefix>
7-
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
6+
<VersionPrefix>2.2.2</VersionPrefix>
7+
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
8+
<PreReleaseVersionIteration></PreReleaseVersionIteration>
9+
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
10+
<DotNetFinalVersionKind></DotNetFinalVersionKind>
11+
812
<!-- Opt-in/out repo features -->
913
<UsingToolPdbConverter>false</UsingToolPdbConverter>
1014
<UsingToolNuGetRepack>true</UsingToolNuGetRepack>

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.2.25502.107",
3+
"version": "10.0.100",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature",
66
"paths": [
@@ -10,9 +10,9 @@
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.2.25502.107"
13+
"dotnet": "10.0.100"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25563.104"
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25578.106"
1717
}
1818
}

0 commit comments

Comments
 (0)