Add namespaces to Program.cs. Make publish locations runtime-agnostic.

immense · Aug 18, 2023 · 3f28fab · 3f28fab
1 parent 6fc0d98
commit 3f28fab
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 58 deletions.
diff --git a/Desktop.Linux/Program.cs b/Desktop.Linux/Program.cs
@@ -16,6 +16,8 @@
 using Immense.RemoteControl.Desktop.UI;
 using Desktop.Shared.Services;
 
+namespace Remotely.Desktop.XPlat;
+
 public class Program
 {
     // This is needed for the visual designer to work.
@@ -105,4 +107,4 @@ public static async Task Main(string[] args)
         }
         catch (TaskCanceledException) { }
     }
-}
+}
diff --git a/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml b/Desktop.Linux/Properties/PublishProfiles/packaged-linux-x64.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
     <TargetFramework>net7.0</TargetFramework>
-    <PublishDir>..\Agent\bin\Release\net7.0\linux-x64\publish\Desktop</PublishDir>
+    <PublishDir>..\Agent\bin\publish\linux-x64\Desktop</PublishDir>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>

diff --git a/Desktop.Win/Program.cs b/Desktop.Win/Program.cs
@@ -15,6 +15,8 @@
 using Immense.RemoteControl.Desktop.UI;
 using Desktop.Shared.Services;
 
+namespace Remotely.Desktop.Win;
+
 public class Program
 {
     // This is needed for the visual designer to work.
@@ -95,4 +97,4 @@ public static async Task Main(string[] args)
         }
         catch (TaskCanceledException) { }
     }
-}
+}
diff --git a/Desktop.Win/Properties/PublishProfiles/packaged-win-x64-debug.pubxml b/Desktop.Win/Properties/PublishProfiles/packaged-win-x64-debug.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Configuration>Debug</Configuration>
     <Platform>x64</Platform>
     <TargetFramework>net7.0</TargetFramework>
-    <PublishDir>..\Agent\bin\Release\net7.0\win-x64\publish\Desktop</PublishDir>
+    <PublishDir>..\Agent\bin\publish\win-x64\Desktop</PublishDir>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-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
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
     <TargetFramework>net7.0</TargetFramework>
-    <PublishDir>..\Agent\bin\Release\net7.0\win-x64\publish\Desktop</PublishDir>
+    <PublishDir>..\Agent\bin\publish\win-x64\Desktop</PublishDir>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-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
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Configuration>Release</Configuration>
     <Platform>x86</Platform>
     <TargetFramework>net7.0</TargetFramework>
-    <PublishDir>..\Agent\bin\Release\net7.0\win-x86\publish\Desktop</PublishDir>
+    <PublishDir>..\Agent\bin\publish\win-x86\Desktop</PublishDir>
     <RuntimeIdentifier>win-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
