Tweaks to #129

cairoshell · Apr 16, 2018 · bb07963 · bb07963
1 parent f88e45e
commit bb07963
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 82 deletions.
diff --git a/Cairo Desktop/Cairo Desktop.sln b/Cairo Desktop/Cairo Desktop.sln
@@ -41,160 +41,108 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CairoDesktop.Plugins.Places
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F0383E91-6ADC-4016-9E21-D3DC0FFC55FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0383E91-6ADC-4016-9E21-D3DC0FFC55FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F0383E91-6ADC-4016-9E21-D3DC0FFC55FF}.Debug|x64.ActiveCfg = Debug|x64
 		{F0383E91-6ADC-4016-9E21-D3DC0FFC55FF}.Debug|x64.Build.0 = Debug|x64
 		{F0383E91-6ADC-4016-9E21-D3DC0FFC55FF}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F0383E91-6ADC-4016-9E21-D3DC0FFC55FF}.Debug|x86.Build.0 = Debug|Any CPU
-		{F0383E91-6ADC-4016-9E21-D3DC0FFC55FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0383E91-6ADC-4016-9E21-D3DC0FFC55FF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F0383E91-6ADC-4016-9E21-D3DC0FFC55FF}.Release|x64.ActiveCfg = Release|x64
 		{F0383E91-6ADC-4016-9E21-D3DC0FFC55FF}.Release|x64.Build.0 = Release|x64
 		{F0383E91-6ADC-4016-9E21-D3DC0FFC55FF}.Release|x86.ActiveCfg = Release|Any CPU
 		{F0383E91-6ADC-4016-9E21-D3DC0FFC55FF}.Release|x86.Build.0 = Release|Any CPU
-		{233781C8-83E4-47A6-847E-FA7A31B1CC51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{233781C8-83E4-47A6-847E-FA7A31B1CC51}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{233781C8-83E4-47A6-847E-FA7A31B1CC51}.Debug|x64.ActiveCfg = Debug|x64
 		{233781C8-83E4-47A6-847E-FA7A31B1CC51}.Debug|x64.Build.0 = Debug|x64
 		{233781C8-83E4-47A6-847E-FA7A31B1CC51}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{233781C8-83E4-47A6-847E-FA7A31B1CC51}.Debug|x86.Build.0 = Debug|Any CPU
-		{233781C8-83E4-47A6-847E-FA7A31B1CC51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{233781C8-83E4-47A6-847E-FA7A31B1CC51}.Release|Any CPU.Build.0 = Release|Any CPU
 		{233781C8-83E4-47A6-847E-FA7A31B1CC51}.Release|x64.ActiveCfg = Release|x64
 		{233781C8-83E4-47A6-847E-FA7A31B1CC51}.Release|x64.Build.0 = Release|x64
 		{233781C8-83E4-47A6-847E-FA7A31B1CC51}.Release|x86.ActiveCfg = Release|Any CPU
 		{233781C8-83E4-47A6-847E-FA7A31B1CC51}.Release|x86.Build.0 = Release|Any CPU
-		{DE9674CC-507E-4049-9152-5C899B9F0939}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE9674CC-507E-4049-9152-5C899B9F0939}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DE9674CC-507E-4049-9152-5C899B9F0939}.Debug|x64.ActiveCfg = Debug|x64
 		{DE9674CC-507E-4049-9152-5C899B9F0939}.Debug|x64.Build.0 = Debug|x64
 		{DE9674CC-507E-4049-9152-5C899B9F0939}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{DE9674CC-507E-4049-9152-5C899B9F0939}.Debug|x86.Build.0 = Debug|Any CPU
-		{DE9674CC-507E-4049-9152-5C899B9F0939}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE9674CC-507E-4049-9152-5C899B9F0939}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DE9674CC-507E-4049-9152-5C899B9F0939}.Release|x64.ActiveCfg = Release|x64
 		{DE9674CC-507E-4049-9152-5C899B9F0939}.Release|x64.Build.0 = Release|x64
 		{DE9674CC-507E-4049-9152-5C899B9F0939}.Release|x86.ActiveCfg = Release|Any CPU
 		{DE9674CC-507E-4049-9152-5C899B9F0939}.Release|x86.Build.0 = Release|Any CPU
