Skip to content

Commit

Permalink
Merge pull request 7514 from darc-internal/release/3.1-53b5fca6-849c-…
Browse files Browse the repository at this point in the history
…4962-94ba-cb43e566749d into internal/release/3.1
  • Loading branch information
dotnet-bot committed Apr 22, 2020
1 parent a49970f commit a8242d7
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 29 deletions.
6 changes: 3 additions & 3 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +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-extensions-7cc2a10" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-7cc2a109/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-extensions-3b1f2b7" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-3b1f2b7c/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="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,70 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.4-servicing.20214.9">
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.4-servicing.20221.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>7cc2a109d98493cf617de56709ec188fa5cd3fc1</Sha>
<Sha>3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.4-servicing.20214.9">
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.4-servicing.20221.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>7cc2a109d98493cf617de56709ec188fa5cd3fc1</Sha>
<Sha>3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.4-servicing.20214.9">
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.4-servicing.20221.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>7cc2a109d98493cf617de56709ec188fa5cd3fc1</Sha>
<Sha>3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>7cc2a109d98493cf617de56709ec188fa5cd3fc1</Sha>
<Sha>3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.4-servicing.20214.9">
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.4-servicing.20221.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>7cc2a109d98493cf617de56709ec188fa5cd3fc1</Sha>
<Sha>3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.4-servicing.20214.9">
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.4-servicing.20221.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>7cc2a109d98493cf617de56709ec188fa5cd3fc1</Sha>
<Sha>3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb</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>
<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.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.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.Runtime.CompilerServices.Unsafe" Version="4.7.1" Pinned="true">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>8a3ffed558ddf943c1efa87d693227722d6af094</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.4" CoherentParentDependency="Microsoft.Extensions.Logging">
<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" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20221.3" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>009061358022e51c62bef1daa3535a08ca122750</Sha>
<Sha>0c2e69caa609d5164e16df91d6d646eb9ed74640</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">
<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" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>009061358022e51c62bef1daa3535a08ca122750</Sha>
<Sha>0c2e69caa609d5164e16df91d6d646eb9ed74640</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.4-servicing.20214.9</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.1.4-servicing.20214.9</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.4-servicing.20214.9</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.4-servicing.20221.11</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.1.4-servicing.20221.11</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.4-servicing.20221.11</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.4</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.4-servicing.20214.9</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.4-servicing.20221.11</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.1.4</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.4-servicing.20214.9</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.4-servicing.20221.11</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<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>
<MicrosoftNETCorePlatformsPackageVersion>3.1.1</MicrosoftNETCorePlatformsPackageVersion>
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.7.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
Expand Down

0 comments on commit a8242d7

Please sign in to comment.