Skip to content

Commit 1af385f

Browse files
jacobsen9026jacobsen9026
authored
Merge pull request #1223 from Blazam-App/v1-Nightly
v1.4.9 Update
2 parents 4d77125 + 813337f commit 1af385f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+611
-398
lines changed

‎BLAZAM.Tests/BLAZAM.Tests.csproj‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,34 +23,34 @@
2323
<PrivateAssets>all</PrivateAssets>
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2525
</PackageReference>
26-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.19" />
27-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.19">
26+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.20" />
27+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.20">
2828
<PrivateAssets>all</PrivateAssets>
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3030
</PackageReference>
31-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.8" />
32-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
33-
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.8" />
34-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
35-
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
36-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
37-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
31+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.9" />
32+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
33+
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.9" />
34+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.9" />
35+
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
36+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
37+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
3838
<PackageReference Include="Moq" Version="4.20.72" />
39-
<PackageReference Include="MudBlazor" Version="8.11.0" />
39+
<PackageReference Include="MudBlazor" Version="8.13.0" />
4040
<PackageReference Include="Octokit" Version="14.0.0" />
4141
<PackageReference Include="PreMailer.Net" Version="2.7.2" />
4242
<PackageReference Include="Serilog" Version="4.3.0" />
4343
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
4444
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
45-
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
46-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.3" />
47-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.8" />
48-
<PackageReference Include="System.DirectoryServices.Protocols" Version="9.0.8" />
49-
<PackageReference Include="System.Drawing.Common" Version="9.0.8" />
50-
<PackageReference Include="System.Management" Version="9.0.8" />
51-
<PackageReference Include="System.Security.Permissions" Version="9.0.8" />
45+
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
46+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.6" />
47+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.9" />
48+
<PackageReference Include="System.DirectoryServices.Protocols" Version="9.0.9" />
49+
<PackageReference Include="System.Drawing.Common" Version="9.0.9" />
50+
<PackageReference Include="System.Management" Version="9.0.9" />
51+
<PackageReference Include="System.Security.Permissions" Version="9.0.9" />
5252
<PackageReference Include="xunit" Version="2.9.3" />
53-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
53+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
5454
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5555
<PrivateAssets>all</PrivateAssets>
5656
</PackageReference>

‎BLAZAM.Tests/Jobs/JobTests.cs‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,12 @@
1-
using BLAZAM.Global.Exceptions;
1+
using BLAZAM.Gui.Helper;
22
using BLAZAM.Jobs;
33

