Skip to content

Commit bcc3954

Browse files
ucswiftucswift
authored
Merge pull request #177 from Resgrid/develop
Develop
2 parents a39494c + e374a53 commit bcc3954

File tree

61 files changed

+747
-602
lines changed

Some content is hidden

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

61 files changed

+747
-602
lines changed

‎.github/workflows/dotnet.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup .NET
1818
uses: actions/setup-dotnet@v4
1919
with:
20-
dotnet-version: 8.0.x
20+
dotnet-version: 9.0.x
2121
- name: Restore dependencies
2222
run: dotnet restore
2323
- name: Build

‎Core/Resgrid.Config/Resgrid.Config.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Configurations>Debug;Release;Docker</Configurations>
55
</PropertyGroup>
66
<ItemGroup>

‎Core/Resgrid.Framework/Resgrid.Framework.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<AssemblyName>Resgrid.Framework</AssemblyName>
55
<Company>Resgrid, LLC</Company>
66
<Product>Resgrid OSS CAD</Product>
@@ -12,14 +12,14 @@
1212
<None Include="..\..\Common\Resgrid-PubPriv-KeyFile.snk" Link="Resgrid-PubPriv-KeyFile.snk" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<PackageReference Include="HtmlAgilityPack" Version="1.11.59" />
16-
<PackageReference Include="NodaTime" Version="3.1.11" />
17-
<PackageReference Include="protobuf-net" Version="3.2.30" />
18-
<PackageReference Include="Sentry" Version="4.10.2" />
19-
<PackageReference Include="Sentry.Serilog" Version="4.10.2" />
20-
<PackageReference Include="Serilog" Version="4.0.1" />
15+
<PackageReference Include="HtmlAgilityPack" Version="1.12.0" />
16+
<PackageReference Include="NodaTime" Version="3.2.2" />
17+
<PackageReference Include="protobuf-net" Version="3.2.46" />
18+
<PackageReference Include="Sentry" Version="5.4.0" />
19+
<PackageReference Include="Sentry.Serilog" Version="5.4.0" />
20+
<PackageReference Include="Serilog" Version="4.2.0" />
2121
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
22-
<PackageReference Include="TimeZoneConverter" Version="6.1.0" />
22+
<PackageReference Include="TimeZoneConverter" Version="7.0.0" />
2323
<PackageReference Include="Vereyon.Web.HtmlSanitizer" Version="1.8.0" />
2424
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2525
</ItemGroup>

‎Core/Resgrid.Localization/Resgrid.Localization.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Nullable>enable</Nullable>
55
</PropertyGroup>
66
<ItemGroup>

‎Core/Resgrid.Model/Providers/IRabbitOutboundQueueProvider.cs‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
using Resgrid.Model.Events;
22
using Resgrid.Model.Queue;
3+
using System.Threading.Tasks;
34

45
namespace Resgrid.Model.Providers
56
{
67
public interface IRabbitOutboundQueueProvider
78
{
8-
bool EnqueueCall(CallQueueItem callQueue);
9-
bool EnqueueMessage(MessageQueueItem messageQueue);
10-
bool EnqueueDistributionList(DistributionListQueueItem distributionListQueue);
11-
bool EnqueueNotification(NotificationItem notificationQueue);
12-
bool EnqueueShiftNotification(ShiftQueueItem shiftQueueItem);
13-
bool EnqueueCqrsEvent(CqrsEvent cqrsEvent);
14-
bool EnqueueAuditEvent(AuditEvent auditEvent);
15-
bool EnqueueUnitLocationEvent(UnitLocationEvent unitLocationEvent);
16-
bool EnqueuePersonnelLocationEvent(PersonnelLocationEvent personnelLocationEvent);
17-
bool VerifyAndCreateClients();
9+
Task<bool> EnqueueCall(CallQueueItem callQueue);
10+
Task<bool> EnqueueMessage(MessageQueueItem messageQueue);
11+
Task<bool> EnqueueDistributionList(DistributionListQueueItem distributionListQueue);
12+
Task<bool> EnqueueNotification(NotificationItem notificationQueue);
13+
Task<bool> EnqueueShiftNotification(ShiftQueueItem shiftQueueItem);
14+
Task<bool> EnqueueCqrsEvent(CqrsEvent cqrsEvent);
15+
Task<bool> EnqueueAuditEvent(AuditEvent auditEvent);
16+
Task<bool> EnqueueUnitLocationEvent(UnitLocationEvent unitLocationEvent);
17+
Task<bool> EnqueuePersonnelLocationEvent(PersonnelLocationEvent personnelLocationEvent);
18+
Task<bool> VerifyAndCreateClients();
1819
}
1920
}

