From 8f02cbc234bbce56824aa4b2325c294fec6c52ca Mon Sep 17 00:00:00 2001
From: Lavius Motileng <58791731+laviusmotileng-ms@users.noreply.github.com>
Date: Mon, 9 Mar 2020 22:06:05 -0700
Subject: [PATCH] updated namespaces

---
 PowerToys.sln                                 |  26 ++++++++++--------
 .../Microsoft.PowerToys.Settings.Test.csproj} |   2 +-
 .../UnitTest1.cs                              |   0
 .../App.xaml                                  |   4 +--
 .../App.xaml.cs                               |   2 +-
 .../AssemblyInfo.cs                           |   0
 .../MainWindow.xaml                           |   4 +--
 .../MainWindow.xaml.cs                        |   2 +-
 ...osoft.PowerToys.Settings.UI.Island.csproj} |  13 +++++----
 .../Program.cs                                |   6 ++--
 .../icon.ico                                  | Bin
 .../Microsoft.PowerToys.Settings.UI}/App.xaml |   4 +--
 .../App.xaml.cs                               |   7 ++---
 .../Assets/logo.png                           | Bin
 .../Assets/logo150.png                        | Bin
 .../Assets/logo44.png                         | Bin
 .../Microsoft.PowerToys.Settings.UI.csproj}   |   0
 .../Package.appxmanifest                      |   0
 .../Properties/AssemblyInfo.cs                |   0
 .../Properties/Default.rd.xml                 |   0
 20 files changed, 36 insertions(+), 34 deletions(-)
 rename src/{settingsUintTests/settingsUintTests.csproj => core/Microsoft.PowerToys.Settings.Test/Microsoft.PowerToys.Settings.Test.csproj} (92%)
 rename src/{settingsUintTests => core/Microsoft.PowerToys.Settings.Test}/UnitTest1.cs (100%)
 rename src/{settings_v2 => core/Microsoft.PowerToys.Settings.UI.Island}/App.xaml (73%)
 rename src/{settings_v2 => core/Microsoft.PowerToys.Settings.UI.Island}/App.xaml.cs (92%)
 rename src/{settings_v2 => core/Microsoft.PowerToys.Settings.UI.Island}/AssemblyInfo.cs (100%)
 rename src/{settings_v2 => core/Microsoft.PowerToys.Settings.UI.Island}/MainWindow.xaml (84%)
 rename src/{settings_v2 => core/Microsoft.PowerToys.Settings.UI.Island}/MainWindow.xaml.cs (93%)
 rename src/{settings_v2/settingswpf.csproj => core/Microsoft.PowerToys.Settings.UI.Island/Microsoft.PowerToys.Settings.UI.Island.csproj} (78%)
 rename src/{settings_v2 => core/Microsoft.PowerToys.Settings.UI.Island}/Program.cs (70%)
 rename src/{settings_v2 => core/Microsoft.PowerToys.Settings.UI.Island}/icon.ico (100%)
 rename src/{settingsui => core/Microsoft.PowerToys.Settings.UI}/App.xaml (78%)
 rename src/{settingsui => core/Microsoft.PowerToys.Settings.UI}/App.xaml.cs (52%)
 rename src/{settingsui => core/Microsoft.PowerToys.Settings.UI}/Assets/logo.png (100%)
 rename src/{settingsui => core/Microsoft.PowerToys.Settings.UI}/Assets/logo150.png (100%)
 rename src/{settingsui => core/Microsoft.PowerToys.Settings.UI}/Assets/logo44.png (100%)
 rename src/{settingsui/settingsui.csproj => core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj} (100%)
 rename src/{settingsui => core/Microsoft.PowerToys.Settings.UI}/Package.appxmanifest (100%)
 rename src/{settingsui => core/Microsoft.PowerToys.Settings.UI}/Properties/AssemblyInfo.cs (100%)
 rename src/{settingsui => core/Microsoft.PowerToys.Settings.UI}/Properties/Default.rd.xml (100%)

