Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[main] Update dependencies from dotnet/winforms #9260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 19, 2024
Merged

[main] Update dependencies from dotnet/winforms #9260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3130a1d
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Jun 18, 2024
c7b0c43
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Jun 19, 2024
8ba47c0
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Jun 19, 2024
a9c9b7d
System.Runtime.Serialization.Formatters is now a pacakge
MichalStrehovsky Jun 19, 2024
444a937
Revert "System.Runtime.Serialization.Formatters is now a pacakge"
MichalStrehovsky Jun 19, 2024
b411079
Reapply "System.Runtime.Serialization.Formatters is now a pacakge"
ViktorHofer Jun 19, 2024
b895603
Fix System.Runtime.Serialization.Formatters RAR lookup
ViktorHofer Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 78 additions & 74 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 17 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,27 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/winforms -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>9.0.0-preview.6.24317.4</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>9.0.0-preview.6.24318.4</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/runtime -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.6.24316.2</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<MicrosoftNETCoreAppRefVersion>9.0.0-preview.6.24316.2</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-preview.6.24316.2</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>9.0.0-preview.6.24316.2</MicrosoftNETCorePlatformsVersion>
<SystemCodeDomPackageVersion>9.0.0-preview.6.24316.2</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>9.0.0-preview.6.24316.2</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>9.0.0-preview.6.24316.2</SystemDiagnosticsEventLogPackageVersion>
<SystemDrawingCommonVersion>9.0.0-preview.6.24317.4</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>9.0.0-preview.6.24316.2</SystemDirectoryServicesVersion>
<SystemIOPackagingVersion>9.0.0-preview.6.24316.2</SystemIOPackagingVersion>
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.6.24316.2</SystemReflectionMetadataLoadContextVersion>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.6.24318.5</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<MicrosoftNETCoreAppRefVersion>9.0.0-preview.6.24318.5</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-preview.6.24318.5</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>9.0.0-preview.6.24318.5</MicrosoftNETCorePlatformsVersion>
<SystemCodeDomPackageVersion>9.0.0-preview.6.24318.5</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>9.0.0-preview.6.24318.5</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>9.0.0-preview.6.24318.5</SystemDiagnosticsEventLogPackageVersion>
<SystemDrawingCommonVersion>9.0.0-preview.6.24318.4</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>9.0.0-preview.6.24318.5</SystemDirectoryServicesVersion>
<SystemIOPackagingVersion>9.0.0-preview.6.24318.5</SystemIOPackagingVersion>
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.6.24318.5</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemResourcesExtensionsVersion>9.0.0-preview.6.24316.2</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyXmlPackageVersion>9.0.0-preview.6.24316.2</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>9.0.0-preview.6.24316.2</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>9.0.0-preview.6.24316.2</SystemWindowsExtensionsPackageVersion>
<SystemResourcesExtensionsVersion>9.0.0-preview.6.24318.5</SystemResourcesExtensionsVersion>
<SystemRuntimeSerializationFormattersPackageVersion>9.0.0-preview.6.24318.5</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>9.0.0-preview.6.24318.5</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>9.0.0-preview.6.24318.5</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>9.0.0-preview.6.24318.5</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Docs / Intellisense -->
<PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions eng/WpfArcadeSdk/tools/TestProjects.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" CopyLocal="true" />
<PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" CopyLocal="true" />
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" CopyLocal="true" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" CopyLocal="true" />
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" CopyLocal="true" />

Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1408,7 +1408,6 @@
<NetCoreReference Include="System.Runtime.CompilerServices.VisualC" />
<NetCoreReference Include="System.Runtime.Extensions" />
<NetCoreReference Include="System.Runtime.InteropServices" />
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
<NetCoreReference Include="System.Text.Encoding.Extensions" />
<NetCoreReference Include="System.Text.RegularExpressions" />
<NetCoreReference Include="System.Threading" />
Expand All @@ -1422,6 +1421,8 @@

