Skip to content

Commit

Permalink
Merge pull request 9228 from darc-internal/release/3.1-5c7c7a65-f1fe-…
Browse files Browse the repository at this point in the history
…47a6-9cbb-87101307ef38 into internal/release/3.1
  • Loading branch information
dotnet-bot committed Jul 22, 2020
1 parent 085e2dd commit 784b0ff
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
4 changes: 3 additions & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
<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-bed3814" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-bed38147/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-fcfdef8-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-fcfdef8d-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-fcfdef8" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-fcfdef8d/nuget/v3/index.json" />
<add key="darc-int-dotnet-corefx-36b8b8e" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-36b8b8e2/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" />
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,17 @@
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.6">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>bed381477994a1fc59f84b39b9e00d34324c858e</Sha>
<Sha>fcfdef8d6ba770e4d7ba9efefe2591d8c33a1fc6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.6-servicing.20324.2">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.7-servicing.20371.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>bed381477994a1fc59f84b39b9e00d34324c858e</Sha>
<Sha>fcfdef8d6ba770e4d7ba9efefe2591d8c33a1fc6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
<Sha>059a4a19e602494bfbed473dbbb18f2dbfbd0878</Sha>
<Sha>36b8b8e26a8e2e06e000f59e19910d117bf0025b</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
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/core-setup -->
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.6-servicing.20324.2</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.7-servicing.20371.4</MicrosoftNETCoreAppInternalPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
<!-- Packages from dotnet/corefx -->
<MicrosoftBclAsyncInterfacesPackageVersion>1.1.1</MicrosoftBclAsyncInterfacesPackageVersion>
Expand All @@ -73,7 +73,7 @@
<SystemTextEncodingsWebPackageVersion>4.7.1</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
<!-- Workaround https://github.com/dotnet/cli/issues/10528-->
<MicrosoftNETCorePlatformsPackageVersion>3.1.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.1.2</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20213.4</MicrosoftDotNetGenAPIPackageVersion>
<!-- Packages from dotnet/roslyn -->
Expand Down

0 comments on commit 784b0ff

Please sign in to comment.