Update to .NET 7.

immense · Apr 21, 2023 · 820cb53 · 820cb53
1 parent 9a538de
commit 820cb53
Show file tree

Hide file tree

Showing 28 changed files with 67 additions and 106 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/Desktop.Linux/bin/Debug/net6.0/Remotely_Desktop.dll",
+            "program": "${workspaceFolder}/Desktop.Linux/bin/Debug/.net7.0/Remotely_Desktop.dll",
             "args": [],
             "cwd": "${workspaceFolder}/Desktop.Linux",
             "console": "internalConsole",

diff --git a/Agent/Agent.csproj b/Agent/Agent.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Copyright>Copyright © 2023 Immense Networks</Copyright>

diff --git a/Desktop.Core/Desktop.Core.csproj b/Desktop.Core/Desktop.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>.net7.0</TargetFramework>
     <RootNamespace>Remotely.Desktop.Core</RootNamespace>
     <AssemblyName>Remotely_Desktop.Core</AssemblyName>
     <Platforms>AnyCPU;x64;x86</Platforms>

diff --git a/Desktop.Linux/Desktop.Linux.csproj b/Desktop.Linux/Desktop.Linux.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ApplicationIcon>Assets\favicon.ico</ApplicationIcon>
     <AssemblyName>Remotely_Desktop</AssemblyName>
     <RootNamespace>Remotely.Desktop.XPlat</RootNamespace>
@@ -55,13 +55,8 @@
     <EmbeddedResource Include="Assets\Remotely_Icon.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.18" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
-  </ItemGroup>
-  <ItemGroup>
+    <ProjectReference Include="..\..\immybot\submodules\RemoteControl\Immense.RemoteControl.Desktop\Immense.RemoteControl.Desktop.csproj" />
     <ProjectReference Include="..\Desktop.Shared\Desktop.Shared.csproj" />
-    <ProjectReference Include="..\Shared\Shared.csproj" />
-    <ProjectReference Include="..\submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.Linux\Immense.RemoteControl.Desktop.Linux.csproj" />
+    <ProjectReference Include="..\submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.Shared\Immense.RemoteControl.Desktop.Shared.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Desktop.Linux/Program.cs b/Desktop.Linux/Program.cs
@@ -7,9 +7,9 @@
 using Microsoft.Extensions.Logging;
 using Remotely.Shared.Services;
 using Immense.RemoteControl.Desktop.Shared.Services;
-using Immense.RemoteControl.Desktop.UI.Services;
+using Immense.RemoteControl.Desktop.Services;
 using System.Diagnostics;
-using Immense.RemoteControl.Desktop.Linux.Startup;
+using Immense.RemoteControl.Desktop.Startup;
 using Remotely.Shared.Utilities;
 
 var version = typeof(Program).Assembly.GetName().Version?.ToString() ?? "0.0.0";

diff --git a/Desktop.Linux/Properties/PublishProfiles/desktop-linux-x64.pubxml b/Desktop.Linux/Properties/PublishProfiles/desktop-linux-x64.pubxml
@@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>.net7.0</TargetFramework>
     <PublishDir>..\Server\wwwroot\Content\Linux-x64\</PublishDir>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>

diff --git a/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml b/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml
@@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
-    <TargetFramework>net6.0</TargetFramework>
-    <PublishDir>..\Agent\bin\Release\net6.0\linux-x64\publish\Desktop</PublishDir>
+    <TargetFramework>.net7.0</TargetFramework>
+    <PublishDir>..\Agent\bin\Release\.net7.0\linux-x64\publish\Desktop</PublishDir>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>

diff --git a/Desktop.Shared/Desktop.Shared.csproj b/Desktop.Shared/Desktop.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/Desktop.Win/Desktop.Win.csproj b/Desktop.Win/Desktop.Win.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
     <AssemblyName>Remotely_Desktop</AssemblyName>
