Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/core-setup build 2…
Browse files Browse the repository at this point in the history
…0190913.05 (#1265)

- Microsoft.NETCore.App.Ref - 3.0.0
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0

Dependency coherency updates

- Microsoft.CSharp - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.CodeDom - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Configuration.ConfigurationManager - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Data.SqlClient - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  • Loading branch information
dotnet-maestro[bot] authored Sep 13, 2019
1 parent c47df13 commit 67f9c70
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 21 deletions.
4 changes: 4 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
<configuration>
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<add key="darc-pub-dotnet-core-setup-7d57652" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-7d57652f/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" />
<!--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="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
Expand Down
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.CSharp" Version="4.6.0-rc2.19460.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.CSharp" Version="4.6.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f43072465d4be9920ab04a3c3ad91f82144de4e</Sha>
<Sha>4ac4c0367003fe3973a3648eb0715ddb0e3bbcea</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-rc2-19460-02">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>4421cfb105df112492038e5c5a70c24bce48e72f</Sha>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.0-rc2-19460-02">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.0">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>4421cfb105df112492038e5c5a70c24bce48e72f</Sha>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="4.6.0-rc2.19460.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.CodeDom" Version="4.6.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f43072465d4be9920ab04a3c3ad91f82144de4e</Sha>
<Sha>4ac4c0367003fe3973a3648eb0715ddb0e3bbcea</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.Annotations" Version="4.6.0-rc2.19460.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.ComponentModel.Annotations" Version="4.6.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f43072465d4be9920ab04a3c3ad91f82144de4e</Sha>
<Sha>4ac4c0367003fe3973a3648eb0715ddb0e3bbcea</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-rc2.19460.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f43072465d4be9920ab04a3c3ad91f82144de4e</Sha>
<Sha>4ac4c0367003fe3973a3648eb0715ddb0e3bbcea</Sha>
</Dependency>
<Dependency Name="System.Data.SqlClient" Version="4.7.0-rc2.19460.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.Data.SqlClient" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>1f43072465d4be9920ab04a3c3ad91f82144de4e</Sha>
<Sha>4ac4c0367003fe3973a3648eb0715ddb0e3bbcea</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
<MySqlDataEntityVersion>6.7.2-beta-ef6</MySqlDataEntityVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/corefx">
<MicrosoftCSharpVersion>4.6.0-rc2.19460.1</MicrosoftCSharpVersion>
<SystemCodeDomVersion>4.6.0-rc2.19460.1</SystemCodeDomVersion>
<SystemComponentModelAnnotationsVersion>4.6.0-rc2.19460.1</SystemComponentModelAnnotationsVersion>
<SystemConfigurationConfigurationManagerVersion>4.6.0-rc2.19460.1</SystemConfigurationConfigurationManagerVersion>
<SystemDataSqlClientVersion>4.7.0-rc2.19460.1</SystemDataSqlClientVersion>
<MicrosoftCSharpVersion>4.6.0</MicrosoftCSharpVersion>
<SystemCodeDomVersion>4.6.0</SystemCodeDomVersion>
<SystemComponentModelAnnotationsVersion>4.6.0</SystemComponentModelAnnotationsVersion>
<SystemConfigurationConfigurationManagerVersion>4.6.0</SystemConfigurationConfigurationManagerVersion>
<SystemDataSqlClientVersion>4.7.0</SystemDataSqlClientVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/core-setup">
<MicrosoftNETCoreAppRefPackageVersion>3.0.0-rc2-19460-02</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-rc2-19460-02</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
</PropertyGroup>
<PropertyGroup Label="Dependency version settings">
<!--
Expand Down

0 comments on commit 67f9c70

Please sign in to comment.