Skip to content

Commit

Permalink
[internal/release/3.1] Update dependencies from dnceng/internal/dotne…
Browse files Browse the repository at this point in the history
…t-core-setup

- Coherency Updates:
  - System.Text.Encodings.Web: from 4.7.1 to 4.7.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  - Microsoft.NETCore.Platforms: from 3.1.4 to 3.1.5 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  • Loading branch information
dotnet-bot committed Feb 16, 2021
1 parent d760767 commit 945dd07
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
6 changes: 4 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-corefx -->
<add key="darc-int-dotnet-corefx-9299d90" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-9299d909/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-corefx -->
<!-- Begin: Package sources from dotnet-core-setup -->
<add key="darc-int-dotnet-core-setup-2155b18" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-2155b182/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-64df28e" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-64df28ec/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-core-setup -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
Expand All @@ -18,12 +19,13 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-core-setup -->
<add key="darc-int-dotnet-core-setup-2155b18" value="true" />
<add key="darc-int-dotnet-core-setup-64df28e" value="true" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="darc-int-dotnet-core-setup-0267ad0" value="true" />
<add key="darc-int-dotnet-core-setup-0267ad0" value="true" />
<!-- End: Package sources from dotnet-core-setup -->
<!-- Begin: Package sources from dotnet-corefx -->
<add key="darc-int-dotnet-corefx-9299d90" value="true" />
<add key="darc-int-dotnet-corefx-50a99d5" value="true" />
<add key="darc-int-dotnet-corefx-50a99d5" value="true" />
<!-- End: Package sources from dotnet-corefx -->
Expand Down
18 changes: 9 additions & 9 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="4.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.Text.Encodings.Web" Version="4.7.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
<Sha>059a4a19e602494bfbed473dbbb18f2dbfbd0878</Sha>
<Sha>9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e</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 @@ -83,20 +83,20 @@
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.13">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>2155b1825cee9a88eec48a7cc42e80c4a4a8ec5a</Sha>
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>64df28ec4a52d6cc23efffbb918eab87ee42600f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>3acd9b0cd16596bad450c82be08780875a73c05c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.13-servicing.21110.2">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>2155b1825cee9a88eec48a7cc42e80c4a4a8ec5a</Sha>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.13-servicing.21116.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>64df28ec4a52d6cc23efffbb918eab87ee42600f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.5" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
<Sha>50a99d5d3c6e68aecf70627897c0d862a92fc283</Sha>
<Sha>9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e</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 @@ -57,7 +57,7 @@
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.13</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.13-servicing.21110.2</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.13-servicing.21116.2</MicrosoftNETCoreAppInternalPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
<!-- Packages from dotnet/corefx -->
<MicrosoftBclAsyncInterfacesPackageVersion>1.1.1</MicrosoftBclAsyncInterfacesPackageVersion>
Expand All @@ -74,11 +74,11 @@
<SystemSecurityCryptographyCngPackageVersion>4.7.0</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.7.0</SystemSecurityCryptographyXmlPackageVersion>
<SystemServiceProcessServiceControllerPackageVersion>4.7.0</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingsWebPackageVersion>4.7.1</SystemTextEncodingsWebPackageVersion>
<SystemTextEncodingsWebPackageVersion>4.7.2</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
<SystemThreadingChannelsPackageVersion>4.7.1</SystemThreadingChannelsPackageVersion>
<!-- Workaround https://github.com/dotnet/cli/issues/10528-->
<MicrosoftNETCorePlatformsPackageVersion>3.1.4</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.1.5</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.21110.10</MicrosoftDotNetGenAPIPackageVersion>
<!-- Packages from dotnet/roslyn -->
Expand Down

0 comments on commit 945dd07

Please sign in to comment.