Skip to content

Net 5 Upgrade complete #156

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
StuartFerguson merged 1 commit into from
Jan 21, 2021
Merged

Net 5 Upgrade complete #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 34 additions & 0 deletions EstateManagement.BusinessLogic.Tests/EstateManagement - Backup.BusinessLogic.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<DebugType>None</DebugType>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="3.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="Moq" Version="4.14.4" />
<PackageReference Include="Shared.EventStore" Version="1.0.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\EstateManagement.BusinessLogic\EstateManagement.BusinessLogic.csproj" />
<ProjectReference Include="..\EstateManagement.Testing\EstateManagement.Testing.csproj" />
</ItemGroup>

<ItemGroup>
<Folder Include="Common\" />
</ItemGroup>

</Project>
14 changes: 7 additions & 7 deletions EstateManagement.BusinessLogic.Tests/EstateManagement.BusinessLogic.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<DebugType>None</DebugType>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="2.9.0">
<PackageReference Include="coverlet.msbuild" Version="3.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="Moq" Version="4.14.4" />
<PackageReference Include="Shared.EventStore" Version="1.0.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Moq" Version="4.16.0" />
<PackageReference Include="Shared.EventStore" Version="1.0.3" />
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
7 changes: 4 additions & 3 deletions EstateManagement.BusinessLogic.Tests/ModelFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using ContractEntity = EstateReporting.Database.Entities.Contract;
using ContractProductEntity = EstateReporting.Database.Entities.ContractProduct;
using ContractProductTransactionFeeEntity = EstateReporting.Database.Entities.ContractProductTransactionFee;
using ContractProductTransactionFeeModel = EstateManagement.Models.Contract.TransactionFee;

using MerchantEntity = EstateReporting.Database.Entities.Merchant;
using MerchantAddressEntity = EstateReporting.Database.Entities.MerchantAddress;
Expand Down Expand Up @@ -602,12 +603,12 @@ public void ContractEntities_ContractProductTransactionFee_ConvertFrom_Transacti
};

ModelFactory modelFactory = new ModelFactory();
List<TransactionFee> transactionFeesModelList = modelFactory.ConvertFrom(contractProductsTransactionFees);
List<ContractProductTransactionFeeModel> transactionFeesModelList = modelFactory.ConvertFrom(contractProductsTransactionFees);

transactionFeesModelList.ShouldNotBeNull();
transactionFeesModelList.ShouldHaveSingleItem();

TransactionFee contractProductTransactionFee = transactionFeesModelList.Single();
ContractProductTransactionFeeModel contractProductTransactionFee = transactionFeesModelList.Single();
ContractProductTransactionFee expectedContractProductTransactionFee = contractProductsTransactionFees.Single();
contractProductTransactionFee.TransactionFeeId.ShouldBe(expectedContractProductTransactionFee.TransactionFeeId);
contractProductTransactionFee.Description.ShouldBe(expectedContractProductTransactionFee.Description);
Expand Down Expand Up @@ -649,7 +650,7 @@ public void ContractEntities_ConvertFrom_ContractConverted()
contractProduct.TransactionFees.ShouldNotBeNull();
contractProduct.TransactionFees.ShouldHaveSingleItem();

TransactionFee contractProductTransactionFee = contractProduct.TransactionFees.Single();
ContractProductTransactionFeeModel contractProductTransactionFee = contractProduct.TransactionFees.Single();
ContractProductTransactionFee expectedContractProductTransactionFee = contractProductsTransactionFees.Single();
contractProductTransactionFee.TransactionFeeId.ShouldBe(expectedContractProductTransactionFee.TransactionFeeId);
contractProductTransactionFee.Description.ShouldBe(expectedContractProductTransactionFee.Description);
Expand Down
8 changes: 4 additions & 4 deletions EstateManagement.BusinessLogic/EstateManagement.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="SecurityService.Client" Version="1.0.1" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.1" />
<PackageReference Include="MediatR" Version="8.0.1" />
<PackageReference Include="SecurityService.Client" Version="1.0.4" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.3" />
<PackageReference Include="MediatR" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions EstateManagement.Client/EstateManagement.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeP2PAssets</TargetsForTfmSpecificBuildOutput>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="1.0.1" />
<PackageReference Include="ClientProxyBase" Version="1.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions EstateManagement.Contract.DomainEvents/EstateManagement.Contract.DomainEvents.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.1" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.3" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions EstateManagement.ContractAggregate.Tests/EstateManagement.ContractAggregate.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<DebugType>None</DebugType>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="1.3.0">
<PackageReference Include="coverlet.collector" Version="3.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions EstateManagement.ContractAggregate/EstateManagement.ContractAggregate.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">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.1" />
<PackageReference Include="Shared.EventStore" Version="1.0.1" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.3" />
<PackageReference Include="Shared.EventStore" Version="1.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions EstateManagement.DataTransferObjects/EstateManagement.DataTransferObjects.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<DebugType>None</DebugType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions EstateManagement.Estate.DomainEvents/EstateManagement.Estate.DomainEvents.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.1" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.3" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions EstateManagement.EstateAggregate.Tests/EstateManagement.EstateAggregate.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<DebugType>None</DebugType>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="Shared.EventStore" Version="1.0.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Shared.EventStore" Version="1.0.3" />
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="2.9.0">
<PackageReference Include="coverlet.msbuild" Version="3.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions EstateManagement.EstateAggregate/EstateManagement.EstateAggregate.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">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.1" />
<PackageReference Include="Shared.EventStore" Version="1.0.1" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.3" />
<PackageReference Include="Shared.EventStore" Version="1.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions EstateManagement.IntegrationTests/Common/DockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ public override async Task StopContainersForScenarioRun()

await RemoveEstateReadModel().ConfigureAwait(false);

if (EnumerableExtensions.Any(this.Containers))
if (this.Containers.Any())
{
foreach (IContainerService containerService in this.Containers)
{
Expand All @@ -251,7 +251,7 @@ public override async Task StopContainersForScenarioRun()
}
}

if (EnumerableExtensions.Any(this.TestNetworks))
if (this.TestNetworks.Any())
{
foreach (INetworkService networkService in this.TestNetworks)
{
Expand Down
10 changes: 5 additions & 5 deletions EstateManagement.IntegrationTests/Contract/Contract.feature.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions EstateManagement.IntegrationTests/Estate/Estate.feature.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading