diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props index 06affe49a8c..54b4c44f5b4 100644 --- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props +++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props @@ -8,6 +8,11 @@ 10.0.19041.0 + + + + + DummyPropertyValueForILLinkTasksAssembly DynamicLibrary diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/Serialization/SerializerDescriptor.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/Serialization/SerializerDescriptor.cs index f879aa792bd..aa5a58d840f 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/Serialization/SerializerDescriptor.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/Serialization/SerializerDescriptor.cs @@ -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) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj index b1a2b4ee490..63e6c572158 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj @@ -253,6 +253,7 @@ +