Skip to content

Commit b8c0f1e

Browse files
dotnet-maestro[bot]wtgodbe
dotnet-maestro[bot]
and
wtgodbe
authored
[release/3.1] Update dependencies from dotnet/winforms (#2670)
* Update dependencies from https://github.com/dotnet/winforms build 20200227.4 - Microsoft.Private.Winforms - 4.8.1-servicing.20127.4 Dependency coherency updates - Microsoft.Win32.Registry - 4.7.0 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.1.3-servicing.20120.1 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.7.0 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 4.7.0 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 4.7.0 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 4.7.0 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 4.7.0 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 4.7.0 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 4.7.1 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 4.7.0 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 4.7.0 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 4.7.0 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 4.7.0 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 4.7.0 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 3.1.0 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 4.7.0 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILDAsm - 3.1.3-servicing.20118.3 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.1.3-servicing.20118.3 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 3.1.3-servicing.20118.3 (parent: Microsoft.NETCore.Runtime.CoreCLR) - System.Resources.Extensions - 4.7.0 (parent: Microsoft.NETCore.App) * Fixup microsoft.netcore.app dependencies (#2675) Co-authored-by: William Godbe <[email protected]>
1 parent 5759ba9 commit b8c0f1e

File tree

8 files changed

+88
-72
lines changed

8 files changed

+88
-72
lines changed

‎NuGet.config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
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-2d163b8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-2d163b87/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-corefx-e946ceb-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-e946cebe-1/nuget/v3/index.json" />
9+
<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" />
10+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
611
<add key="myget-fxlab" value="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" />
712
<add key="arcade" value="https://dotnetfeed.blob.core.windows.net/dotnet-tools-internal/index.json" />
813
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />

‎eng/Version.Details.xml‎

Lines changed: 51 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,71 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.1-servicing.20069.13">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.1-servicing.20127.4">
55
<Uri>https://github.com/dotnet/winforms</Uri>
6-
<Sha>b3a34e6695615d67a167fdbc436fce1e885f986e</Sha>
6+
<Sha>8b60caf6234fd40d51f2593dbaa474e1ffab0bff</Sha>
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.Win32.Registry" Version="4.7.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
10+
<Dependency Name="Microsoft.Win32.Registry" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
1111
<Uri>https://github.com/dotnet/corefx</Uri>
12-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
12+
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
1313
</Dependency>
14-
<Dependency Name="System.CodeDom" Version="4.7.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
14+
<Dependency Name="System.CodeDom" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
1515
<Uri>https://github.com/dotnet/corefx</Uri>
16-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
16+
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
1717
</Dependency>
18-
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.7.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
18+
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
1919
<Uri>https://github.com/dotnet/corefx</Uri>
20-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
20+
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
2121
</Dependency>
22-
<Dependency Name="System.Diagnostics.EventLog" Version="4.7.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
22+
<Dependency Name="System.Diagnostics.EventLog" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
2323
<Uri>https://github.com/dotnet/corefx</Uri>
24-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
24+
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
2525
</Dependency>
26-
<Dependency Name="System.DirectoryServices" Version="4.7.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
26+
<Dependency Name="System.DirectoryServices" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
2727
<Uri>https://github.com/dotnet/corefx</Uri>
28-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
28+
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
2929
</Dependency>
30-
<Dependency Name="System.Drawing.Common" Version="4.7.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
30+
<Dependency Name="System.Drawing.Common" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
3131
<Uri>https://github.com/dotnet/corefx</Uri>
32-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
32+
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
3333
</Dependency>
34-
<Dependency Name="System.Reflection.Emit" Version="4.7.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
34+
<Dependency Name="System.Reflection.Emit" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
3535
<Uri>https://github.com/dotnet/corefx</Uri>
36-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
36+
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
3737
</Dependency>
38-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.7.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
38+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
3939
<Uri>https://github.com/dotnet/corefx</Uri>
40-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
40+
<Sha>e946cebe43a510e8c6476bbc8185d1445df33a1a</Sha>
4141
</Dependency>
42-
<Dependency Name="System.Security.AccessControl" Version="4.7.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
42+
<Dependency Name="System.Security.AccessControl" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
4343
<Uri>https://github.com/dotnet/corefx</Uri>
44-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
44+
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
4545
</Dependency>
46-
<Dependency Name="System.Security.Cryptography.Xml" Version="4.7.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
46+
<Dependency Name="System.Security.Cryptography.Xml" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
4747
<Uri>https://github.com/dotnet/corefx</Uri>
48-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
48+
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
4949
</Dependency>
50-
<Dependency Name="System.Security.Permissions" Version="4.7.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
50+
<Dependency Name="System.Security.Permissions" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
5151
<Uri>https://github.com/dotnet/corefx</Uri>
52-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
52+
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
5353
</Dependency>
54-
<Dependency Name="System.Security.Principal.Windows" Version="4.7.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
54+
<Dependency Name="System.Security.Principal.Windows" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
5555
<Uri>https://github.com/dotnet/corefx</Uri>
56-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
56+
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
5757
</Dependency>
58-
<Dependency Name="System.Windows.Extensions" Version="4.7.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
58+
<Dependency Name="System.Windows.Extensions" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
5959
<Uri>https://github.com/dotnet/corefx</Uri>
60-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
60+
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.NETCore.App" Version="3.1.0-preview3.19551.4" CoherentParentDependency="Microsoft.Private.Winforms">
62+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.3-servicing.20120.1" CoherentParentDependency="Microsoft.Private.Winforms">
6363
<Uri>https://github.com/dotnet/core-setup</Uri>
64-
<Sha>00491cd463dc0a17996b8ddb24cf9faf390f04fb</Sha>
64+
<Sha>2d163b87b605fd23ceebfb04484e5ec5f2bffc32</Sha>
65+
</Dependency>
66+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.3">
67+
<Uri>https://github.com/dotnet/core-setup</Uri>
68+
<Sha>2d163b87b605fd23ceebfb04484e5ec5f2bffc32</Sha>
6569
</Dependency>
6670
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20113.5">
6771
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -71,29 +75,29 @@
7175
<Uri>https://github.com/dotnet/arcade</Uri>
7276
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
7377
</Dependency>
74-
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
78+
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
7579
<Uri>https://github.com/dotnet/corefx</Uri>
76-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
80+
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
7781
</Dependency>
7882
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.1-preview2.19553.2">
7983
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
8084
<Sha>90e4d4d634d385b0213347e8c1e43a8ca0a002c2</Sha>
8185
</Dependency>
82-
<Dependency Name="System.IO.Packaging" Version="4.7.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
86+
<Dependency Name="System.IO.Packaging" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
8387
<Uri>https://github.com/dotnet/corefx</Uri>
84-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
88+
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
8589
</Dependency>
86-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.0-preview3.19531.2" CoherentParentDependency="Microsoft.NETCore.App">
90+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.3-servicing.20118.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
8791
<Uri>https://github.com/dotnet/coreclr</Uri>
88-
<Sha>c3fddaa79b1ae1de2656327179fdc863ece4a5af</Sha>
92+
<Sha>c5d3d752260383fbed72ba2b4d86d82fea673c76</Sha>
8993
</Dependency>
90-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.1.0-preview3.19531.2" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
94+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.1.3-servicing.20118.3" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
9195
<Uri>https://github.com/dotnet/coreclr</Uri>
92-
<Sha>c3fddaa79b1ae1de2656327179fdc863ece4a5af</Sha>
96+
<Sha>c5d3d752260383fbed72ba2b4d86d82fea673c76</Sha>
9397
</Dependency>
94-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.0-preview3.19531.2" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
98+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.3-servicing.20118.3" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
9599
<Uri>https://github.com/dotnet/coreclr</Uri>
96-
<Sha>c3fddaa79b1ae1de2656327179fdc863ece4a5af</Sha>
100+
<Sha>c5d3d752260383fbed72ba2b4d86d82fea673c76</Sha>
97101
</Dependency>
98102
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20113.5">
99103
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -107,9 +111,14 @@
107111
<Uri>https://github.com/dotnet/arcade</Uri>
108112
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
109113
</Dependency>
110-
<Dependency Name="System.Resources.Extensions" Version="4.7.0-preview3.19551.2" CoherentParentDependency="Microsoft.NETCore.App">
114+
<Dependency Name="System.Resources.Extensions" Version="4.7.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
111115
<Uri>https://github.com/dotnet/corefx</Uri>
112-
<Sha>281e5dab8db6d7e30d1529039143aa4c463b1a65</Sha>
116+
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
117+
</Dependency>
118+
<!-- Keep these dependencies at the bottom of ToolsetDependencies, else they will be picked as the parent for CoherentParentDependencies -->
119+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true">
120+
<Uri>https://github.com/dotnet/core-setup</Uri>
121+
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
113122
</Dependency>
114123
</ToolsetDependencies>
115124
</Dependencies>

‎eng/Versions.props‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,40 +13,42 @@
1313
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
1414
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
1515
<AssemblyVersion>4.0.0.0</AssemblyVersion>
16-
<SystemResourcesExtensionsVersion>4.7.0-preview3.19551.2</SystemResourcesExtensionsVersion>
17-
<SystemIOPackagingVersion>4.7.0-preview3.19551.2</SystemIOPackagingVersion>
16+
<SystemResourcesExtensionsVersion>4.7.0</SystemResourcesExtensionsVersion>
17+
<SystemIOPackagingVersion>4.7.0</SystemIOPackagingVersion>
1818
</PropertyGroup>
1919
<!-- NuGet Package Versions -->
2020
<PropertyGroup>
21-
<MicrosoftPrivateWinformsVersion>4.8.1-servicing.20069.13</MicrosoftPrivateWinformsVersion>
21+
<MicrosoftPrivateWinformsVersion>4.8.1-servicing.20127.4</MicrosoftPrivateWinformsVersion>
2222
</PropertyGroup>
2323
<!-- Packages that come from https://github.com/dotnet/coreclr -->
2424
<PropertyGroup>
25-
<MicrosoftNETCoreRuntimeCoreCLRVersion>3.1.0-preview3.19531.2</MicrosoftNETCoreRuntimeCoreCLRVersion>
26-
<MicrosoftNETCoreILDAsmVersion>3.1.0-preview3.19531.2</MicrosoftNETCoreILDAsmVersion>
27-
<MicrosoftNETCoreILAsmVersion>3.1.0-preview3.19531.2</MicrosoftNETCoreILAsmVersion>
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>
2828
</PropertyGroup>
2929
<!-- Packages that come from https://github.com/dotnet/core-setup -->
3030
<PropertyGroup>
31-
<MicrosoftNETCoreAppVersion>3.1.0-preview3.19551.4</MicrosoftNETCoreAppVersion>
32-
<MicrosoftNETCorePlatformsVersion>3.1.0-preview3.19551.2</MicrosoftNETCorePlatformsVersion>
33-
<SystemDrawingCommonVersion>4.7.0-preview3.19551.2</SystemDrawingCommonVersion>
34-
<SystemDirectoryServicesVersion>4.7.0-preview3.19551.2</SystemDirectoryServicesVersion>
35-
<SystemReflectionMetadataLoadContextVersion>4.7.0-preview3.19551.2</SystemReflectionMetadataLoadContextVersion>
31+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
32+
<MicrosoftNETCoreAppInternalPackageVersion>3.1.3-servicing.20120.1</MicrosoftNETCoreAppInternalPackageVersion>
33+
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
34+
<MicrosoftNETCorePlatformsVersion>3.1.0</MicrosoftNETCorePlatformsVersion>
35+
<SystemDrawingCommonVersion>4.7.0</SystemDrawingCommonVersion>
36+
<SystemDirectoryServicesVersion>4.7.0</SystemDirectoryServicesVersion>
37+
<SystemReflectionMetadataLoadContextVersion>4.7.1</SystemReflectionMetadataLoadContextVersion>
3638
</PropertyGroup>
3739
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
3840
<PropertyGroup>
39-
<MicrosoftWin32RegistryPackageVersion>4.7.0-preview3.19551.2</MicrosoftWin32RegistryPackageVersion>
40-
<SystemCodeDomPackageVersion>4.7.0-preview3.19551.2</SystemCodeDomPackageVersion>
41-
<SystemConfigurationConfigurationManagerPackageVersion>4.7.0-preview3.19551.2</SystemConfigurationConfigurationManagerPackageVersion>
42-
<SystemDiagnosticsEventLogPackageVersion>4.7.0-preview3.19551.2</SystemDiagnosticsEventLogPackageVersion>
43-
<SystemReflectionEmitPackageVersion>4.7.0-preview3.19551.2</SystemReflectionEmitPackageVersion>
41+
<MicrosoftWin32RegistryPackageVersion>4.7.0</MicrosoftWin32RegistryPackageVersion>
42+
<SystemCodeDomPackageVersion>4.7.0</SystemCodeDomPackageVersion>
43+
<SystemConfigurationConfigurationManagerPackageVersion>4.7.0</SystemConfigurationConfigurationManagerPackageVersion>
44+
<SystemDiagnosticsEventLogPackageVersion>4.7.0</SystemDiagnosticsEventLogPackageVersion>
45+
<SystemReflectionEmitPackageVersion>4.7.0</SystemReflectionEmitPackageVersion>
4446
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
45-
<SystemSecurityAccessControlPackageVersion>4.7.0-preview3.19551.2</SystemSecurityAccessControlPackageVersion>
46-
<SystemSecurityCryptographyXmlPackageVersion>4.7.0-preview3.19551.2</SystemSecurityCryptographyXmlPackageVersion>
47-
<SystemSecurityPermissionsPackageVersion>4.7.0-preview3.19551.2</SystemSecurityPermissionsPackageVersion>
48-
<SystemSecurityPrincipalWindowsPackageVersion>4.7.0-preview3.19551.2</SystemSecurityPrincipalWindowsPackageVersion>
49-
<SystemWindowsExtensionsPackageVersion>4.7.0-preview3.19551.2</SystemWindowsExtensionsPackageVersion>
47+
<SystemSecurityAccessControlPackageVersion>4.7.0</SystemSecurityAccessControlPackageVersion>
48+
<SystemSecurityCryptographyXmlPackageVersion>4.7.0</SystemSecurityCryptographyXmlPackageVersion>
49+
<SystemSecurityPermissionsPackageVersion>4.7.0</SystemSecurityPermissionsPackageVersion>
50+
<SystemSecurityPrincipalWindowsPackageVersion>4.7.0</SystemSecurityPrincipalWindowsPackageVersion>
51+
<SystemWindowsExtensionsPackageVersion>4.7.0</SystemWindowsExtensionsPackageVersion>
5052
</PropertyGroup>
5153
<!-- Packages that come from https://github.com/dotnet/arcade -->
5254
<PropertyGroup>

‎eng/WpfArcadeSdk/tools/CreateTestPayload.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<WpfTestBasePayloadPath>$(PayloadRoot)\Test\</WpfTestBasePayloadPath>
1212

13-
<NETCoreAppPayloadPath>$(PayloadRoot)\dotnet\shared\Microsoft.NETCore.App\$(MicrosoftNETCoreAppVersion)\</NETCoreAppPayloadPath>
13+
<NETCoreAppPayloadPath>$(PayloadRoot)\dotnet\shared\Microsoft.NETCore.App\$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)\</NETCoreAppPayloadPath>
1414
</PropertyGroup>
1515