diff --git a/PowerToys.sln b/PowerToys.sln
index ef269b3f85..b6f9f308a1 100644
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -175,12 +175,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "powerpreview", "src\modules
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "powerpreviewTest", "src\modules\previewpane\powerpreviewTest\powerpreviewTest.vcxproj", "{47310AB4-9034-4BD1-8D8B-E88AD21A171B}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "settingsui", "src\settingsui\settingsui.csproj", "{A7D5099E-F0FD-4BF3-8522-5A682759F915}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{C3081D9A-1586-441A-B5F4-ED815B3719C1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "settingswpf", "src\settings_v2\settingswpf.csproj", "{806222E4-A9BE-431D-A1E7-3B0B15ABD160}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Settings.Test", "src\core\Microsoft.PowerToys.Settings.Test\Microsoft.PowerToys.Settings.Test.csproj", "{6F2B5799-36AE-4D10-9DCF-B19CD26A5DBC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "settingsUintTests", "src\settingsUintTests\settingsUintTests.csproj", "{E56203D2-1BC4-4D4B-A5D8-F6302ADED104}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.PowerToys.Settings.UI", "src\core\Microsoft.PowerToys.Settings.UI\Microsoft.PowerToys.Settings.UI.csproj", "{A7D5099E-F0FD-4BF3-8522-5A682759F915}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "settingsv2", "settingsv2", "{852D6EFE-D679-409D-A112-AEC69DB2DEE7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Settings.UI.Island", "src\core\Microsoft.PowerToys.Settings.UI.Island\Microsoft.PowerToys.Settings.UI.Island.csproj", "{AE3EFE25-662D-4987-B24E-30E729701B2E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -328,20 +329,20 @@ Global
 		{47310AB4-9034-4BD1-8D8B-E88AD21A171B}.Debug|x64.Build.0 = Debug|x64
 		{47310AB4-9034-4BD1-8D8B-E88AD21A171B}.Release|x64.ActiveCfg = Release|x64
 		{47310AB4-9034-4BD1-8D8B-E88AD21A171B}.Release|x64.Build.0 = Release|x64
+		{6F2B5799-36AE-4D10-9DCF-B19CD26A5DBC}.Debug|x64.ActiveCfg = Debug|x64
+		{6F2B5799-36AE-4D10-9DCF-B19CD26A5DBC}.Debug|x64.Build.0 = Debug|x64
+		{6F2B5799-36AE-4D10-9DCF-B19CD26A5DBC}.Release|x64.ActiveCfg = Release|x64
+		{6F2B5799-36AE-4D10-9DCF-B19CD26A5DBC}.Release|x64.Build.0 = Release|x64
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Debug|x64.ActiveCfg = Debug|x64
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Debug|x64.Build.0 = Debug|x64
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Debug|x64.Deploy.0 = Debug|x64
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.ActiveCfg = Release|x64
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.Build.0 = Release|x64
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.Deploy.0 = Release|x64
-		{806222E4-A9BE-431D-A1E7-3B0B15ABD160}.Debug|x64.ActiveCfg = Debug|x64
-		{806222E4-A9BE-431D-A1E7-3B0B15ABD160}.Debug|x64.Build.0 = Debug|x64
-		{806222E4-A9BE-431D-A1E7-3B0B15ABD160}.Release|x64.ActiveCfg = Release|Any CPU
-		{806222E4-A9BE-431D-A1E7-3B0B15ABD160}.Release|x64.Build.0 = Release|Any CPU
-		{E56203D2-1BC4-4D4B-A5D8-F6302ADED104}.Debug|x64.ActiveCfg = Debug|x64
-		{E56203D2-1BC4-4D4B-A5D8-F6302ADED104}.Debug|x64.Build.0 = Debug|x64
-		{E56203D2-1BC4-4D4B-A5D8-F6302ADED104}.Release|x64.ActiveCfg = Release|Any CPU
-		{E56203D2-1BC4-4D4B-A5D8-F6302ADED104}.Release|x64.Build.0 = Release|Any CPU
+		{AE3EFE25-662D-4987-B24E-30E729701B2E}.Debug|x64.ActiveCfg = Debug|x64
+		{AE3EFE25-662D-4987-B24E-30E729701B2E}.Debug|x64.Build.0 = Debug|x64
+		{AE3EFE25-662D-4987-B24E-30E729701B2E}.Release|x64.ActiveCfg = Release|x64
+		{AE3EFE25-662D-4987-B24E-30E729701B2E}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -388,6 +389,9 @@ Global
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915} = {852D6EFE-D679-409D-A112-AEC69DB2DEE7}
 		{806222E4-A9BE-431D-A1E7-3B0B15ABD160} = {852D6EFE-D679-409D-A112-AEC69DB2DEE7}
 		{E56203D2-1BC4-4D4B-A5D8-F6302ADED104} = {852D6EFE-D679-409D-A112-AEC69DB2DEE7}
