Skip to content

Updated urls and moved to net5 #16

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 2 commits into from
Dec 17, 2021
+158 −32
Merged

Updated urls and moved to net5 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e477303
Updated urls and moved to net5
StuartFerguson Dec 17, 2021
29be2dd
Workflow updates
StuartFerguson Dec 17, 2021
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: 0 additions & 5 deletions .github/workflows/createrelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ jobs:
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}

- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.100

- name: Restore Nuget Packages
run: dotnet restore TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json

Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/pullrequest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ jobs:
steps:
- uses: actions/checkout@v1

- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.100

- name: Restore Nuget Packages
run: dotnet restore TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json

Expand Down
3 changes: 3 additions & 0 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,6 +19,9 @@ static async Task Main(string[] args)
endDate = DateTime.ParseExact(args[2], "yyyy-MM-dd", null);
}

startDate = new DateTime(2021,10,29);
endDate = new DateTime(2021,11,24);

SettlementProcessor processor = new SettlementProcessor();
processor.LoadConfiguration();
await processor.ProcessSettlement(estateId, startDate, endDate);
Expand Down
8 changes: 4 additions & 4 deletions TransactionProcessor.DataGenerator/DataGenerator/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ static async Task Main(string[] args)
List<MerchantResponse> merchants = await Program.EstateClient.GetMerchants(Program.TokenResponse.AccessToken, estateId, CancellationToken.None);

// Set the date range
DateTime startDate = new DateTime(2021,10,6); //27/7
DateTime endDate = new DateTime(2021,10,27); // This is the date of te last generated transaction
DateTime startDate = new DateTime(2021,11,06); //27/7
DateTime endDate = new DateTime(2021,11,23); // This is the date of te last generated transaction
List<DateTime> dateRange = Program.GenerateDateRange(startDate, endDate);

// Only use merchants that have a device
Expand All @@ -118,8 +118,8 @@ static async Task Main(string[] args)

foreach (DateTime dateTime in dateRange)
{
await Program.GenerateTransactions(merchants, dateTime, CancellationToken.None);
//await Program.GenerateFileUploads(merchants, dateTime, CancellationToken.None);
//await Program.GenerateTransactions(merchants, dateTime, CancellationToken.None);
await Program.GenerateFileUploads(merchants, dateTime, CancellationToken.None);
}

Console.WriteLine($"Process Complete");
Expand Down
2 changes: 1 addition & 1 deletion TransactionProcessor.DataGenerator/DataGenerator/TransactionDataGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="EstateManagement.Client" Version="1.0.10" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="SecurityService.Client" Version="1.0.6" />
<PackageReference Include="TransactionProcessor.Client" Version="1.0.12" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...ctionProcessor.DataGenerator/TransactionGeneratorWorker/TransactionGeneratorWorker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Worker">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<UserSecretsId>dotnet-TransactionGeneratorWorker-80A862A1-E375-48F6-8D64-7F8135EF7DD7</UserSecretsId>
</PropertyGroup>

Expand All @@ -10,7 +10,7 @@
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.9" />
<PackageReference Include="SecurityService.Client" Version="1.0.4" />
<PackageReference Include="Shared" Version="1.0.1" />
<PackageReference Include="NLog" Version="4.7.2" />
<PackageReference Include="NLog" Version="4.7.6" />
<PackageReference Include="NLog.Web.AspNetCore" Version="4.5.0-beta04" />
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="3.1.9" />
Expand Down
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>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

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