-		{79B5DDAC-5102-4B11-BFA1-B16D6F6FE661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{79B5DDAC-5102-4B11-BFA1-B16D6F6FE661}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{79B5DDAC-5102-4B11-BFA1-B16D6F6FE661}.Debug|x64.ActiveCfg = Debug|x64
 		{79B5DDAC-5102-4B11-BFA1-B16D6F6FE661}.Debug|x64.Build.0 = Debug|x64
 		{79B5DDAC-5102-4B11-BFA1-B16D6F6FE661}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{79B5DDAC-5102-4B11-BFA1-B16D6F6FE661}.Debug|x86.Build.0 = Debug|Any CPU
-		{79B5DDAC-5102-4B11-BFA1-B16D6F6FE661}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{79B5DDAC-5102-4B11-BFA1-B16D6F6FE661}.Release|Any CPU.Build.0 = Release|Any CPU
 		{79B5DDAC-5102-4B11-BFA1-B16D6F6FE661}.Release|x64.ActiveCfg = Release|x64
 		{79B5DDAC-5102-4B11-BFA1-B16D6F6FE661}.Release|x64.Build.0 = Release|x64
 		{79B5DDAC-5102-4B11-BFA1-B16D6F6FE661}.Release|x86.ActiveCfg = Release|Any CPU
 		{79B5DDAC-5102-4B11-BFA1-B16D6F6FE661}.Release|x86.Build.0 = Release|Any CPU
-		{5FABAD0F-D28C-4EE6-A826-77968087864E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5FABAD0F-D28C-4EE6-A826-77968087864E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5FABAD0F-D28C-4EE6-A826-77968087864E}.Debug|x64.ActiveCfg = Debug|x64
 		{5FABAD0F-D28C-4EE6-A826-77968087864E}.Debug|x64.Build.0 = Debug|x64
 		{5FABAD0F-D28C-4EE6-A826-77968087864E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5FABAD0F-D28C-4EE6-A826-77968087864E}.Debug|x86.Build.0 = Debug|Any CPU
-		{5FABAD0F-D28C-4EE6-A826-77968087864E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5FABAD0F-D28C-4EE6-A826-77968087864E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5FABAD0F-D28C-4EE6-A826-77968087864E}.Release|x64.ActiveCfg = Release|x64
 		{5FABAD0F-D28C-4EE6-A826-77968087864E}.Release|x64.Build.0 = Release|x64
 		{5FABAD0F-D28C-4EE6-A826-77968087864E}.Release|x86.ActiveCfg = Release|Any CPU
 		{5FABAD0F-D28C-4EE6-A826-77968087864E}.Release|x86.Build.0 = Release|Any CPU
-		{68A28672-FF2F-4E6D-9FD6-B3DEE652851D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68A28672-FF2F-4E6D-9FD6-B3DEE652851D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{68A28672-FF2F-4E6D-9FD6-B3DEE652851D}.Debug|x64.ActiveCfg = Debug|x64
 		{68A28672-FF2F-4E6D-9FD6-B3DEE652851D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{68A28672-FF2F-4E6D-9FD6-B3DEE652851D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{68A28672-FF2F-4E6D-9FD6-B3DEE652851D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{68A28672-FF2F-4E6D-9FD6-B3DEE652851D}.Release|x64.ActiveCfg = Release|x64
 		{68A28672-FF2F-4E6D-9FD6-B3DEE652851D}.Release|x86.ActiveCfg = Release|Any CPU
-		{0F1F5673-02B2-4E89-A61D-90F56D368C3F}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{0F1F5673-02B2-4E89-A61D-90F56D368C3F}.Debug|x64.ActiveCfg = Debug|x64
 		{0F1F5673-02B2-4E89-A61D-90F56D368C3F}.Debug|x64.Build.0 = Debug|x64
 		{0F1F5673-02B2-4E89-A61D-90F56D368C3F}.Debug|x86.ActiveCfg = Debug|Win32
 		{0F1F5673-02B2-4E89-A61D-90F56D368C3F}.Debug|x86.Build.0 = Debug|Win32
-		{0F1F5673-02B2-4E89-A61D-90F56D368C3F}.Release|Any CPU.ActiveCfg = Release|Win32
 		{0F1F5673-02B2-4E89-A61D-90F56D368C3F}.Release|x64.ActiveCfg = Release|x64
 		{0F1F5673-02B2-4E89-A61D-90F56D368C3F}.Release|x64.Build.0 = Release|x64
 		{0F1F5673-02B2-4E89-A61D-90F56D368C3F}.Release|x86.ActiveCfg = Release|Win32
 		{0F1F5673-02B2-4E89-A61D-90F56D368C3F}.Release|x86.Build.0 = Release|Win32
-		{8E50FC68-8BF3-44F2-9229-708500625757}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E50FC68-8BF3-44F2-9229-708500625757}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8E50FC68-8BF3-44F2-9229-708500625757}.Debug|x64.ActiveCfg = Debug|x64
 		{8E50FC68-8BF3-44F2-9229-708500625757}.Debug|x64.Build.0 = Debug|x64
 		{8E50FC68-8BF3-44F2-9229-708500625757}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{8E50FC68-8BF3-44F2-9229-708500625757}.Debug|x86.Build.0 = Debug|Any CPU
-		{8E50FC68-8BF3-44F2-9229-708500625757}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E50FC68-8BF3-44F2-9229-708500625757}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8E50FC68-8BF3-44F2-9229-708500625757}.Release|x64.ActiveCfg = Release|x64
 		{8E50FC68-8BF3-44F2-9229-708500625757}.Release|x64.Build.0 = Release|x64
 		{8E50FC68-8BF3-44F2-9229-708500625757}.Release|x86.ActiveCfg = Release|Any CPU
 		{8E50FC68-8BF3-44F2-9229-708500625757}.Release|x86.Build.0 = Release|Any CPU
-		{52A795C9-3C28-487A-B7B8-AAB324DA7305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52A795C9-3C28-487A-B7B8-AAB324DA7305}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{52A795C9-3C28-487A-B7B8-AAB324DA7305}.Debug|x64.ActiveCfg = Debug|x64
 		{52A795C9-3C28-487A-B7B8-AAB324DA7305}.Debug|x64.Build.0 = Debug|x64
 		{52A795C9-3C28-487A-B7B8-AAB324DA7305}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{52A795C9-3C28-487A-B7B8-AAB324DA7305}.Debug|x86.Build.0 = Debug|Any CPU
-		{52A795C9-3C28-487A-B7B8-AAB324DA7305}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{52A795C9-3C28-487A-B7B8-AAB324DA7305}.Release|Any CPU.Build.0 = Release|Any CPU
 		{52A795C9-3C28-487A-B7B8-AAB324DA7305}.Release|x64.ActiveCfg = Release|x64
 		{52A795C9-3C28-487A-B7B8-AAB324DA7305}.Release|x64.Build.0 = Release|x64
 		{52A795C9-3C28-487A-B7B8-AAB324DA7305}.Release|x86.ActiveCfg = Release|Any CPU
 		{52A795C9-3C28-487A-B7B8-AAB324DA7305}.Release|x86.Build.0 = Release|Any CPU
-		{963EB868-7672-4557-8FE9-6A1A388AA5FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{963EB868-7672-4557-8FE9-6A1A388AA5FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{963EB868-7672-4557-8FE9-6A1A388AA5FF}.Debug|x64.ActiveCfg = Debug|x64
 		{963EB868-7672-4557-8FE9-6A1A388AA5FF}.Debug|x64.Build.0 = Debug|x64
 		{963EB868-7672-4557-8FE9-6A1A388AA5FF}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{963EB868-7672-4557-8FE9-6A1A388AA5FF}.Debug|x86.Build.0 = Debug|Any CPU
-		{963EB868-7672-4557-8FE9-6A1A388AA5FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{963EB868-7672-4557-8FE9-6A1A388AA5FF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{963EB868-7672-4557-8FE9-6A1A388AA5FF}.Release|x64.ActiveCfg = Release|x64
 		{963EB868-7672-4557-8FE9-6A1A388AA5FF}.Release|x64.Build.0 = Release|x64
 		{963EB868-7672-4557-8FE9-6A1A388AA5FF}.Release|x86.ActiveCfg = Release|Any CPU
 		{963EB868-7672-4557-8FE9-6A1A388AA5FF}.Release|x86.Build.0 = Release|Any CPU
-		{9EEA28C8-3AF4-4853-A31C-46E6FBF7FBB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9EEA28C8-3AF4-4853-A31C-46E6FBF7FBB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9EEA28C8-3AF4-4853-A31C-46E6FBF7FBB5}.Debug|x64.ActiveCfg = Debug|x64
 		{9EEA28C8-3AF4-4853-A31C-46E6FBF7FBB5}.Debug|x64.Build.0 = Debug|x64
 		{9EEA28C8-3AF4-4853-A31C-46E6FBF7FBB5}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{9EEA28C8-3AF4-4853-A31C-46E6FBF7FBB5}.Debug|x86.Build.0 = Debug|Any CPU
-		{9EEA28C8-3AF4-4853-A31C-46E6FBF7FBB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9EEA28C8-3AF4-4853-A31C-46E6FBF7FBB5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9EEA28C8-3AF4-4853-A31C-46E6FBF7FBB5}.Release|x64.ActiveCfg = Release|x64
 		{9EEA28C8-3AF4-4853-A31C-46E6FBF7FBB5}.Release|x64.Build.0 = Release|x64
 		{9EEA28C8-3AF4-4853-A31C-46E6FBF7FBB5}.Release|x86.ActiveCfg = Release|Any CPU
 		{9EEA28C8-3AF4-4853-A31C-46E6FBF7FBB5}.Release|x86.Build.0 = Release|Any CPU
-		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Debug|x64.Build.0 = Debug|Any CPU
+		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Debug|x64.ActiveCfg = Debug|x64
+		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Debug|x64.Build.0 = Debug|x64
 		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Debug|x86.Build.0 = Debug|Any CPU
-		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Release|x64.ActiveCfg = Release|Any CPU
-		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Release|x64.Build.0 = Release|Any CPU
+		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Release|x64.ActiveCfg = Release|x64
+		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Release|x64.Build.0 = Release|x64
 		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Release|x86.ActiveCfg = Release|Any CPU
 		{015A0EA4-B61A-4A16-A71F-DFA1DF4AB17C}.Release|x86.Build.0 = Release|Any CPU
-		{B3E797B3-3987-41F3-9604-BB25A09CD1BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B3E797B3-3987-41F3-9604-BB25A09CD1BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B3E797B3-3987-41F3-9604-BB25A09CD1BA}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{B3E797B3-3987-41F3-9604-BB25A09CD1BA}.Debug|x64.Build.0 = Debug|Any CPU
 		{B3E797B3-3987-41F3-9604-BB25A09CD1BA}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B3E797B3-3987-41F3-9604-BB25A09CD1BA}.Debug|x86.Build.0 = Debug|Any CPU
-		{B3E797B3-3987-41F3-9604-BB25A09CD1BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B3E797B3-3987-41F3-9604-BB25A09CD1BA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B3E797B3-3987-41F3-9604-BB25A09CD1BA}.Release|x64.ActiveCfg = Release|Any CPU
 		{B3E797B3-3987-41F3-9604-BB25A09CD1BA}.Release|x64.Build.0 = Release|Any CPU
 		{B3E797B3-3987-41F3-9604-BB25A09CD1BA}.Release|x86.ActiveCfg = Release|Any CPU

diff --git a/Cairo Desktop/Cairo Desktop/MenuBar.xaml.cs b/Cairo Desktop/Cairo Desktop/MenuBar.xaml.cs
@@ -142,7 +142,7 @@ private void setupPlaces()
             }
 
             // Add _Application PlacesMenu MenuItems
-            if (_CairoShell.Instance.PlacesMenu.Count > 0)
+            if (Screen.Primary && _CairoShell.Instance.PlacesMenu.Count > 0)
             {
                 var separatorStyle = PlacesMenu.Items.OfType<Separator>().First().Style;
                 var menuItemStyle = PlacesMenu.Items.OfType<MenuItem>().First().Style;

diff --git a/Cairo Desktop/Cairo Desktop/Startup.InitializationRoutines.cs b/Cairo Desktop/Cairo Desktop/Startup.InitializationRoutines.cs
@@ -18,7 +18,7 @@ public partial class Startup
         private static void SetupLoggingSystem()
         {
             var dateTimeNow = DateTime.Now;
-            string logsDirectoryPath = Path.Combine(Application.StartupPath, "Logs");
+            string logsDirectoryPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Cairo_Development_Team");
             string logFilePath = Path.Combine(logsDirectoryPath, string.Format(@"{0:yyyy-MM-dd}_{1}.log", dateTimeNow, dateTimeNow.Ticks));
 
             var fileLog = new FileLog(logFilePath);
@@ -58,8 +58,6 @@ internal static void WriteApplicationDebugInfoToConsole()
             SingletonLogger.Instance.Info(string.Format(@"Startup Path: {0}", Application.StartupPath));
             SingletonLogger.Instance.Info(string.Format(@"Running As: {0}-bit Process", IntPtr.Size * 8));
             SingletonLogger.Instance.Info(@break);
-            SingletonLogger.Instance.Info(string.Format(@"Client User Agent: {0}", GetWebBrowserUserAgent()));
-            SingletonLogger.Instance.Info(@break);
         }
 
         internal static bool InternalCheckIsWow64()
@@ -86,12 +84,5 @@ internal static bool InternalCheckIsWow64()
             }
             return false;
         }
-
-        private static string GetWebBrowserUserAgent()
-        {
-            var wb = new WebBrowser { Url = new Uri("about:blank") };
-            wb.Document.Write("<script type='text/javascript'>function getUserAgent(){return navigator.userAgent}</script>");
-            return wb.Document.InvokeScript("getUserAgent") as string;
-        }
     }
 }
