Skip to content

Commit ca6b364

Browse files
NightAngellNightAngell
committed
net6.0 update
1 parent f1c4bb9 commit ca6b364

File tree

10 files changed

+74
-48
lines changed

10 files changed

+74
-48
lines changed

‎Directory.Build.props‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33

4-
<!--Target framework-->
54
<PropertyGroup>
6-
<!--Supported values: {net5.0, netstandard2.1}. Any other values may require additional projects configuration-->
7-
<TargetFrameworkForExampleAndTests>net5.0</TargetFrameworkForExampleAndTests>
8-
<TargetFrameworkForLib>netstandard2.1</TargetFrameworkForLib>
5+
<!--Supported values:
6+
{net5.0, netstandard2.1},
7+
{net6.0, net6.0}
8+
It is also important to made sure that tests and example project have valid dependencies-->
9+
<TargetFrameworkForExampleAndTests>net6.0</TargetFrameworkForExampleAndTests>
10+
<TargetFrameworkForLib>net6.0</TargetFrameworkForLib>
11+
12+
<EntityFrameworkMinSupportedVersion>6.0.0</EntityFrameworkMinSupportedVersion>
13+
<EntityFrameworkCurrentVersion>6.0.*</EntityFrameworkCurrentVersion>
14+
<MicrosoftTestSDKVersion>17.1.0</MicrosoftTestSDKVersion>
915
</PropertyGroup>
1016

11-
<!-- Unit testins support nugets related config.
12-
Warning! UseUnitTestingSupportNugetsInsteadOfProjects and nugets version options are supported from nuget 5.0.0 version and higher.-->
17+
<!-- Unit testing support nugets related config.
18+
Warning!
19+
UseUnitTestingSupportNugetsInsteadOfProjects
20+
and nugets version options
21+
are supported from nuget 5.0.0 version and higher.-->
1322
<PropertyGroup>
14-
1523
<!--Allowed values: true, false-->
1624
<UseUnitTestingSupportNugetsInsteadOfProjects>false</UseUnitTestingSupportNugetsInsteadOfProjects>
1725

1826
<!--Used only if UseUnitTestingSupportNugetsInsteadOfProjects is set to true -->
19-
<UnitTestingSupportNugetsVersion>2.0.0</UnitTestingSupportNugetsVersion>
20-
27+
<UnitTestingSupportNugetsVersion>6.0.0</UnitTestingSupportNugetsVersion>
2128
</PropertyGroup>
2229

2330
<!--StyleCop-->
@@ -39,32 +46,30 @@
3946

4047
<!--Nugets configuration (for publish)-->
4148
<PropertyGroup>
42-
4349
<!--Authors and license-->
4450
<NugetAuthors>Mateusz Soboń (NightAngell)</NugetAuthors>
4551
<NugetCompany>Mateusz Soboń (NightAngell)</NugetCompany>
4652
<NugetPackageLicenseExpression>MIT</NugetPackageLicenseExpression>
4753
<NugetPackageRequireLicenseAcceptance>true</NugetPackageRequireLicenseAcceptance>
4854
<NugetCopyright>MIT License (Mateusz Soboń)</NugetCopyright>
4955

50-
<!--Vesion-->
51-
<NugetVersion>5.0.0</NugetVersion>
52-
<NugetAssemblyVersion>5.0.0.0</NugetAssemblyVersion>
53-
<NugetFileVersion>5.0.0.0</NugetFileVersion>
54-
<NugetPackageReleaseNotes>Updated to netstandard2.1</NugetPackageReleaseNotes>
56+
<!--Version-->
57+
<NugetVersion>6.0.0</NugetVersion>
58+
<NugetAssemblyVersion>6.0.0.0</NugetAssemblyVersion>
59+
<NugetFileVersion>6.0.0.0</NugetFileVersion>
60+
<NugetPackageReleaseNotes>Updated to net6.0. Updated dependencies.</NugetPackageReleaseNotes>
5561

5662
<!--Repo url-->
5763
<NuGetPackageProjectUrl>https://github.com/NightAngell/SignalR_UnitTestingSupport</NuGetPackageProjectUrl>
5864
<NuGetRepositoryUrl>https://github.com/NightAngell/SignalR_UnitTestingSupport</NuGetRepositoryUrl>
5965

6066
<!--Description and common tags-->
61-
<NugetCommonDescription>Easy to use, small, SignalR Core (2.1+) unit testing support with</NugetCommonDescription>
67+
<NugetCommonDescription>Easy to use, small, SignalR Core unit testing support with</NugetCommonDescription>
6268
<NugetCommonTags>SignalR SignalRCore SignalRUnitTest SignalRCoreUnitTest SignalRUnitTesting SignalRCoreUnitTesting SignalRUnitTests SignalRCoreUnitTests Unit Test Tests Testing MSTest SignalRUnitTestingSupport SignalRCoreUnitTestingSupport AspNetCore AspNetCore.SignalR aspnetcore "AspNetCore SignalR Unit Test" "AspNetCore SignalR Unit Tests" "AspNetCore SignalR Unit Testing"</NugetCommonTags>
6369

