Skip to content

Commit ff20cfc

Browse files
committed
Merge in 'release/3.1' changes
2 parents 537e03d + 4100c7f commit ff20cfc

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

eng/Version.Details.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@
6767
<Uri>https://github.com/dotnet/core-setup</Uri>
6868
<Sha>1a04dd08e56bf52e88668c1ef2bd3f630ad442a5</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21158.9">
70+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21161.1">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>ab42d248928f65dd174a2383f3256e68d9379bb7</Sha>
72+
<Sha>9467b1074927ee3fe98d539d3b72f5686c861958</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.21158.9">
74+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.21161.1">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>ab42d248928f65dd174a2383f3256e68d9379bb7</Sha>
76+
<Sha>9467b1074927ee3fe98d539d3b72f5686c861958</Sha>
7777
</Dependency>
7878
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
7979
<Uri>https://github.com/dotnet/corefx</Uri>
@@ -99,17 +99,17 @@
9999
<Uri>https://github.com/dotnet/coreclr</Uri>
100100
<Sha>c2e8c9f71737d87a95610851587e2a1eaf18c91c</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21158.9">
102+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21161.1">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>ab42d248928f65dd174a2383f3256e68d9379bb7</Sha>
104+
<Sha>9467b1074927ee3fe98d539d3b72f5686c861958</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.21158.9">
106+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.21161.1">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>ab42d248928f65dd174a2383f3256e68d9379bb7</Sha>
108+
<Sha>9467b1074927ee3fe98d539d3b72f5686c861958</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21158.9">
110+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21161.1">
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112-
<Sha>ab42d248928f65dd174a2383f3256e68d9379bb7</Sha>
112+
<Sha>9467b1074927ee3fe98d539d3b72f5686c861958</Sha>
113113
</Dependency>
114114
<Dependency Name="System.Resources.Extensions" Version="4.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
115115
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>

eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
</PropertyGroup>
5353
<!-- Packages that come from https://github.com/dotnet/arcade -->
5454
<PropertyGroup>
55-
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.21158.9</MicrosoftDotNetApiCompatVersion>
56-
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.21158.9</MicrosoftDotNetCodeAnalysisPackageVersion>
57-
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.21158.9</MicrosoftDotNetGenAPIVersion>
55+
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.21161.1</MicrosoftDotNetApiCompatVersion>
56+
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.21161.1</MicrosoftDotNetCodeAnalysisPackageVersion>
57+
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.21161.1</MicrosoftDotNetGenAPIVersion>
5858
</PropertyGroup>
5959
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
6060
<PropertyGroup>

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21158.9",
16-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21158.9"
15+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21161.1",
16+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21161.1"
1717
},
1818
"native-tools": {
1919
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)