diff --git a/Cairo Desktop/CairoDesktop.Extensibility/CairoDesktop.Extensibility.csproj b/Cairo Desktop/CairoDesktop.Extensibility/CairoDesktop.Extensibility.csproj
@@ -17,18 +17,37 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\Build\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\Build\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\Build\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\Build\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationFramework" />

diff --git a/Cairo Desktop/CairoDesktop.Extensibility/Properties/AssemblyInfo.cs b/Cairo Desktop/CairoDesktop.Extensibility/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("CairoDesktop.Extensibility")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CairoDesktop.Extensibility")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCompany("Cairo Development Team")]
+[assembly: AssemblyProduct("Cairo Desktop Environment")]
+[assembly: AssemblyCopyright("Copyright © 2018 Cairo Development Team")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.3.*")]
diff --git a/Cairo Desktop/CairoDesktop.WindowsTray/InteropCalls.cs b/Cairo Desktop/CairoDesktop.WindowsTray/InteropCalls.cs
@@ -6,19 +6,19 @@ namespace CairoDesktop.WindowsTray
 
     internal class InteropCalls
     {
-        [DllImport("CairoDesktop.WindowsTrayHooks.dll", CallingConvention = CallingConvention.StdCall)]
+        [DllImport("CairoDesktop.WindowsTrayHooks.dll", CallingConvention = CallingConvention.Cdecl)]
         internal static extern void SetSystrayCallback(Delegate theDelegate);
 
-        [DllImport("CairoDesktop.WindowsTrayHooks.dll", CallingConvention = CallingConvention.StdCall)]
+        [DllImport("CairoDesktop.WindowsTrayHooks.dll", CallingConvention = CallingConvention.Cdecl)]
         internal static extern void SetIconDataCallback(Delegate theDelegate);
 
-        [DllImport("CairoDesktop.WindowsTrayHooks.dll", CallingConvention = CallingConvention.StdCall)]
+        [DllImport("CairoDesktop.WindowsTrayHooks.dll", CallingConvention = CallingConvention.Cdecl)]
         internal static extern IntPtr InitializeSystray(int width, float scale);
 
-        [DllImport("CairoDesktop.WindowsTrayHooks.dll", CallingConvention = CallingConvention.StdCall)]
+        [DllImport("CairoDesktop.WindowsTrayHooks.dll", CallingConvention = CallingConvention.Cdecl)]
         internal static extern void Run();
 
-        [DllImport("CairoDesktop.WindowsTrayHooks.dll", CallingConvention = CallingConvention.StdCall)]
+        [DllImport("CairoDesktop.WindowsTrayHooks.dll", CallingConvention = CallingConvention.Cdecl)]
         internal static extern void ShutdownSystray();
     }
 }
diff --git a/Cairo Desktop/Plugins/CairoDesktop.Plugins.Places1/CairoDesktop.Plugins.Places1.csproj b/Cairo Desktop/Plugins/CairoDesktop.Plugins.Places1/CairoDesktop.Plugins.Places1.csproj
@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\Build\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\Build\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/Cairo Desktop/Plugins/CairoDesktop.Plugins.Places1/Places1Plugin.cs b/Cairo Desktop/Plugins/CairoDesktop.Plugins.Places1/Places1Plugin.cs
@@ -10,7 +10,7 @@ namespace CairoDesktop.Plugins.Places1
     [PluginAuthors("Joe LaFountain")]
     [PluginDescription("Provides private labeling of WelcomeScreen")]
     [PluginId("e658f49a-244b-4db8-9e9d-b4ec2623024")]
-    [PluginManufacturer("OptionSoft Technologies, Inc.")]
+    [PluginManufacturer("Cairo Development Team")]
     [PluginVersion("0.0.0.1")]
     public sealed class Places1Plugin : Plugin
     {