Skip to content

Commit b5e84e9

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #44 from TransactionProcessing/task/#43_net7upgrade
Upgrade to Net 7
2 parents 9059963 + cd954c4 commit b5e84e9

File tree

12 files changed

+87
-39
lines changed

12 files changed

+87
-39
lines changed

‎.github/workflows/createrelease.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ jobs:
1414

1515
steps:
1616
- uses: actions/checkout@v1
17+
18+
- name: Install NET 7
19+
uses: actions/setup-dotnet@v2
20+
with:
21+
dotnet-version: '7.0.x'
1722

1823
- name: Get the version
1924
id: get_version

‎.github/workflows/pullrequest.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ jobs:
1515

1616
steps:
1717
- uses: actions/checkout@v1
18+
19+
- name: Install NET 7
20+
uses: actions/setup-dotnet@v2
21+
with:
22+
dotnet-version: '7.0.x'
1823

1924
- name: Restore Nuget Packages
2025
run: |

‎TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.Jobs/TransactionProcessing.SchedulerService.Jobs.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="EstateManagement.Client" Version="1.1.3" />
9-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
8+
<PackageReference Include="EstateManagement.Client" Version="1.1.6-build21" />
9+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
1010
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
11-
<PackageReference Include="Quartz" Version="3.3.3" />
12-
<PackageReference Include="SecurityService.Client" Version="1.1.1" />
13-
<PackageReference Include="TransactionProcessor.Client" Version="1.1.9" />
11+
<PackageReference Include="Quartz" Version="3.5.0" />
12+
<PackageReference Include="SecurityService.Client" Version="1.1.2-build23" />
13+
<PackageReference Include="TransactionProcessor.Client" Version="1.1.13-build29" />
1414
</ItemGroup>
1515
</Project>

‎TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService/TransactionProcessing - Backup.SchedulerService.csproj‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net7.0</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
9+
<PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
10+
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.5.0" />
11+
<PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.5.0" />
12+
<PackageReference Include="Quartz.Serialization.Json" Version="3.5.0" />
13+
<PackageReference Include="Shared" Version="1.5.1" />
14+
<PackageReference Include="SilkierQuartz" Version="5.0.309" />
15+
</ItemGroup>
16+
17+
<ItemGroup>
18+
<ProjectReference Include="..\TransactionProcessing.SchedulerService.Jobs\TransactionProcessing.SchedulerService.Jobs.csproj" />
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<Content Update="quartz.config">
23+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
24+
</Content>
25+
</ItemGroup>
26+
</Project>

‎TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
9-
<PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.3.3" />
10-
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.3.3" />
11-
<PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.3.3" />
12-
<PackageReference Include="Quartz.Serialization.Json" Version="3.3.3" />
13-
<PackageReference Include="Shared" Version="1.3.8" />
14-
<PackageReference Include="SilkierQuartz" Version="5.0.309" />
8+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
9+
<PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
10+
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.5.0" />
11+
<PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.5.0" />
12+
<PackageReference Include="Quartz.Serialization.Json" Version="3.5.0" />
13+
<PackageReference Include="Shared" Version="1.5.1" />
14+
<PackageReference Include="SilkierQuartz" Version="5.0.356" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ static async Task Main(string[] args)
1919
endDate = DateTime.ParseExact(args[2], "yyyy-MM-dd", null);
2020
}
2121

22-
startDate = new DateTime(2022,7,1);
23-
endDate = new DateTime(2022,7,31);
22+
startDate = new DateTime(2022,11,3);
23+
endDate = new DateTime(2022,11,7);
2424

2525
SettlementProcessor processor = new SettlementProcessor();
2626
processor.LoadConfiguration();

‎TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Properties/launchSettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"profiles": {
33
"TransactionProcessing.SettlementProcessor": {
44
"commandName": "Project",
5-
"commandLineArgs": "435613ac-a468-47a3-ac4f-649d89764c22"
5+
"commandLineArgs": "7c757c2c-4ec9-4d78-ac9b-3a7bfc6d5877"
66
}
77
}
88
}

‎TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
10-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
9+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
1111
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
12-
<PackageReference Include="SecurityService.Client" Version="1.0.8" />
13-
<PackageReference Include="Shared" Version="1.3.3" />
14-
<PackageReference Include="TransactionProcessor.Client" Version="1.1.5" />
12+
<PackageReference Include="SecurityService.Client" Version="1.1.2-build23" />
13+
<PackageReference Include="Shared" Version="1.5.1" />
14+
<PackageReference Include="TransactionProcessor.Client" Version="1.1.13-build29" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="EstateManagement.Client" Version="1.1.5" />
9+
<PackageReference Include="EstateManagement.Client" Version="1.1.6-build21" />
1010
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
11-
<PackageReference Include="SecurityService.Client" Version="1.0.6" />
12-
<PackageReference Include="TransactionProcessor.Client" Version="1.1.11" />
11+
<PackageReference Include="SecurityService.Client" Version="1.1.2-build23" />
12+
<PackageReference Include="TransactionProcessor.Client" Version="1.1.13-build29" />
1313
</ItemGroup>
1414

1515
</Project>

‎TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="5.0.1" />
9-
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="5.0.1" />
8+
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="6.0.5" />
9+
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="6.0.5" />
1010
</ItemGroup>
1111

1212
</Project>

0 commit comments

Comments
 (0)