+		{6F2B5799-36AE-4D10-9DCF-B19CD26A5DBC} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
+		{A7D5099E-F0FD-4BF3-8522-5A682759F915} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
+		{AE3EFE25-662D-4987-B24E-30E729701B2E} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
diff --git a/src/settingsUintTests/settingsUintTests.csproj b/src/core/Microsoft.PowerToys.Settings.Test/Microsoft.PowerToys.Settings.Test.csproj
similarity index 92%
rename from src/settingsUintTests/settingsUintTests.csproj
rename to src/core/Microsoft.PowerToys.Settings.Test/Microsoft.PowerToys.Settings.Test.csproj
index 660c450ca3..dd59020c85 100644
--- a/src/settingsUintTests/settingsUintTests.csproj
+++ b/src/core/Microsoft.PowerToys.Settings.Test/Microsoft.PowerToys.Settings.Test.csproj
@@ -5,7 +5,7 @@
 
     <IsPackable>false</IsPackable>
 
-    <Platforms>AnyCPU;x64</Platforms>
+    <Platforms>x64</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/settingsUintTests/UnitTest1.cs b/src/core/Microsoft.PowerToys.Settings.Test/UnitTest1.cs
similarity index 100%
rename from src/settingsUintTests/UnitTest1.cs
rename to src/core/Microsoft.PowerToys.Settings.Test/UnitTest1.cs
diff --git a/src/settings_v2/App.xaml b/src/core/Microsoft.PowerToys.Settings.UI.Island/App.xaml
similarity index 73%
rename from src/settings_v2/App.xaml
rename to src/core/Microsoft.PowerToys.Settings.UI.Island/App.xaml
index af355d9c37..c9b1541c7e 100644
--- a/src/settings_v2/App.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Island/App.xaml
@@ -1,7 +1,7 @@
-<Application x:Class="settings_v2.App"
+<Application x:Class="SettingsMain.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:settings_v2"
+             xmlns:local="clr-namespace:SettingsMain"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
          
