Skip to content

Commit

Permalink
Merge pull request 7229 from darc-internal/release/3.1-e0882eec-956c-…
Browse files Browse the repository at this point in the history
…4a1d-b3d8-4a0153647f67 into internal/release/3.1
  • Loading branch information
dotnet-bot committed Apr 13, 2020
1 parent 496f12f commit 7f7323b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<add key="darc-pub-dotnet-corefx-8a3ffed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-8a3ffed5/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-3c16cbb" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-3c16cbb0/nuget/v3/index.json" />
<add key="darc-int-dotnet-corefx-d14f55b" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-d14f55bd/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-be38cb2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-be38cb2b/nuget/v3/index.json" />
<add key="darc-int-dotnet-corefx-d6f354d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-d6f354db/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json" />
<add key="dotnet3-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json" />
Expand Down
10 changes: 5 additions & 5 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,23 +60,23 @@
</Dependency>
<Dependency Name="System.Text.Json" Version="4.7.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
<Sha>d14f55bd2920bb96138518159d573c09351d6ace</Sha>
<Sha>d6f354dba35b7a7da472450b22a45fb091f98ab9</Sha>
</Dependency>
<!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>3c16cbb071d42984dce5b16a183eedff71a47d23</Sha>
<Sha>be38cb2b9305c5875ae16e945445be256620bba2</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20208.2">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20212.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>3c16cbb071d42984dce5b16a183eedff71a47d23</Sha>
<Sha>be38cb2b9305c5875ae16e945445be256620bba2</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
<Sha>d14f55bd2920bb96138518159d573c09351d6ace</Sha>
<Sha>d6f354dba35b7a7da472450b22a45fb091f98ab9</Sha>
</Dependency>
<!-- Keep this dependency at the bottom of ProductDependencies, else it will be picked as the parent for CoherentParentDependencies -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true">
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<!-- Packages from dotnet/core-setup -->
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20208.2</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20212.2</MicrosoftNETCoreAppInternalPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
<!-- Packages from dotnet/corefx -->
<MicrosoftBclAsyncInterfacesPackageVersion>1.1.0</MicrosoftBclAsyncInterfacesPackageVersion>
Expand Down

0 comments on commit 7f7323b

Please sign in to comment.