</Project>
36 changes: 24 additions & 12 deletions TransactionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,46 @@
"AllowedHosts": "*",
"HealthChecksUI": {
"HealthChecks": [
{
"Name": "Estate Management Service",
"Uri": "http://192.168.0.133:5000/health"
},
{
"Name": "Security Service",
"Uri": "http://192.168.1.133:5001/health"
"Uri": "https://192.168.0.133:5001/health"
},
{
"Name": "Messaging Service",
"Uri": "http://192.168.1.133:5006/health"
"Name": "Transaction Processor Service",
"Uri": "http://192.168.0.133:5002/health"
},
{
"Name": "Estate Management Service",
"Uri": "http://192.168.1.133:5000/health"
"Name": "Transaction Processor ACL Service",
"Uri": "http://192.168.0.133:5003/health"
},
{
"Name": "Estate Management UI",
"Uri": "http://192.168.1.133:5004/health"
"Uri": "http://192.168.0.133:5004/health"
},
{
"Name": "Estate Reporting Service",
"Uri": "http://192.168.1.133:5005/health"
"Uri": "http://192.168.0.133:5005/health"
},
{
"Name": "Transaction Processor Service",
"Uri": "http://192.168.1.133:5002/health"
"Name": "Messaging Service",
"Uri": "http://192.168.0.133:5006/health"
},
{
"Name": "Transaction Processor ACL Service",
"Uri": "http://192.168.1.133:5003/health"
}
"Name": "Voucher Management Service",
"Uri": "http://192.168.0.133:5007/health"
},
{
"Name": "Voucher Management ACL Service",
"Uri": "http://192.168.0.133:5008/health"
}//,
//{
// "Name": "File Processor Service",
// "Uri": "http://192.168.0.133:5009/health"
//}
],
"EvaluationTimeInSeconds": 10,
"MinimumSecondsBetweenFailureNotifications": 60
Expand Down
9 changes: 9 additions & 0 deletions ...thChecksUI/TransactionProcessor.HealthChecksUI/appsettings.preproduction.development.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
}
}
56 changes: 56 additions & 0 deletions ...ocessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.preproduction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"AllowedHosts": "*",
"HealthChecksUI": {
"HealthChecks": [
{
"Name": "Estate Management Service",
"Uri": "http://192.168.0.134:5000/health"
},
{
"Name": "Security Service",
"Uri": "http://192.168.0.134:5001/health"
},
{
"Name": "Transaction Processor Service",
"Uri": "http://192.168.0.134:5002/health"
},
{
"Name": "Transaction Processor ACL Service",
"Uri": "http://192.168.0.134:5003/health"
},
{
"Name": "Estate Management UI",
"Uri": "http://192.168.0.134:5004/health"
},
{
"Name": "Estate Reporting Service",
"Uri": "http://192.168.0.133:5005/health"
},
{
"Name": "Messaging Service",
"Uri": "http://192.168.0.133:5006/health"
},
{
"Name": "Voucher Management Service",
"Uri": "http://192.168.0.134:5007/health"
},
{
"Name": "Voucher Management ACL Service",
"Uri": "http://192.168.0.134:5008/health"
},
{
"Name": "File Processor Service",
"Uri": "http://192.168.0.134:5009/health"
}
],
"EvaluationTimeInSeconds": 300,
"MinimumSecondsBetweenFailureNotifications": 60
}
}
56 changes: 56 additions & 0 deletions ...tionProcessor.HealthChecksUI/TransactionProcessor.HealthChecksUI/appsettings.staging.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"AllowedHosts": "*",
"HealthChecksUI": {
"HealthChecks": [
{
"Name": "Estate Management Service",
"Uri": "http://192.168.0.133:5000/health"
},
{
"Name": "Security Service",
"Uri": "http://192.168.0.133:5001/health"
},
{
"Name": "Transaction Processor Service",
"Uri": "http://192.168.0.133:5002/health"
},
{
"Name": "Transaction Processor ACL Service",
"Uri": "http://192.168.0.133:5003/health"
},
{
"Name": "Estate Management UI",
"Uri": "http://192.168.0.133:5004/health"
},
{
"Name": "Estate Reporting Service",
"Uri": "http://192.168.0.133:5005/health"
},
{
"Name": "Messaging Service",
"Uri": "http://192.168.0.133:5006/health"
},
{
"Name": "Voucher Management Service",
"Uri": "http://192.168.0.133:5007/health"
},
{
"Name": "Voucher Management ACL Service",
"Uri": "http://192.168.0.133:5008/health"
},
{
"Name": "File Processor Service",
"Uri": "http://192.168.0.133:5009/health"
}
],
"EvaluationTimeInSeconds": 300,
"MinimumSecondsBetweenFailureNotifications": 60
}
}