Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Commit

Permalink
Merge in 'release/3.0' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Dec 4, 2019
2 parents fd11277 + b7dd5af commit a2c3406
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<add key="darc-pub-dotnet-standard-a5b5f2e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-standard-a5b5f2e1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-corefx-e14c43e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-e14c43ea/nuget/v3/index.json" />
<add key="darc-pub-dotnet-corefx-c177851" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-c1778515/nuget/v3/index.json" />
<add key="darc-pub-dotnet-corefx-4ac4c03" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-4ac4c036/nuget/v3/index.json" />
<add key="darc-pub-dotnet-corefx-2a67785" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-2a67785e/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!--
'src/test/PrepareTestAssets/PrepareTestAssets.proj' generates a NuGet.config file using this
Expand Down
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>2a67785e42133ba0f16b85cd4f424d98c68d073b</Sha>
<Sha>e14c43ea3f727d1ed8844014aae8b168cc608b22</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Targets" Version="3.0.0">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>4ac4c0367003fe3973a3648eb0715ddb0e3bbcea</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-servicing.19577.1">
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-servicing.19577.8">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>2a67785e42133ba0f16b85cd4f424d98c68d073b</Sha>
<Sha>e14c43ea3f727d1ed8844014aae8b168cc608b22</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="4.6.0">
<Uri>https://github.com/dotnet/corefx</Uri>
Expand Down Expand Up @@ -51,7 +51,7 @@
</Dependency>
<Dependency Name="System.Drawing.Common" Version="4.6.2">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>2a67785e42133ba0f16b85cd4f424d98c68d073b</Sha>
<Sha>e14c43ea3f727d1ed8844014aae8b168cc608b22</Sha>
</Dependency>
<Dependency Name="System.IO.FileSystem.AccessControl" Version="4.6.0">
<Uri>https://github.com/dotnet/corefx</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<!-- corefx -->
<MicrosoftNETCorePlatformsPackageVersion>3.0.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreTargetsPackageVersion>3.0.0</MicrosoftNETCoreTargetsPackageVersion>
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.6.0-servicing.19577.1</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.6.0-servicing.19577.8</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
<MicrosoftWin32RegistryAccessControlVersion>4.6.0</MicrosoftWin32RegistryAccessControlVersion>
<MicrosoftWin32RegistryVersion>4.6.0</MicrosoftWin32RegistryVersion>
<MicrosoftWin32SystemEventsVersion>4.6.0</MicrosoftWin32SystemEventsVersion>
Expand Down

0 comments on commit a2c3406

Please sign in to comment.