Skip to content

Commit 4a1791f

Browse files
authored
Merge branch 'release/3.1' into internal-merge-3.1-2021-12-14-0958
2 parents 2b2eb8e + 34cb0b5 commit 4a1791f

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

NuGet.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@
3737
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
3838
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
3939
<!-- Begin: Package sources from dotnet-efcore -->
40-
<add key="darc-int-dotnet-efcore-5407d86" value="true" />
4140
<!-- End: Package sources from dotnet-efcore -->
4241
<!-- Begin: Package sources from dotnet-core-setup -->
43-
<add key="darc-int-dotnet-core-setup-35fa579" value="true" />
4442
<!-- End: Package sources from dotnet-core-setup -->
4543
<!-- Begin: Package sources from dotnet-corefx -->
4644
<!-- End: Package sources from dotnet-corefx -->

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,13 +418,13 @@
418418
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
419419
<Sha>d8690e6fcc4bc6c2ae77a1b748f87040180894fc</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21552.6">
421+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21561.2">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>afb79612f8e0b62603d9c1a614d7e4cf3f54a1e7</Sha>
423+
<Sha>3df4410511ad9900804da00ec680bd1c7d6f21e1</Sha>
424424
</Dependency>
425-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21552.6">
425+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21561.2">
426426
<Uri>https://github.com/dotnet/arcade</Uri>
427-
<Sha>afb79612f8e0b62603d9c1a614d7e4cf3f54a1e7</Sha>
427+
<Sha>3df4410511ad9900804da00ec680bd1c7d6f21e1</Sha>
428428
</Dependency>
429429
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.22-servicing.21571.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
430430
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
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.21552.6</MicrosoftDotNetGenAPIPackageVersion>
67+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21561.2</MicrosoftDotNetGenAPIPackageVersion>
6868
<!-- Packages from dotnet/roslyn -->
6969
<MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
7070
<!-- Packages from dotnet/core-setup -->

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
},
2727
"msbuild-sdks": {
2828
"Yarn.MSBuild": "1.15.2",
29-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21552.6"
29+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21561.2"
3030
}
3131
}

0 commit comments

Comments
 (0)