Skip to content

Commit ae3839c

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #156 from StuartFerguson/task/#155_net5upgrade
Net 5 Upgrade complete
2 parents b32cc22 + a7ab9d2 commit ae3839c

35 files changed

Lines changed: 436 additions & 150 deletions

File tree

‎EstateManagement.BusinessLogic.Tests/EstateManagement - Backup.BusinessLogic.Tests.csproj‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net5.0</TargetFramework>
5+
<DebugType>None</DebugType>
6+
<IsPackable>false</IsPackable>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<PackageReference Include="coverlet.msbuild" Version="3.0.1">
11+
<PrivateAssets>all</PrivateAssets>
12+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13+
</PackageReference>
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
15+
<PackageReference Include="Moq" Version="4.14.4" />
16+
<PackageReference Include="Shared.EventStore" Version="1.0.1" />
17+
<PackageReference Include="Shouldly" Version="3.0.2" />
18+
<PackageReference Include="xunit" Version="2.4.1" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
20+
<PrivateAssets>all</PrivateAssets>
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22+
</PackageReference>
23+
</ItemGroup>
24+
25+
<ItemGroup>
26+
<ProjectReference Include="..\EstateManagement.BusinessLogic\EstateManagement.BusinessLogic.csproj" />
27+
<ProjectReference Include="..\EstateManagement.Testing\EstateManagement.Testing.csproj" />
28+
</ItemGroup>
29+
30+
<ItemGroup>
31+
<Folder Include="Common\" />
32+
</ItemGroup>
33+
34+
</Project>

‎EstateManagement.BusinessLogic.Tests/EstateManagement.BusinessLogic.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<DebugType>None</DebugType>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="coverlet.msbuild" Version="2.9.0">
10+
<PackageReference Include="coverlet.msbuild" Version="3.0.1">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
15-
<PackageReference Include="Moq" Version="4.14.4" />
16-
<PackageReference Include="Shared.EventStore" Version="1.0.1" />
17-
<PackageReference Include="Shouldly" Version="3.0.2" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
15+
<PackageReference Include="Moq" Version="4.16.0" />
16+
<PackageReference Include="Shared.EventStore" Version="1.0.3" />
17+
<PackageReference Include="Shouldly" Version="4.0.3" />
1818
<PackageReference Include="xunit" Version="2.4.1" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
19+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageReference>

‎EstateManagement.BusinessLogic.Tests/ModelFactoryTests.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using ContractEntity = EstateReporting.Database.Entities.Contract;
1111
using ContractProductEntity = EstateReporting.Database.Entities.ContractProduct;
1212
using ContractProductTransactionFeeEntity = EstateReporting.Database.Entities.ContractProductTransactionFee;
13+
using ContractProductTransactionFeeModel = EstateManagement.Models.Contract.TransactionFee;
1314

1415
using MerchantEntity = EstateReporting.Database.Entities.Merchant;
1516
using MerchantAddressEntity = EstateReporting.Database.Entities.MerchantAddress;
@@ -602,12 +603,12 @@ public void ContractEntities_ContractProductTransactionFee_ConvertFrom_Transacti
602603
};
603604

604605
ModelFactory modelFactory = new ModelFactory();
605-
List<TransactionFee> transactionFeesModelList = modelFactory.ConvertFrom(contractProductsTransactionFees);
606+
List<ContractProductTransactionFeeModel> transactionFeesModelList = modelFactory.ConvertFrom(contractProductsTransactionFees);
606607

607608
transactionFeesModelList.ShouldNotBeNull();
608609
transactionFeesModelList.ShouldHaveSingleItem();
609610

610-
TransactionFee contractProductTransactionFee = transactionFeesModelList.Single();
611+
ContractProductTransactionFeeModel contractProductTransactionFee = transactionFeesModelList.Single();
611612
ContractProductTransactionFee expectedContractProductTransactionFee = contractProductsTransactionFees.Single();
612613
contractProductTransactionFee.TransactionFeeId.ShouldBe(expectedContractProductTransactionFee.TransactionFeeId);
613614
contractProductTransactionFee.Description.ShouldBe(expectedContractProductTransactionFee.Description);
@@ -649,7 +650,7 @@ public void ContractEntities_ConvertFrom_ContractConverted()
649650
contractProduct.TransactionFees.ShouldNotBeNull();
650651
contractProduct.TransactionFees.ShouldHaveSingleItem();
651652

652-
TransactionFee contractProductTransactionFee = contractProduct.TransactionFees.Single();
653+
ContractProductTransactionFeeModel contractProductTransactionFee = contractProduct.TransactionFees.Single();
653654
ContractProductTransactionFee expectedContractProductTransactionFee = contractProductsTransactionFees.Single();
654655
contractProductTransactionFee.TransactionFeeId.ShouldBe(expectedContractProductTransactionFee.TransactionFeeId);
655656
contractProductTransactionFee.Description.ShouldBe(expectedContractProductTransactionFee.Description);

‎EstateManagement.BusinessLogic/EstateManagement.BusinessLogic.csproj‎

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

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

77
<ItemGroup>
8-
<PackageReference Include="SecurityService.Client" Version="1.0.1" />
9-
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.1" />
10-
<PackageReference Include="MediatR" Version="8.0.1" />
8+
<PackageReference Include="SecurityService.Client" Version="1.0.4" />
9+
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.3" />
10+
<PackageReference Include="MediatR" Version="9.0.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎EstateManagement.Client/EstateManagement.Client.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeP2PAssets</TargetsForTfmSpecificBuildOutput>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="ClientProxyBase" Version="1.0.1" />
10+
<PackageReference Include="ClientProxyBase" Version="1.0.3" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎EstateManagement.Contract.DomainEvents/EstateManagement.Contract.DomainEvents.csproj‎

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

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

77
<ItemGroup>
8-
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.1" />
8+
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.3" />
99
</ItemGroup>
1010

1111
</Project>

‎EstateManagement.ContractAggregate.Tests/EstateManagement.ContractAggregate.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<DebugType>None</DebugType>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
11-
<PackageReference Include="Shouldly" Version="3.0.2" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
11+
<PackageReference Include="Shouldly" Version="4.0.3" />
1212
<PackageReference Include="xunit" Version="2.4.1" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="coverlet.collector" Version="1.3.0">
17+
<PackageReference Include="coverlet.collector" Version="3.0.1">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>

‎EstateManagement.ContractAggregate/EstateManagement.ContractAggregate.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">
22

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

77
<ItemGroup>
8-
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.1" />
9-
<PackageReference Include="Shared.EventStore" Version="1.0.1" />
8+
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.3" />
9+
<PackageReference Include="Shared.EventStore" Version="1.0.3" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎EstateManagement.DataTransferObjects/EstateManagement.DataTransferObjects.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<DebugType>None</DebugType>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
10-
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
10+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
1111
</ItemGroup>
1212

1313
</Project>

‎EstateManagement.Estate.DomainEvents/EstateManagement.Estate.DomainEvents.csproj‎

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

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

77
<ItemGroup>
8-
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.1" />
8+
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.3" />
99
</ItemGroup>
1010
</Project>

0 commit comments

Comments
 (0)