Skip to content

Commit

Permalink
Merging internal commits for release/3.1 (#34309)
Browse files Browse the repository at this point in the history
* [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-efcore

* [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-aspnetcore-tooling

 - Merge remote-tracking branch 'origin/internal/release/3.1' into darc-internal/release/3.1-453f35a7-98c5-426b-be65-d9f77e888b5c

* Update baseline/SDK

Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: Will Godbe <wigodbe@microsoft.com>
  • Loading branch information
3 people committed Jul 13, 2021
2 parents 70f1620 + 1102978 commit 92460fb
Show file tree
Hide file tree
Showing 6 changed files with 516 additions and 508 deletions.
8 changes: 8 additions & 0 deletions NuGet.config
Expand Up @@ -4,14 +4,18 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
<add key="darc-int-dotnet-aspnetcore-tooling-cd61ca2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-cd61ca2e/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
<!-- Begin: Package sources from dotnet-corefx -->
<!-- End: Package sources from dotnet-corefx -->
<!-- Begin: Package sources from dotnet-core-setup -->
<add key="darc-int-dotnet-core-setup-3a75b80" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-3a75b805/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-core-setup -->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-f81aa66" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-f81aa66b/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-extensions -->
<add key="darc-int-dotnet-extensions-904ee5c" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-904ee5cc/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-extensions -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
Expand All @@ -24,12 +28,16 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-extensions -->
<add key="darc-int-dotnet-extensions-904ee5c" value="true" />
<!-- End: Package sources from dotnet-extensions -->
<!-- Begin: Package sources from dotnet-aspnetcore-tooling -->
<add key="darc-int-dotnet-aspnetcore-tooling-cd61ca2" value="true" />
<!-- End: Package sources from dotnet-aspnetcore-tooling -->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-f81aa66" value="true" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-core-setup -->
<add key="darc-int-dotnet-core-setup-3a75b80" value="true" />
<!-- End: Package sources from dotnet-core-setup -->
<!-- Begin: Package sources from dotnet-corefx -->
<!-- End: Package sources from dotnet-corefx -->
Expand Down

0 comments on commit 92460fb

Please sign in to comment.