Skip to content

Commit

Permalink
Merge pull request #1998 from dotnet/wtgodbe/316
Browse files Browse the repository at this point in the history
 Update branding to 3.1.6
  • Loading branch information
wtgodbe authored Jun 9, 2020
2 parents 6d2ff72 + 56dfdf1 commit cef995f
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
36 changes: 18 additions & 18 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.4-servicing.20221.11">
<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>3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb</Sha>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.4-servicing.20221.11">
<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>3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb</Sha>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.4-servicing.20221.11">
<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>3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb</Sha>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.4">
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb</Sha>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.4-servicing.20221.11">
<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>3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb</Sha>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.4-servicing.20221.11">
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.5-servicing.20270.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb</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 @@ -45,13 +45,13 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>8a3ffed558ddf943c1efa87d693227722d6af094</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.4" CoherentParentDependency="Microsoft.Extensions.Logging">
<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>0c2e69caa609d5164e16df91d6d646eb9ed74640</Sha>
<Sha>65cd7897774a464b5991c1962f7a0d476bb63101</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20221.3" 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>0c2e69caa609d5164e16df91d6d646eb9ed74640</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 @@ -62,9 +62,9 @@
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">
<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>0c2e69caa609d5164e16df91d6d646eb9ed74640</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
20 changes: 10 additions & 10 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PropertyGroup>
<MajorVersion>3</MajorVersion>
<MinorVersion>1</MinorVersion>
<PatchVersion>5</PatchVersion>
<PatchVersion>6</PatchVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
Expand Down Expand Up @@ -47,16 +47,16 @@
-->
<PropertyGroup Label="Automated">
<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.20221.11</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.1.4</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.4-servicing.20221.11</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<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.9</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.1.5</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.5-servicing.20270.9</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20221.3</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<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 cef995f

Please sign in to comment.