Skip to content

Commit

Permalink
Merge pull request 8097 from darc-internal/release/3.1-78e15a1d-0c83-…
Browse files Browse the repository at this point in the history
…4c53-a1ef-bdf1dfa6176e into internal/release/3.1
  • Loading branch information
dotnet-bot committed May 21, 2020
1 parent 6fae23d commit 0e01666
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 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-extensions-9a2cbbc" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-9a2cbbc9/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-08b412c" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-08b412cd/nuget/v3/index.json" />
<add key="darc-int-dotnet-extensions-877455f" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-877455ff/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-65cd789" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-65cd7897/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="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
Expand Down
30 changes: 15 additions & 15 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.5-servicing.20270.6">
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.5-servicing.20270.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>9a2cbbc919167b0ff3f2d25f58a55a18d96e5189</Sha>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.5-servicing.20270.6">
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.5-servicing.20270.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>9a2cbbc919167b0ff3f2d25f58a55a18d96e5189</Sha>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.5-servicing.20270.6">
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.5-servicing.20270.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>9a2cbbc919167b0ff3f2d25f58a55a18d96e5189</Sha>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>9a2cbbc919167b0ff3f2d25f58a55a18d96e5189</Sha>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.5-servicing.20270.6">
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.5-servicing.20270.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>9a2cbbc919167b0ff3f2d25f58a55a18d96e5189</Sha>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.5-servicing.20270.6">
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.5-servicing.20270.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>9a2cbbc919167b0ff3f2d25f58a55a18d96e5189</Sha>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</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>
Expand All @@ -47,11 +47,11 @@
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.5" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>08b412cdbca480c6784c77b2bee195e0693186d4</Sha>
<Sha>65cd7897774a464b5991c1962f7a0d476bb63101</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.5-servicing.20270.1" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.5-servicing.20270.5" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>08b412cdbca480c6784c77b2bee195e0693186d4</Sha>
<Sha>65cd7897774a464b5991c1962f7a0d476bb63101</Sha>
</Dependency>
<!-- Listed as a dependency to workaround https://github.com/dotnet/cli/issues/10528 -->
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
Expand All @@ -64,7 +64,7 @@
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.5" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>08b412cdbca480c6784c77b2bee195e0693186d4</Sha>
<Sha>65cd7897774a464b5991c1962f7a0d476bb63101</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
12 changes: 6 additions & 6 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@
-->
<PropertyGroup Label="Automated">
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.5-servicing.20270.6</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.1.5-servicing.20270.6</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.5-servicing.20270.6</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.5-servicing.20270.9</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.1.5-servicing.20270.9</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.5-servicing.20270.9</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.5</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.5-servicing.20270.6</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.5-servicing.20270.9</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.1.5</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.5-servicing.20270.6</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.5-servicing.20270.9</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.5-servicing.20270.1</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.5-servicing.20270.5</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.1.1</MicrosoftNETCorePlatformsPackageVersion>
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.7.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
Expand Down

0 comments on commit 0e01666

Please sign in to comment.