Skip to content

Commit ec2894b

Browse files
committed
Merge in 'release/3.1' changes
2 parents be1461c + dd80dab commit ec2894b

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -418,17 +418,17 @@
418418
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
419419
<Sha>904ee5cc71a77faea808d43636a4e3e8c175c006</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21228.7">
421+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21322.2">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
423+
<Sha>1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e</Sha>
424424
</Dependency>
425-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21228.7">
425+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21322.2">
426426
<Uri>https://github.com/dotnet/arcade</Uri>
427-
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
427+
<Sha>1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e</Sha>
428428
</Dependency>
429-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21228.7">
429+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21322.2">
430430
<Uri>https://github.com/dotnet/arcade</Uri>
431-
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
431+
<Sha>1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e</Sha>
432432
</Dependency>
433433
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.17-servicing.21315.14" CoherentParentDependency="Microsoft.EntityFrameworkCore">
434434
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
-->
6565
<PropertyGroup Label="Automated">
6666
<!-- Packages from dotnet/arcade -->
67-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21228.7</MicrosoftDotNetGenAPIPackageVersion>
67+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21322.2</MicrosoftDotNetGenAPIPackageVersion>
6868
<!-- Packages from dotnet/roslyn -->
6969
<MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
7070
<!-- Packages from dotnet/core-setup -->

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
"msbuild-sdks": {
2828
"Yarn.MSBuild": "1.15.2",
29-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21228.7",
30-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21228.7"
29+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21322.2",
30+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21322.2"
3131
}
3232
}

0 commit comments

Comments
 (0)