Skip to content

Commit

Permalink
Merge pull request 7503 from darc-internal/release/3.1-844a35d0-17c1-…
Browse files Browse the repository at this point in the history
…4eeb-b9df-9e3f3dd6d324 into internal/release/3.1
  • Loading branch information
dotnet-bot committed Apr 22, 2020
1 parent 7cc2a10 commit 3b1f2b7
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 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-0090613" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-00906135/nuget/v3/index.json" />
<add key="darc-int-dotnet-corefx-c416492" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-c4164928/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-0c2e69c" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0c2e69ca/nuget/v3/index.json" />
<add key="darc-int-dotnet-corefx-059a4a1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-059a4a19/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
18 changes: 9 additions & 9 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ProductDependencies>
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
<Sha>c4164928b270ee2369808ab347d33423ef765216</Sha>
<Sha>059a4a19e602494bfbed473dbbb18f2dbfbd0878</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="4.7.0" Pinned="true">
<Uri>https://github.com/dotnet/corefx</Uri>
Expand All @@ -24,7 +24,7 @@
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="4.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
<Sha>c4164928b270ee2369808ab347d33423ef765216</Sha>
<Sha>059a4a19e602494bfbed473dbbb18f2dbfbd0878</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
Expand All @@ -36,7 +36,7 @@
</Dependency>
<Dependency Name="System.Reflection.Metadata" Version="1.8.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
<Sha>c4164928b270ee2369808ab347d33423ef765216</Sha>
<Sha>059a4a19e602494bfbed473dbbb18f2dbfbd0878</Sha>
</Dependency>
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" Pinned="true">
<Uri>https://github.com/dotnet/corefx</Uri>
Expand All @@ -56,27 +56,27 @@
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="4.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
<Sha>c4164928b270ee2369808ab347d33423ef765216</Sha>
<Sha>059a4a19e602494bfbed473dbbb18f2dbfbd0878</Sha>
</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>c4164928b270ee2369808ab347d33423ef765216</Sha>
<Sha>059a4a19e602494bfbed473dbbb18f2dbfbd0878</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>009061358022e51c62bef1daa3535a08ca122750</Sha>
<Sha>0c2e69caa609d5164e16df91d6d646eb9ed74640</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20214.5">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20221.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>009061358022e51c62bef1daa3535a08ca122750</Sha>
<Sha>0c2e69caa609d5164e16df91d6d646eb9ed74640</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>c4164928b270ee2369808ab347d33423ef765216</Sha>
<Sha>059a4a19e602494bfbed473dbbb18f2dbfbd0878</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.20214.5</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20221.3</MicrosoftNETCoreAppInternalPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
<!-- Packages from dotnet/corefx -->
<MicrosoftBclAsyncInterfacesPackageVersion>1.1.1</MicrosoftBclAsyncInterfacesPackageVersion>
Expand Down

0 comments on commit 3b1f2b7

Please sign in to comment.