Skip to content

Upgrade to Net 7 #44

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Nov 19, 2022
Merged

Upgrade to Net 7 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2faa612
Upgrade to Net 7
StuartFerguson Nov 19, 2022
e59afa6
Merge branch 'master' into task/#43_net7upgrade
StuartFerguson Nov 19, 2022
1fa53cc
Workflow :|
StuartFerguson Nov 19, 2022
cd954c4
Merge branch 'task/#43_net7upgrade' of ssh://github.com/StuartFerguso…
StuartFerguson Nov 19, 2022
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
5 changes: 5 additions & 0 deletions .github/workflows/createrelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ jobs:

steps:
- uses: actions/checkout@v1

- name: Install NET 7
uses: actions/setup-dotnet@v2
with:
dotnet-version: '7.0.x'

- name: Get the version
id: get_version
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/pullrequest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ jobs:

steps:
- uses: actions/checkout@v1

- name: Install NET 7
uses: actions/setup-dotnet@v2
with:
dotnet-version: '7.0.x'

- name: Restore Nuget Packages
run: |
Expand Down
12 changes: 6 additions & 6 deletions ...actionProcessing.SchedulerService.Jobs/TransactionProcessing.SchedulerService.Jobs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EstateManagement.Client" Version="1.1.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
<PackageReference Include="EstateManagement.Client" Version="1.1.6-build21" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Quartz" Version="3.3.3" />
<PackageReference Include="SecurityService.Client" Version="1.1.1" />
<PackageReference Include="TransactionProcessor.Client" Version="1.1.9" />
<PackageReference Include="Quartz" Version="3.5.0" />
<PackageReference Include="SecurityService.Client" Version="1.1.2-build23" />
<PackageReference Include="TransactionProcessor.Client" Version="1.1.13-build29" />
</ItemGroup>
</Project>
26 changes: 26 additions & 0 deletions ...sactionProcessing.SchedulerService/TransactionProcessing - Backup.SchedulerService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.5.0" />
<PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.5.0" />
<PackageReference Include="Quartz.Serialization.Json" Version="3.5.0" />
<PackageReference Include="Shared" Version="1.5.1" />
<PackageReference Include="SilkierQuartz" Version="5.0.309" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\TransactionProcessing.SchedulerService.Jobs\TransactionProcessing.SchedulerService.Jobs.csproj" />
</ItemGroup>

<ItemGroup>
<Content Update="quartz.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>
16 changes: 8 additions & 8 deletions ...vice/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
<PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.3.3" />
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.3.3" />
<PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.3.3" />
<PackageReference Include="Quartz.Serialization.Json" Version="3.3.3" />
<PackageReference Include="Shared" Version="1.3.8" />
<PackageReference Include="SilkierQuartz" Version="5.0.309" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.5.0" />
<PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.5.0" />
<PackageReference Include="Quartz.Serialization.Json" Version="3.5.0" />
<PackageReference Include="Shared" Version="1.5.1" />
<PackageReference Include="SilkierQuartz" Version="5.0.356" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...actionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ static async Task Main(string[] args)
endDate = DateTime.ParseExact(args[2], "yyyy-MM-dd", null);
}

startDate = new DateTime(2022,7,1);
endDate = new DateTime(2022,7,31);
startDate = new DateTime(2022,11,3);
endDate = new DateTime(2022,11,7);

SettlementProcessor processor = new SettlementProcessor();
processor.LoadConfiguration();
Expand Down
2 changes: 1 addition & 1 deletion ...tlementProcessor/TransactionProcessing.SettlementProcessor/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"profiles": {
"TransactionProcessing.SettlementProcessor": {
"commandName": "Project",
"commandLineArgs": "435613ac-a468-47a3-ac4f-649d89764c22"
"commandLineArgs": "7c757c2c-4ec9-4d78-ac9b-3a7bfc6d5877"
}
}
}
12 changes: 6 additions & 6 deletions ...ransactionProcessing.SettlementProcessor/TransactionProcessing.SettlementProcessor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="SecurityService.Client" Version="1.0.8" />
<PackageReference Include="Shared" Version="1.3.3" />
<PackageReference Include="TransactionProcessor.Client" Version="1.1.5" />
<PackageReference Include="SecurityService.Client" Version="1.1.2-build23" />
<PackageReference Include="Shared" Version="1.5.1" />
<PackageReference Include="TransactionProcessor.Client" Version="1.1.13-build29" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EstateManagement.Client" Version="1.1.5" />
<PackageReference Include="EstateManagement.Client" Version="1.1.6-build21" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="SecurityService.Client" Version="1.0.6" />
<PackageReference Include="TransactionProcessor.Client" Version="1.1.11" />
<PackageReference Include="SecurityService.Client" Version="1.1.2-build23" />
<PackageReference Include="TransactionProcessor.Client" Version="1.1.13-build29" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions ...thChecksUI/TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="5.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="5.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="6.0.5" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="6.0.5" />
</ItemGroup>

</Project>
18 changes: 9 additions & 9 deletions TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj
View file
Open in desktop
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>
</PropertyGroup>

<ItemGroup>
Expand All @@ -16,15 +16,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="EstateManagement.Client" Version="1.1.5" />
<PackageReference Include="EventStore.Client.Grpc.PersistentSubscriptions" Version="21.2.0" />
<PackageReference Include="EventStore.Client.Grpc.ProjectionManagement" Version="21.2.0" />
<PackageReference Include="EventStoreProjections" Version="1.0.11" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="EstateManagement.Client" Version="1.1.6-build21" />
<PackageReference Include="EventStore.Client.Grpc.PersistentSubscriptions" Version="22.0.0" />
<PackageReference Include="EventStore.Client.Grpc.ProjectionManagement" Version="22.0.0" />
<PackageReference Include="EventStoreProjections" Version="1.0.13" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="SecurityService.Client" Version="1.0.8" />
<PackageReference Include="Shared" Version="1.3.3" />
<PackageReference Include="SecurityService.Client" Version="1.1.2-build23" />
<PackageReference Include="Shared" Version="1.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 12 additions & 0 deletions compose-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
services:
app:
entrypoint:
- sleep
- infinity
image: docker/dev-environments-default:stable-1
init: true
volumes:
- type: bind
source: /var/run/docker.sock
target: /var/run/docker.sock