diff --git a/src/settings_v2/App.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI.Island/App.xaml.cs
similarity index 92%
rename from src/settings_v2/App.xaml.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Island/App.xaml.cs
index 8ca60a4000..2d24abb71e 100644
--- a/src/settings_v2/App.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Island/App.xaml.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace settings_v2
+namespace SettingsMain
 {
     /// <summary>
     /// Interaction logic for App.xaml
diff --git a/src/settings_v2/AssemblyInfo.cs b/src/core/Microsoft.PowerToys.Settings.UI.Island/AssemblyInfo.cs
similarity index 100%
rename from src/settings_v2/AssemblyInfo.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Island/AssemblyInfo.cs
diff --git a/src/settings_v2/MainWindow.xaml b/src/core/Microsoft.PowerToys.Settings.UI.Island/MainWindow.xaml
similarity index 84%
rename from src/settings_v2/MainWindow.xaml
rename to src/core/Microsoft.PowerToys.Settings.UI.Island/MainWindow.xaml
index bd2d5667b9..8534fd1cea 100644
--- a/src/settings_v2/MainWindow.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Island/MainWindow.xaml
@@ -1,9 +1,9 @@
-<Window x:Class="settings_v2.MainWindow"
+<Window x:Class="SettingsMain.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:settings_v2"
+        xmlns:local="clr-namespace:SettingsMain"
         xmlns:Controls="clr-namespace:Microsoft.Toolkit.Wpf.UI.Controls;assembly=Microsoft.Toolkit.Wpf.UI.Controls"
         mc:Ignorable="d"
         Title="PowerToys Settings" Height="800" Width="800">
diff --git a/src/settings_v2/MainWindow.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI.Island/MainWindow.xaml.cs
similarity index 93%
rename from src/settings_v2/MainWindow.xaml.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Island/MainWindow.xaml.cs
index bada888538..63203590fd 100644
--- a/src/settings_v2/MainWindow.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Island/MainWindow.xaml.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using Microsoft.Toolkit.Win32.UI.Controls.Interop.WinRT;
 
-namespace settings_v2
+namespace SettingsMain
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml
diff --git a/src/settings_v2/settingswpf.csproj b/src/core/Microsoft.PowerToys.Settings.UI.Island/Microsoft.PowerToys.Settings.UI.Island.csproj
similarity index 78%
rename from src/settings_v2/settingswpf.csproj
rename to src/core/Microsoft.PowerToys.Settings.UI.Island/Microsoft.PowerToys.Settings.UI.Island.csproj
index 0d3b66f33d..18f8248e47 100644
--- a/src/settings_v2/settingswpf.csproj
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Island/Microsoft.PowerToys.Settings.UI.Island.csproj
@@ -4,7 +4,7 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
-    <StartupObject>settings_v2.Program</StartupObject>
+    <StartupObject>SettingsMain.Program</StartupObject>
     <Authors>Microsoft Corporation</Authors>
     <Product>PowerToys</Product>
     <Description>Windows system utilities to maximize productivity</Description>
@@ -15,17 +15,14 @@
     <RepositoryType>Github</RepositoryType>
     <PackageTags>PowerToys</PackageTags>
     <Version>0.15.2.0</Version>
-    <Platforms>AnyCPU;x64</Platforms>
+    <Platforms>x64</Platforms>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <Win32Resource />
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls" Version="6.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\settingsui\settingsui.csproj" />
+    <PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -35,4 +32,8 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.PowerToys.Settings.UI\Microsoft.PowerToys.Settings.UI.csproj" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/settings_v2/Program.cs b/src/core/Microsoft.PowerToys.Settings.UI.Island/Program.cs
similarity index 70%
rename from src/settings_v2/Program.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Island/Program.cs
index cc427372af..261b94f737 100644
--- a/src/settings_v2/Program.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Island/Program.cs
@@ -2,16 +2,16 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace settings_v2
+namespace SettingsMain
 {
     public class Program
     {
         [System.STAThreadAttribute()]
         public static void Main()
         {
-            using (new settingsui.App())
+            using (new SettingsUI.App())
             {
-                settings_v2.App app = new settings_v2.App();
+                SettingsMain.App app = new SettingsMain.App();
                 app.InitializeComponent();
                 app.Run();
             }
diff --git a/src/settings_v2/icon.ico b/src/core/Microsoft.PowerToys.Settings.UI.Island/icon.ico
similarity index 100%
rename from src/settings_v2/icon.ico
rename to src/core/Microsoft.PowerToys.Settings.UI.Island/icon.ico
diff --git a/src/settingsui/App.xaml b/src/core/Microsoft.PowerToys.Settings.UI/App.xaml
similarity index 78%
rename from src/settingsui/App.xaml
rename to src/core/Microsoft.PowerToys.Settings.UI/App.xaml
index 5bfc8e22a2..9c8ab5980f 100644
--- a/src/settingsui/App.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/App.xaml
@@ -1,7 +1,7 @@
 <xaml:XamlApplication
-    x:Class="settingsui.App"
+    x:Class="SettingsUI.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:xaml="using:Microsoft.Toolkit.Win32.UI.XamlHost"
-    xmlns:local="using:settingsui">
+    xmlns:local="using:SettingsUI">
 </xaml:XamlApplication>
\ No newline at end of file
diff --git a/src/settingsui/App.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/App.xaml.cs
similarity index 52%
rename from src/settingsui/App.xaml.cs
rename to src/core/Microsoft.PowerToys.Settings.UI/App.xaml.cs
index 950ac5c2a5..c7c86d6c4b 100644
--- a/src/settingsui/App.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/App.xaml.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Microsoft.Toolkit.Win32.UI.XamlHost;
+using Microsoft.Toolkit.Win32.UI.XamlHost;
 
-namespace settingsui
+namespace SettingsUI
 {
     public sealed partial class App : XamlApplication
     {
diff --git a/src/settingsui/Assets/logo.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/logo.png
similarity index 100%
rename from src/settingsui/Assets/logo.png
rename to src/core/Microsoft.PowerToys.Settings.UI/Assets/logo.png
diff --git a/src/settingsui/Assets/logo150.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/logo150.png
similarity index 100%
rename from src/settingsui/Assets/logo150.png
rename to src/core/Microsoft.PowerToys.Settings.UI/Assets/logo150.png
diff --git a/src/settingsui/Assets/logo44.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/logo44.png
similarity index 100%
rename from src/settingsui/Assets/logo44.png
rename to src/core/Microsoft.PowerToys.Settings.UI/Assets/logo44.png
diff --git a/src/settingsui/settingsui.csproj b/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
similarity index 100%
rename from src/settingsui/settingsui.csproj
rename to src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
diff --git a/src/settingsui/Package.appxmanifest b/src/core/Microsoft.PowerToys.Settings.UI/Package.appxmanifest
similarity index 100%
rename from src/settingsui/Package.appxmanifest
rename to src/core/Microsoft.PowerToys.Settings.UI/Package.appxmanifest
diff --git a/src/settingsui/Properties/AssemblyInfo.cs b/src/core/Microsoft.PowerToys.Settings.UI/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/settingsui/Properties/AssemblyInfo.cs
rename to src/core/Microsoft.PowerToys.Settings.UI/Properties/AssemblyInfo.cs
diff --git a/src/settingsui/Properties/Default.rd.xml b/src/core/Microsoft.PowerToys.Settings.UI/Properties/Default.rd.xml
similarity index 100%
rename from src/settingsui/Properties/Default.rd.xml
rename to src/core/Microsoft.PowerToys.Settings.UI/Properties/Default.rd.xml