Skip to content

Commit e790847

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/3.1] Update dependencies from dotnet/winforms (#3478)
[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
1 parent c0cabff commit e790847

File tree

3 files changed

+32
-29
lines changed

3 files changed

+32
-29
lines changed

‎NuGet.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<configuration>
44
<packageSources>
55
<clear />
6+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
7+
<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" />
8+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
69
<add key="myget-fxlab" value="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" />
710
<add key="arcade" value="https://dotnetfeed.blob.core.windows.net/dotnet-tools-internal/index.json" />
811
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />

‎eng/Version.Details.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.1-servicing.20412.5">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.1-servicing.20465.3">
55
<Uri>https://github.com/dotnet/winforms</Uri>
6-
<Sha>cf28cab9e5142862de29534e688680a239ba781c</Sha>
6+
<Sha>2f216bb9a58a975a31509cb1b2cf5cc5857f1d5d</Sha>
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
@@ -35,9 +35,9 @@
3535
<Uri>https://github.com/dotnet/corefx</Uri>
3636
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
3737
</Dependency>
38-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
39-
<Uri>https://github.com/dotnet/corefx</Uri>
40-
<Sha>e946cebe43a510e8c6476bbc8185d1445df33a1a</Sha>
38+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.7.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
39+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
40+
<Sha>c4164928b270ee2369808ab347d33423ef765216</Sha>
4141
</Dependency>
4242
<Dependency Name="System.Security.AccessControl" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
4343
<Uri>https://github.com/dotnet/corefx</Uri>
@@ -59,13 +59,13 @@
5959
<Uri>https://github.com/dotnet/corefx</Uri>
6060
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.3-servicing.20120.1" CoherentParentDependency="Microsoft.Private.Winforms">
62+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.9-servicing.20459.3" CoherentParentDependency="Microsoft.Private.Winforms">
6363
<Uri>https://github.com/dotnet/core-setup</Uri>
64-
<Sha>2d163b87b605fd23ceebfb04484e5ec5f2bffc32</Sha>
64+
<Sha>1a04dd08e56bf52e88668c1ef2bd3f630ad442a5</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.3" CoherentParentDependency="Microsoft.Private.Winforms">
66+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.9" CoherentParentDependency="Microsoft.Private.Winforms">
6767
<Uri>https://github.com/dotnet/core-setup</Uri>
68-
<Sha>2d163b87b605fd23ceebfb04484e5ec5f2bffc32</Sha>
68+
<Sha>1a04dd08e56bf52e88668c1ef2bd3f630ad442a5</Sha>
6969
</Dependency>
7070
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20113.5">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -75,9 +75,9 @@
7575
<Uri>https://github.com/dotnet/arcade</Uri>
7676
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
78+
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
7979
<Uri>https://github.com/dotnet/corefx</Uri>
80-
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
80+
<Sha>d6302a72f8eafa326d7572a02acf8f3021ebb9e8</Sha>
8181
</Dependency>
8282
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.1-servicing.20459.10">
8383
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
@@ -87,17 +87,17 @@
8787
<Uri>https://github.com/dotnet/corefx</Uri>
8888
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.3-servicing.20118.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
90+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.9-servicing.20458.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
9191
<Uri>https://github.com/dotnet/coreclr</Uri>
92-
<Sha>c5d3d752260383fbed72ba2b4d86d82fea673c76</Sha>
92+
<Sha>c2e8c9f71737d87a95610851587e2a1eaf18c91c</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.1.3-servicing.20118.3" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
94+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.1.9-servicing.20458.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
9595
<Uri>https://github.com/dotnet/coreclr</Uri>
96-
<Sha>c5d3d752260383fbed72ba2b4d86d82fea673c76</Sha>
96+
<Sha>c2e8c9f71737d87a95610851587e2a1eaf18c91c</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.3-servicing.20118.3" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
98+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.9-servicing.20458.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
9999
<Uri>https://github.com/dotnet/coreclr</Uri>
100-
<Sha>c5d3d752260383fbed72ba2b4d86d82fea673c76</Sha>
100+
<Sha>c2e8c9f71737d87a95610851587e2a1eaf18c91c</Sha>
101101
</Dependency>
102102
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20113.5">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -111,9 +111,9 @@
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112112
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
113113
</Dependency>
114-
<Dependency Name="System.Resources.Extensions" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
115-
<Uri>https://github.com/dotnet/corefx</Uri>
116-
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
114+
<Dependency Name="System.Resources.Extensions" Version="4.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
115+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
116+
<Sha>059a4a19e602494bfbed473dbbb18f2dbfbd0878</Sha>
117117
</Dependency>
118118
<!-- Keep these dependencies at the bottom of ToolsetDependencies, else they will be picked as the parent for CoherentParentDependencies -->
119119
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true">

‎eng/Versions.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,28 @@
1313
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
1414
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
1515
<AssemblyVersion>4.0.0.0</AssemblyVersion>
16-
<SystemResourcesExtensionsVersion>4.7.0</SystemResourcesExtensionsVersion>
16+
<SystemResourcesExtensionsVersion>4.7.1</SystemResourcesExtensionsVersion>
1717
<SystemIOPackagingVersion>4.7.0</SystemIOPackagingVersion>
1818
</PropertyGroup>
1919
<!-- NuGet Package Versions -->
2020
<PropertyGroup>
21-
<MicrosoftPrivateWinformsVersion>4.8.1-servicing.20412.5</MicrosoftPrivateWinformsVersion>
21+
<MicrosoftPrivateWinformsVersion>4.8.1-servicing.20465.3</MicrosoftPrivateWinformsVersion>
2222
</PropertyGroup>
2323
<!-- Packages that come from https://github.com/dotnet/coreclr -->
2424
<PropertyGroup>
25-
<MicrosoftNETCoreRuntimeCoreCLRVersion>3.1.3-servicing.20118.3</MicrosoftNETCoreRuntimeCoreCLRVersion>
26-
<MicrosoftNETCoreILDAsmVersion>3.1.3-servicing.20118.3</MicrosoftNETCoreILDAsmVersion>
27-
<MicrosoftNETCoreILAsmVersion>3.1.3-servicing.20118.3</MicrosoftNETCoreILAsmVersion>
25+
<MicrosoftNETCoreRuntimeCoreCLRVersion>3.1.9-servicing.20458.2</MicrosoftNETCoreRuntimeCoreCLRVersion>
26+
<MicrosoftNETCoreILDAsmVersion>3.1.9-servicing.20458.2</MicrosoftNETCoreILDAsmVersion>
27+
<MicrosoftNETCoreILAsmVersion>3.1.9-servicing.20458.2</MicrosoftNETCoreILAsmVersion>
2828
</PropertyGroup>
2929
<!-- Packages that come from https://github.com/dotnet/core-setup -->
3030
<PropertyGroup>
31-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
32-
<MicrosoftNETCoreAppInternalPackageVersion>3.1.3-servicing.20120.1</MicrosoftNETCoreAppInternalPackageVersion>
31+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
32+
<MicrosoftNETCoreAppInternalPackageVersion>3.1.9-servicing.20459.3</MicrosoftNETCoreAppInternalPackageVersion>
3333
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
34-
<MicrosoftNETCorePlatformsVersion>3.1.0</MicrosoftNETCorePlatformsVersion>
34+
<MicrosoftNETCorePlatformsVersion>3.1.3</MicrosoftNETCorePlatformsVersion>
3535
<SystemDrawingCommonVersion>4.7.0</SystemDrawingCommonVersion>
3636
<SystemDirectoryServicesVersion>4.7.0</SystemDirectoryServicesVersion>
37-
<SystemReflectionMetadataLoadContextVersion>4.7.1</SystemReflectionMetadataLoadContextVersion>
37+
<SystemReflectionMetadataLoadContextVersion>4.7.2</SystemReflectionMetadataLoadContextVersion>
3838
</PropertyGroup>
3939
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
4040
<PropertyGroup>

0 commit comments

Comments
 (0)