Merge pull request #2011 from dotnet/dev/roladuca/missingfwds30

Fix missing type forwards in reference assemblies (3.0 port)

Author: rladuca

src/Microsoft.DotNet.Wpf/ApiCompat/Baselines/System.Xaml-ref-Net48.baseline.txt

@@ -16,7 +16,7 @@ CannotRemoveBaseTypeOrInterface : Type 'System.Windows.Markup.TrimSurroundingWhi
 CannotRemoveAttribute : Attribute 'System.ComponentModel.TypeConverterAttribute' exists on 'System.Windows.Markup.TypeExtension' in the contract but not the implementation.
 CannotRemoveBaseTypeOrInterface : Type 'System.Windows.Markup.UidPropertyAttribute' does not implement interface 'System.Runtime.InteropServices._Attribute' in the implementation but it does in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'System.Windows.Markup.UsableDuringInitializationAttribute' does not implement interface 'System.Runtime.InteropServices._Attribute' in the implementation but it does in the contract.
-TypesMustExist : Type 'System.Windows.Markup.ValueSerializerAttribute' does not exist in the implementation but it does exist in the contract.
+CannotRemoveBaseTypeOrInterface : Type 'System.Windows.Markup.ValueSerializerAttribute' does not implement interface 'System.Runtime.InteropServices._Attribute' in the implementation but it does in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'System.Windows.Markup.WhitespaceSignificantCollectionAttribute' does not implement interface 'System.Runtime.InteropServices._Attribute' in the implementation but it does in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'System.Windows.Markup.XamlDeferLoadAttribute' does not implement interface 'System.Runtime.InteropServices._Attribute' in the implementation but it does in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'System.Windows.Markup.XamlSetMarkupExtensionAttribute' does not implement interface 'System.Runtime.InteropServices._Attribute' in the implementation but it does in the contract.

src/Microsoft.DotNet.Wpf/ApiCompat/Baselines/WindowsBase-ref-Net48.baseline.txt

@@ -1,10 +1,4 @@
 Compat issues with assembly WindowsBase:
-TypesMustExist : Type 'System.Collections.ObjectModel.ObservableCollection<T>' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'System.Collections.ObjectModel.ReadOnlyObservableCollection<T>' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'System.Collections.Specialized.INotifyCollectionChanged' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'System.Collections.Specialized.NotifyCollectionChangedAction' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'System.Collections.Specialized.NotifyCollectionChangedEventArgs' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'System.Collections.Specialized.NotifyCollectionChangedEventHandler' does not exist in the implementation but it does exist in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'System.ComponentModel.PropertyFilterAttribute' does not implement interface 'System.Runtime.InteropServices._Attribute' in the implementation but it does in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'System.IO.FileFormatException' does not implement interface 'System.Runtime.InteropServices._Exception' in the implementation but it does in the contract.
 MembersMustExist : Member 'System.IO.Packaging.Package..ctor(System.IO.FileAccess, System.Boolean)' does not exist in the implementation but it does exist in the contract.
@@ -38,4 +32,4 @@ CannotRemoveBaseTypeOrInterface : Type 'System.Windows.Markup.XmlnsCompatibleWit
 CannotRemoveBaseTypeOrInterface : Type 'System.Windows.Markup.XmlnsDefinitionAttribute' does not implement interface 'System.Runtime.InteropServices._Attribute' in the implementation but it does in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'System.Windows.Markup.XmlnsPrefixAttribute' does not implement interface 'System.Runtime.InteropServices._Attribute' in the implementation but it does in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'System.Windows.Media.DisableDpiAwarenessAttribute' does not implement interface 'System.Runtime.InteropServices._Attribute' in the implementation but it does in the contract.
-Total Issues: 39
+Total Issues: 33

src/Microsoft.DotNet.Wpf/src/PresentationFramework/otherassemblyattrs.cs

@@ -20,7 +20,12 @@
 [assembly:TypeForwardedTo(typeof(System.Windows.Markup.NullExtension))]
 [assembly:TypeForwardedTo(typeof(System.Windows.Markup.StaticExtension))]
 [assembly:TypeForwardedTo(typeof(System.Windows.Markup.TypeExtension))]
