Separate 32/64-bit Windows desktop clients.

This commit is contained in:
Jared Goodwin 2019-12-22 23:02:24 -08:00
parent 21e670ca66
commit 7ccae0f987
8 changed files with 44 additions and 9 deletions

2
.gitignore vendored
View File

@ -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

View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PublishProtocol>FileSystem</PublishProtocol>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<TargetFramework>netcoreapp3.1</TargetFramework>
<PublishDir>..\Server\wwwroot\Downloads\Win-x64\</PublishDir>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>false</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
<PublishReadyToRun>False</PublishReadyToRun>
</PropertyGroup>
</Project>

View File

@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<TargetFramework>netcoreapp3.1</TargetFramework>
<PublishDir>..\Server\wwwroot\Downloads</PublishDir>
<PublishDir>..\Server\wwwroot\Downloads\Win-x86\</PublishDir>
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
<SelfContained>false</SelfContained>
<PublishSingleFile>True</PublishSingleFile>

View File

@ -10,21 +10,21 @@
Instant desktop sharing. No account required.
</div>
<div class="col-sm-6 mb-3">
<h6>Windows (64/32-Bit)</h6>
<h6>Windows (64-Bit)</h6>
<p>
<strong>Download:</strong>
<br />
<a href="~/Downloads/Remotely_Desktop.exe">Windows EXE</a>
<a href="~/Downloads/Win-x64/Remotely_Desktop.exe">Windows EXE</a>
</p>
</div>
@*<div class="col-sm-6">
<div class="col-sm-6">
<h6>Windows (32-Bit)</h6>
<p>
<strong>Download:</strong>
<br />
<a href="~/Downloads/Remotely_Desktop_Installer_x86.msi">Windows Installer</a>
<a href="~/Downloads/Win-x86/Remotely_Desktop.exe">Windows EXE</a>
</p>
</div>*@
</div>
<div class="col-sm-6 mb-3">
<h6>Linux 64-Bit</h6>
<p>

View File

@ -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/

View File

@ -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

View File

@ -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

View File

@ -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"