mirror of
https://github.com/immense/Remotely.git
synced 2025-10-26 11:27:15 +00:00
Bug fix when updating tags via grid. Added Linux GUI to downloads page.
This commit is contained in:
parent
9f5e25d0de
commit
02ea46d8c6
@ -38,7 +38,6 @@
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Remotely_ScreenCast.Core\Remotely_ScreenCast.Core.csproj" />
|
||||
<ProjectReference Include="..\Remotely_ScreenCast.Linux\Remotely_ScreenCast.Linux.csproj" />
|
||||
<ProjectReference Include="..\Remotely_ScreenCast.Win\Remotely_ScreenCast.Win.csproj" />
|
||||
<ProjectReference Include="..\Remotely_Shared\Remotely_Shared.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -10,8 +10,6 @@ using Remotely_ScreenCast.Core.Models;
|
||||
using Remotely_ScreenCast.Core.Utilities;
|
||||
using Remotely_ScreenCast.Linux.Capture;
|
||||
using Remotely_ScreenCast.Linux.Input;
|
||||
using Remotely_ScreenCast.Win.Capture;
|
||||
using Remotely_ScreenCast.Win.Input;
|
||||
using Remotely_Shared.Models;
|
||||
using Remotely_Shared.Services;
|
||||
using System;
|
||||
@ -157,10 +155,6 @@ namespace Remotely_Desktop.Unix.ViewModels
|
||||
{
|
||||
Conductor.SetMessageHandlers(new X11Input());
|
||||
}
|
||||
else if (OSUtils.IsWindows)
|
||||
{
|
||||
Conductor.SetMessageHandlers(new WinInput());
|
||||
}
|
||||
|
||||
await Conductor.CasterSocket.SendDeviceInfo(Conductor.ServiceID, Environment.MachineName);
|
||||
await Conductor.CasterSocket.GetSessionID();
|
||||
@ -205,17 +199,6 @@ namespace Remotely_Desktop.Unix.ViewModels
|
||||
{
|
||||
capturer = new X11Capture();
|
||||
}
|
||||
else if (OSUtils.IsWindows)
|
||||
{
|
||||
if (Conductor.Viewers.Count == 0)
|
||||
{
|
||||
capturer = new DXCapture();
|
||||
}
|
||||
else
|
||||
{
|
||||
capturer = new BitBltCapture();
|
||||
}
|
||||
}
|
||||
|
||||
await Conductor.CasterSocket.SendCursorChange(new CursorInfo(null, Point.Empty, "default"), new List<string>() { screenCastRequest.ViewerID });
|
||||
ScreenCaster.BeginScreenCasting(screenCastRequest.ViewerID, screenCastRequest.RequesterName, capturer, Conductor);
|
||||
|
||||
@ -1 +1 @@
|
||||
2019.05.03.1003
|
||||
2019.05.09.2205
|
||||
|
||||
@ -36,21 +36,21 @@
|
||||
Instant desktop sharing with no installation or hassles.
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<h6 class="font-weight-bold">Windows</h6>
|
||||
<h6 class="font-weight-bold">Windows (32/64-Bit)</h6>
|
||||
<p>
|
||||
<strong>Download:</strong>
|
||||
<br />
|
||||
<a href="~/Downloads/Remotely_Desktop.exe">Windows Portable EXE</a>
|
||||
</p>
|
||||
</div>
|
||||
@*<div class="col-sm-6">
|
||||
<h6 class="font-weight-bold">Windows 32-Bit</h6>
|
||||
<div class="col-sm-6">
|
||||
<h6 class="font-weight-bold">Linux 64-Bit</h6>
|
||||
<p>
|
||||
<strong>Download:</strong>
|
||||
<br />
|
||||
<a href="~/Downloads/Remotely_ScreenCast.exe">Windows x86 Portable EXE</a>
|
||||
<a href="~/Downloads/Remotely_Desktop.Unix.zip">Linux Zipped</a>
|
||||
</p>
|
||||
</div>*@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
|
||||
@ -314,7 +314,9 @@ var commands = [
|
||||
parameterDict["tags"] = x.Tags.trim() + separator + parameterDict["tags"];
|
||||
}
|
||||
DataGrid.DataSource.find(y => y.ID == x.ID).Tags = parameterDict["tags"];
|
||||
document.getElementById(x.ID).querySelector(".device-tag").value = parameterDict["tags"];
|
||||
var deviceTagInput = document.getElementById(x.ID).querySelector(".device-tag");
|
||||
deviceTagInput.value = parameterDict["tags"];
|
||||
deviceTagInput.setAttribute("value", parameterDict["tags"]);
|
||||
BrowserSockets.Connection.invoke("UpdateTags", x.ID, parameterDict["tags"]);
|
||||
});
|
||||
}),
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -440,7 +440,9 @@ var commands: Array<ConsoleCommand> = [
|
||||
parameterDict["tags"] = x.Tags.trim() + separator + parameterDict["tags"]
|
||||
}
|
||||
DataGrid.DataSource.find(y => y.ID == x.ID).Tags = parameterDict["tags"];
|
||||
(document.getElementById(x.ID).querySelector(".device-tag") as HTMLInputElement).value = parameterDict["tags"];
|
||||
var deviceTagInput = document.getElementById(x.ID).querySelector(".device-tag") as HTMLInputElement;
|
||||
deviceTagInput.value = parameterDict["tags"];
|
||||
deviceTagInput.setAttribute("value", parameterDict["tags"]);
|
||||
BrowserSockets.Connection.invoke("UpdateTags", x.ID, parameterDict["tags"]);
|
||||
});
|
||||
}
|
||||
|
||||
@ -45,6 +45,9 @@ export function AddOrUpdateDevice(device) {
|
||||
recordRow.querySelector(".device-tag").onchange = (ev) => {
|
||||
var newTag = ev.currentTarget.value;
|
||||
DataSource.find(x => x.ID == device.ID).Tags = newTag;
|
||||
var deviceTagInput = document.getElementById(device.ID).querySelector(".device-tag");
|
||||
deviceTagInput.value = newTag;
|
||||
deviceTagInput.setAttribute("value", newTag);
|
||||
BrowserSockets.Connection.invoke("UpdateTags", device.ID, newTag);
|
||||
};
|
||||
UpdateDeviceCounts();
|
||||
|
||||
@ -1 +1 @@
|
||||
{"version":3,"file":"DataGrid.js","sourceRoot":"","sources":["DataGrid.ts"],"names":[],"mappings":"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"}
|
||||
{"version":3,"file":"DataGrid.js","sourceRoot":"","sources":["DataGrid.ts"],"names":[],"mappings":"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"}
|
||||
@ -51,6 +51,9 @@ export function AddOrUpdateDevice(device: Device) {
|
||||
(recordRow.querySelector(".device-tag") as HTMLInputElement).onchange = (ev) => {
|
||||
var newTag = (ev.currentTarget as HTMLInputElement).value;
|
||||
DataSource.find(x => x.ID == device.ID).Tags = newTag;
|
||||
var deviceTagInput = document.getElementById(device.ID).querySelector(".device-tag") as HTMLInputElement;
|
||||
deviceTagInput.value = newTag;
|
||||
deviceTagInput.setAttribute("value", newTag);
|
||||
BrowserSockets.Connection.invoke("UpdateTags", device.ID, newTag);
|
||||
};
|
||||
UpdateDeviceCounts();
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<#
|
||||
.SYNOPSIS
|
||||
Publishes the Remotely client.
|
||||
Publishes the Remotely clients.
|
||||
.DESCRIPTION
|
||||
Publishes the Remotely client.
|
||||
For automated deployments, supply the following arguments: -rid win10-x64 -outdir path\to\dir
|
||||
Publishes the Remotely clients.
|
||||
To deploy the server, supply the following arguments: -rid win10-x64 -outdir path\to\dir
|
||||
.COPYRIGHT
|
||||
Copyright © 2019 Translucency Software. All rights reserved.
|
||||
.EXAMPLE
|
||||
@ -17,38 +17,18 @@ $Day = (Get-Date).Day.ToString().PadLeft(2, "0")
|
||||
$Hour = (Get-Date).Hour.ToString().PadLeft(2, "0")
|
||||
$Minute = (Get-Date).Minute.ToString().PadLeft(2, "0")
|
||||
$CurrentVersion = "$Year.$Month.$Day.$Hour$Minute"
|
||||
$ArgList = New-Object -TypeName System.Collections.ArrayList
|
||||
$OutDir = ""
|
||||
# RIDs are described here: https://docs.microsoft.com/en-us/dotnet/core/rid-catalog
|
||||
$RID = ""
|
||||
|
||||
if ($args.Count -eq 0){
|
||||
$Options = Read-Host "Select Args: [C]lient and/or [S]erver (e.g. 'c,s')?"
|
||||
foreach ($option in $Options.Split(",")){
|
||||
$ArgList.Add($option.ToLower().Trim())
|
||||
for ($i = 0; $i -lt $args.Count; $i++)
|
||||
{
|
||||
$arg = $args[$i].ToString().ToLower()
|
||||
if ($arg.Contains("outdir")){
|
||||
$OutDir = $args[$i+1]
|
||||
}
|
||||
|
||||
if ($ArgList.Contains("s")){
|
||||
if ([string]::IsNullOrWhiteSpace($OutDir)) {
|
||||
$OutDir = Read-Host "Server Out Dir"
|
||||
}
|
||||
if ([string]::IsNullOrWhiteSpace($RID)) {
|
||||
$RID = Read-Host "Server Runtime ID (see comment at top of script)"
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
$ArgList.Add("c")
|
||||
$ArgList.Add("s")
|
||||
for ($i = 0; $i -lt $args.Count; $i++)
|
||||
{
|
||||
$arg = $args[$i].ToString().ToLower()
|
||||
if ($arg.Contains("outdir")){
|
||||
$OutDir = $args[$i+1]
|
||||
}
|
||||
elseif ($arg.Contains("rid")){
|
||||
$RID = $args[$i+1]
|
||||
}
|
||||
elseif ($arg.Contains("rid")){
|
||||
$RID = $args[$i+1]
|
||||
}
|
||||
}
|
||||
|
||||
@ -56,92 +36,94 @@ $Root = (Get-Item -Path $PSScriptRoot).Parent.FullName
|
||||
|
||||
Set-Location -Path $Root
|
||||
|
||||
if ($ArgList.Contains("c")) {
|
||||
# Add Current Version file to root content folder for client update checks.
|
||||
Set-Content -Path ".\Remotely_Server\CurrentVersion.txt" -Value $CurrentVersion.Trim() -Encoding UTF8 -Force
|
||||
# Add Current Version file to root content folder for client update checks.
|
||||
Set-Content -Path ".\Remotely_Server\CurrentVersion.txt" -Value $CurrentVersion.Trim() -Encoding UTF8 -Force
|
||||
|
||||
|
||||
# Clear publish folders.
|
||||
if ((Test-Path -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish") -eq $true) {
|
||||
Get-ChildItem -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish" | Remove-Item -Force -Recurse
|
||||
}
|
||||
if ((Test-Path -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish" ) -eq $true) {
|
||||
Get-ChildItem -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish" | Remove-Item -Force -Recurse
|
||||
}
|
||||
if ((Test-Path -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\linux-x64\publish") -eq $true) {
|
||||
Get-ChildItem -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\linux-x64\publish" | Remove-Item -Force -Recurse
|
||||
}
|
||||
|
||||
Push-Location -Path ".\Remotely_Agent"
|
||||
|
||||
# Publish Core clients.
|
||||
dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x64 --configuration Release --output ".\bin\Release\netcoreapp2.2\win10-x64\publish"
|
||||
dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x86 --configuration Release --output ".\bin\Release\netcoreapp2.2\win10-x86\publish"
|
||||
dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --output ".\bin\Release\netcoreapp2.2\linux-x64\publish"
|
||||
|
||||
Pop-Location
|
||||
|
||||
New-Item -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish\ScreenCast\" -ItemType Directory -Force
|
||||
New-Item -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish\ScreenCast\" -ItemType Directory -Force
|
||||
New-Item -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\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\Remotely_Agent\bin\Release\netcoreapp2.2\linux-x64\publish\ScreenCast\" "$Root\Remotely_ScreenCast.Linux\"
|
||||
|
||||
|
||||
# Copy .NET Framework ScreenCaster to Agent output folder.
|
||||
if ((Test-Path -Path ".\Remotely_ScreenCast.Win\bin\Release\Remotely_ScreenCast.exe") -eq $true) {
|
||||
Copy-Item -Path ".\Remotely_ScreenCast.Win\bin\Release\Remotely_ScreenCast.exe" -Destination ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish\ScreenCast\Remotely_ScreenCast.exe" -Force
|
||||
Copy-Item -Path ".\Remotely_ScreenCast.Win\bin\Release\Remotely_ScreenCast.exe" -Destination ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish\ScreenCast\Remotely_ScreenCast.exe" -Force
|
||||
}
|
||||
elseif ((Test-Path -Path ".\Remotely_ScreenCast.Win\bin\Debug\Remotely_ScreenCast.exe") -eq $true) {
|
||||
Copy-Item -Path ".\Remotely_ScreenCast.Win\bin\Debug\Remotely_ScreenCast.exe" -Destination ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish\ScreenCast\Remotely_ScreenCast.exe" -Force
|
||||
Copy-Item -Path ".\Remotely_ScreenCast.Win\bin\Debug\Remotely_ScreenCast.exe" -Destination ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish\ScreenCast\Remotely_ScreenCast.exe" -Force
|
||||
}
|
||||
|
||||
|
||||
|
||||
# Compress Core clients.
|
||||
Push-Location -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish"
|
||||
Compress-Archive -Path ".\*" -DestinationPath "Remotely-Win10-x64.zip" -CompressionLevel Optimal -Force
|
||||
while ((Test-Path -Path ".\Remotely-Win10-x64.zip") -eq $false){
|
||||
Start-Sleep -Seconds 1
|
||||
}
|
||||
Pop-Location
|
||||
Move-Item -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish\Remotely-Win10-x64.zip" -Destination ".\Remotely_Server\wwwroot\Downloads\Remotely-Win10-x64.zip" -Force
|
||||
|
||||
Push-Location -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish"
|
||||
Compress-Archive -Path ".\*" -DestinationPath "Remotely-Win10-x86.zip" -CompressionLevel Optimal -Force
|
||||
while ((Test-Path -Path ".\Remotely-Win10-x86.zip") -eq $false){
|
||||
Start-Sleep -Seconds 1
|
||||
}
|
||||
Pop-Location
|
||||
Move-Item -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish\Remotely-Win10-x86.zip" -Destination ".\Remotely_Server\wwwroot\Downloads\Remotely-Win10-x86.zip" -Force
|
||||
|
||||
Push-Location -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\linux-x64\publish"
|
||||
Compress-Archive -Path ".\*" -DestinationPath "Remotely-Linux.zip" -CompressionLevel Optimal -Force
|
||||
while ((Test-Path -Path ".\Remotely-Linux.zip") -eq $false){
|
||||
Start-Sleep -Seconds 1
|
||||
}
|
||||
Pop-Location
|
||||
Move-Item -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\linux-x64\publish\Remotely-Linux.zip" -Destination ".\Remotely_Server\wwwroot\Downloads\Remotely-Linux.zip" -Force
|
||||
|
||||
# Copy desktop app to Downloads folder.
|
||||
if ((Test-Path -Path ".\Remotely_Desktop.Win\bin\Release\Remotely_Desktop.exe") -eq $true) {
|
||||
Copy-Item -Path ".\Remotely_Desktop.Win\bin\Release\Remotely_Desktop.exe" -Destination ".\Remotely_Server\wwwroot\Downloads\Remotely_Desktop.exe" -Force
|
||||
}
|
||||
elseif ((Test-Path -Path ".\Remotely_Desktop.Win\bin\Debug\Remotely_Desktop.exe") -eq $true) {
|
||||
Copy-Item -Path ".\Remotely_Desktop.Win\bin\Debug\Remotely_Desktop.exe" -Destination ".\Remotely_Server\wwwroot\Downloads\Remotely_Desktop.exe" -Force
|
||||
}
|
||||
|
||||
# Clear publish folders.
|
||||
if ((Test-Path -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish") -eq $true) {
|
||||
Get-ChildItem -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish" | Remove-Item -Force -Recurse
|
||||
}
|
||||
if ((Test-Path -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish" ) -eq $true) {
|
||||
Get-ChildItem -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish" | Remove-Item -Force -Recurse
|
||||
}
|
||||
if ((Test-Path -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\linux-x64\publish") -eq $true) {
|
||||
Get-ChildItem -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\linux-x64\publish" | Remove-Item -Force -Recurse
|
||||
}
|
||||
|
||||
if ($ArgList.Contains("s") -and $OutDir.Length -gt 0) {
|
||||
|
||||
# Publish Core clients.
|
||||
dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x64 --configuration Release --output ".\bin\Release\netcoreapp2.2\win10-x64\publish" "$Root\Remotely_Agent"
|
||||
dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x86 --configuration Release --output ".\bin\Release\netcoreapp2.2\win10-x86\publish" "$Root\Remotely_Agent"
|
||||
dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --output ".\bin\Release\netcoreapp2.2\linux-x64\publish" "$Root\Remotely_Agent"
|
||||
|
||||
New-Item -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish\ScreenCast\" -ItemType Directory -Force
|
||||
New-Item -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish\ScreenCast\" -ItemType Directory -Force
|
||||
New-Item -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\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\Remotely_Agent\bin\Release\netcoreapp2.2\linux-x64\publish\ScreenCast\" "$Root\Remotely_ScreenCast.Linux\"
|
||||
|
||||
# Publish Linux GUI App
|
||||
$PublishDir = "$Root\Remotely_Desktop.Unix\bin\Release\netcoreapp2.2\linux-x64\publish\"
|
||||
dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --output "$PublishDir" "$Root\Remotely_Desktop.Unix\"
|
||||
# Compress Linux GUI App
|
||||
Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely_Desktop.Unix.zip" -CompressionLevel Optimal -Force
|
||||
while ((Test-Path -Path "$PublishDir\Remotely_Desktop.Unix.zip") -eq $false){
|
||||
Start-Sleep -Seconds 1
|
||||
}
|
||||
Move-Item -Path "$PublishDir\Remotely_Desktop.Unix.zip" -Destination "$Root\Remotely_Server\wwwroot\Downloads\Remotely_Desktop.Unix.zip" -Force
|
||||
|
||||
|
||||
# Copy .NET Framework ScreenCaster to Agent output folder.
|
||||
if ((Test-Path -Path ".\Remotely_ScreenCast.Win\bin\Release\Remotely_ScreenCast.exe") -eq $true) {
|
||||
Copy-Item -Path ".\Remotely_ScreenCast.Win\bin\Release\Remotely_ScreenCast.exe" -Destination ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish\ScreenCast\Remotely_ScreenCast.exe" -Force
|
||||
Copy-Item -Path ".\Remotely_ScreenCast.Win\bin\Release\Remotely_ScreenCast.exe" -Destination ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish\ScreenCast\Remotely_ScreenCast.exe" -Force
|
||||
}
|
||||
elseif ((Test-Path -Path ".\Remotely_ScreenCast.Win\bin\Debug\Remotely_ScreenCast.exe") -eq $true) {
|
||||
Copy-Item -Path ".\Remotely_ScreenCast.Win\bin\Debug\Remotely_ScreenCast.exe" -Destination ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish\ScreenCast\Remotely_ScreenCast.exe" -Force
|
||||
Copy-Item -Path ".\Remotely_ScreenCast.Win\bin\Debug\Remotely_ScreenCast.exe" -Destination ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish\ScreenCast\Remotely_ScreenCast.exe" -Force
|
||||
}
|
||||
|
||||
|
||||
|
||||
# Compress Core clients.
|
||||
$PublishDir = "$Root\Remotely_Agent\bin\Release\netcoreapp2.2\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\Remotely_Server\wwwroot\Downloads\Remotely-Win10-x64.zip" -Force
|
||||
|
||||
$PublishDir = "$Root\Remotely_Agent\bin\Release\netcoreapp2.2\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\Remotely_Server\wwwroot\Downloads\Remotely-Win10-x86.zip" -Force
|
||||
|
||||
$PublishDir = "$Root\Remotely_Agent\bin\Release\netcoreapp2.2\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
|
||||
}
|
||||
Move-Item -Path "$PublishDir\Remotely-Linux.zip" -Destination "$Root\Remotely_Server\wwwroot\Downloads\Remotely-Linux.zip" -Force
|
||||
|
||||
# Copy desktop app to Downloads folder.
|
||||
if ((Test-Path -Path ".\Remotely_Desktop.Win\bin\Release\Remotely_Desktop.exe") -eq $true) {
|
||||
Copy-Item -Path ".\Remotely_Desktop.Win\bin\Release\Remotely_Desktop.exe" -Destination ".\Remotely_Server\wwwroot\Downloads\Remotely_Desktop.exe" -Force
|
||||
}
|
||||
elseif ((Test-Path -Path ".\Remotely_Desktop.Win\bin\Debug\Remotely_Desktop.exe") -eq $true) {
|
||||
Copy-Item -Path ".\Remotely_Desktop.Win\bin\Debug\Remotely_Desktop.exe" -Destination ".\Remotely_Server\wwwroot\Downloads\Remotely_Desktop.exe" -Force
|
||||
}
|
||||
|
||||
if ($RID.Length -gt 0 -and $OutDir.Length -gt 0) {
|
||||
if ((Test-Path -Path $OutDir) -eq $false){
|
||||
New-Item -Path $OutDir -ItemType Directory
|
||||
}
|
||||
Push-Location -Path ".\Remotely_Server\"
|
||||
dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime $RID --configuration Release --output $OutDir
|
||||
Pop-Location
|
||||
dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime $RID --configuration Release --output $OutDir "$Root\Remotely_Server\"
|
||||
}
|
||||
else {
|
||||
Write-Host "`r`nSkipping server deployment. Params -outdir and -rid not specified." -ForegroundColor DarkYellow
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user