Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ImmyBot integration. #624

Merged
merged 32 commits into from
May 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c0b10ef
Refactor to align with changes in submodule.
bitbound Apr 18, 2023
9a538de
Update submodule after namespace changes.
bitbound Apr 19, 2023
820cb53
Update to .NET 7.
bitbound Apr 21, 2023
cf39b88
Update submodule.
bitbound Apr 21, 2023
0fa41e8
Update submodule ref.
bitbound Apr 21, 2023
bb2126b
Sync Remotely with latest integration changes.
bitbound Apr 25, 2023
e3cf287
Fix session info state after reconnects. Use hosting for agent. Fix…
bitbound Apr 26, 2023
222c83c
Update submodule.
bitbound Apr 26, 2023
6eb8e53
Fix desktop process closure when changing Windows sessions.
bitbound Apr 27, 2023
339e552
Update dotnet version in scripts and Dockerfile.
bitbound Apr 27, 2023
886d679
Update build task versions.
bitbound Apr 27, 2023
0edbf4d
Replace WindowsService.cs.
bitbound Apr 27, 2023
a044c83
Update Release Build.yml for Azure Pipelines
bitbound Apr 27, 2023
e5e33f0
Update submodule.
bitbound Apr 27, 2023
12aef74
Update NUGet packages. Fix libman.json.
bitbound Apr 27, 2023
c4942ff
Update submodule.
bitbound Apr 27, 2023
47fc7e8
Remove node in pipeline.
bitbound Apr 27, 2023
62edeab
Allow saving of appsettings from server config page when in dev.
bitbound Apr 27, 2023
4578915
Fix WPF RelayCommand binding issue.
bitbound Apr 27, 2023
603af55
Update submodule.
bitbound Apr 27, 2023
4f98ab3
Remove dev appsettings.
bitbound Apr 28, 2023
a1384ed
Add dev appsettings to gitignore.
bitbound Apr 28, 2023
533c5e0
Update submodule.
bitbound Apr 28, 2023
02c0898
Implement submodule changes.
bitbound Apr 28, 2023
73b4420
Update submodule.
bitbound Apr 28, 2023
1a295a9
Test multi-stage Dockerfile.
bitbound Apr 28, 2023
172a80a
Pre-extract archive in CI/CD before Dockerfile.
bitbound Apr 28, 2023
b401635
Fix copy path.
bitbound Apr 28, 2023
9ee51e9
Add basic healthcheck.
bitbound Apr 28, 2023
e2e92e9
Fix scripts page "Creator" display field and public filter.
bitbound May 2, 2023
4f912ab
Update submodule reference.
bitbound May 2, 2023
122c3e0
Update pipelines badge and remove link that no longer exists.
bitbound May 2, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions .azure-pipelines/Release Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ jobs:
Write-Host "Setting current version to $CurrentVersion."

- task: UseDotNet@2
displayName: Use .NET Core sdk 6.x
displayName: Use .NET SDK
inputs:
version: 6.x
version: 7.x

- task: DotNetCoreCLI@2
displayName: dotnet publish x64
Expand Down Expand Up @@ -90,12 +90,6 @@ jobs:
- task: VisualStudioTestPlatformInstaller@1
displayName: Visual Studio Test Platform Installer

- task: NodeTool@0
inputs:
versionSource: 'spec'
versionSpec: '6.x'
checkLatest: true

- task: DownloadPipelineArtifact@2
displayName: Download macOS x64 Agent
inputs:
Expand Down Expand Up @@ -125,9 +119,9 @@ jobs:
packagesDirectory: $(Build.SourcesDirectory)\packages

- task: UseDotNet@2
displayName: Use .NET Core sdk 6.x
displayName: Use .NET SDK
inputs:
version: 6.x
version: 7.x

- task: DotNetCoreCLI@2
displayName: dotnet restore
Expand All @@ -138,8 +132,10 @@ jobs:
- task: DotNetCoreCLI@2
displayName: dotnet test
inputs:
command: test
projects: Tests\Tests.csproj
command: 'test'
projects: |
**\Server.Tests.csproj
**\Shared.Tests.csproj

- task: PowerShell@2
displayName: Create Code Signing Cert
Expand All @@ -166,18 +162,19 @@ jobs:
# The MSBuild TypeScript task doesn't compiled the TS
# files without this build step before publishing.
- task: DotNetCoreCLI@2
displayName: Build Server
inputs:
command: 'build'
projects: '$(Build.SourcesDirectory)/Server/Server.csproj'
arguments: '-r linux-x64 -c Release'
arguments: '-r linux-x64 -c Release --self-contained'

