diff --git a/.gitignore b/.gitignore index 5be670d4..b5c56ad8 100644 --- a/.gitignore +++ b/.gitignore @@ -273,3 +273,5 @@ __pycache__/ /Server/Server.db-shm /Server/Server.db-wal /Server/wwwroot/Downloads/Remotely_Desktop +Server/wwwroot/Downloads/Win-x64/Remotely_Desktop.exe +Server/wwwroot/Downloads/Win-x86/Remotely_Desktop.exe diff --git a/Desktop.Win/Properties/PublishProfiles/win-x64.pubxml b/Desktop.Win/Properties/PublishProfiles/win-x64.pubxml new file mode 100644 index 00000000..70fe84fb --- /dev/null +++ b/Desktop.Win/Properties/PublishProfiles/win-x64.pubxml @@ -0,0 +1,17 @@ + + + + + FileSystem + Release + Any CPU + netcoreapp3.1 + ..\Server\wwwroot\Downloads\Win-x64\ + win-x64 + false + True + False + + \ No newline at end of file diff --git a/Desktop.Win/Properties/PublishProfiles/win-x86.pubxml b/Desktop.Win/Properties/PublishProfiles/win-x86.pubxml index b45e09ac..01cbf211 100644 --- a/Desktop.Win/Properties/PublishProfiles/win-x86.pubxml +++ b/Desktop.Win/Properties/PublishProfiles/win-x86.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU netcoreapp3.1 - ..\Server\wwwroot\Downloads + ..\Server\wwwroot\Downloads\Win-x86\ win-x86 false True diff --git a/Server/Pages/Agents.cshtml b/Server/Pages/Agents.cshtml index 2ad5bc35..1683dd94 100644 --- a/Server/Pages/Agents.cshtml +++ b/Server/Pages/Agents.cshtml @@ -10,21 +10,21 @@ Instant desktop sharing. No account required.
-
Windows (64/32-Bit)
+
Windows (64-Bit)

Download:
- Windows EXE + Windows EXE

- @*
+
Windows (32-Bit)

Download:
- Windows Installer + Windows EXE

-
*@ +
Linux 64-Bit

diff --git a/Server/wwwroot/Downloads/Install-Linux-x64.sh b/Server/wwwroot/Downloads/Install-Linux-x64.sh index 3e979390..d1a07287 100644 --- a/Server/wwwroot/Downloads/Install-Linux-x64.sh +++ b/Server/wwwroot/Downloads/Install-Linux-x64.sh @@ -18,6 +18,10 @@ apt-get -y install libgdiplus apt-get -y install libxtst-dev apt-get -y install xclip +wget -q https://dot.net/v1/dotnet-install.sh +chmod +x dotnet-install.sh +sudo ./dotnet-install.sh --runtime dotnet + mkdir -p /usr/local/bin/Remotely/ cd /usr/local/bin/Remotely/ diff --git a/Server/wwwroot/Downloads/Install-Win10-x64.ps1 b/Server/wwwroot/Downloads/Install-Win10-x64.ps1 index cb0b179e..4f345d2b 100644 --- a/Server/wwwroot/Downloads/Install-Win10-x64.ps1 +++ b/Server/wwwroot/Downloads/Install-Win10-x64.ps1 @@ -66,6 +66,8 @@ function Uninstall-Remotely { } function Install-Remotely { + Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile "$env:TEMP\dotnet-install.ps1" + &"$env:TEMP\dotnet-install.ps1" -runtime dotnet if ((Test-Path -Path "$InstallPath") -eq $true){ if ((Test-Path -Path "$InstallPath\ConnectionInfo.json") -eq $true){ $ConnectionInfo = Get-Content -Path "$InstallPath\ConnectionInfo.json" | ConvertFrom-Json diff --git a/Server/wwwroot/Downloads/Install-Win10-x86.ps1 b/Server/wwwroot/Downloads/Install-Win10-x86.ps1 index d76e9ad1..181c9bbc 100644 --- a/Server/wwwroot/Downloads/Install-Win10-x86.ps1 +++ b/Server/wwwroot/Downloads/Install-Win10-x86.ps1 @@ -63,6 +63,8 @@ function Uninstall-Remotely { } function Install-Remotely { + Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile "$env:TEMP\dotnet-install.ps1" + &"$env:TEMP\dotnet-install.ps1" -runtime dotnet if ((Test-Path -Path "$InstallPath") -eq $true){ if ((Test-Path -Path "$InstallPath\ConnectionInfo.json") -eq $true){ $ConnectionInfo = Get-Content -Path "$InstallPath\ConnectionInfo.json" | ConvertFrom-Json diff --git a/Utilities/Publish.ps1 b/Utilities/Publish.ps1 index affe5484..9f9d10c2 100644 --- a/Utilities/Publish.ps1 +++ b/Utilities/Publish.ps1 @@ -136,13 +136,21 @@ dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion -p:Publ # Publish Windows ScreenCaster (64-bit) dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion -p:PublishProfile=win-x64 "$Root\ScreenCast.Win" -# Publish Windows GUI App -dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion -p:PublishProfile=win-x64 "$Root\ScreenCast.Win" +# Publish Windows GUI App (64-bit) +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion -p:PublishProfile=win-x64 "$Root\Desktop.Win" if ($SignAssemblies) { - &"$Root\Utilities\signtool.exe" sign /f "$CertificatePath" /p $CertificatePassword /t http://timestamp.digicert.com "$Root\Server\wwwroot\Downloads\Remotely_Desktop.exe" + &"$Root\Utilities\signtool.exe" sign /f "$CertificatePath" /p $CertificatePassword /t http://timestamp.digicert.com "$Root\Server\wwwroot\Downloads\Win-x64\Remotely_Desktop.exe" } +# Publish Windows GUI App (32-bit) +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion -p:PublishProfile=win-x86 "$Root\Desktop.Win" + +if ($SignAssemblies) { + &"$Root\Utilities\signtool.exe" sign /f "$CertificatePath" /p $CertificatePassword /t http://timestamp.digicert.com "$Root\Server\wwwroot\Downloads\Win-x86\Remotely_Desktop.exe" +} + + # Compress Core clients. $PublishDir = "$Root\Agent\bin\Release\netcoreapp3.1\win10-x64\publish"