Skip to content

Commit

Permalink
[release/3.1] Update dependencies from dotnet/winforms (#3478)
Browse files Browse the repository at this point in the history
[release/3.1] Update dependencies from dotnet/winforms
- Coherency Updates:
  - Microsoft.NETCore.App.Internal: from 3.1.3-servicing.20120.1 to 3.1.9-servicing.20459.3 (parent: Microsoft.Private.Winforms)

 - Merge remote-tracking branch 'upstream/release/3.1' into darc-release/3.1-7a61dcc9-4cdb-4228-aa8c-d019d8b67d0a

 - Update to CPD-strict compatible coherency
  • Loading branch information
dotnet-maestro[bot] authored Sep 15, 2020
1 parent c0cabff commit e790847
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 29 deletions.
3 changes: 3 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
<configuration>
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<add key="darc-pub-dotnet-core-setup-1a04dd0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-1a04dd08/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="myget-fxlab" value="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" />
<add key="arcade" value="https://dotnetfeed.blob.core.windows.net/dotnet-tools-internal/index.json" />
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.1-servicing.20412.5">
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.1-servicing.20465.3">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>cf28cab9e5142862de29534e688680a239ba781c</Sha>
<Sha>2f216bb9a58a975a31509cb1b2cf5cc5857f1d5d</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down Expand Up @@ -35,9 +35,9 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>e946cebe43a510e8c6476bbc8185d1445df33a1a</Sha>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.7.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
<Sha>c4164928b270ee2369808ab347d33423ef765216</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
Expand All @@ -59,13 +59,13 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.3-servicing.20120.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.9-servicing.20459.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>2d163b87b605fd23ceebfb04484e5ec5f2bffc32</Sha>
<Sha>1a04dd08e56bf52e88668c1ef2bd3f630ad442a5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.9" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>2d163b87b605fd23ceebfb04484e5ec5f2bffc32</Sha>
<Sha>1a04dd08e56bf52e88668c1ef2bd3f630ad442a5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20113.5">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand All @@ -75,9 +75,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
<Sha>d6302a72f8eafa326d7572a02acf8f3021ebb9e8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.1-servicing.20459.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
Expand All @@ -87,17 +87,17 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.3-servicing.20118.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.9-servicing.20458.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>c5d3d752260383fbed72ba2b4d86d82fea673c76</Sha>
<Sha>c2e8c9f71737d87a95610851587e2a1eaf18c91c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.1.3-servicing.20118.3" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.1.9-servicing.20458.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>c5d3d752260383fbed72ba2b4d86d82fea673c76</Sha>
<Sha>c2e8c9f71737d87a95610851587e2a1eaf18c91c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.3-servicing.20118.3" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.9-servicing.20458.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>c5d3d752260383fbed72ba2b4d86d82fea673c76</Sha>
<Sha>c2e8c9f71737d87a95610851587e2a1eaf18c91c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20113.5">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand All @@ -111,9 +111,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
<Dependency Name="System.Resources.Extensions" Version="4.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
<Sha>059a4a19e602494bfbed473dbbb18f2dbfbd0878</Sha>
</Dependency>
<!-- Keep these dependencies at the bottom of ToolsetDependencies, else they will be picked as the parent for CoherentParentDependencies -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true">
Expand Down
18 changes: 9 additions & 9 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,28 @@
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<SystemResourcesExtensionsVersion>4.7.0</SystemResourcesExtensionsVersion>
<SystemResourcesExtensionsVersion>4.7.1</SystemResourcesExtensionsVersion>
<SystemIOPackagingVersion>4.7.0</SystemIOPackagingVersion>
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>4.8.1-servicing.20412.5</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>4.8.1-servicing.20465.3</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>3.1.3-servicing.20118.3</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>3.1.3-servicing.20118.3</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>3.1.3-servicing.20118.3</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreRuntimeCoreCLRVersion>3.1.9-servicing.20458.2</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>3.1.9-servicing.20458.2</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>3.1.9-servicing.20458.2</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.3-servicing.20120.1</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.9-servicing.20459.3</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsVersion>3.1.0</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETCorePlatformsVersion>3.1.3</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>4.7.0</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>4.7.0</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>4.7.1</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>4.7.2</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
Expand Down

0 comments on commit e790847

Please sign in to comment.