- task: DotNetCoreCLI@2
displayName: dotnet publish linux-x64
displayName: Publish Server (linux-x64)
inputs:
command: publish
publishWebProjects: false
projects: '$(Build.SourcesDirectory)/Server/Server.csproj'
arguments: /p:Version=$(CurrentVersion) /p:FileVersion=$(CurrentVersion) --configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)\linux-x64 --runtime linux-x64
arguments: /p:Version=$(CurrentVersion) /p:FileVersion=$(CurrentVersion) --configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)\linux-x64 --runtime linux-x64 --self-contained


- task: PowerShell@2
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3.5.2
with:
submodules: recursive

- name: Install .NET Core
uses: actions/setup-dotnet@v1.9.0
uses: actions/setup-dotnet@v3.0.3
with:
dotnet-version: 6.0.x
dotnet-version: 7

- name: Setup NuGet.exe for use with actions
uses: NuGet/setup-nuget@v1.0.5
uses: NuGet/setup-nuget@v1.2.0

- name: Set current version
shell: pwsh
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3.5.2
with:
# Comment out the below 'repository' line if you want to build from
# your fork instead of the author's.
Expand All @@ -102,9 +102,9 @@ jobs:

# Install the .NET Core workload
- name: Install .NET Core
uses: actions/setup-dotnet@v1.9.0
uses: actions/setup-dotnet@v3.0.3
with:
dotnet-version: 6.0.x
dotnet-version: 7

# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
- name: Setup MSBuild.exe
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:


- name: Download macOS x64 Agent
uses: actions/download-artifact@v2
uses: actions/download-artifact@v2.1.1
with:
name: Mac-Agent-x64
path: ./Server/wwwroot/Content/
Expand All @@ -161,7 +161,7 @@ jobs:

# Upload build artifact to be deployed from Ubuntu runner
- name: Upload build artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3.1.2
with:
path: ./publish/
name: Server
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3.5.2
with:
submodules: recursive
fetch-depth: 0

# Install the .NET Core workload
- name: Install .NET Core
uses: actions/setup-dotnet@v1.9.0
uses: actions/setup-dotnet@v3.0.3
with:
dotnet-version: 6.0.x
dotnet-version: 7

# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
- name: Setup MSBuild.exe
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -294,4 +294,5 @@ Server.Installer/Properties/launchSettings.json
.DS_Store
/Server/wwwroot/Content/Linux-x64/Remotely_Desktop
!/.vscode/launch.json
!/.vscode/tasks.json
!/.vscode/tasks.json
/Server/appsettings.Development.json
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/Desktop.Linux/bin/Debug/net6.0/Remotely_Desktop.dll",
"program": "${workspaceFolder}/Desktop.Linux/bin/Debug/.net7.0/Remotely_Desktop.dll",
"args": [],
"cwd": "${workspaceFolder}/Desktop.Linux",
"console": "internalConsole",
Expand Down
1 change: 0 additions & 1 deletion Agent.Installer.Win/Services/InstallerService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,6 @@ private void InstallService()
Description = "Background service that maintains a connection to the Remotely server. The service is used for remote support and maintenance by this computer's administrators.",
ServiceName = "Remotely_Service",
StartType = ServiceStartMode.Automatic,
DelayedAutoStart = true,
Parent = new ServiceProcessInstaller()
};

Expand Down
26 changes: 14 additions & 12 deletions Agent/Agent.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<Copyright>Copyright © 2023 Immense Networks</Copyright>
Expand All @@ -23,17 +23,19 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.9" />
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.9" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.6" />
<PackageReference Include="Microsoft.WSMan.Management" Version="7.2.6" />
<PackageReference Include="Microsoft.WSMan.Runtime" Version="7.2.6" />
<PackageReference Include="System.Management.Automation" Version="7.2.6" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="7.0.5" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.5" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.5" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.3.4" />
<PackageReference Include="Microsoft.WSMan.Management" Version="7.3.4" />
<PackageReference Include="Microsoft.WSMan.Runtime" Version="7.3.4" />
<PackageReference Include="System.Management.Automation" Version="7.3.4" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion Agent/Interfaces/IDeviceInformationService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@ public interface IDeviceInformationService
(double usedGB, double totalGB) GetMemoryInGB();
string GetAgentVersion();
List<Drive> GetAllDrives();
Task<double> GetCpuUtilization();
}
}
Loading