Skip to content

Commit 956b60c

Browse files
bitboundbitbound
authored
Merge pull request #894 from immense/insufficient-branch-name
Assortment of updates.
2 parents d2c2d09 + f8af914 commit 956b60c

40 files changed

+734
-252
lines changed

‎.azure-pipelines/Release Build.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ pr:
55
- master
66

77
jobs:
8-
- job: Build
9-
displayName: Build
8+
- job: Windows_Build
9+
displayName: Windows Build
1010
timeoutInMinutes: 360
1111
pool:
1212
vmImage: windows-latest
@@ -44,12 +44,6 @@ jobs:
4444
- task: NuGetToolInstaller@1
4545
displayName: 'Use NuGet'
4646

47-
- task: NuGetCommand@2
48-
displayName: NuGet restore Agent.Installer.Win
49-
inputs:
50-
solution: Agent.Installer.Win/packages.config
51-
packagesDirectory: $(Build.SourcesDirectory)\packages
52-
5347
- task: UseDotNet@2
5448
displayName: Use .NET SDK
5549
inputs:

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,3 +296,4 @@ Server.Installer/Properties/launchSettings.json
296296
!/.vscode/launch.json
297297
!/.vscode/tasks.json
298298
/Server/appsettings.Development.json
299+
/Server/AppData

‎Agent.Installer.Win/ViewModels/MainWindowViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ private bool CheckParams()
317317
(serverUri.Scheme != Uri.UriSchemeHttp && serverUri.Scheme != Uri.UriSchemeHttps))
318318
{
319319
Logger.Write("ServerUrl is not valid.");
320-
MessageBoxEx.Show("Server URL must be a valid Uri (e.g. https://app.remotely.one).", "Invalid Server URL", MessageBoxButton.OK, MessageBoxImage.Error);
320+
MessageBoxEx.Show("Server URL must be a valid Uri (e.g. https://app.example.com).", "Invalid Server URL", MessageBoxButton.OK, MessageBoxImage.Error);
321321
return false;
322322
}
323323

‎Agent/Agent.csproj

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<Product>Remotely Agent</Product>
1212
<Company>Immense Networks</Company>
1313
<AssemblyVersion>1.0.0.0</AssemblyVersion>
14-
<PackageProjectUrl>https://remotely.one</PackageProjectUrl>
1514
<Platforms>AnyCPU;x86;x64</Platforms>
1615
<AssemblyName>Remotely_Agent</AssemblyName>
1716
<RootNamespace>Remotely.Agent</RootNamespace>
@@ -24,18 +23,18 @@
2423
</ItemGroup>
2524

2625
<ItemGroup>
27-
<PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="8.0.2" />
28-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.2" />
26+
<PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="8.0.6" />
27+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.6" />
2928
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
3029
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
3130
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
3231
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
3332
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="8.0.0" />
34-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.2" />
35-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.1" />
36-
<PackageReference Include="Microsoft.WSMan.Management" Version="7.4.1" />
37-
<PackageReference Include="Microsoft.WSMan.Runtime" Version="7.4.1" />
38-
<PackageReference Include="System.Management.Automation" Version="7.4.1" />
33+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.6" />
34+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.2" />
35+
<PackageReference Include="Microsoft.WSMan.Management" Version="7.4.2" />
36+
<PackageReference Include="Microsoft.WSMan.Runtime" Version="7.4.2" />
37+
<PackageReference Include="System.Management.Automation" Version="7.4.2" />
3938
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
4039
</ItemGroup>
4140

‎Agent/Program.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22
using Microsoft.Extensions.Logging;
33
using Remotely.Agent.Interfaces;
44
using Remotely.Agent.Services;
5-
using Remotely.Shared.Enums;
65
using Remotely.Shared.Utilities;
76
using Remotely.Shared.Services;
87
using System;
9-
using System.Diagnostics;
108
using System.IO;
11-
using System.ServiceProcess;
129
using System.Threading.Tasks;
1310
using System.Runtime.Versioning;
1411
using Remotely.Agent.Services.Linux;

‎Desktop.Linux/Desktop.Linux.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<Product>Remotely Desktop</Product>
3131
<Description>Desktop client for allowing your IT admin to provide remote support.</Description>
3232
<Copyright>Copyright © 2023 Immense Networks</Copyright>
33-
<PackageProjectUrl>https://remotely.one</PackageProjectUrl>
3433
<Nullable>enable</Nullable>
3534
</PropertyGroup>
3635
<ItemGroup>

