From e8c40d4275b36ef03fbc3e1862cc304cd2bac95b Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sat, 28 Nov 2020 22:24:34 -0500
Subject: [PATCH] Rename FluentControls

---
 samples/ControlCatalog/MainWindow.xaml.cs                       | 2 +-
 src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj        | 1 -
 .../Controls/{FluentTheme.xaml => FluentControls.xaml}          | 2 +-
 .../Controls/{FluentTheme.xaml.cs => FluentControls.xaml.cs}    | 2 +-
 src/Avalonia.Themes.Fluent/FluentDark.xaml                      | 2 +-
 src/Avalonia.Themes.Fluent/FluentLight.xaml                     | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename src/Avalonia.Themes.Fluent/Controls/{FluentTheme.xaml => FluentControls.xaml} (98%)
 rename src/Avalonia.Themes.Fluent/Controls/{FluentTheme.xaml.cs => FluentControls.xaml.cs} (81%)

diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index a316321cd1..723351ae57 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -67,7 +67,7 @@ namespace ControlCatalog
             if (Application.Current.Styles.Contains(App.FluentDark)
                 || Application.Current.Styles.Contains(App.FluentLight))
             {
-                var theme = new Avalonia.Themes.Fluent.FluentTheme();
+                var theme = new Avalonia.Themes.Fluent.Controls.FluentControls();
                 theme.TryGetResource("Button", out _);
             }
             else
diff --git a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
index b710b5ef3b..72f1fbf973 100644
--- a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
+++ b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentTheme.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
similarity index 98%
rename from src/Avalonia.Themes.Fluent/Controls/FluentTheme.xaml
rename to src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 5205fc16a6..0acb8f4f6e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentTheme.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -1,6 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="Avalonia.Themes.Fluent.Controls.FluentTheme">
+        x:Class="Avalonia.Themes.Fluent.Controls.FluentControls">
   <!-- Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox) -->  
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToolTip.xaml"/>
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml"/>
diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentTheme.xaml.cs b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml.cs
similarity index 81%
rename from src/Avalonia.Themes.Fluent/Controls/FluentTheme.xaml.cs
rename to src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml.cs
index bf880f2334..37822f5c8c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentTheme.xaml.cs
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml.cs
@@ -6,7 +6,7 @@ namespace Avalonia.Themes.Fluent.Controls
     /// <summary>
     /// The default Avalonia theme.
     /// </summary>
-    public class FluentTheme : Styles
+    public class FluentControls : Styles
     {
     }
 }
diff --git a/src/Avalonia.Themes.Fluent/FluentDark.xaml b/src/Avalonia.Themes.Fluent/FluentDark.xaml
index 48f3553b92..74b583a240 100644
--- a/src/Avalonia.Themes.Fluent/FluentDark.xaml
+++ b/src/Avalonia.Themes.Fluent/FluentDark.xaml
@@ -5,5 +5,5 @@
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FluentTheme.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FluentControls.xaml" />
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/FluentLight.xaml b/src/Avalonia.Themes.Fluent/FluentLight.xaml
index 565212328b..1bc51f655e 100644
--- a/src/Avalonia.Themes.Fluent/FluentLight.xaml
+++ b/src/Avalonia.Themes.Fluent/FluentLight.xaml
@@ -5,5 +5,5 @@
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" />  
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FluentTheme.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FluentControls.xaml" />
 </Styles>