@@ -60,7 +60,7 @@
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="if $(SolutionDir) == *Undefined* (&#xD;&#xA;  exit 0&#xD;&#xA;)&#xD;&#xA;if $(ConfigurationName) == Debug (&#xD;&#xA;  if $(PlatformName) == AnyCPU (&#xD;&#xA;      md &quot;$(SolutionDir)Agent\bin\Debug\net6.0\Desktop\&quot;&#xD;&#xA;      xcopy &quot;$(TargetDir)*&quot; &quot;$(SolutionDir)Agent\bin\Debug\net6.0\Desktop\&quot; /y /e /i&#xD;&#xA;  )&#xD;&#xA;  if $(PlatformName) == x64 (&#xD;&#xA;      md &quot;$(SolutionDir)Agent\bin\x64\Debug\net6.0\Desktop\&quot;&#xD;&#xA;      xcopy &quot;$(TargetDir)*&quot; &quot;$(SolutionDir)Agent\bin\x64\Debug\net6.0\Desktop\&quot; /y /e /i&#xD;&#xA;  )&#xD;&#xA;  if $(PlatformName) == x86 (&#xD;&#xA;      md &quot;$(SolutionDir)Agent\bin\x86\Debug\net6.0\Desktop\&quot;&#xD;&#xA;      xcopy &quot;$(TargetDir)*&quot; &quot;$(SolutionDir)Agent\bin\x86\Debug\net6.0\Desktop\&quot; /y /e /i&#xD;&#xA;  )&#xD;&#xA;)" />
+    <Exec Command="if $(SolutionDir) == *Undefined* (&#xD;&#xA;  exit 0&#xD;&#xA;)&#xD;&#xA;if $(ConfigurationName) == Debug (&#xD;&#xA;  if $(PlatformName) == AnyCPU (&#xD;&#xA;      md &quot;$(SolutionDir)Agent\bin\Debug\.net7.0\Desktop\&quot;&#xD;&#xA;      xcopy &quot;$(TargetDir)*&quot; &quot;$(SolutionDir)Agent\bin\Debug\.net7.0\Desktop\&quot; /y /e /i&#xD;&#xA;  )&#xD;&#xA;  if $(PlatformName) == x64 (&#xD;&#xA;      md &quot;$(SolutionDir)Agent\bin\x64\Debug\.net7.0\Desktop\&quot;&#xD;&#xA;      xcopy &quot;$(TargetDir)*&quot; &quot;$(SolutionDir)Agent\bin\x64\Debug\.net7.0\Desktop\&quot; /y /e /i&#xD;&#xA;  )&#xD;&#xA;  if $(PlatformName) == x86 (&#xD;&#xA;      md &quot;$(SolutionDir)Agent\bin\x86\Debug\.net7.0\Desktop\&quot;&#xD;&#xA;      xcopy &quot;$(TargetDir)*&quot; &quot;$(SolutionDir)Agent\bin\x86\Debug\.net7.0\Desktop\&quot; /y /e /i&#xD;&#xA;  )&#xD;&#xA;)" />
   </Target>
 
 </Project>
diff --git a/Desktop.Win/Program.cs b/Desktop.Win/Program.cs
@@ -12,6 +12,7 @@
 using System.Diagnostics;
 using Remotely.Shared.Utilities;
 using Immense.RemoteControl.Desktop.Windows.Startup;
+using Immense.RemoteControl.Desktop.Shared.Startup;
 
 var version = typeof(Program).Assembly.GetName().Version?.ToString() ?? "0.0.0";
 var logger = new FileLogger("Remotely_Desktop", version, "Program.cs");
@@ -62,7 +63,7 @@
     orgIdProvider.OrganizationId = orgId;
 }
 
