Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit b423f8b

Browse files
committed
Merge in 'release/3.1' changes
2 parents 2494499 + d6c68ae commit b423f8b

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -244,21 +244,21 @@
244244
</Dependency>
245245
</ProductDependencies>
246246
<ToolsetDependencies>
247-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22159.6">
247+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22260.3">
248248
<Uri>https://github.com/dotnet/arcade</Uri>
249-
<Sha>aebcd10d76469b2e84cffd39d043574bc5357d22</Sha>
249+
<Sha>65777bddfce6966941a4ade1b53efa5e5fc9c87d</Sha>
250250
</Dependency>
251-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.22159.6">
251+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.22260.3">
252252
<Uri>https://github.com/dotnet/arcade</Uri>
253-
<Sha>aebcd10d76469b2e84cffd39d043574bc5357d22</Sha>
253+
<Sha>65777bddfce6966941a4ade1b53efa5e5fc9c87d</Sha>
254254
</Dependency>
255-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.22159.6">
255+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.22260.3">
256256
<Uri>https://github.com/dotnet/arcade</Uri>
257-
<Sha>aebcd10d76469b2e84cffd39d043574bc5357d22</Sha>
257+
<Sha>65777bddfce6966941a4ade1b53efa5e5fc9c87d</Sha>
258258
</Dependency>
259-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.22159.6">
259+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.22260.3">
260260
<Uri>https://github.com/dotnet/arcade</Uri>
261-
<Sha>aebcd10d76469b2e84cffd39d043574bc5357d22</Sha>
261+
<Sha>65777bddfce6966941a4ade1b53efa5e5fc9c87d</Sha>
262262
</Dependency>
263263
<Dependency Name="Microsoft.SourceLink" Version="1.0.0-beta2-19367-01">
264264
<Uri>https://github.com/dotnet/sourcelink</Uri>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
<!--Package versions-->
6060
<PropertyGroup>
6161
<!-- arcade -->
62-
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.22159.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
63-
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.22159.6</MicrosoftDotNetBuildTasksPackagingPackageVersion>
64-
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.22159.6</MicrosoftDotNetVersionToolsTasksPackageVersion>
62+
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.22260.3</MicrosoftDotNetBuildTasksFeedPackageVersion>
63+
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.22260.3</MicrosoftDotNetBuildTasksPackagingPackageVersion>
64+
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.22260.3</MicrosoftDotNetVersionToolsTasksPackageVersion>
6565
<!-- sourcelink -->
6666
<MicrosoftSourceLinkVSTSVersion>1.0.0-beta2-19519-01</MicrosoftSourceLinkVSTSVersion>
6767
<!-- corefx -->

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"tools": {
3-
"dotnet": "3.1.100"
3+
"dotnet": "3.1.419"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22159.6"
6+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22260.3"
77
}
88
}

0 commit comments

Comments
 (0)