diff --git a/Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/wrapper-x86.pubxml
diff --git a/Utilities/Publish.ps1 b/Utilities/Publish.ps1
@@ -92,25 +92,25 @@ if ([string]::IsNullOrWhiteSpace($MSBuildPath) -or !(Test-Path -Path $MSBuildPat
 
 
 # Clear publish folders.
-if ((Test-Path -Path "$Root\Agent\bin\Release\net7.0\win-x64\publish") -eq $true) {
-	Get-ChildItem -Path "$Root\Agent\bin\Release\net7.0\win-x64\publish" | Remove-Item -Force -Recurse
+if ((Test-Path -Path "$Root\Agent\bin\publish\win-x64") -eq $true) {
+	Get-ChildItem -Path "$Root\Agent\bin\publish\win-x64" | Remove-Item -Force -Recurse
 }
-if ((Test-Path -Path  "$Root\Agent\bin\Release\net7.0\win-x86\publish" ) -eq $true) {
-	Get-ChildItem -Path  "$Root\Agent\bin\Release\net7.0\win-x86\publish" | Remove-Item -Force -Recurse
+if ((Test-Path -Path  "$Root\Agent\bin\publish\win-x86" ) -eq $true) {
+	Get-ChildItem -Path  "$Root\Agent\bin\publish\win-x86" | Remove-Item -Force -Recurse
 }
-if ((Test-Path -Path "$Root\Agent\bin\Release\net7.0\linux-x64\publish") -eq $true) {
-	Get-ChildItem -Path "$Root\Agent\bin\Release\net7.0\linux-x64\publish" | Remove-Item -Force -Recurse
+if ((Test-Path -Path "$Root\Agent\bin\publish\linux-x64") -eq $true) {
+	Get-ChildItem -Path "$Root\Agent\bin\publish\linux-x64" | Remove-Item -Force -Recurse
 }
 
 
 # Publish Core clients.
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win-x64 --self-contained --configuration Release --output "$Root\Agent\bin\Release\net7.0\win-x64\publish" "$Root\Agent"
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --self-contained --configuration Release --output "$Root\Agent\bin\Release\net7.0\linux-x64\publish" "$Root\Agent"
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win-x86 --self-contained --configuration Release --output "$Root\Agent\bin\Release\net7.0\win-x86\publish" "$Root\Agent"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win-x64 --self-contained --configuration Release --output "$Root\Agent\bin\publish\win-x64" "$Root\Agent"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --self-contained --configuration Release --output "$Root\Agent\bin\publish\linux-x64" "$Root\Agent"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win-x86 --self-contained --configuration Release --output "$Root\Agent\bin\publish\win-x86" "$Root\Agent"
 
-New-Item -Path "$Root\Agent\bin\Release\net7.0\win-x64\publish\Desktop\" -ItemType Directory -Force
-New-Item -Path "$Root\Agent\bin\Release\net7.0\win-x86\publish\Desktop\" -ItemType Directory -Force
-New-Item -Path "$Root\Agent\bin\Release\net7.0\linux-x64\publish\Desktop\" -ItemType Directory -Force
+New-Item -Path "$Root\Agent\bin\publish\win-x64\Desktop\" -ItemType Directory -Force
+New-Item -Path "$Root\Agent\bin\publish\win-x86\Desktop\" -ItemType Directory -Force
+New-Item -Path "$Root\Agent\bin\publish\linux-x64\Desktop\" -ItemType Directory -Force
 
 
 # Publish Linux ScreenCaster
@@ -155,23 +155,23 @@ if ($SignAssemblies) {
 }
 
 # Compress Core clients.
-$PublishDir =  "$Root\Agent\bin\Release\net7.0\win-x64\publish"
+$PublishDir =  "$Root\Agent\bin\publish\win-x64"
 Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Win-x64.zip" -Force
 while ((Test-Path -Path "$PublishDir\Remotely-Win-x64.zip") -eq $false){
     Write-Host "Waiting for archive to finish: $PublishDir\Remotely-Win-x64.zip"
     Start-Sleep -Seconds 3
 }
 Move-Item -Path "$PublishDir\Remotely-Win-x64.zip" -Destination "$Root\Server\wwwroot\Content\Remotely-Win-x64.zip" -Force
 
-$PublishDir =  "$Root\Agent\bin\Release\net7.0\win-x86\publish"
+$PublishDir =  "$Root\Agent\bin\publish\win-x86"
 Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Win-x86.zip" -Force
 while ((Test-Path -Path "$PublishDir\Remotely-Win-x86.zip") -eq $false){
     Write-Host "Waiting for archive to finish: $PublishDir\Remotely-Win-x86.zip"
     Start-Sleep -Seconds 3
 }
 Move-Item -Path "$PublishDir\Remotely-Win-x86.zip" -Destination "$Root\Server\wwwroot\Content\Remotely-Win-x86.zip" -Force
 
-$PublishDir =  "$Root\Agent\bin\Release\net7.0\linux-x64\publish"
+$PublishDir =  "$Root\Agent\bin\publish\linux-x64"
 Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Linux.zip" -Force
 while ((Test-Path -Path "$PublishDir\Remotely-Linux.zip") -eq $false){
     Write-Host "Waiting for archive to finish: $PublishDir\Remotely-Win-x86.zip"

diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl
+3 −5		Immense.RemoteControl.Desktop.UI/Services/ChatUiService.cs
+26 −25		Immense.RemoteControl.Desktop.UI/Services/RemoteControlAccessService.cs
+8 −9		Immense.RemoteControl.Desktop.UI/Services/ViewModelFactory.cs
+0 −15		Immense.RemoteControl.Desktop.UI/ViewModels/PromptForAccessWindowViewModel.cs
+1 −0		Immense.RemoteControl.Desktop.UI/Views/PromptForAccessWindow.axaml
+3 −10		Immense.RemoteControl.Desktop.UI/Views/PromptForAccessWindow.axaml.cs
+3 −3		Immense.RemoteControl.Desktop.UI/Views/SessionIndicatorWindow.axaml
+6 −0		Immense.RemoteControl.Desktop.UI/Views/SessionIndicatorWindow.axaml.cs
+1 −1		Immense.RemoteControl.Server/Hubs/ViewerHub.cs