Skip to content

Commit 7478bb1

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/winforms (#9260)
[main] Update dependencies from dotnet/winforms - Coherency Updates: - System.Reflection.MetadataLoadContext: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - Microsoft.Win32.Registry.AccessControl: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - Microsoft.Win32.SystemEvents: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.CodeDom: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.ComponentModel.Composition: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Data.Odbc: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Data.OleDb: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Diagnostics.PerformanceCounter: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.DirectoryServices.AccountManagement: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.DirectoryServices.Protocols: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.IO.Ports: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Management: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Reflection.Context: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Runtime.Caching: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Pkcs: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.ProtectedData: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.ServiceModel.Syndication: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.ServiceProcess.ServiceController: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Speech: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Text.Encoding.CodePages: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Threading.AccessControl: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.ComponentModel.Composition.Registration: from 9.0.0-preview.6.24316.2 to 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms) - System.Runtime.Serialization.Formatters is now a pacakge - Revert "System.Runtime.Serialization.Formatters is now a pacakge" This reverts commit a9c9b7d. - Reapply "System.Runtime.Serialization.Formatters is now a pacakge" This reverts commit 444a937. - Fix System.Runtime.Serialization.Formatters RAR lookup
1 parent 5a350c2 commit 7478bb1

File tree

9 files changed

+108
-96
lines changed

9 files changed

+108
-96
lines changed

‎eng/Version.Details.xml‎

Lines changed: 78 additions & 74 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,27 @@
2121
</PropertyGroup>
2222
<!-- Packages that come from https://github.com/dotnet/winforms -->
2323
<PropertyGroup>
24-
<MicrosoftPrivateWinformsVersion>9.0.0-preview.6.24317.4</MicrosoftPrivateWinformsVersion>
24+
<MicrosoftPrivateWinformsVersion>9.0.0-preview.6.24318.4</MicrosoftPrivateWinformsVersion>
2525
</PropertyGroup>
2626
<!-- Packages that come from https://github.com/dotnet/runtime -->
2727
<PropertyGroup>
28-
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.6.24316.2</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
29-
<MicrosoftNETCoreAppRefVersion>9.0.0-preview.6.24316.2</MicrosoftNETCoreAppRefVersion>
30-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-preview.6.24316.2</MicrosoftNETCoreAppRuntimewinx64Version>
31-
<MicrosoftNETCorePlatformsVersion>9.0.0-preview.6.24316.2</MicrosoftNETCorePlatformsVersion>
32-
<SystemCodeDomPackageVersion>9.0.0-preview.6.24316.2</SystemCodeDomPackageVersion>
33-
<SystemConfigurationConfigurationManagerPackageVersion>9.0.0-preview.6.24316.2</SystemConfigurationConfigurationManagerPackageVersion>
34-
<SystemDiagnosticsEventLogPackageVersion>9.0.0-preview.6.24316.2</SystemDiagnosticsEventLogPackageVersion>
35-
<SystemDrawingCommonVersion>9.0.0-preview.6.24317.4</SystemDrawingCommonVersion>
36-
<SystemDirectoryServicesVersion>9.0.0-preview.6.24316.2</SystemDirectoryServicesVersion>
37-
<SystemIOPackagingVersion>9.0.0-preview.6.24316.2</SystemIOPackagingVersion>
38-
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.6.24316.2</SystemReflectionMetadataLoadContextVersion>
28+
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.6.24318.5</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
29+
<MicrosoftNETCoreAppRefVersion>9.0.0-preview.6.24318.5</MicrosoftNETCoreAppRefVersion>
30+
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-preview.6.24318.5</MicrosoftNETCoreAppRuntimewinx64Version>
31+
<MicrosoftNETCorePlatformsVersion>9.0.0-preview.6.24318.5</MicrosoftNETCorePlatformsVersion>
32+
<SystemCodeDomPackageVersion>9.0.0-preview.6.24318.5</SystemCodeDomPackageVersion>
33+
<SystemConfigurationConfigurationManagerPackageVersion>9.0.0-preview.6.24318.5</SystemConfigurationConfigurationManagerPackageVersion>
34+
<SystemDiagnosticsEventLogPackageVersion>9.0.0-preview.6.24318.5</SystemDiagnosticsEventLogPackageVersion>
35+
<SystemDrawingCommonVersion>9.0.0-preview.6.24318.4</SystemDrawingCommonVersion>
36+
<SystemDirectoryServicesVersion>9.0.0-preview.6.24318.5</SystemDirectoryServicesVersion>
37+
<SystemIOPackagingVersion>9.0.0-preview.6.24318.5</SystemIOPackagingVersion>
38+
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.6.24318.5</SystemReflectionMetadataLoadContextVersion>
3939
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
40-
<SystemResourcesExtensionsVersion>9.0.0-preview.6.24316.2</SystemResourcesExtensionsVersion>
41-
<SystemSecurityCryptographyXmlPackageVersion>9.0.0-preview.6.24316.2</SystemSecurityCryptographyXmlPackageVersion>
42-
<SystemSecurityPermissionsPackageVersion>9.0.0-preview.6.24316.2</SystemSecurityPermissionsPackageVersion>
43-
<SystemWindowsExtensionsPackageVersion>9.0.0-preview.6.24316.2</SystemWindowsExtensionsPackageVersion>
40+
<SystemResourcesExtensionsVersion>9.0.0-preview.6.24318.5</SystemResourcesExtensionsVersion>
41+
<SystemRuntimeSerializationFormattersPackageVersion>9.0.0-preview.6.24318.5</SystemRuntimeSerializationFormattersPackageVersion>
42+
<SystemSecurityCryptographyXmlPackageVersion>9.0.0-preview.6.24318.5</SystemSecurityCryptographyXmlPackageVersion>
43+
<SystemSecurityPermissionsPackageVersion>9.0.0-preview.6.24318.5</SystemSecurityPermissionsPackageVersion>
44+
<SystemWindowsExtensionsPackageVersion>9.0.0-preview.6.24318.5</SystemWindowsExtensionsPackageVersion>
4445
</PropertyGroup>
4546
<!-- Docs / Intellisense -->
4647
<PropertyGroup>