6470
<!--Others-->
6571
<NugetIsPackable>true</NugetIsPackable>
6672
<NuGetGeneratePackageOnBuild>false</NuGetGeneratePackageOnBuild>
6773
<NugetOutputType>Library</NugetOutputType>
68-
6974
</PropertyGroup>
7075
</Project>

‎ExampleSignalRCoreProject/ExampleSignalRCoreProject.csproj‎

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

33
<PropertyGroup>
44
<TargetFramework>$(TargetFrameworkForExampleAndTests)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.4" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.4" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.4">
8+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EntityFrameworkCurrentVersion)" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EntityFrameworkCurrentVersion)" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EntityFrameworkCurrentVersion)">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>

‎SignalR_UnitTestingSupport/SignalR_UnitTestingSupport.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@
4040
</ItemGroup>
4141

4242
<ItemGroup>
43-
<PackageReference Include="nunit" Version="3.13.1" />
43+
<PackageReference Include="nunit" Version="3.13.2" />
4444
</ItemGroup>
4545
</Project>

‎SignalR_UnitTestingSupportCommon/README.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Common code for all SignalR.UnitTestingSupport.* nugets. If you want support for unit testing signalR core (Hub and IHubContext) use one of this packages (NUnit, xUnit, MsTest version):
2+
3+
https://www.nuget.org/packages/SignalR.UnitTestingSupport.NUnit,
4+
5+
https://www.nuget.org/packages/SignalR.UnitTestingSupport.xUnit,
6+
7+
https://www.nuget.org/packages/SignalR.UnitTestingSupport.MSTest
8+
9+
10+
Or use it directly only if you use different testing framework. See:
11+
12+
https://github.com/NightAngell/SignalR_UnitTestingSupport/wiki/How-use-testing-support-if-you-don't-want-(or-you-can`t)-use-provided-by-me-base-classes-or-your-testing-framework-don't-support-before-and-after-each-test-code-execution-features
13+
14+
https://github.com/NightAngell/SignalR_UnitTestingSupport/wiki/How-implement-testing-support-for-different-than-NUnit,-xUnit-or-MsTest-Framework

‎SignalR_UnitTestingSupportCommon/SignalR_UnitTestingSupportCommon.csproj‎

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

33
<PropertyGroup>
44
<TargetFramework>$(TargetFrameworkForLib)</TargetFramework>
@@ -38,16 +38,23 @@ https://github.com/NightAngell/SignalR_UnitTestingSupport/wiki/How-implement-tes
3838
<AssemblyVersion>$(NugetAssemblyVersion)</AssemblyVersion>
3939
<FileVersion>$(NugetFileVersion)</FileVersion>
4040
<PackageLicenseExpression>$(NugetPackageLicenseExpression)</PackageLicenseExpression>
41+
<PackageReadmeFile>README.md</PackageReadmeFile>
4142
</PropertyGroup>
4243

4344
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
4445
<DocumentationFile>C:\Users\sobta\Desktop\update\SignalR_UnitTestingSupport\SignalR_UnitTestingSupportCommon\SignalR_UnitTestingSupportCommon.xml</DocumentationFile>
4546
</PropertyGroup>
4647

4748
<ItemGroup>
48-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.1.0" />
49-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.4" />
50-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
51-
<PackageReference Include="Moq" Version="4.16.1" />
49+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EntityFrameworkMinSupportedVersion)" />
50+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkMinSupportedVersion)" />
51+
<PackageReference Include="Moq" Version="4.17.2" />
52+
</ItemGroup>
53+
54+
<ItemGroup>
55+
<None Update="README.md">
56+
<Pack>True</Pack>
57+
<PackagePath>\</PackagePath>
58+
</None>
5259
</ItemGroup>
5360
</Project>

‎SignalR_UnitTestingSupportMSTest/SignalR_UnitTestingSupportMSTest.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</ItemGroup>
4141

4242
<ItemGroup>
43-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
44-
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
43+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
44+
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
4545
</ItemGroup>
4646
</Project>

‎TestsWithIHubContextSupport/TestsWithIHubContextSupport.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="nunit" Version="3.13.1" />
19-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
18+
<PackageReference Include="nunit" Version="3.13.2" />
19+
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎TestsWithUnitTestingSupport/TestsWithUnitTestingSupport.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.4" />
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.4" />
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
21-
<PackageReference Include="nunit" Version="3.13.1" />
22-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EntityFrameworkCurrentVersion)" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EntityFrameworkCurrentVersion)" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkCurrentVersion)" />
21+
<PackageReference Include="nunit" Version="3.13.2" />
22+
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

‎TestsWithUnitTestingSupportMSTest/TestsWithUnitTestingSupportMSTest.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.4" />
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.4" />
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
22-
<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
23-
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EntityFrameworkCurrentVersion)" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EntityFrameworkCurrentVersion)" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkCurrentVersion)" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
22+
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
23+
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

‎TestsWithUnitTestingSupportXUnit/TestsWithUnitTestingSupportXUnit.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.4" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.4" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EntityFrameworkCurrentVersion)" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EntityFrameworkCurrentVersion)" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkCurrentVersion)" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
1414

1515
<PackageReference Include="xunit" Version="2.4.1" />
1616
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

0 commit comments

Comments
 (0)