44
namespace BLAZAM.Tests.Jobs
55
{
66
public class JobTests
77
{
88

9-
private static IJob TestJob
10-
{
11-
get
12-
{
13-
var job = new Job("Test Job");
14-
var job2 = new Job("Nested Job");
15-
var step1 = new JobStep("Regular Step Passes", (step) => { Task.Delay(200).Wait(); return true; });
16-
var step2 = new JobStep("Regular Step Fails", (step) => { Task.Delay(200).Wait(); return false; });
17-
#pragma warning disable CS0162 // Unreachable code detected
18-
var step3 = new JobStep("Regular Step Throws", (step) => { Task.Delay(200).Wait(); throw new AppException("Test exception"); return false; });
19-
#pragma warning restore CS0162 // Unreachable code detected
20-
var step4 = new JobStep("Nested Step Passes", (step) => { Task.Delay(200).Wait(); return true; });
21-
var step5 = new JobStep("Nested Step Fails", (step) => { Task.Delay(200).Wait(); return false; });
22-
#pragma warning disable CS0162 // Unreachable code detected
23-
var step6 = new JobStep("Nested Step Throws", (step) => { Task.Delay(200).Wait(); throw new AppException("Test exception"); return false; });
24-
#pragma warning restore CS0162 // Unreachable code detected
25-
26-
job.AddStep(step1);
27-
job.AddStep(step2);
28-
job.AddStep(step3);
29-
job2.AddStep(step4);
30-
job2.AddStep(step5);
31-
job2.AddStep(step6);
32-
job.AddStep(job2);
33-
return job;
34-
}
35-
}
9+
private static IJob TestJob => JobHelpers.TestJob;
3610
[Fact]
3711
public void Job_Stops_On_Error_When_Stop_Enabled()
3812
{

‎BLAZAM/BLAZAM.csproj‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<ServerGarbageCollection>false</ServerGarbageCollection>
8-
<AssemblyVersion>1.4.8</AssemblyVersion>
9-
<Version>2025.09.23.0333</Version>
8+
<AssemblyVersion>1.4.9</AssemblyVersion>
9+
<Version>2025.10.06.2119</Version>
1010
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
1111
<RootNamespace>BLAZAM</RootNamespace>
1212
<GenerateDocumentationFile>True</GenerateDocumentationFile>
@@ -41,43 +41,43 @@
4141
<PackageReference Include="BlazorTemplater" Version="1.5.1" />
4242
<PackageReference Include="Cassia" Version="2.0.0.60" />
4343
<PackageReference Include="DuoUniversal" Version="1.3.1" />
44-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.19" />
45-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.19" />
46-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.19" />
44+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.20" />
45+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.20" />
46+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.20" />
4747
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.3.0" />
48-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.19">
48+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.20">
4949
<PrivateAssets>all</PrivateAssets>
5050
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5151
</PackageReference>
52-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.8" />
53-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
54-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.8" />
55-
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.8" />
56-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
57-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.8" />
58-
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
59-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
60-
<PackageReference Include="MudBlazor" Version="8.11.0" />
52+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.9" />
53+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
54+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.9" />
55+
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.9" />
56+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.9" />
57+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.9" />
58+
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
59+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
60+
<PackageReference Include="MudBlazor" Version="8.13.0" />
6161
<PackageReference Include="MudBlazor.ThemeManager" Version="3.0.0" />
62-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
62+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
6363
<PackageReference Include="Octokit" Version="14.0.0" />
6464
<PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
6565
<PackageReference Include="Serilog" Version="4.3.0" />
6666
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
67-
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
68-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.3" />
69-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.8" />
70-
<PackageReference Include="System.DirectoryServices" Version="9.0.8" />
67+
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.6" />
68+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.6" />
69+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.9" />
70+
<PackageReference Include="System.DirectoryServices" Version="9.0.9" />
7171

72-
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="9.0.8" />
72+
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="9.0.9" />
7373

74-
<PackageReference Include="System.DirectoryServices.Protocols" Version="9.0.8" />
74+
<PackageReference Include="System.DirectoryServices.Protocols" Version="9.0.9" />
7575

76-
<PackageReference Include="System.Drawing.Common" Version="9.0.8" />
76+
<PackageReference Include="System.Drawing.Common" Version="9.0.9" />
7777

78-
<PackageReference Include="System.Management" Version="9.0.8" />
78+
<PackageReference Include="System.Management" Version="9.0.9" />
7979

80-
<PackageReference Include="System.Security.Permissions" Version="9.0.8" />
80+
<PackageReference Include="System.Security.Permissions" Version="9.0.9" />
8181
</ItemGroup>
8282

8383
<ItemGroup>

‎BLAZAM/Pages/Download/DBExport.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using System.IO.Compression;
2-
using BLAZAM.Common.Data;
3-
using BLAZAM.Database.Context;
42
using BLAZAM.Jobs;
53
using BLAZAM.Localization;
64
using Microsoft.AspNetCore.Authorization;

‎BLAZAMActiveDirectory/Adapters/DirectoryEntryAdapter.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -993,14 +993,14 @@ public virtual void Delete(bool forceDeleteChildren = false)
993993
case ActiveDirectoryObjectType.Group:
994994
case ActiveDirectoryObjectType.Printer:
995995
case ActiveDirectoryObjectType.Computer:
996-
if (forceDeleteChildren)
996+
if (forceDeleteChildren && DirectoryEntry != null)
997997
{
998-
var children = DirectoryEntry?.Children;
998+
var children = DirectoryEntry.Children;
999999
if (children != null)
10001000
{
10011001
foreach (DirectoryEntry child in children)
10021002
{
1003-
DirectoryEntry?.Children.Remove(child);
1003+
DirectoryEntry.Children.Remove(child);
10041004
}
10051005
}
10061006

‎BLAZAMActiveDirectory/Adapters/RemoteSession.cs‎

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private ITerminalServicesSession? Session
5757
public AppDelegate<IRemoteSession> OnSessionDown { get; set; }
5858
public AppDelegate<IRemoteSession> OnSessionUpdated { get; set; }
5959

60-
private Timer t;
60+
private readonly Timer t;
6161
public RemoteSession(ITerminalServicesSession session, IADComputer host)
6262
{
6363
Host = host;
@@ -233,12 +233,11 @@ private void GetNewSessionState()
233233

234234
public override bool Equals(object? obj)
235235
{
236-
if (obj is IRemoteSession other && other.Server != null)
236+
if (obj is IRemoteSession other && other.Server != null
237+
&& (other.SessionId.Equals(SessionId) && other.Server.ServerName.Equals(Server?.ServerName)))
237238
{
238-
if (other.SessionId.Equals(SessionId) && other.Server.ServerName.Equals(Server?.ServerName))
239-
{
240-
return true;
241-
}
239+
return true;
240+
242241
}
243242
return false;
244243
}
@@ -248,12 +247,37 @@ public override int GetHashCode()
248247
return (SessionId + Server?.ServerName).GetHashCode();
249248
}
250249

250+
private bool _disposed = false;
251+
252+
protected virtual void Dispose(bool disposing)
253+
{
254+
if (!_disposed)
255+
{
256+
if (disposing)
257+
{
258+
// Dispose managed resources
259+
t?.Dispose();
260+
if (Session != null && Session.Server != null)
261+
{
262+
Session.Server.Close();
263+
}
264+
Session = null;
265+
}
266+
// Free unmanaged resources (if any) here
267+
268+
_disposed = true;
269+
}
270+
}
271+
251272
public void Dispose()
252273
{
253-
t?.Dispose();
254-
if (Session != null && Session.Server != null)
255-
Session.Server.Close();
256-
Session = null;
274+
Dispose(true);
275+
GC.SuppressFinalize(this);
276+
}
277+
278+
~RemoteSession()
279+
{
280+
Dispose(false);
257281
}
258282
}
259283
}

‎BLAZAMActiveDirectory/BLAZAMActiveDirectory.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.19" />
12-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.19" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.19" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.19" />
15-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.19">
11+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.20" />
12+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.20" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.20" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.20" />
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.20">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>
19-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.8" />
20-
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
22-
<PackageReference Include="MudBlazor" Version="8.11.0" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.9" />
20+
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
21+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
22+
<PackageReference Include="MudBlazor" Version="8.13.0" />
2323
<PackageReference Include="PreMailer.Net" Version="2.7.2" />
2424
<PackageReference Include="Serilog" Version="4.3.0" />
2525
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
2626
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
27-
<PackageReference Include="System.DirectoryServices.Protocols" Version="9.0.8" />
28-
<PackageReference Include="System.Management" Version="9.0.8" />
29-
<PackageReference Include="System.Security.Permissions" Version="9.0.8" />
27+
<PackageReference Include="System.DirectoryServices.Protocols" Version="9.0.9" />
28+
<PackageReference Include="System.Management" Version="9.0.9" />
29+
<PackageReference Include="System.Security.Permissions" Version="9.0.9" />
3030
</ItemGroup>
3131

3232
<ItemGroup>

‎BLAZAMActiveDirectory/Helpers/ActiveDirectoryHelpers.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,11 @@ public static List<IDirectoryEntryAdapter> Encapsulate(this SearchResultCollecti
232232

233233

234234

235+
}
236+
else
237+
{
238+
Loggers.ActiveDirectoryLogger.Information("Unable to match ad object type. {Object}", sr.Path);
239+
235240
}
236241
}
237242
return thisObject;
@@ -288,7 +293,7 @@ public static List<IDirectoryEntryAdapter> Encapsulate(this SearchResultCollecti
288293
}
289294
else
290295
{
291-
Loggers.ActiveDirectoryLogger.Warning(new AppException("Unable to match ad object type"), "Unable to match ad object type. {Object}", sr);
296+
Loggers.ActiveDirectoryLogger.Information("Unable to match ad object type. {Object}", sr.Path);
292297

293298
}
294299
}

0 commit comments

Comments
 (0)