‎Core/Resgrid.Model/Repositories/IMongoRepository.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public interface IMongoRepository<TDocument> where TDocument : INoSqlDocument
1313
{
1414
IMongoCollection<TDocument> GetCollection();
1515

16-
IMongoQueryable<TDocument> AsQueryable();
16+
IQueryable<TDocument> AsQueryable();
1717

1818
IEnumerable<TDocument> FilterBy(
1919
Expression<Func<TDocument, bool>> filterExpression);

‎Core/Resgrid.Model/Resgrid.Model.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Configurations>Debug;Release;Docker</Configurations>
55
</PropertyGroup>
66
<ItemGroup>
@@ -79,12 +79,12 @@
7979
</ItemGroup>
8080
<ItemGroup>
8181
<PackageReference Include="GeoCoordinate.NetCore" Version="1.0.0.1" />
82-
<PackageReference Include="GeoJSON.Net" Version="1.2.19" />
83-
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
84-
<PackageReference Include="MimeKit" Version="4.7.1" />
85-
<PackageReference Include="MongoDB.Driver" Version="2.24.0" />
86-
<PackageReference Include="protobuf-net" Version="3.2.30" />
87-
<PackageReference Include="Stripe.net" Version="45.1.0" />
82+
<PackageReference Include="GeoJSON.Net" Version="1.4.1" />
83+
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.3.1" />
84+
<PackageReference Include="MimeKit" Version="4.11.0" />
85+
<PackageReference Include="MongoDB.Driver" Version="3.2.1" />
86+
<PackageReference Include="protobuf-net" Version="3.2.46" />
87+
<PackageReference Include="Stripe.net" Version="47.4.0" />
8888
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
8989
</ItemGroup>
9090
<ItemGroup>

‎Core/Resgrid.Model/Services/IHealthService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ public interface IHealthService
77
Task<string> GetDatabaseTimestamp();
88
bool IsCacheProviderConnected();
99

10-
bool IsServiceBusProviderConnected();
10+
Task<bool> IsServiceBusProviderConnected();
1111
}
1212
}

‎Core/Resgrid.Services/HealthService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ public bool IsCacheProviderConnected()
2828
return _cacheProvider.IsConnected();
2929
}
3030

31-
public bool IsServiceBusProviderConnected()
31+
public async Task<bool> IsServiceBusProviderConnected()
3232
{
33-
return _rabbitOutboundQueueProvider.VerifyAndCreateClients();
33+
return await _rabbitOutboundQueueProvider.VerifyAndCreateClients();
3434
}
3535
}
3636
}

‎Core/Resgrid.Services/Resgrid.Services.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Configurations>Debug;Release;Docker</Configurations>
55
</PropertyGroup>
66
<ItemGroup>
77
<None Include="..\..\Common\Resgrid-PubPriv-KeyFile.snk" Link="Resgrid-PubPriv-KeyFile.snk" />
88
</ItemGroup>
99
<ItemGroup>
10-
<PackageReference Include="Autofac" Version="8.0.0" />
10+
<PackageReference Include="Autofac" Version="8.2.0" />
1111
<PackageReference Include="CommonServiceLocator" Version="2.0.7" />
12-
<PackageReference Include="GeoJSON.Net" Version="1.2.19" />
13-
<PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="110.2.0" />
14-
<PackageReference Include="Stripe.net" Version="45.1.0" />
12+
<PackageReference Include="GeoJSON.Net" Version="1.4.1" />
13+
<PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="112.1.0" />
14+
<PackageReference Include="Stripe.net" Version="47.4.0" />
1515
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1616
</ItemGroup>
1717
<ItemGroup>

0 commit comments

Comments
 (0)