‎Desktop.Linux/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static async Task Main(string[] args)
3333
var logger = new FileLogger("Remotely_Desktop", version, "Program.cs");
3434
var filePath = Environment.ProcessPath ?? Environment.GetCommandLineArgs().First();
3535
var serverUrl = Debugger.IsAttached ? "http://localhost:5000" : string.Empty;
36-
var getEmbeddedResult = await EmbeddedServerDataSearcher.Instance.TryGetEmbeddedData(filePath);
36+
var getEmbeddedResult = EmbeddedServerDataProvider.Instance.TryGetEmbeddedData(filePath);
3737
if (getEmbeddedResult.IsSuccess)
3838
{
3939
serverUrl = getEmbeddedResult.Value.ServerUrl.AbsoluteUri;
@@ -46,7 +46,7 @@ public static async Task Main(string[] args)
4646
var services = new ServiceCollection();
4747

4848
services.AddSingleton<IOrganizationIdProvider, OrganizationIdProvider>();
49-
services.AddSingleton<IEmbeddedServerDataSearcher, EmbeddedServerDataSearcher>();
49+
services.AddSingleton<IEmbeddedServerDataProvider, EmbeddedServerDataProvider>();
5050

5151
services.AddRemoteControlLinux(
5252
config =>

‎Desktop.Shared/Services/BrandingProvider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Desktop.Shared.Services;
1313
public class BrandingProvider : IBrandingProvider
1414
{
1515
private readonly IAppState _appState;
16-
private readonly IEmbeddedServerDataSearcher _embeddedDataSearcher;
16+
private readonly IEmbeddedServerDataProvider _embeddedDataSearcher;
1717
private readonly ILogger<BrandingProvider> _logger;
1818
private readonly IOrganizationIdProvider _orgIdProvider;
1919
private BrandingInfoBase? _brandingInfo;
@@ -22,7 +22,7 @@ public class BrandingProvider : IBrandingProvider
2222
public BrandingProvider(
2323
IAppState appState,
2424
IOrganizationIdProvider orgIdProvider,
25-
IEmbeddedServerDataSearcher embeddedServerDataSearcher,
25+
IEmbeddedServerDataProvider embeddedServerDataSearcher,
2626
ILogger<BrandingProvider> logger)
2727
{
2828
_appState = appState;
@@ -85,7 +85,7 @@ private async Task<Result<BrandingInfo>> TryGetBrandingInfo()
8585
return Result.Fail<BrandingInfo>("Failed to retrieve executing file name.");
8686
}
8787

88-
var result = await _embeddedDataSearcher.TryGetEmbeddedData(filePath);
88+
var result = _embeddedDataSearcher.TryGetEmbeddedData(filePath);
8989

9090
if (!result.IsSuccess)
9191
{

‎Desktop.Win/Desktop.Win.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<Authors>Jared Goodwin</Authors>
1313
<Company>Immense Networks</Company>
1414
<Product>Remotely Desktop</Product>
15-
<PackageProjectUrl>https://remotely.one</PackageProjectUrl>
1615
<Platforms>AnyCPU;x86;x64</Platforms>
1716
<StartupObject></StartupObject>
1817
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>

‎Desktop.Win/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static async Task Main(string[] args)
3535
var logger = new FileLogger("Remotely_Desktop", version, "Program.cs");
3636
var filePath = Environment.ProcessPath ?? Environment.GetCommandLineArgs().First();
3737
var serverUrl = Debugger.IsAttached ? "https://localhost:5001" : string.Empty;
38-
var getEmbeddedResult = await EmbeddedServerDataSearcher.Instance.TryGetEmbeddedData(filePath);
38+
var getEmbeddedResult = EmbeddedServerDataProvider.Instance.TryGetEmbeddedData(filePath);
3939
if (getEmbeddedResult.IsSuccess)
4040
{
4141
serverUrl = getEmbeddedResult.Value.ServerUrl.AbsoluteUri;
@@ -47,7 +47,7 @@ public static async Task Main(string[] args)
4747
var services = new ServiceCollection();
4848

4949
services.AddSingleton<IOrganizationIdProvider, OrganizationIdProvider>();
50-
services.AddSingleton<IEmbeddedServerDataSearcher>(EmbeddedServerDataSearcher.Instance);
50+
services.AddSingleton<IEmbeddedServerDataProvider>(EmbeddedServerDataProvider.Instance);
5151

5252
services.AddRemoteControlWindows(
5353
config =>

0 commit comments

Comments
 (0)