Skip to content

Commit

Permalink
[release/3.1] Update dependencies from dotnet/roslyn dotnet/core-setup (
Browse files Browse the repository at this point in the history
#2875)

* Update dependencies from https://github.com/dotnet/roslyn build 20191214.1

- Microsoft.Net.Compilers.Toolset - 3.4.1-beta4-19614-01

* Update dependencies from https://github.com/dotnet/core-setup build 20200116.9

- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20066.9
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2

Dependency coherency updates

- System.Text.Json - 4.7.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  • Loading branch information
dotnet-maestro[bot] authored and wtgodbe committed Jan 17, 2020
1 parent f104d44 commit decdd34
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-corefx-07080ce" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-07080cea/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" />
<add key="dotnet3-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json" />
Expand Down
14 changes: 7 additions & 7 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,21 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.Text.Json" Version="4.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
<Sha>07080ceab1e5b305d8a5fecd9d5b793fb502d57a</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.2">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>1213474f57d85484c2bc0646198976b8f29fb030</Sha>
<Sha>08d54755cdc438ae06b4d8b26cc76f0908fe1209</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.2-servicing.20066.6">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.2-servicing.20066.9">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>1213474f57d85484c2bc0646198976b8f29fb030</Sha>
<Sha>08d54755cdc438ae06b4d8b26cc76f0908fe1209</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
Expand Down Expand Up @@ -101,9 +101,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4d80b9cfa53e309c8f685abff3512f60c3d8a3d1</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.4.0-beta4-19569-03">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.4.1-beta4-19614-01">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>82f2e2541478e239dc4b04f231e90dc2b3dcb422</Sha>
<Sha>165046097562cfe65b09c2e9a9d8f7cd88526f2c</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<!-- Packages from dotnet/core-setup -->
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.2-servicing.20066.6</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.2-servicing.20066.9</MicrosoftNETCoreAppInternalPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
<!-- Packages from dotnet/corefx -->
<MicrosoftBclAsyncInterfacesPackageVersion>1.1.0</MicrosoftBclAsyncInterfacesPackageVersion>
Expand All @@ -71,13 +71,13 @@
<SystemSecurityCryptographyXmlPackageVersion>4.7.0</SystemSecurityCryptographyXmlPackageVersion>
<SystemServiceProcessServiceControllerPackageVersion>4.7.0</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingsWebPackageVersion>4.7.0</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>4.7.0</SystemTextJsonPackageVersion>
<SystemTextJsonPackageVersion>4.7.1</SystemTextJsonPackageVersion>
<!-- Workaround https://github.com/dotnet/cli/issues/10528-->
<MicrosoftNETCorePlatformsPackageVersion>3.1.0</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19607.3</MicrosoftDotNetGenAPIPackageVersion>
<!-- Packages from dotnet/roslyn -->
<MicrosoftNetCompilersToolsetVersion>3.4.0-beta4-19569-03</MicrosoftNetCompilersToolsetVersion>
<MicrosoftNetCompilersToolsetVersion>3.4.1-beta4-19614-01</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<PropertyGroup Label="Dependency version settings">
<!--
Expand Down

0 comments on commit decdd34

Please sign in to comment.