-var result = await provider.UseRemoteControlClientWindows(args, serverUrl);
+var result = await provider.UseRemoteControlClient(args, serverUrl);
 
 if (!result.IsSuccess)
 {

diff --git a/Desktop.Win/Properties/PublishProfiles/desktop-win-x64.pubxml b/Desktop.Win/Properties/PublishProfiles/desktop-win-x64.pubxml
@@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>.net7.0-windows</TargetFramework>
     <PublishDir>..\Server\wwwroot\Content\Win-x64\</PublishDir>
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>

diff --git a/Desktop.Win/Properties/PublishProfiles/desktop-win-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/desktop-win-x86.pubxml
@@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x86</Platform>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>.net7.0-windows</TargetFramework>
     <PublishDir>..\Server\wwwroot\Content\Win-x86\</PublishDir>
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
     <SelfContained>true</SelfContained>

diff --git a/Desktop.Win/Properties/PublishProfiles/install-folder.pubxml b/Desktop.Win/Properties/PublishProfiles/install-folder.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>x64</Platform>
     <PublishDir>C:\Program Files\Remotely\Desktop</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>.net7.0-windows</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>

diff --git a/Desktop.Win/Properties/PublishProfiles/packaged-win-x64-debug.pubxml b/Desktop.Win/Properties/PublishProfiles/packaged-win-x64-debug.pubxml
@@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Debug</Configuration>
     <Platform>x64</Platform>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <PublishDir>..\Agent\bin\Release\net6.0\win10-x64\publish\Desktop</PublishDir>
+    <TargetFramework>.net7.0-windows</TargetFramework>
+    <PublishDir>..\Agent\bin\Release\.net7.0\win10-x64\publish\Desktop</PublishDir>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
     <PublishSingleFile>True</PublishSingleFile>

diff --git a/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml b/Desktop.Win/Properties/PublishProfiles/packaged-win-x64.pubxml
@@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <PublishDir>..\Agent\bin\Release\net6.0\win10-x64\publish\Desktop</PublishDir>
+    <TargetFramework>.net7.0-windows</TargetFramework>
+    <PublishDir>..\Agent\bin\Release\.net7.0\win10-x64\publish\Desktop</PublishDir>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
     <PublishSingleFile>False</PublishSingleFile>

diff --git a/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/packaged-win-x86.pubxml
@@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x86</Platform>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <PublishDir>..\Agent\bin\Release\net6.0\win10-x86\publish\Desktop</PublishDir>
+    <TargetFramework>.net7.0-windows</TargetFramework>
+    <PublishDir>..\Agent\bin\Release\.net7.0\win10-x86\publish\Desktop</PublishDir>
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>

diff --git a/Desktop.Win/Properties/PublishProfiles/wrapper-x64.pubxml b/Desktop.Win/Properties/PublishProfiles/wrapper-x64.pubxml
@@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>.net7.0-windows</TargetFramework>
     <PublishDir>bin\Release\win-x64\publish\</PublishDir>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>

diff --git a/Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml
@@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x86</Platform>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>.net7.0-windows</TargetFramework>
     <PublishDir>bin\Release\win-x86\publish\</PublishDir>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win10-x86</RuntimeIdentifier>

diff --git a/Remotely.sln b/Remotely.sln
@@ -61,14 +61,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docker", "Docker", "{963B55
 		.docker\DockerMain.sh = .docker\DockerMain.sh
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop.Linux", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.Linux\Immense.RemoteControl.Desktop.Linux.csproj", "{9E082AD4-AD3F-4C74-9787-F02FD7C064CA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop.Mac", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.Mac\Immense.RemoteControl.Desktop.Mac.csproj", "{8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop.Shared", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.Shared\Immense.RemoteControl.Desktop.Shared.csproj", "{3EB48B01-A672-4658-868B-8CA21FF73929}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop.UI", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.UI\Immense.RemoteControl.Desktop.UI.csproj", "{15E77F4B-1D80-476E-B2A2-3E88B4F98828}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop.UI.WPF", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.UI.WPF\Immense.RemoteControl.Desktop.UI.WPF.csproj", "{A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop.Windows", "submodules\Immense.RemoteControl\Immense.RemoteControl.Desktop.Windows\Immense.RemoteControl.Desktop.Windows.csproj", "{7FA4456D-8695-4990-B20A-B897CF9DF0EF}"
@@ -77,6 +71,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Serve
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Shared", "submodules\Immense.RemoteControl\Immense.RemoteControl.Shared\Immense.RemoteControl.Shared.csproj", "{FEF0D431-EB2F-4C08-A125-8DF59AFDA525}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Desktop", "..\immybot\submodules\RemoteControl\Immense.RemoteControl.Desktop\Immense.RemoteControl.Desktop.csproj", "{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -207,30 +203,6 @@ Global
 		{38099844-F6B6-4975-BEC5-D58A547145F0}.Release|x64.Build.0 = Release|Any CPU
 		{38099844-F6B6-4975-BEC5-D58A547145F0}.Release|x86.ActiveCfg = Release|Any CPU
 		{38099844-F6B6-4975-BEC5-D58A547145F0}.Release|x86.Build.0 = Release|Any CPU
-		{9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Debug|x64.Build.0 = Debug|Any CPU
-		{9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Debug|x86.Build.0 = Debug|Any CPU
-		{9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Release|x64.ActiveCfg = Release|Any CPU
-		{9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Release|x64.Build.0 = Release|Any CPU
-		{9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Release|x86.ActiveCfg = Release|Any CPU
-		{9E082AD4-AD3F-4C74-9787-F02FD7C064CA}.Release|x86.Build.0 = Release|Any CPU
-		{8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Debug|x64.Build.0 = Debug|Any CPU
-		{8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Debug|x86.Build.0 = Debug|Any CPU
-		{8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Release|x64.ActiveCfg = Release|Any CPU
-		{8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Release|x64.Build.0 = Release|Any CPU
-		{8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Release|x86.ActiveCfg = Release|Any CPU
-		{8013BDF2-BEBF-4CEF-AB64-6818224AFCAF}.Release|x86.Build.0 = Release|Any CPU
 		{3EB48B01-A672-4658-868B-8CA21FF73929}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3EB48B01-A672-4658-868B-8CA21FF73929}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3EB48B01-A672-4658-868B-8CA21FF73929}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -243,18 +215,6 @@ Global
 		{3EB48B01-A672-4658-868B-8CA21FF73929}.Release|x64.Build.0 = Release|Any CPU
 		{3EB48B01-A672-4658-868B-8CA21FF73929}.Release|x86.ActiveCfg = Release|Any CPU
 		{3EB48B01-A672-4658-868B-8CA21FF73929}.Release|x86.Build.0 = Release|Any CPU
-		{15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Debug|x64.Build.0 = Debug|Any CPU
-		{15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Debug|x86.Build.0 = Debug|Any CPU
-		{15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Release|Any CPU.Build.0 = Release|Any CPU
-		{15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Release|x64.ActiveCfg = Release|Any CPU
-		{15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Release|x64.Build.0 = Release|Any CPU
-		{15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Release|x86.ActiveCfg = Release|Any CPU
-		{15E77F4B-1D80-476E-B2A2-3E88B4F98828}.Release|x86.Build.0 = Release|Any CPU
 		{A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -303,6 +263,18 @@ Global
 		{FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Release|x64.Build.0 = Release|Any CPU
 		{FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Release|x86.ActiveCfg = Release|Any CPU
 		{FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Release|x86.Build.0 = Release|Any CPU
+		{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|x64.Build.0 = Debug|Any CPU
+		{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Debug|x86.Build.0 = Debug|Any CPU
+		{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|x64.ActiveCfg = Release|Any CPU
+		{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|x64.Build.0 = Release|Any CPU
+		{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|x86.ActiveCfg = Release|Any CPU
+		{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -312,14 +284,12 @@ Global
 		{6C25240C-613D-4A86-A04E-784BA6726094} = {0754E195-7080-4AAC-B5A3-A9923B1283CE}
 		{B6C1030D-1F74-4143-BB70-FC79C0274653} = {0754E195-7080-4AAC-B5A3-A9923B1283CE}
 		{963B5555-30AE-428E-9686-59C4B6FEC052} = {2176596E-12DA-4766-96E1-4D23EA7DBEC8}
-		{9E082AD4-AD3F-4C74-9787-F02FD7C064CA} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8}
-		{8013BDF2-BEBF-4CEF-AB64-6818224AFCAF} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8}
 		{3EB48B01-A672-4658-868B-8CA21FF73929} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8}
-		{15E77F4B-1D80-476E-B2A2-3E88B4F98828} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8}
 		{A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8}
 		{7FA4456D-8695-4990-B20A-B897CF9DF0EF} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8}
 		{8CBED18D-64A8-44C0-8433-EE14E93B472A} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8}
 		{FEF0D431-EB2F-4C08-A125-8DF59AFDA525} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8}
+		{605F98CC-D1DE-4B34-B42D-5738EC4CB0D9} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EAE10B28-119B-437C-9E68-06F0EE3F968A}