From 7b118042af5b6bbd12878f8124259a53687dcd24 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Sun, 17 Sep 2023 18:33:34 -0500
Subject: [PATCH] - remove compat

---
 .../Maui.Controls.Sample.Profiling.csproj     |  1 -
 .../Maui.Controls.Sample.Sandbox.csproj       |  1 -
 .../Maui.Controls.Sample.csproj               |  1 -
 .../samples/Controls.Sample/MauiProgram.cs    |  2 --
 .../Controls.Core.UnitTests.csproj            |  1 -
 .../Xaml.UnitTests.ExternalAssembly/App.cs    | 21 ++++++++++++++
 .../AppResources.xaml                         |  7 +++++
 ...ols.Xaml.UnitTests.ExternalAssembly.csproj | 29 +++++++++++++++++++
 .../Directory.Build.targets                   |  5 ++++
 .../Issue3076Button.cs                        | 14 +++++++++
 .../Issues/Maui14158/Attributes.cs            |  4 +++
 .../Issues/Maui14158/PublicTypes.cs           | 13 +++++++++
 .../Issues/Maui14158/WithSuffix.cs            |  7 +++++
 .../Issues/Maui16923/Gh16923Library.cs        | 12 ++++++++
 .../Controls.Xaml.UnitTests.csproj            |  2 +-
 15 files changed, 113 insertions(+), 7 deletions(-)
 create mode 100644 src/Controls/tests/Xaml.UnitTests.ExternalAssembly/App.cs
 create mode 100644 src/Controls/tests/Xaml.UnitTests.ExternalAssembly/AppResources.xaml
 create mode 100644 src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Controls.Xaml.UnitTests.ExternalAssembly.csproj
 create mode 100644 src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Directory.Build.targets
 create mode 100644 src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issue3076Button.cs
 create mode 100644 src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui14158/Attributes.cs
 create mode 100644 src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui14158/PublicTypes.cs
 create mode 100644 src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui14158/WithSuffix.cs
 create mode 100644 src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui16923/Gh16923Library.cs

diff --git a/src/Controls/samples/Controls.Sample.Profiling/Maui.Controls.Sample.Profiling.csproj b/src/Controls/samples/Controls.Sample.Profiling/Maui.Controls.Sample.Profiling.csproj
index 2dbb53f863ea..fc112ee520a3 100644
--- a/src/Controls/samples/Controls.Sample.Profiling/Maui.Controls.Sample.Profiling.csproj
+++ b/src/Controls/samples/Controls.Sample.Profiling/Maui.Controls.Sample.Profiling.csproj
@@ -27,7 +27,6 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(UseMaui)' != 'true' ">
-    <ProjectReference Include="..\..\..\Compatibility\Core\src\Compatibility.csproj" />
     <ProjectReference Include="..\..\..\Core\src\Core.csproj" />
     <ProjectReference Include="..\..\src\Xaml\Controls.Xaml.csproj" />
     <ProjectReference Include="..\..\src\Core\Controls.Core.csproj" />
diff --git a/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj b/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj
index 6a18a3957423..c90edebe01e5 100644
--- a/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj
+++ b/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj
@@ -27,7 +27,6 @@
     <ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml.csproj" />
     <ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core.csproj" />
     <ProjectReference Include="..\..\..\BlazorWebView\src\Maui\Microsoft.AspNetCore.Components.WebView.Maui.csproj" />
-    <ProjectReference Include="..\..\..\Compatibility\Core\src\Compatibility.csproj" />
     <ProjectReference Include="..\..\..\Controls\Maps\src\Controls.Maps.csproj" />
     <ProjectReference Include="..\..\..\Controls\Foldable\src\Controls.Foldable.csproj" />
   </ItemGroup>
diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
index 8e240e7b0127..31c7533d849a 100644
--- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
+++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
@@ -57,7 +57,6 @@
     <ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core.csproj" />
     <ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml.csproj" />
     <ProjectReference Include="..\..\..\Core\src\Core.csproj" />
-    <ProjectReference Include="..\..\..\Compatibility\Core\src\Compatibility.csproj" />
     <ProjectReference Include="..\..\..\Controls\Foldable\src\Controls.Foldable.csproj" />
     <ProjectReference Include="..\..\..\Controls\Maps\src\Controls.Maps.csproj" />
   </ItemGroup>
