From 3d9a8765ce40e5053f900c1deddfba804c80e640 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Sat, 28 Sep 2019 10:35:11 -0700 Subject: [PATCH] Updated scripts and readme. --- README.md | 6 ++--- Server/CurrentVersion.txt | 2 +- Utilities/Publish.ps1 | 38 ++++++++++++++-------------- Utilities/Remotely_Server_Install.sh | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 25b3d4bf..2e16b452 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ The following steps will configure your Windows 10 machine for building the Remo * If the site will be public-facing, configure your bindings in IIS. * An SSL certificate for HTTPS is recommended. You can install one for free using Let's Encrypt. * Resources: https://letsencrypt.org/, https://certifytheweb.com/ -* Documentation for hosting in IIS can be found here: https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/iis/index?view=aspnetcore-2.2 +* Documentation for hosting in IIS can be found here: https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/iis/index?view=aspnetcore-3.0 ## Hosting a Server (Ubuntu) * Ubuntu 18.04 and 19.04 have been tested. The Linux server package might work with other distros after some alterations to the setup script. @@ -51,7 +51,7 @@ The following steps will configure your Windows 10 machine for building the Remo * More information: https://letsencrypt.org/, https://certbot.eff.org/ * Change values in appsettings.json for your environment. * After creating your account on the website, you can set "AllowSelfRegistration" to false in appsettings.json to disable registration. -* Documentation for hosting behind Nginx can be found here: https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/linux-nginx?view=aspnetcore-2.2 +* Documentation for hosting behind Nginx can be found here: https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/linux-nginx?view=aspnetcore-3.0 ## Logging * On clients, logs are kept in %temp%\Remotely_Logs.txt. @@ -62,7 +62,7 @@ The following steps will configure your Windows 10 machine for building the Remo * On Windows Servers, the above logs can also be written to the Windows Event Log. * This is enabled in appsettings.json by setting EnableWindowsEventLog to true. * You can configure logging levels and other settings in appsetttings.json. - * More information: https://docs.microsoft.com/en-us/aspnet/core/fundamentals/logging/?view=aspnetcore-2.2 + * More information: https://docs.microsoft.com/en-us/aspnet/core/fundamentals/logging/?view=aspnetcore-3.0 ## Remote Control Requirements * Windows: Only the latest version of Windows 10 is tested. diff --git a/Server/CurrentVersion.txt b/Server/CurrentVersion.txt index 02d95b2c..44273786 100644 --- a/Server/CurrentVersion.txt +++ b/Server/CurrentVersion.txt @@ -1 +1 @@ -2019.09.18.1743 +2019.09.28.1011 diff --git a/Utilities/Publish.ps1 b/Utilities/Publish.ps1 index f0411f3f..087fdbab 100644 --- a/Utilities/Publish.ps1 +++ b/Utilities/Publish.ps1 @@ -69,32 +69,32 @@ Set-Content -Path ".\Server\CurrentVersion.txt" -Value $CurrentVersion.Trim() -E # Clear publish folders. -if ((Test-Path -Path ".\Agent\bin\Release\netcoreapp2.2\win10-x64\publish") -eq $true) { - Get-ChildItem -Path ".\Agent\bin\Release\netcoreapp2.2\win10-x64\publish" | Remove-Item -Force -Recurse +if ((Test-Path -Path ".\Agent\bin\Release\netcoreapp\win10-x64\publish") -eq $true) { + Get-ChildItem -Path ".\Agent\bin\Release\netcoreapp3.0\win10-x64\publish" | Remove-Item -Force -Recurse } -if ((Test-Path -Path ".\Agent\bin\Release\netcoreapp2.2\win10-x86\publish" ) -eq $true) { - Get-ChildItem -Path ".\Agent\bin\Release\netcoreapp2.2\win10-x86\publish" | Remove-Item -Force -Recurse +if ((Test-Path -Path ".\Agent\bin\Release\netcoreapp3.0\win10-x86\publish" ) -eq $true) { + Get-ChildItem -Path ".\Agent\bin\Release\netcoreapp3.0\win10-x86\publish" | Remove-Item -Force -Recurse } -if ((Test-Path -Path ".\Agent\bin\Release\netcoreapp2.2\linux-x64\publish") -eq $true) { - Get-ChildItem -Path ".\Agent\bin\Release\netcoreapp2.2\linux-x64\publish" | Remove-Item -Force -Recurse +if ((Test-Path -Path ".\Agent\bin\Release\netcoreapp3.0\linux-x64\publish") -eq $true) { + Get-ChildItem -Path ".\Agent\bin\Release\netcoreapp3.0\linux-x64\publish" | Remove-Item -Force -Recurse } # Publish Core clients. -dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x64 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp2.2\win10-x64\publish" "$Root\Agent" -dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp2.2\linux-x64\publish" "$Root\Agent" -dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x86 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp2.2\win10-x86\publish" "$Root\Agent" +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x64 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp3.0\win10-x64\publish" "$Root\Agent" +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp3.0\linux-x64\publish" "$Root\Agent" +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x86 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp3.0\win10-x86\publish" "$Root\Agent" -New-Item -Path ".\Agent\bin\Release\netcoreapp2.2\win10-x64\publish\ScreenCast\" -ItemType Directory -Force -New-Item -Path ".\Agent\bin\Release\netcoreapp2.2\win10-x86\publish\ScreenCast\" -ItemType Directory -Force -New-Item -Path ".\Agent\bin\Release\netcoreapp2.2\linux-x64\publish\ScreenCast\" -ItemType Directory -Force +New-Item -Path ".\Agent\bin\Release\netcoreapp3.0\win10-x64\publish\ScreenCast\" -ItemType Directory -Force +New-Item -Path ".\Agent\bin\Release\netcoreapp3.0\win10-x86\publish\ScreenCast\" -ItemType Directory -Force +New-Item -Path ".\Agent\bin\Release\netcoreapp3.0\linux-x64\publish\ScreenCast\" -ItemType Directory -Force # Publish Linux ScreenCaster -dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp2.2\linux-x64\publish\ScreenCast\" "$Root\ScreenCast.Linux\" +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp3.0\linux-x64\publish\ScreenCast\" "$Root\ScreenCast.Linux\" # Publish Linux GUI App -$PublishDir = "$Root\Desktop.Unix\bin\Release\netcoreapp2.2\linux-x64\publish\" +$PublishDir = "$Root\Desktop.Unix\bin\Release\netcoreapp3.0\linux-x64\publish\" dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --output "$PublishDir" "$Root\Desktop.Unix\" # Compress Linux GUI App Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely_Desktop.Unix.zip" -CompressionLevel Optimal -Force @@ -107,32 +107,32 @@ Move-Item -Path "$PublishDir\Remotely_Desktop.Unix.zip" -Destination "$Root\Serv &"$MSBuildPath" "$Root\ScreenCast.Win" /t:Build /p:Configuration=Release /p:Platform=x86 # Copy 32-bit .NET Framework ScreenCaster to Agent output folder. -Get-ChildItem -Path ".\ScreenCast.Win\bin\x86\Release\" -Exclude "*.xml" | Copy-Item -Destination ".\Agent\bin\Release\netcoreapp2.2\win10-x86\publish\ScreenCast\" -Force +Get-ChildItem -Path ".\ScreenCast.Win\bin\x86\Release\" -Exclude "*.xml" | Copy-Item -Destination ".\Agent\bin\Release\netcoreapp3.0\win10-x86\publish\ScreenCast\" -Force # Build .NET Framework ScreenCaster (64-bit) &"$MSBuildPath" "$Root\ScreenCast.Win" /t:Build /p:Configuration=Release /p:Platform=x64 # Copy 64-bit .NET Framework ScreenCaster to Agent output folder. -Get-ChildItem -Path ".\ScreenCast.Win\bin\x64\Release\" -Exclude "*.xml" | Copy-Item -Destination ".\Agent\bin\Release\netcoreapp2.2\win10-x64\publish\ScreenCast\" -Force +Get-ChildItem -Path ".\ScreenCast.Win\bin\x64\Release\" -Exclude "*.xml" | Copy-Item -Destination ".\Agent\bin\Release\netcoreapp3.0\win10-x64\publish\ScreenCast\" -Force # Compress Core clients. -$PublishDir = "$Root\Agent\bin\Release\netcoreapp2.2\win10-x64\publish" +$PublishDir = "$Root\Agent\bin\Release\netcoreapp3.0\win10-x64\publish" Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Win10-x64.zip" -CompressionLevel Optimal -Force while ((Test-Path -Path "$PublishDir\Remotely-Win10-x64.zip") -eq $false){ Start-Sleep -Seconds 1 } Move-Item -Path "$PublishDir\Remotely-Win10-x64.zip" -Destination "$Root\Server\wwwroot\Downloads\Remotely-Win10-x64.zip" -Force -$PublishDir = "$Root\Agent\bin\Release\netcoreapp2.2\win10-x86\publish" +$PublishDir = "$Root\Agent\bin\Release\netcoreapp3.0\win10-x86\publish" Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Win10-x86.zip" -CompressionLevel Optimal -Force while ((Test-Path -Path "$PublishDir\Remotely-Win10-x86.zip") -eq $false){ Start-Sleep -Seconds 1 } Move-Item -Path "$PublishDir\Remotely-Win10-x86.zip" -Destination "$Root\Server\wwwroot\Downloads\Remotely-Win10-x86.zip" -Force -$PublishDir = "$Root\Agent\bin\Release\netcoreapp2.2\linux-x64\publish" +$PublishDir = "$Root\Agent\bin\Release\netcoreapp3.0\linux-x64\publish" Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Linux.zip" -CompressionLevel Optimal -Force while ((Test-Path -Path "$PublishDir\Remotely-Linux.zip") -eq $false){ Start-Sleep -Seconds 1 diff --git a/Utilities/Remotely_Server_Install.sh b/Utilities/Remotely_Server_Install.sh index d6a1fb3e..9fbd7de8 100644 --- a/Utilities/Remotely_Server_Install.sh +++ b/Utilities/Remotely_Server_Install.sh @@ -17,7 +17,7 @@ dpkg -i packages-microsoft-prod.deb add-apt-repository universe apt-get install -y apt-transport-https apt-get update -apt-get install -y aspnetcore-runtime-2.2 +apt-get install -y aspnetcore-runtime-3.0 rm packages-microsoft-prod.deb