Skip to content

Commit 05e5268

Browse files
joshkempnerjoshkempner
authored
Removes .NET 6 support (#167)
1 parent deae32e commit 05e5268

10 files changed

+9
-208
lines changed

‎.github/workflows/pr-checks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
strategy:
5050
matrix:
51-
dotnet-version: [ '6.0', '8.0']
51+
dotnet-version: [ '8.0' ]
5252
os: [windows-latest, ubuntu-latest]
5353

5454
runs-on: ${{ matrix.os }}

‎src/ReactiveDomain.Debug.nuspec‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@
1616
<dependency id="System.Configuration.ConfigurationManager" version="8.0.0" exclude="Build,Analyzers" />
1717
<dependency id="System.Diagnostics.PerformanceCounter" version="8.0.0" exclude="Build,Analyzers" />
1818
</group>
19-
<group targetFramework="net6.0">
20-
<dependency id="EventStore.Client" version="21.2.2" exclude="Build,Analyzers" />
21-
<dependency id="Microsoft.CSharp" version="4.7.0" exclude="Build,Analyzers" />
22-
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
23-
<dependency id="System.Reactive" version="6.0.1" exclude="Build,Analyzers"/>
24-
<dependency id="System.Configuration.ConfigurationManager" version="8.0.0" exclude="Build,Analyzers" />
25-
<dependency id="System.Diagnostics.PerformanceCounter" version="8.0.0" exclude="Build,Analyzers" />
26-
</group>
2719
</dependencies>
2820
<references>
2921
<group targetFramework="net8.0">
@@ -33,13 +25,6 @@
3325
<reference file="ReactiveDomain.Persistence.dll" />
3426
<reference file="ReactiveDomain.Transport.dll" />
3527
</group>
36-
<group targetFramework="net6.0">
37-
<reference file="ReactiveDomain.Core.dll" />
38-
<reference file="ReactiveDomain.Foundation.dll" />
39-
<reference file="ReactiveDomain.Messaging.dll" />
40-
<reference file="ReactiveDomain.Persistence.dll" />
41-
<reference file="ReactiveDomain.Transport.dll" />
42-
</group>
4328
</references>
4429
</metadata>
4530
<files>
@@ -61,23 +46,5 @@
6146
<file src="..\bld\Debug\net8.0\ReactiveDomain.Messaging.dll" target="ref\net8.0" />
6247
<file src="..\bld\Debug\net8.0\ReactiveDomain.Persistence.dll" target="ref\net8.0" />
6348
<file src="..\bld\Debug\net8.0\ReactiveDomain.Transport.dll" target="ref\net8.0" />
64-
65-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Core.pdb" target="lib\net6.0" />
66-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Foundation.pdb" target="lib\net6.0" />
67-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Messaging.pdb" target="lib\net6.0" />
68-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Persistence.pdb" target="lib\net6.0" />
69-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Transport.pdb" target="lib\net6.0" />
70-
71-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Core.dll" target="lib\net6.0" />
72-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Foundation.dll" target="lib\net6.0" />
73-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Messaging.dll" target="lib\net6.0" />
74-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Persistence.dll" target="lib\net6.0" />
75-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Transport.dll" target="lib\net6.0" />
76-
77-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Core.dll" target="ref\net6.0" />
78-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Foundation.dll" target="ref\net6.0" />
79-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Messaging.dll" target="ref\net6.0" />
80-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Persistence.dll" target="ref\net6.0" />
81-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Transport.dll" target="ref\net6.0" />
8249
</files>
8350
</package>

‎src/ReactiveDomain.Policy.Debug.nuspec‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,13 @@
1818
<dependency id="System.DirectoryServices" version="8.0.0" exclude="Build,Analyzers"/>
1919
<dependency id="System.DirectoryServices.AccountManagement" version="8.0.0" exclude="Build,Analyzers" />
2020
</group>
21-
<group targetFramework="net6.0">
22-
<dependency id="ReactiveDomain" version="0.11.0.0" exclude="Build,Analyzers" />
23-
<dependency id="DynamicData" version="8.4.1" exclude="Build,Analyzers" />
24-
<dependency id="IdentityModel" version="4.6.0" exclude="Build,Analyzers" />
25-
<dependency id="IdentityServer4.Storage" version="4.1.2" exclude="Build,Analyzers"/>
26-
<dependency id="Microsoft.CSharp" version="4.7.0" exclude="Build,Analyzers" />
27-
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
28-
<dependency id="System.DirectoryServices" version="8.0.0" exclude="Build,Analyzers"/>
29-
<dependency id="System.DirectoryServices.AccountManagement" version="8.0.0" exclude="Build,Analyzers" />
30-
</group>
3121
</dependencies>
3222
<references>
3323
<group targetFramework="net8.0">
3424
<reference file="ReactiveDomain.Policy.dll" />
3525
<reference file="ReactiveDomain.PolicyStorage.dll" />
3626
<reference file="ReactiveDomain.IdentityStorage.dll" />
3727
</group>
38-
<group targetFramework="net6.0">
39-
<reference file="ReactiveDomain.Policy.dll" />
40-
<reference file="ReactiveDomain.PolicyStorage.dll" />
41-
<reference file="ReactiveDomain.IdentityStorage.dll" />
42-
</group>
4328
</references>
4429
</metadata>
4530
<files>
@@ -59,17 +44,5 @@
5944
<file src="..\bld\Debug\net8.0\ReactiveDomain.IdentityStorage.pdb" target="lib\net8.0" />
6045
<file src="..\bld\Debug\net8.0\ReactiveDomain.IdentityStorage.dll" target="lib\net8.0" />
6146
<file src="..\bld\Debug\net8.0\ReactiveDomain.IdentityStorage.dll" target="ref\net8.0" />
62-
63-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Policy.pdb" target="lib\net6.0" />
64-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Policy.dll" target="lib\net6.0" />
65-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Policy.dll" target="ref\net6.0" />
66-
67-
<file src="..\bld\Debug\net6.0\ReactiveDomain.PolicyStorage.pdb" target="lib\net6.0" />
68-
<file src="..\bld\Debug\net6.0\ReactiveDomain.PolicyStorage.dll" target="lib\net6.0" />
69-
<file src="..\bld\Debug\net6.0\ReactiveDomain.PolicyStorage.dll" target="ref\net6.0" />
70-
71-
<file src="..\bld\Debug\net6.0\ReactiveDomain.IdentityStorage.pdb" target="lib\net6.0" />
72-
<file src="..\bld\Debug\net6.0\ReactiveDomain.IdentityStorage.dll" target="lib\net6.0" />
73-
<file src="..\bld\Debug\net6.0\ReactiveDomain.IdentityStorage.dll" target="ref\net6.0" />
7447
</files>
7548
</package>

‎src/ReactiveDomain.Policy.nuspec‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<authors>Reactive Domain Group</authors>
77
<requireLicenseAcceptance>false</requireLicenseAcceptance>
88
<license type="expression">MIT</license>
9-
<description>Package includes all ReactiveDomain Core assemblies</description>
9+
<description>Package includes all ReactiveDomain Identity and Policy assemblies</description>
1010
<copyright>Copyright © 2024 Reactive Domain Group</copyright>
1111
<dependencies>
1212
<group targetFramework="net8.0">
@@ -19,28 +19,13 @@
1919
<dependency id="System.DirectoryServices" version="8.0.0" exclude="Build,Analyzers"/>
2020
<dependency id="System.DirectoryServices.AccountManagement" version="8.0.0" exclude="Build,Analyzers" />
2121
</group>
22-
<group targetFramework="net6.0">
23-
<dependency id="ReactiveDomain" version="0.11.0.0" exclude="Build,Analyzers" />
24-
<dependency id="DynamicData" version="8.4.1" exclude="Build,Analyzers" />
25-
<dependency id="IdentityModel" version="4.6.0" exclude="Build,Analyzers" />
26-
<dependency id="IdentityServer4.Storage" version="4.1.2" exclude="Build,Analyzers"/>
27-
<dependency id="Microsoft.CSharp" version="4.7.0" exclude="Build,Analyzers" />
28-
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
29-
<dependency id="System.DirectoryServices" version="8.0.0" exclude="Build,Analyzers"/>
30-
<dependency id="System.DirectoryServices.AccountManagement" version="8.0.0" exclude="Build,Analyzers" />
31-
</group>
3222
</dependencies>
3323
<references>
3424
<group targetFramework="net8.0">
3525
<reference file="ReactiveDomain.Policy.dll" />
3626
<reference file="ReactiveDomain.PolicyStorage.dll" />
3727
<reference file="ReactiveDomain.IdentityStorage.dll" />
3828
</group>
39-
<group targetFramework="net6.0">
40-
<reference file="ReactiveDomain.Policy.dll" />
41-
<reference file="ReactiveDomain.PolicyStorage.dll" />
42-
<reference file="ReactiveDomain.IdentityStorage.dll" />
43-
</group>
4429
</references>
4530
</metadata>
4631
<files>
@@ -60,17 +45,5 @@
6045
<file src="..\bld\Release\net8.0\ReactiveDomain.IdentityStorage.pdb" target="lib\net8.0" />
6146
<file src="..\bld\Release\net8.0\ReactiveDomain.IdentityStorage.dll" target="lib\net8.0" />
6247
<file src="..\bld\Release\net8.0\ReactiveDomain.IdentityStorage.dll" target="ref\net8.0" />
63-
64-
<file src="..\bld\Release\net6.0\ReactiveDomain.Policy.pdb" target="lib\net6.0" />
65-
<file src="..\bld\Release\net6.0\ReactiveDomain.Policy.dll" target="lib\net6.0" />
66-
<file src="..\bld\Release\net6.0\ReactiveDomain.Policy.dll" target="ref\net6.0" />
67-
68-
<file src="..\bld\Release\net6.0\ReactiveDomain.PolicyStorage.pdb" target="lib\net6.0" />
69-
<file src="..\bld\Release\net6.0\ReactiveDomain.PolicyStorage.dll" target="lib\net6.0" />
70-
<file src="..\bld\Release\net6.0\ReactiveDomain.PolicyStorage.dll" target="ref\net6.0" />
71-
72-
<file src="..\bld\Release\net6.0\ReactiveDomain.IdentityStorage.pdb" target="lib\net6.0" />
73-
<file src="..\bld\Release\net6.0\ReactiveDomain.IdentityStorage.dll" target="lib\net6.0" />
74-
<file src="..\bld\Release\net6.0\ReactiveDomain.IdentityStorage.dll" target="ref\net6.0" />
7548
</files>
7649
</package>

‎src/ReactiveDomain.Testing.Debug.nuspec‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,17 @@
1616
<dependency id="xunit" version="2.9.0" exclude="Build,Analyzers" />
1717
<dependency id="xunit.runner.console" version="2.9.0" exclude="Build,Analyzers" />
1818
</group>
19-
<group targetFramework="net6.0">
20-
<dependency id="ReactiveDomain" version="0.11.0.0" exclude="Build,Analyzers" />
21-
<dependency id="Microsoft.NET.Test.Sdk" version="17.10.0" exclude="Build,Analyzers" />
22-
<dependency id="xunit" version="2.9.0" exclude="Build,Analyzers" />
23-
<dependency id="xunit.runner.console" version="2.9.0" exclude="Build,Analyzers" />
24-
</group>
2519
</dependencies>
2620
<references>
2721
<group targetFramework="net8.0">
2822
<reference file="ReactiveDomain.Testing.dll" />
2923
</group>
30-
<group targetFramework="net6.0">
31-
<reference file="ReactiveDomain.Testing.dll" />
32-
</group>
3324
</references>
3425
</metadata>
3526
<files>
3627
<file src="..\build\ReactiveDomain.Testing.props" target="build" />
3728
<file src="..\bld\Debug\net8.0\ReactiveDomain.Testing.pdb" target="lib\net8.0" />
3829
<file src="..\bld\Debug\net8.0\ReactiveDomain.Testing.dll" target="lib\net8.0" />
3930
<file src="..\bld\Debug\net8.0\ReactiveDomain.Testing.dll" target="ref\net8.0" />
40-
41-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Testing.pdb" target="lib\net6.0" />
42-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Testing.dll" target="lib\net6.0" />
43-
<file src="..\bld\Debug\net6.0\ReactiveDomain.Testing.dll" target="ref\net6.0" />
4431
</files>
4532
</package>

‎src/ReactiveDomain.Testing.nuspec‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,17 @@
1616
<dependency id="xunit" version="2.9.0" exclude="Build,Analyzers" />
1717
<dependency id="xunit.runner.console" version="2.9.0" exclude="Build,Analyzers" />
1818
</group>
19-
<group targetFramework="net6.0">
20-
<dependency id="ReactiveDomain" version="0.11.0.0" exclude="Build,Analyzers" />
21-
<dependency id="Microsoft.NET.Test.Sdk" version="17.10.0" exclude="Build,Analyzers" />
22-
<dependency id="xunit" version="2.9.0" exclude="Build,Analyzers" />
23-
<dependency id="xunit.runner.console" version="2.9.0" exclude="Build,Analyzers" />
24-
</group>
2519
</dependencies>
2620
<references>
2721
<group targetFramework="net8.0">
2822
<reference file="ReactiveDomain.Testing.dll" />
2923
</group>
30-
<group targetFramework="net6.0">
31-
<reference file="ReactiveDomain.Testing.dll" />
32-
</group>
3324
</references>
3425
</metadata>
3526
<files>
3627
<file src="..\build\ReactiveDomain.Testing.props" target="build" />
3728
<file src="..\bld\Release\net8.0\ReactiveDomain.Testing.pdb" target="lib\net8.0" />
3829
<file src="..\bld\Release\net8.0\ReactiveDomain.Testing.dll" target="lib\net8.0" />
3930
<file src="..\bld\Release\net8.0\ReactiveDomain.Testing.dll" target="ref\net8.0" />
40-
<file src="..\bld\Release\net6.0\ReactiveDomain.Testing.pdb" target="lib\net6.0" />
41-
<file src="..\bld\Release\net6.0\ReactiveDomain.Testing.dll" target="lib\net6.0" />
42-
<file src="..\bld\Release\net6.0\ReactiveDomain.Testing.dll" target="ref\net6.0" />
4331
</files>
4432
</package>

‎src/ReactiveDomain.nuspec‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@
1717
<dependency id="System.Configuration.ConfigurationManager" version="8.0.0" exclude="Build,Analyzers" />
1818
<dependency id="System.Diagnostics.PerformanceCounter" version="8.0.0" exclude="Build,Analyzers" />
1919
</group>
20-
<group targetFramework="net6.0">
21-
<dependency id="EventStore.Client" version="22.0.0" exclude="Build,Analyzers" />
22-
<dependency id="Microsoft.CSharp" version="4.7.0" exclude="Build,Analyzers" />
23-
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
24-
<dependency id="System.Reactive" version="6.0.1" exclude="Build,Analyzers" />
25-
<dependency id="System.Configuration.ConfigurationManager" version="8.0.0" exclude="Build,Analyzers" />
26-
<dependency id="System.Diagnostics.PerformanceCounter" version="8.0.0" exclude="Build,Analyzers" />
27-
</group>
2820
</dependencies>
2921
<references>
3022
<group targetFramework="net8.0">
@@ -34,17 +26,7 @@
3426
<reference file="ReactiveDomain.Persistence.dll" />
3527
<reference file="ReactiveDomain.Transport.dll" />
3628
</group>
37-
<group targetFramework="net6.0">
38-
<reference file="ReactiveDomain.Core.dll" />
39-
<reference file="ReactiveDomain.Foundation.dll" />
40-
<reference file="ReactiveDomain.Messaging.dll" />
41-
<reference file="ReactiveDomain.Persistence.dll" />
42-
<reference file="ReactiveDomain.Transport.dll" />
43-
</group>
4429
</references>
45-
<frameworkAssemblies>
46-
<frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.0" />
47-
</frameworkAssemblies>
4830
</metadata>
4931
<files>
5032
<file src="..\build\ReactiveDomain.props" target="build" />
@@ -63,20 +45,5 @@
6345
<file src="..\bld\Release\net8.0\ReactiveDomain.Messaging.dll" target="ref\net8.0" />
6446
<file src="..\bld\Release\net8.0\ReactiveDomain.Persistence.dll" target="ref\net8.0" />
6547
<file src="..\bld\Release\net8.0\ReactiveDomain.Transport.dll" target="ref\net8.0" />
66-
<file src="..\bld\Release\net6.0\ReactiveDomain.Core.pdb" target="lib\net6.0" />
67-
<file src="..\bld\Release\net6.0\ReactiveDomain.Foundation.pdb" target="lib\net6.0" />
68-
<file src="..\bld\Release\net6.0\ReactiveDomain.Messaging.pdb" target="lib\net6.0" />
69-
<file src="..\bld\Release\net6.0\ReactiveDomain.Persistence.pdb" target="lib\net6.0" />
70-
<file src="..\bld\Release\net6.0\ReactiveDomain.Transport.pdb" target="lib\net6.0" />
71-
<file src="..\bld\Release\net6.0\ReactiveDomain.Core.dll" target="lib\net6.0" />
72-
<file src="..\bld\Release\net6.0\ReactiveDomain.Foundation.dll" target="lib\net6.0" />
73-
<file src="..\bld\Release\net6.0\ReactiveDomain.Messaging.dll" target="lib\net6.0" />
74-
<file src="..\bld\Release\net6.0\ReactiveDomain.Persistence.dll" target="lib\net6.0" />
75-
<file src="..\bld\Release\net6.0\ReactiveDomain.Transport.dll" target="lib\net6.0" />
76-
<file src="..\bld\Release\net6.0\ReactiveDomain.Core.dll" target="ref\net6.0" />
77-
<file src="..\bld\Release\net6.0\ReactiveDomain.Foundation.dll" target="ref\net6.0" />
78-
<file src="..\bld\Release\net6.0\ReactiveDomain.Messaging.dll" target="ref\net6.0" />
79-
<file src="..\bld\Release\net6.0\ReactiveDomain.Persistence.dll" target="ref\net6.0" />
80-
<file src="..\bld\Release\net6.0\ReactiveDomain.Transport.dll" target="ref\net6.0" />
8148
</files>
8249
</package>

‎src/build.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<Prefer32Bit>false</Prefer32Bit>
2020
<Platforms>AnyCPU</Platforms>
2121
<Authors>Reactive Domain Group</Authors>
22-
<Copyright>Copyright © 2024 Reactive Domain Group</Copyright>
22+
<Copyright>Copyright © 2025 Reactive Domain Group</Copyright>
2323
<Description />
24-
<AssemblyVersion>0.11.0.0</AssemblyVersion>
25-
<FileVersion>0.11.0.0</FileVersion>
24+
<AssemblyVersion>0.11.1.0</AssemblyVersion>
25+
<FileVersion>0.11.1.0</FileVersion>
2626
<NeutralLanguage />
2727
<PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
2828
<DebugSymbols>true</DebugSymbols>
@@ -50,7 +50,7 @@
5050
</When>
5151
</Choose>
5252
<PropertyGroup>
53-
<LibTargetFrameworks>net6.0;net8.0</LibTargetFrameworks>
54-
<TestTargetFrameworks>net6.0;net8.0</TestTargetFrameworks>
53+
<LibTargetFrameworks>net8.0</LibTargetFrameworks>
54+
<TestTargetFrameworks>net8.0</TestTargetFrameworks>
5555
</PropertyGroup>
5656
</Project>

‎tools/CreateDebugNuget.ps1‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,6 @@ function GetPackageRefFromProject([string]$Id, [string]$CsProj, [string]$Framewo
157157
{
158158
$compOperator = "!="
159159
}
160-
161-
if ($currentCondition -match "net6.0")
162-
{
163-
$currentFramework = "net6.0"
164-
}
165160

166161
if ($currentCondition -match "net8.0")
167162
{
@@ -194,9 +189,6 @@ function UpdateDependencyVersions([string]$Nuspec, [string]$CsProj)
194189
$net8 = $xml | Select-XML -XPath "//package/metadata/dependencies/group[@targetFramework='net8.0']"
195190
$net8Nodes = $net8.Node.ChildNodes
196191

197-
$net6 = $xml | Select-XML -XPath "//package/metadata/dependencies/group[@targetFramework='net6.0']"
198-
$net6Nodes = $net6.Node.ChildNodes
199-
200192
foreach($refnode in $net8Nodes)
201193
{
202194
if ( $refnode.id -match "ReactiveDomain")
@@ -214,24 +206,6 @@ function UpdateDependencyVersions([string]$Nuspec, [string]$CsProj)
214206
$refnode.version = $pRef.Version
215207
}
216208
}
217-
218-
foreach($refnode in $net6Nodes)
219-
{
220-
if ( $refnode.id -match "ReactiveDomain")
221-
{
222-
$refnode.version = $RDVersion
223-
continue
224-
}
225-
226-
$pRef = GetPackageRefFromProject $refnode.id $CsProj "net6.0"
227-
if ((($pRef.ComparisonOperator -eq "" -or $pRef.Framework -eq "") -or
228-
($pRef.ComparisonOperator -eq "==" -and $pRef.Framework -eq "net6.0") -or
229-
($pRef.ComparisonOperator -eq "!=" -and $pRef.Framework -ne "net6.0")) -and
230-
($pRef.version -ne ""))
231-
{
232-
$refnode.version = $pRef.Version
233-
}
234-
}
235209
$xml.Save($Nuspec)
236210
Write-Host "Updated dependency versions of: $Nuspec"
237211
}

0 commit comments

Comments
 (0)