‎eng/WpfArcadeSdk/tools/TestProjects.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
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" />
3233
<PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" CopyLocal="true" />
3334
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" CopyLocal="true" />
3435

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1408,7 +1408,6 @@
14081408
<NetCoreReference Include="System.Runtime.CompilerServices.VisualC" />
14091409
<NetCoreReference Include="System.Runtime.Extensions" />
14101410
<NetCoreReference Include="System.Runtime.InteropServices" />
1411-
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
14121411
<NetCoreReference Include="System.Text.Encoding.Extensions" />
14131412
<NetCoreReference Include="System.Text.RegularExpressions" />
14141413
<NetCoreReference Include="System.Threading" />
@@ -1422,6 +1421,8 @@
14221421

14231422
<ItemGroup>
14241423
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
1424+
<!-- PrivateAssets metadata is required as Packaging.props in WpfArcadeSdk unconditionally sets it to all which is wrong: https://github.com/dotnet/wpf/issues/9261. -->
1425+
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" PrivateAssets="contentfiles;analyzers;build" />
14251426
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
14261427
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
14271428
</ItemGroup>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
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" />
5453
<NetCoreReference Include="System.Text.Encoding.Extensions" />
5554
<NetCoreReference Include="System.Text.RegularExpressions" />
5655
<NetCoreReference Include="System.Threading" />
@@ -63,6 +62,8 @@
6362
</ItemGroup>
6463
<ItemGroup>
6564
<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" />
6667
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
6768
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
6869
</ItemGroup>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,6 @@
14031403
<NetCoreReference Include="System.Resources.ResourceManager" />
14041404
<NetCoreReference Include="System.Runtime.CompilerServices.DynamicAttribute" />
14051405
<NetCoreReference Include="System.Runtime.InteropServices" />
1406-
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
14071406
<NetCoreReference Include="System.Text.RegularExpressions" />
14081407
<NetCoreReference Include="System.Threading" />
14091408
<NetCoreReference Include="System.Threading.Tasks" />
@@ -1447,6 +1446,8 @@
14471446

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

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
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" />
6261
<NetCoreReference Include="System.Text.RegularExpressions" />
6362
<NetCoreReference Include="System.Threading" />
6463
<NetCoreReference Include="System.Threading.Tasks" />
@@ -90,6 +89,8 @@
9089
</ItemGroup>
9190
<ItemGroup>
9291
<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" />
9394
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
9495
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
9596
</ItemGroup>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@
111111
<NetCoreReference Include="System.Reflection" />
112112
<NetCoreReference Include="System.Runtime.Extensions" />
113113
<NetCoreReference Include="System.Runtime.InteropServices" />
114-
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
115114
<NetCoreReference Include="System.Text.Encoding" />
116115
<NetCoreReference Include="System.Text.Encoding.Extensions" />
117116
<NetCoreReference Include="System.Threading" />
@@ -122,6 +121,8 @@
122121
<NetCoreReference Include="System.Xml.ReaderWriter" />
123122
</ItemGroup>
124123
<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" />
125126
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
126127
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
127128
</ItemGroup>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<NetCoreReference Include="System.Reflection" />
3939
<NetCoreReference Include="System.Runtime.Extensions" />
4040
<NetCoreReference Include="System.Runtime.InteropServices" />
41-
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
4241
<NetCoreReference Include="System.Text.Encoding" />
4342
<NetCoreReference Include="System.Text.Encoding.Extensions" />
4443
<NetCoreReference Include="System.Threading" />
@@ -49,6 +48,8 @@
4948
<NetCoreReference Include="System.Xml.ReaderWriter" />
5049
</ItemGroup>
5150
<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" />
5253
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
5354
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
5455
</ItemGroup>

0 commit comments

Comments
 (0)