diff --git a/src/Controls/samples/Controls.Sample/MauiProgram.cs b/src/Controls/samples/Controls.Sample/MauiProgram.cs
index 8297c4ab1658..3a6a8f760ff9 100644
--- a/src/Controls/samples/Controls.Sample/MauiProgram.cs
+++ b/src/Controls/samples/Controls.Sample/MauiProgram.cs
@@ -16,8 +16,6 @@
 using Microsoft.Maui.Hosting;
 using Microsoft.Maui.LifecycleEvents;
 using Microsoft.Maui.Foldable;
-using Microsoft.Maui.Controls.Compatibility;
-using Microsoft.Maui.Controls.Compatibility.Hosting;
 
 
 #if NET6_0_OR_GREATER
diff --git a/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj b/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj
index 5458ae3f097f..745766c0d06c 100644
--- a/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj
+++ b/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj
@@ -29,7 +29,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Compatibility\Core\src\Compatibility.csproj" />
     <ProjectReference Include="..\..\..\Controls\Maps\src\Controls.Maps.csproj" />
     <ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core.csproj" />
     <ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml.csproj" />
diff --git a/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/App.cs b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/App.cs
new file mode 100644
index 000000000000..f26b7b47c868
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/App.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.Maui.Graphics;
+
+[assembly: Microsoft.Maui.Controls.XmlnsDefinition(
+		xmlNamespace: "http://example.com/maui-controls", clrNamespace: "Microsoft.Maui.Controls",
+		AssemblyName = "Microsoft.Maui.Controls")]
+
+namespace Microsoft.Maui.Controls.ControlGallery
+{
+	public class App : Application
+	{
+		public const string AppName = "CompatibilityGalleryControls";
+	}
+}
diff --git a/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/AppResources.xaml b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/AppResources.xaml
new file mode 100644
index 000000000000..ba4bd6d1ae89
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/AppResources.xaml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+    <Color x:Key="notBlue">Red</Color>
+    <Color x:Key="AccentColor">#FF4B14</Color>
+</ResourceDictionary>
diff --git a/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Controls.Xaml.UnitTests.ExternalAssembly.csproj b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Controls.Xaml.UnitTests.ExternalAssembly.csproj
new file mode 100644
index 000000000000..08512a976a1e
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Controls.Xaml.UnitTests.ExternalAssembly.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(_MauiDotNetTfm)</TargetFramework>
+    <AssemblyName>Microsoft.Maui.Controls.Xaml.UnitTests.ExternalAssembly</AssemblyName>
+    <IsPackable>false</IsPackable>
+    <NoWarn>0114;0672;0108;0067;0168;0169;0219;0612;0618;1998;4014</NoWarn>
+    <RootNamespace>Controls.Xaml.UnitTests.ExternalAssembly</RootNamespace>
+  </PropertyGroup>
+
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Controls\Maps\src\Controls.Maps.csproj" />
+    <ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core.csproj" />
+    <ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml.csproj" />
+    <ProjectReference Include="..\..\..\Core\maps\src\Maps.csproj" />
+    <ProjectReference Include="..\..\..\Core\src\Core.csproj" />
+    <ProjectReference Include="..\..\..\Essentials\src\Essentials.csproj" />
+    <ProjectReference Include="..\..\..\TestUtils\src\TestUtils\TestUtils.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\..\Core\tests\UnitTests\TestClasses\DispatcherStub.cs" Link="TestClasses\DispatcherStub.cs" />
+  </ItemGroup>
+
+
+  <Import Project="$(MauiSrcDirectory)Maui.InTree.props" Condition=" '$(UseMaui)' != 'true' " />
+
+</Project>
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Directory.Build.targets b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Directory.Build.targets
new file mode 100644
index 000000000000..dace2da70514
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Directory.Build.targets
@@ -0,0 +1,5 @@
+<Project>
+  <Import Project="$(MauiSrcDirectory)Maui.InTree.targets" Condition=" '$(UseMaui)' != 'true' " />
+  <Import Project="$(MauiSrcDirectory)Microsoft.Maui.Controls.Debug.targets" />
+  <Import Project="$(MauiRootDirectory)Directory.Build.targets" />
+</Project>
diff --git a/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issue3076Button.cs b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issue3076Button.cs
new file mode 100644
index 000000000000..0ace29a6a0fd
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issue3076Button.cs
@@ -0,0 +1,14 @@
+namespace Microsoft.Maui.Controls.ControlGallery
+{
+	public class Issue3076Button : Button
+	{
+		public static readonly BindableProperty HorizontalContentAlignmentProperty =
+			BindableProperty.Create("HorizontalContentAlignemnt", typeof(TextAlignment), typeof(Issue3076Button), TextAlignment.Center);
+
+		public TextAlignment HorizontalContentAlignment
+		{
+			get { return (TextAlignment)GetValue(HorizontalContentAlignmentProperty); }
+			set { SetValue(HorizontalContentAlignmentProperty, value); }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui14158/Attributes.cs b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui14158/Attributes.cs
new file mode 100644
index 000000000000..67835a3ae652
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui14158/Attributes.cs
@@ -0,0 +1,4 @@
+using Microsoft.Maui.Controls;
+
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/2021/maui/xaml/tests", "Microsoft.Maui.Controls.Xaml.UnitTests.Issues.Maui14158")]
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/2021/maui/xaml/tests", "Microsoft.Maui.Controls.Xaml.UnitTests.Issues.Maui14158", AssemblyName = "Microsoft.Maui.Controls.Xaml.UnitTests.InternalsHiddenAssembly")]
diff --git a/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui14158/PublicTypes.cs b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui14158/PublicTypes.cs
new file mode 100644
index 000000000000..854d4f73d412
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui14158/PublicTypes.cs
@@ -0,0 +1,13 @@
+using System.ComponentModel;
+using Microsoft.Maui.Controls;
+
+namespace Microsoft.Maui.Controls.Xaml.UnitTests.Issues.Maui14158;
+
+[Description("Microsoft.Maui.Controls.Xaml.UnitTests.ExternalAssembly")]
+public class PublicInExternal : Button { }
+
+[Description("Microsoft.Maui.Controls.Xaml.UnitTests.ExternalAssembly")]
+internal class PublicInHidden : Button { }
+
+[Description("Microsoft.Maui.Controls.Xaml.UnitTests.ExternalAssembly")]
+internal class PublicInVisible : Button { }
diff --git a/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui14158/WithSuffix.cs b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui14158/WithSuffix.cs
new file mode 100644
index 000000000000..959e925c3987
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui14158/WithSuffix.cs
@@ -0,0 +1,7 @@
+using System.ComponentModel;
+using Microsoft.Maui.Controls;
+
+namespace Microsoft.Maui.Controls.Xaml.UnitTests.Issues.Maui14158;
+
+[Description("Microsoft.Maui.Controls.Xaml.UnitTests.ExternalAssembly")]
+public class PublicWithSuffix : Button { }
diff --git a/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui16923/Gh16923Library.cs b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui16923/Gh16923Library.cs
new file mode 100644
index 000000000000..03b0759eb9d8
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests.ExternalAssembly/Issues/Maui16923/Gh16923Library.cs
@@ -0,0 +1,12 @@
+namespace Microsoft.Maui.Controls.Xaml.UnitTests.ExternalAssembly
+{
+	public static class Gh16923Library
+	{
+		public const string LibraryConstant = nameof(LibraryConstant);
+
+		public static class Nested
+		{
+			public const string NestedLibraryConstant = nameof(NestedLibraryConstant);
+		}
+	}
+}
diff --git a/src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj b/src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj
index b29560fc0473..048cedcc0f45 100644
--- a/src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj
+++ b/src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj
@@ -31,13 +31,13 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\Compatibility\ControlGallery\src\Core\Compatibility.ControlGallery.Core.csproj" />
-    <ProjectReference Include="..\..\..\Compatibility\Core\src\Compatibility.csproj" />
     <ProjectReference Include="..\..\..\Controls\Maps\src\Controls.Maps.csproj" />
     <ProjectReference Include="..\..\..\Controls\src\Build.Tasks\Controls.Build.Tasks.csproj" />
     <ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core.csproj" />
     <ProjectReference Include="..\..\..\Controls\src\Xaml\Controls.Xaml.csproj" />
     <ProjectReference Include="..\..\..\Core\src\Core.csproj" />
     <ProjectReference Include="..\..\..\Essentials\src\Essentials.csproj" />
+    <ProjectReference Include="..\Xaml.UnitTests.ExternalAssembly\Controls.Xaml.UnitTests.ExternalAssembly.csproj" />
   </ItemGroup>
 
   <ItemGroup>