<ItemGroup>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
<!-- PrivateAssets metadata is required as Packaging.props in WpfArcadeSdk unconditionally sets it to all which is wrong: https://github.com/dotnet/wpf/issues/9261. -->
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" PrivateAssets="contentfiles;analyzers;build" />
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<NetCoreReference Include="System.Runtime.CompilerServices.VisualC" />
<NetCoreReference Include="System.Runtime.Extensions" />
<NetCoreReference Include="System.Runtime.InteropServices" />
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
<NetCoreReference Include="System.Text.Encoding.Extensions" />
<NetCoreReference Include="System.Text.RegularExpressions" />
<NetCoreReference Include="System.Threading" />
Expand All @@ -63,6 +62,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
<!-- PrivateAssets metadata is required as Packaging.props in WpfArcadeSdk unconditionally sets it to all which is wrong: https://github.com/dotnet/wpf/issues/9261. -->
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" PrivateAssets="contentfiles;analyzers;build" />
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,6 @@
<NetCoreReference Include="System.Resources.ResourceManager" />
<NetCoreReference Include="System.Runtime.CompilerServices.DynamicAttribute" />
<NetCoreReference Include="System.Runtime.InteropServices" />
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
<NetCoreReference Include="System.Text.RegularExpressions" />
<NetCoreReference Include="System.Threading" />
<NetCoreReference Include="System.Threading.Tasks" />
Expand Down Expand Up @@ -1447,6 +1446,8 @@

<ItemGroup>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
<!-- PrivateAssets metadata is required as Packaging.props in WpfArcadeSdk unconditionally sets it to all which is wrong: https://github.com/dotnet/wpf/issues/9261. -->
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" PrivateAssets="contentfiles;analyzers;build" />
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
<NetCoreReference Include="System.Resources.ResourceManager" />
<NetCoreReference Include="System.Runtime.CompilerServices.DynamicAttribute" />
<NetCoreReference Include="System.Runtime.InteropServices" />
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
<NetCoreReference Include="System.Text.RegularExpressions" />
<NetCoreReference Include="System.Threading" />
<NetCoreReference Include="System.Threading.Tasks" />
Expand Down Expand Up @@ -90,6 +89,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
<!-- PrivateAssets metadata is required as Packaging.props in WpfArcadeSdk unconditionally sets it to all which is wrong: https://github.com/dotnet/wpf/issues/9261. -->
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" PrivateAssets="contentfiles;analyzers;build" />
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@
<NetCoreReference Include="System.Reflection" />
<NetCoreReference Include="System.Runtime.Extensions" />
<NetCoreReference Include="System.Runtime.InteropServices" />
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
<NetCoreReference Include="System.Text.Encoding" />
<NetCoreReference Include="System.Text.Encoding.Extensions" />
<NetCoreReference Include="System.Threading" />
Expand All @@ -122,6 +121,8 @@
<NetCoreReference Include="System.Xml.ReaderWriter" />
</ItemGroup>
<ItemGroup>
<!-- PrivateAssets metadata is required as Packaging.props in WpfArcadeSdk unconditionally sets it to all which is wrong: https://github.com/dotnet/wpf/issues/9261. -->
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" PrivateAssets="contentfiles;analyzers;build" />
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<NetCoreReference Include="System.Reflection" />
<NetCoreReference Include="System.Runtime.Extensions" />
<NetCoreReference Include="System.Runtime.InteropServices" />
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
<NetCoreReference Include="System.Text.Encoding" />
<NetCoreReference Include="System.Text.Encoding.Extensions" />
<NetCoreReference Include="System.Threading" />
Expand All @@ -49,6 +48,8 @@
<NetCoreReference Include="System.Xml.ReaderWriter" />
</ItemGroup>
<ItemGroup>
<!-- PrivateAssets metadata is required as Packaging.props in WpfArcadeSdk unconditionally sets it to all which is wrong: https://github.com/dotnet/wpf/issues/9261. -->
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" PrivateAssets="contentfiles;analyzers;build" />
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
</ItemGroup>
Expand Down