Skip to content

Fix and workaround various issues with dependency updates and Preview 3 SDK #4525

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 1 commit into from
May 18, 2021
Merged

Fix and workaround various issues with dependency updates and Preview 3 SDK #4525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions eng/WpfArcadeSdk/tools/Wpf.Cpp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@

<!-- 17134 is Windows 10 v1903 (19H1) SDK -->
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>

<!-- This should be removed when .NET 6 Preview 4 becomes available. P4 contains the SDK fix. -->
<!-- https://github.com/dotnet/core/issues/6066 -->
<!-- https://github.com/dotnet/sdk/issues/16725 -->
<ILLinkTasksAssembly>DummyPropertyValueForILLinkTasksAssembly</ILLinkTasksAssembly>

<ConfigurationType Condition="'$(ConfigurationType)'==''">DynamicLibrary</ConfigurationType>

Expand Down
4 changes: 4 additions & 0 deletions .../src/PresentationFramework/System/Windows/Documents/Serialization/SerializerDescriptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,11 @@ internal static SerializerDescriptor CreateFromRegistry(RegistryKey plugIns, str

if (sd != null)
{
// This will be noted in the release notes as an unsupported API until 4479 is fixed.
// https://github.com/dotnet/wpf/issues/4479
#pragma warning disable SYSLIB0018 // 'Assembly.ReflectionOnlyLoadFrom(string)' is obsolete: 'ReflectionOnly loading is not su pported and throws PlatformNotSupportedException.'
Assembly plugIn = Assembly.ReflectionOnlyLoadFrom(sd._assemblyPath);
#pragma warning restore SYSLIB0018 // 'Assembly.ReflectionOnlyLoadFrom(string)' is obsolete: 'ReflectionOnly loading is not supported and throws PlatformNotSupportedException.'
if (typeof(System.Windows.Controls.Button).Assembly.GetName().Version == sd._winFXVersion &&
plugIn != null &&
plugIn.GetName().Version == sd._assemblyVersion)
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@
<NetCoreReference Include="System.Threading" />
<NetCoreReference Include="System.Threading.Thread" />
<NetCoreReference Include="System.Threading.ThreadPool" />
<NetCoreReference Include="System.Runtime.Loader" />

<MicrosoftPrivateWinFormsReference Include="System.Windows.Forms" />
<MicrosoftPrivateWinFormsReference Include="System.Windows.Forms.Primitives" />
Expand Down