+
+// IProvidePropertyFallback is an internal interface and not included in the PresentationCore reference assembly.
+// Therefore we need to ensure it's not included in the PresentationFramework reference assembly as it won't be defined there.
+#if !PRESENTATION_FRAMEWORK_REF
 [assembly:TypeForwardedTo(typeof(System.Windows.Markup.IProvidePropertyFallback))]
+#endif
 
 [assembly:InternalsVisibleTo(BuildInfo.PresentationFrameworkRoyale)]
 [assembly:InternalsVisibleTo(BuildInfo.PresentationFrameworkLuna)]

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

@@ -3,7 +3,7 @@
     <AssemblyName>PresentationFramework</AssemblyName>
     <PackageId>PresentationFramework-ref</PackageId>
     <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <DefineConstants>$(DefineConstants);FRAMEWORK_NATIVEMETHODS;COMMONDPS;PRESENTATIONFRAMEWORK_ONLY;PRESENTATIONFRAMEWORK;RIBBON_IN_FRAMEWORK</DefineConstants>
+    <DefineConstants>$(DefineConstants);FRAMEWORK_NATIVEMETHODS;COMMONDPS;PRESENTATIONFRAMEWORK_ONLY;PRESENTATIONFRAMEWORK;RIBBON_IN_FRAMEWORK;PRESENTATION_FRAMEWORK_REF</DefineConstants>
     <DefineConstants Condition="'$(WeakEventTelemetry)'=='true'">$(DefineConstants);WeakEventTelemetry</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnablePInvokeAnalyzer>false</EnablePInvokeAnalyzer>
@@ -17,6 +17,7 @@
   <ItemGroup>
     <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
     <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
+    <Compile Include="$(WpfSourceDir)PresentationFramework\OtherAssemblyAttrs.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/otherassemblyattrs.cs

@@ -10,6 +10,7 @@
   <ItemGroup>
     <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
     <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
+    <Compile Include="$(WpfSourceDir)PresentationUI\OtherAssemblyAttrs.cs" />
   </ItemGroup>
   <ItemGroup>
     <NetCoreReference Include="netstandard" />
@@ -20,6 +21,7 @@
     <NetCoreReference Include="System.Runtime.InteropServices" />
     <NetCoreReference Include="System.Resources.ResourceManager" />
 
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\ref\WindowsBase-ref.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\ref\PresentationFramework-ref.csproj" />
   </ItemGroup>
 </Project>

src/Microsoft.DotNet.Wpf/src/PresentationUI/ref/PresentationUI-ref.csproj

@@ -15,5 +15,6 @@
 
 [assembly: TypeForwardedTo(typeof(System.Xaml.Permissions.XamlAccessLevel))]
 [assembly: TypeForwardedTo(typeof(System.Xaml.Permissions.XamlLoadPermission))]
+[assembly: TypeForwardedTo(typeof(System.Windows.Markup.ValueSerializerAttribute))]
 
 [assembly:XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System.Windows.Markup")]

src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/ValueSerializerAttribute.cs

@@ -94,6 +94,13 @@
 [assembly: TypeForwardedTo(typeof(System.Security.Permissions.WebBrowserPermission))]
 [assembly: TypeForwardedTo(typeof(System.Security.Permissions.WebBrowserPermissionAttribute))]
 
+[assembly: TypeForwardedTo(typeof(System.Collections.ObjectModel.ReadOnlyObservableCollection<>))]
+[assembly: TypeForwardedTo(typeof(System.Collections.ObjectModel.ObservableCollection<>))]
+[assembly: TypeForwardedTo(typeof(System.Collections.Specialized.NotifyCollectionChangedAction))]
+[assembly: TypeForwardedTo(typeof(System.Collections.Specialized.NotifyCollectionChangedEventArgs))]
+[assembly: TypeForwardedTo(typeof(System.Collections.Specialized.NotifyCollectionChangedEventHandler))]
+[assembly: TypeForwardedTo(typeof(System.Collections.Specialized.INotifyCollectionChanged))]
+
 // XAML namespace definitions
 [assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows")]
 [assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Input")]