1616
<ItemGroup>
@@ -36,7 +36,7 @@
3636
<OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.cmd" />
3737
<OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.ps1" />
3838
<OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-machine.ps1" />
39-
<MicrosoftNetCoreAppContents Include="$(LocalDotnetLocation)shared\Microsoft.NETCore.App\$(MicrosoftNETCoreAppVersion)\**\*.*" />
39+
<MicrosoftNetCoreAppContents Include="$(LocalDotnetLocation)shared\Microsoft.NETCore.App\$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)\**\*.*" />
4040
</ItemGroup>
4141

4242
<Copy SourceFiles="@(MicrosoftDotNetWpfTestContents)"

‎eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<PropertyGroup>
3-
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppVersion)'!='' And
3+
<RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)'!='' And
44
'$(NoTargets)'!='true' And
55
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
6-
('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1')">$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
6+
('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1')">$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</RuntimeFrameworkVersion>
77
</PropertyGroup>
88

99
<!-- workaround for package downgrade in Microsoft.NetCore.Platforms -->

‎eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
Condition="'$(ManagedCxx)'=='true'"/>
1414

1515
<FrameworkReference Update="Microsoft.NETCore.App"
16-
Condition="'$(MicrosoftNETCoreAppVersion)'!=''
16+
Condition="'$(MicrosoftNETCoreAppRefPackageVersion)'!=''
1717
And '$(NoTargets)'!='true'
1818
And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
1919
And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1')
2020
And '$(MSBuildProjectExtension)'!='.vcxproj'">
21-
<TargetingPackVersion>$(MicrosoftNETCoreAppVersion)</TargetingPackVersion>
21+
<TargetingPackVersion>$(MicrosoftNETCoreAppRefPackageVersion)</TargetingPackVersion>
2222
</FrameworkReference>
2323

2424
<!--

0 commit comments

Comments
 (0)