From 9a538de5e5ca223aaf5a5e71b37a5fac2ce79e1b Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Wed, 19 Apr 2023 07:29:09 -0700 Subject: [PATCH] Update submodule after namespace changes. --- Desktop.Linux/Desktop.Linux.csproj | 3 +- Desktop.Shared/Desktop.Shared.csproj | 2 +- Desktop.Win/Desktop.Win.csproj | 2 +- Desktop.Win/Program.cs | 1 - Remotely.sln | 240 +++++++++++++-------------- Server/Server.csproj | 2 +- Shared/Shared.csproj | 2 +- submodules/Immense.RemoteControl | 2 +- 8 files changed, 126 insertions(+), 128 deletions(-) diff --git a/Desktop.Linux/Desktop.Linux.csproj b/Desktop.Linux/Desktop.Linux.csproj index aa7d0a9d7..b0c39af3f 100644 --- a/Desktop.Linux/Desktop.Linux.csproj +++ b/Desktop.Linux/Desktop.Linux.csproj @@ -62,7 +62,6 @@ - - + diff --git a/Desktop.Shared/Desktop.Shared.csproj b/Desktop.Shared/Desktop.Shared.csproj index 4489fdd18..0cdf66051 100644 --- a/Desktop.Shared/Desktop.Shared.csproj +++ b/Desktop.Shared/Desktop.Shared.csproj @@ -17,7 +17,7 @@ - + diff --git a/Desktop.Win/Desktop.Win.csproj b/Desktop.Win/Desktop.Win.csproj index 0aba39b72..bd7058a55 100644 --- a/Desktop.Win/Desktop.Win.csproj +++ b/Desktop.Win/Desktop.Win.csproj @@ -51,7 +51,7 @@ - + diff --git a/Desktop.Win/Program.cs b/Desktop.Win/Program.cs index 90a0f6169..e89c74511 100644 --- a/Desktop.Win/Program.cs +++ b/Desktop.Win/Program.cs @@ -26,7 +26,6 @@ { logger.LogWarning(getEmbeddedResult.Exception, "Failed to extract embedded server data."); } - var services = new ServiceCollection(); services.AddSingleton(); diff --git a/Remotely.sln b/Remotely.sln index f05c4ba4d..0c395f761 100644 --- a/Remotely.sln +++ b/Remotely.sln @@ -51,24 +51,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared.Tests", "Tests\Share EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Submodules", "Submodules", "{48C738FB-359E-43DB-B338-FD7CB1CCF6A8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "submodules\Immense.RemoteControl\Server\Server.csproj", "{F3156F61-C676-4C48-AC77-5EA0B7E6103C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Desktop.Shared", "submodules\Immense.RemoteControl\Desktop.Shared\Desktop.Shared.csproj", "{13B2A6A1-A4D6-4151-BB1D-AF99C0978BC7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Desktop.Windows", "submodules\Immense.RemoteControl\Desktop.Windows\Desktop.Windows.csproj", "{FA176AB4-9BEB-43A0-873C-A79AE1404175}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Desktop.Linux", "submodules\Immense.RemoteControl\Desktop.Linux\Desktop.Linux.csproj", "{CD57135E-1595-41AB-91D6-4DD5188E3275}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Desktop.Mac", "submodules\Immense.RemoteControl\Desktop.Mac\Desktop.Mac.csproj", "{EF01B68C-7211-44DD-B4B2-B1C7341455CD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "submodules\Immense.RemoteControl\Shared\Shared.csproj", "{60173A96-0886-4DB0-903A-74ABA9F64C2C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Desktop.Shared", "Desktop.Shared\Desktop.Shared.csproj", "{38099844-F6B6-4975-BEC5-D58A547145F0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Desktop.UI.WPF", "submodules\Immense.RemoteControl\Desktop.UI.WPF\Desktop.UI.WPF.csproj", "{1F3338AA-7141-4864-991C-A60196C92111}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Desktop.UI", "submodules\Immense.RemoteControl\Desktop.UI\Desktop.UI.csproj", "{A53091D5-29A9-4EBF-B4E5-26DCFF0A516C}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docker", "Docker", "{963B5555-30AE-428E-9686-59C4B6FEC052}" ProjectSection(SolutionItems) = preProject .docker\Dockerfile = .docker\Dockerfile @@ -77,6 +61,22 @@ 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}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Immense.RemoteControl.Server", "submodules\Immense.RemoteControl\Immense.RemoteControl.Server\Immense.RemoteControl.Server.csproj", "{8CBED18D-64A8-44C0-8433-EE14E93B472A}" +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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -195,78 +195,6 @@ Global {B6C1030D-1F74-4143-BB70-FC79C0274653}.Release|x64.Build.0 = Release|Any CPU {B6C1030D-1F74-4143-BB70-FC79C0274653}.Release|x86.ActiveCfg = Release|Any CPU {B6C1030D-1F74-4143-BB70-FC79C0274653}.Release|x86.Build.0 = Release|Any CPU - {F3156F61-C676-4C48-AC77-5EA0B7E6103C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3156F61-C676-4C48-AC77-5EA0B7E6103C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3156F61-C676-4C48-AC77-5EA0B7E6103C}.Debug|x64.ActiveCfg = Debug|Any CPU - {F3156F61-C676-4C48-AC77-5EA0B7E6103C}.Debug|x64.Build.0 = Debug|Any CPU - {F3156F61-C676-4C48-AC77-5EA0B7E6103C}.Debug|x86.ActiveCfg = Debug|Any CPU - {F3156F61-C676-4C48-AC77-5EA0B7E6103C}.Debug|x86.Build.0 = Debug|Any CPU - {F3156F61-C676-4C48-AC77-5EA0B7E6103C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3156F61-C676-4C48-AC77-5EA0B7E6103C}.Release|Any CPU.Build.0 = Release|Any CPU - {F3156F61-C676-4C48-AC77-5EA0B7E6103C}.Release|x64.ActiveCfg = Release|Any CPU - {F3156F61-C676-4C48-AC77-5EA0B7E6103C}.Release|x64.Build.0 = Release|Any CPU - {F3156F61-C676-4C48-AC77-5EA0B7E6103C}.Release|x86.ActiveCfg = Release|Any CPU - {F3156F61-C676-4C48-AC77-5EA0B7E6103C}.Release|x86.Build.0 = Release|Any CPU - {13B2A6A1-A4D6-4151-BB1D-AF99C0978BC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13B2A6A1-A4D6-4151-BB1D-AF99C0978BC7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13B2A6A1-A4D6-4151-BB1D-AF99C0978BC7}.Debug|x64.ActiveCfg = Debug|Any CPU - {13B2A6A1-A4D6-4151-BB1D-AF99C0978BC7}.Debug|x64.Build.0 = Debug|Any CPU - {13B2A6A1-A4D6-4151-BB1D-AF99C0978BC7}.Debug|x86.ActiveCfg = Debug|Any CPU - {13B2A6A1-A4D6-4151-BB1D-AF99C0978BC7}.Debug|x86.Build.0 = Debug|Any CPU - {13B2A6A1-A4D6-4151-BB1D-AF99C0978BC7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13B2A6A1-A4D6-4151-BB1D-AF99C0978BC7}.Release|Any CPU.Build.0 = Release|Any CPU - {13B2A6A1-A4D6-4151-BB1D-AF99C0978BC7}.Release|x64.ActiveCfg = Release|Any CPU - {13B2A6A1-A4D6-4151-BB1D-AF99C0978BC7}.Release|x64.Build.0 = Release|Any CPU - {13B2A6A1-A4D6-4151-BB1D-AF99C0978BC7}.Release|x86.ActiveCfg = Release|Any CPU - {13B2A6A1-A4D6-4151-BB1D-AF99C0978BC7}.Release|x86.Build.0 = Release|Any CPU - {FA176AB4-9BEB-43A0-873C-A79AE1404175}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA176AB4-9BEB-43A0-873C-A79AE1404175}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA176AB4-9BEB-43A0-873C-A79AE1404175}.Debug|x64.ActiveCfg = Debug|Any CPU - {FA176AB4-9BEB-43A0-873C-A79AE1404175}.Debug|x64.Build.0 = Debug|Any CPU - {FA176AB4-9BEB-43A0-873C-A79AE1404175}.Debug|x86.ActiveCfg = Debug|Any CPU - {FA176AB4-9BEB-43A0-873C-A79AE1404175}.Debug|x86.Build.0 = Debug|Any CPU - {FA176AB4-9BEB-43A0-873C-A79AE1404175}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA176AB4-9BEB-43A0-873C-A79AE1404175}.Release|Any CPU.Build.0 = Release|Any CPU - {FA176AB4-9BEB-43A0-873C-A79AE1404175}.Release|x64.ActiveCfg = Release|Any CPU - {FA176AB4-9BEB-43A0-873C-A79AE1404175}.Release|x64.Build.0 = Release|Any CPU - {FA176AB4-9BEB-43A0-873C-A79AE1404175}.Release|x86.ActiveCfg = Release|Any CPU - {FA176AB4-9BEB-43A0-873C-A79AE1404175}.Release|x86.Build.0 = Release|Any CPU - {CD57135E-1595-41AB-91D6-4DD5188E3275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD57135E-1595-41AB-91D6-4DD5188E3275}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD57135E-1595-41AB-91D6-4DD5188E3275}.Debug|x64.ActiveCfg = Debug|Any CPU - {CD57135E-1595-41AB-91D6-4DD5188E3275}.Debug|x64.Build.0 = Debug|Any CPU - {CD57135E-1595-41AB-91D6-4DD5188E3275}.Debug|x86.ActiveCfg = Debug|Any CPU - {CD57135E-1595-41AB-91D6-4DD5188E3275}.Debug|x86.Build.0 = Debug|Any CPU - {CD57135E-1595-41AB-91D6-4DD5188E3275}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD57135E-1595-41AB-91D6-4DD5188E3275}.Release|Any CPU.Build.0 = Release|Any CPU - {CD57135E-1595-41AB-91D6-4DD5188E3275}.Release|x64.ActiveCfg = Release|Any CPU - {CD57135E-1595-41AB-91D6-4DD5188E3275}.Release|x64.Build.0 = Release|Any CPU - {CD57135E-1595-41AB-91D6-4DD5188E3275}.Release|x86.ActiveCfg = Release|Any CPU - {CD57135E-1595-41AB-91D6-4DD5188E3275}.Release|x86.Build.0 = Release|Any CPU - {EF01B68C-7211-44DD-B4B2-B1C7341455CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF01B68C-7211-44DD-B4B2-B1C7341455CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF01B68C-7211-44DD-B4B2-B1C7341455CD}.Debug|x64.ActiveCfg = Debug|Any CPU - {EF01B68C-7211-44DD-B4B2-B1C7341455CD}.Debug|x64.Build.0 = Debug|Any CPU - {EF01B68C-7211-44DD-B4B2-B1C7341455CD}.Debug|x86.ActiveCfg = Debug|Any CPU - {EF01B68C-7211-44DD-B4B2-B1C7341455CD}.Debug|x86.Build.0 = Debug|Any CPU - {EF01B68C-7211-44DD-B4B2-B1C7341455CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF01B68C-7211-44DD-B4B2-B1C7341455CD}.Release|Any CPU.Build.0 = Release|Any CPU - {EF01B68C-7211-44DD-B4B2-B1C7341455CD}.Release|x64.ActiveCfg = Release|Any CPU - {EF01B68C-7211-44DD-B4B2-B1C7341455CD}.Release|x64.Build.0 = Release|Any CPU - {EF01B68C-7211-44DD-B4B2-B1C7341455CD}.Release|x86.ActiveCfg = Release|Any CPU - {EF01B68C-7211-44DD-B4B2-B1C7341455CD}.Release|x86.Build.0 = Release|Any CPU - {60173A96-0886-4DB0-903A-74ABA9F64C2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60173A96-0886-4DB0-903A-74ABA9F64C2C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60173A96-0886-4DB0-903A-74ABA9F64C2C}.Debug|x64.ActiveCfg = Debug|Any CPU - {60173A96-0886-4DB0-903A-74ABA9F64C2C}.Debug|x64.Build.0 = Debug|Any CPU - {60173A96-0886-4DB0-903A-74ABA9F64C2C}.Debug|x86.ActiveCfg = Debug|Any CPU - {60173A96-0886-4DB0-903A-74ABA9F64C2C}.Debug|x86.Build.0 = Debug|Any CPU - {60173A96-0886-4DB0-903A-74ABA9F64C2C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60173A96-0886-4DB0-903A-74ABA9F64C2C}.Release|Any CPU.Build.0 = Release|Any CPU - {60173A96-0886-4DB0-903A-74ABA9F64C2C}.Release|x64.ActiveCfg = Release|Any CPU - {60173A96-0886-4DB0-903A-74ABA9F64C2C}.Release|x64.Build.0 = Release|Any CPU - {60173A96-0886-4DB0-903A-74ABA9F64C2C}.Release|x86.ActiveCfg = Release|Any CPU - {60173A96-0886-4DB0-903A-74ABA9F64C2C}.Release|x86.Build.0 = Release|Any CPU {38099844-F6B6-4975-BEC5-D58A547145F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {38099844-F6B6-4975-BEC5-D58A547145F0}.Debug|Any CPU.Build.0 = Debug|Any CPU {38099844-F6B6-4975-BEC5-D58A547145F0}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -279,30 +207,102 @@ 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 - {1F3338AA-7141-4864-991C-A60196C92111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F3338AA-7141-4864-991C-A60196C92111}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F3338AA-7141-4864-991C-A60196C92111}.Debug|x64.ActiveCfg = Debug|Any CPU - {1F3338AA-7141-4864-991C-A60196C92111}.Debug|x64.Build.0 = Debug|Any CPU - {1F3338AA-7141-4864-991C-A60196C92111}.Debug|x86.ActiveCfg = Debug|Any CPU - {1F3338AA-7141-4864-991C-A60196C92111}.Debug|x86.Build.0 = Debug|Any CPU - {1F3338AA-7141-4864-991C-A60196C92111}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F3338AA-7141-4864-991C-A60196C92111}.Release|Any CPU.Build.0 = Release|Any CPU - {1F3338AA-7141-4864-991C-A60196C92111}.Release|x64.ActiveCfg = Release|Any CPU - {1F3338AA-7141-4864-991C-A60196C92111}.Release|x64.Build.0 = Release|Any CPU - {1F3338AA-7141-4864-991C-A60196C92111}.Release|x86.ActiveCfg = Release|Any CPU - {1F3338AA-7141-4864-991C-A60196C92111}.Release|x86.Build.0 = Release|Any CPU - {A53091D5-29A9-4EBF-B4E5-26DCFF0A516C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A53091D5-29A9-4EBF-B4E5-26DCFF0A516C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A53091D5-29A9-4EBF-B4E5-26DCFF0A516C}.Debug|x64.ActiveCfg = Debug|Any CPU - {A53091D5-29A9-4EBF-B4E5-26DCFF0A516C}.Debug|x64.Build.0 = Debug|Any CPU - {A53091D5-29A9-4EBF-B4E5-26DCFF0A516C}.Debug|x86.ActiveCfg = Debug|Any CPU - {A53091D5-29A9-4EBF-B4E5-26DCFF0A516C}.Debug|x86.Build.0 = Debug|Any CPU - {A53091D5-29A9-4EBF-B4E5-26DCFF0A516C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A53091D5-29A9-4EBF-B4E5-26DCFF0A516C}.Release|Any CPU.Build.0 = Release|Any CPU - {A53091D5-29A9-4EBF-B4E5-26DCFF0A516C}.Release|x64.ActiveCfg = Release|Any CPU - {A53091D5-29A9-4EBF-B4E5-26DCFF0A516C}.Release|x64.Build.0 = Release|Any CPU - {A53091D5-29A9-4EBF-B4E5-26DCFF0A516C}.Release|x86.ActiveCfg = Release|Any CPU - {A53091D5-29A9-4EBF-B4E5-26DCFF0A516C}.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 + {3EB48B01-A672-4658-868B-8CA21FF73929}.Debug|x64.Build.0 = Debug|Any CPU + {3EB48B01-A672-4658-868B-8CA21FF73929}.Debug|x86.ActiveCfg = Debug|Any CPU + {3EB48B01-A672-4658-868B-8CA21FF73929}.Debug|x86.Build.0 = Debug|Any CPU + {3EB48B01-A672-4658-868B-8CA21FF73929}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3EB48B01-A672-4658-868B-8CA21FF73929}.Release|Any CPU.Build.0 = Release|Any CPU + {3EB48B01-A672-4658-868B-8CA21FF73929}.Release|x64.ActiveCfg = Release|Any CPU + {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 + {A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}.Debug|x64.Build.0 = Debug|Any CPU + {A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}.Debug|x86.ActiveCfg = Debug|Any CPU + {A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}.Debug|x86.Build.0 = Debug|Any CPU + {A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}.Release|Any CPU.Build.0 = Release|Any CPU + {A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}.Release|x64.ActiveCfg = Release|Any CPU + {A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}.Release|x64.Build.0 = Release|Any CPU + {A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}.Release|x86.ActiveCfg = Release|Any CPU + {A6C36B1F-A5EA-4C9C-88E2-FAA05CE89D78}.Release|x86.Build.0 = Release|Any CPU + {7FA4456D-8695-4990-B20A-B897CF9DF0EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7FA4456D-8695-4990-B20A-B897CF9DF0EF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7FA4456D-8695-4990-B20A-B897CF9DF0EF}.Debug|x64.ActiveCfg = Debug|Any CPU + {7FA4456D-8695-4990-B20A-B897CF9DF0EF}.Debug|x64.Build.0 = Debug|Any CPU + {7FA4456D-8695-4990-B20A-B897CF9DF0EF}.Debug|x86.ActiveCfg = Debug|Any CPU + {7FA4456D-8695-4990-B20A-B897CF9DF0EF}.Debug|x86.Build.0 = Debug|Any CPU + {7FA4456D-8695-4990-B20A-B897CF9DF0EF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7FA4456D-8695-4990-B20A-B897CF9DF0EF}.Release|Any CPU.Build.0 = Release|Any CPU + {7FA4456D-8695-4990-B20A-B897CF9DF0EF}.Release|x64.ActiveCfg = Release|Any CPU + {7FA4456D-8695-4990-B20A-B897CF9DF0EF}.Release|x64.Build.0 = Release|Any CPU + {7FA4456D-8695-4990-B20A-B897CF9DF0EF}.Release|x86.ActiveCfg = Release|Any CPU + {7FA4456D-8695-4990-B20A-B897CF9DF0EF}.Release|x86.Build.0 = Release|Any CPU + {8CBED18D-64A8-44C0-8433-EE14E93B472A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8CBED18D-64A8-44C0-8433-EE14E93B472A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8CBED18D-64A8-44C0-8433-EE14E93B472A}.Debug|x64.ActiveCfg = Debug|Any CPU + {8CBED18D-64A8-44C0-8433-EE14E93B472A}.Debug|x64.Build.0 = Debug|Any CPU + {8CBED18D-64A8-44C0-8433-EE14E93B472A}.Debug|x86.ActiveCfg = Debug|Any CPU + {8CBED18D-64A8-44C0-8433-EE14E93B472A}.Debug|x86.Build.0 = Debug|Any CPU + {8CBED18D-64A8-44C0-8433-EE14E93B472A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8CBED18D-64A8-44C0-8433-EE14E93B472A}.Release|Any CPU.Build.0 = Release|Any CPU + {8CBED18D-64A8-44C0-8433-EE14E93B472A}.Release|x64.ActiveCfg = Release|Any CPU + {8CBED18D-64A8-44C0-8433-EE14E93B472A}.Release|x64.Build.0 = Release|Any CPU + {8CBED18D-64A8-44C0-8433-EE14E93B472A}.Release|x86.ActiveCfg = Release|Any CPU + {8CBED18D-64A8-44C0-8433-EE14E93B472A}.Release|x86.Build.0 = Release|Any CPU + {FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Debug|x64.ActiveCfg = Debug|Any CPU + {FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Debug|x64.Build.0 = Debug|Any CPU + {FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Debug|x86.ActiveCfg = Debug|Any CPU + {FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Debug|x86.Build.0 = Debug|Any CPU + {FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Release|Any CPU.Build.0 = Release|Any CPU + {FEF0D431-EB2F-4C08-A125-8DF59AFDA525}.Release|x64.ActiveCfg = Release|Any CPU + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -311,15 +311,15 @@ Global {48D9D0E6-5781-44A9-84C0-56F56C2A1193} = {0754E195-7080-4AAC-B5A3-A9923B1283CE} {6C25240C-613D-4A86-A04E-784BA6726094} = {0754E195-7080-4AAC-B5A3-A9923B1283CE} {B6C1030D-1F74-4143-BB70-FC79C0274653} = {0754E195-7080-4AAC-B5A3-A9923B1283CE} - {F3156F61-C676-4C48-AC77-5EA0B7E6103C} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} - {13B2A6A1-A4D6-4151-BB1D-AF99C0978BC7} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} - {FA176AB4-9BEB-43A0-873C-A79AE1404175} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} - {CD57135E-1595-41AB-91D6-4DD5188E3275} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} - {EF01B68C-7211-44DD-B4B2-B1C7341455CD} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} - {60173A96-0886-4DB0-903A-74ABA9F64C2C} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} - {1F3338AA-7141-4864-991C-A60196C92111} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} - {A53091D5-29A9-4EBF-B4E5-26DCFF0A516C} = {48C738FB-359E-43DB-B338-FD7CB1CCF6A8} {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EAE10B28-119B-437C-9E68-06F0EE3F968A} diff --git a/Server/Server.csproj b/Server/Server.csproj index 7cd4db572..f72bcdcb8 100644 --- a/Server/Server.csproj +++ b/Server/Server.csproj @@ -47,7 +47,7 @@ - + diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj index 3cd82926a..44a4a07c9 100644 --- a/Shared/Shared.csproj +++ b/Shared/Shared.csproj @@ -17,7 +17,7 @@ - + diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl index 283f66562..6c0079577 160000 --- a/submodules/Immense.RemoteControl +++ b/submodules/Immense.RemoteControl @@ -1 +1 @@ -Subproject commit 283f66562d90b84132b40116b31694c691a97cc9 +Subproject commit 6c0079577bd7fdf8379e6b6dc92e9eba67afef53