Skip to content

Commit 57a01ac

Browse files
ericstjericstj
committed
Ensure WPF builds against framework SRSF version (#9492)
WPF was depending on the package version of System.Runtime.Serialization.Formatters but never shipping it. �Instead WPF should depend on the built-in assembly version. To do that we need to update the SDK version since WPF's vcxprojs don't enable the nuget package targeting pack #9490
1 parent b3b6af9 commit 57a01ac

File tree

9 files changed

+9
-15
lines changed

9 files changed

+9
-15
lines changed

‎eng/WpfArcadeSdk/tools/TestProjects.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
3030
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" CopyLocal="true" />
3131
<PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" CopyLocal="true" />
32-
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" CopyLocal="true" />
3332
<PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" CopyLocal="true" />
3433
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" CopyLocal="true" />
3534

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-preview.5.24307.3",
3+
"dotnet": "9.0.100-preview.6.24328.19",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -16,7 +16,7 @@
1616
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24368.9"
1717
},
1818
"sdk": {
19-
"version": "9.0.100-preview.5.24307.3"
19+
"version": "9.0.100-preview.6.24328.19"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.38.0.1",

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,6 +1452,7 @@
14521452
<NetCoreReference Include="System.Runtime.CompilerServices.VisualC" />
14531453
<NetCoreReference Include="System.Runtime.Extensions" />
14541454
<NetCoreReference Include="System.Runtime.InteropServices" />
1455+
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
14551456
<NetCoreReference Include="System.Text.Encoding.Extensions" />
14561457
<NetCoreReference Include="System.Text.RegularExpressions" />
14571458
<NetCoreReference Include="System.Threading" />
@@ -1467,8 +1468,6 @@
14671468

14681469
<ItemGroup>
14691470
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
1470-
<!-- PrivateAssets metadata is required as Packaging.props in WpfArcadeSdk unconditionally sets it to all which is wrong: https://github.com/dotnet/wpf/issues/9261. -->
1471-
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" PrivateAssets="contentfiles;analyzers;build" />
14721471
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
14731472
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
14741473
<PackageReference Include="System.Formats.Nrbf" Version="$(SystemFormatsNrbfVersion)" />

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<NetCoreReference Include="System.Runtime.CompilerServices.VisualC" />
5151
<NetCoreReference Include="System.Runtime.Extensions" />
5252
<NetCoreReference Include="System.Runtime.InteropServices" />
53+
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
5354
<NetCoreReference Include="System.Text.Encoding.Extensions" />
5455
<NetCoreReference Include="System.Text.RegularExpressions" />
5556
<NetCoreReference Include="System.Threading" />
@@ -62,8 +63,6 @@
6263
</ItemGroup>
6364
<ItemGroup>
6465
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
65-
<!-- PrivateAssets metadata is required as Packaging.props in WpfArcadeSdk unconditionally sets it to all which is wrong: https://github.com/dotnet/wpf/issues/9261. -->
66-
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" PrivateAssets="contentfiles;analyzers;build" />
6766
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
6867
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
6968
</ItemGroup>

‎src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,6 +1406,7 @@
14061406
<NetCoreReference Include="System.Resources.ResourceManager" />
14071407
<NetCoreReference Include="System.Runtime.CompilerServices.DynamicAttribute" />
14081408
<NetCoreReference Include="System.Runtime.InteropServices" />
1409+
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
14091410
<NetCoreReference Include="System.Text.RegularExpressions" />
14101411
<NetCoreReference Include="System.Threading" />
14111412
<NetCoreReference Include="System.Threading.Tasks" />
@@ -1450,8 +1451,6 @@
14501451

14511452
<ItemGroup>
14521453
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
1453-
<!-- PrivateAssets metadata is required as Packaging.props in WpfArcadeSdk unconditionally sets it to all which is wrong: https://github.com/dotnet/wpf/issues/9261. -->
1454-
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" PrivateAssets="contentfiles;analyzers;build" />
14551454
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
14561455
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
14571456
</ItemGroup>

‎src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
<NetCoreReference Include="System.Resources.ResourceManager" />
5959
<NetCoreReference Include="System.Runtime.CompilerServices.DynamicAttribute" />
6060
<NetCoreReference Include="System.Runtime.InteropServices" />
61+
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
6162
<NetCoreReference Include="System.Text.RegularExpressions" />
6263
<NetCoreReference Include="System.Threading" />
6364
<NetCoreReference Include="System.Threading.Tasks" />
@@ -89,8 +90,6 @@
8990
</ItemGroup>
9091
<ItemGroup>
9192
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
92-
<!-- PrivateAssets metadata is required as Packaging.props in WpfArcadeSdk unconditionally sets it to all which is wrong: https://github.com/dotnet/wpf/issues/9261. -->
93-
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" PrivateAssets="contentfiles;analyzers;build" />
9493
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
9594
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
9695
</ItemGroup>

‎src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
<NetCoreReference Include="System.Reflection" />
112112
<NetCoreReference Include="System.Runtime.Extensions" />
113113
<NetCoreReference Include="System.Runtime.InteropServices" />
114+
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
114115
<NetCoreReference Include="System.Text.Encoding" />
115116
<NetCoreReference Include="System.Text.Encoding.Extensions" />
116117
<NetCoreReference Include="System.Threading" />
@@ -121,8 +122,6 @@
121122
<NetCoreReference Include="System.Xml.ReaderWriter" />
122123
</ItemGroup>
123124
<ItemGroup>
124-
<!-- PrivateAssets metadata is required as Packaging.props in WpfArcadeSdk unconditionally sets it to all which is wrong: https://github.com/dotnet/wpf/issues/9261. -->
125-
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" PrivateAssets="contentfiles;analyzers;build" />
126125
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
127126
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
128127
</ItemGroup>

‎src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<NetCoreReference Include="System.Reflection" />
3939
<NetCoreReference Include="System.Runtime.Extensions" />
4040
<NetCoreReference Include="System.Runtime.InteropServices" />
41+
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
4142
<NetCoreReference Include="System.Text.Encoding" />
4243
<NetCoreReference Include="System.Text.Encoding.Extensions" />
4344
<NetCoreReference Include="System.Threading" />
@@ -48,8 +49,6 @@
4849
<NetCoreReference Include="System.Xml.ReaderWriter" />
4950
</ItemGroup>
5051
<ItemGroup>
51-
<!-- PrivateAssets metadata is required as Packaging.props in WpfArcadeSdk unconditionally sets it to all which is wrong: https://github.com/dotnet/wpf/issues/9261. -->
52-
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" PrivateAssets="contentfiles;analyzers;build" />
5352
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
5453
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
5554
</ItemGroup>

‎src/Microsoft.DotNet.Wpf/tests/UnitTests/PresentationCore.Tests/PresentationCore.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
2525
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
2626
<PackageReference Include="System.Formats.Nrbf" Version="$(SystemFormatsNrbfVersion)" />
27+
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" />
2728
</ItemGroup>
2829

2930
</Project>

0 commit comments

Comments
 (0)