Skip to content

Removes .NET 6 support #167

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 1 commit into from
Feb 18, 2025
Merged

Removes .NET 6 support #167

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
2 changes: 1 addition & 1 deletion .github/workflows/pr-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:

strategy:
matrix:
dotnet-version: [ '6.0', '8.0']
dotnet-version: [ '8.0' ]
os: [windows-latest, ubuntu-latest]

runs-on: ${{ matrix.os }}
Expand Down
33 changes: 0 additions & 33 deletions src/ReactiveDomain.Debug.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@
<dependency id="System.Configuration.ConfigurationManager" version="8.0.0" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.PerformanceCounter" version="8.0.0" exclude="Build,Analyzers" />
</group>
<group targetFramework="net6.0">
<dependency id="EventStore.Client" version="21.2.2" exclude="Build,Analyzers" />
<dependency id="Microsoft.CSharp" version="4.7.0" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.Reactive" version="6.0.1" exclude="Build,Analyzers"/>
<dependency id="System.Configuration.ConfigurationManager" version="8.0.0" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.PerformanceCounter" version="8.0.0" exclude="Build,Analyzers" />
</group>
</dependencies>
<references>
<group targetFramework="net8.0">
Expand All @@ -33,13 +25,6 @@
<reference file="ReactiveDomain.Persistence.dll" />
<reference file="ReactiveDomain.Transport.dll" />
</group>
<group targetFramework="net6.0">
<reference file="ReactiveDomain.Core.dll" />
<reference file="ReactiveDomain.Foundation.dll" />
<reference file="ReactiveDomain.Messaging.dll" />
<reference file="ReactiveDomain.Persistence.dll" />
<reference file="ReactiveDomain.Transport.dll" />
</group>
</references>
</metadata>
<files>
Expand All @@ -61,23 +46,5 @@
<file src="..\bld\Debug\net8.0\ReactiveDomain.Messaging.dll" target="ref\net8.0" />
<file src="..\bld\Debug\net8.0\ReactiveDomain.Persistence.dll" target="ref\net8.0" />
<file src="..\bld\Debug\net8.0\ReactiveDomain.Transport.dll" target="ref\net8.0" />

<file src="..\bld\Debug\net6.0\ReactiveDomain.Core.pdb" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Foundation.pdb" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Messaging.pdb" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Persistence.pdb" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Transport.pdb" target="lib\net6.0" />

<file src="..\bld\Debug\net6.0\ReactiveDomain.Core.dll" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Foundation.dll" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Messaging.dll" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Persistence.dll" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Transport.dll" target="lib\net6.0" />

<file src="..\bld\Debug\net6.0\ReactiveDomain.Core.dll" target="ref\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Foundation.dll" target="ref\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Messaging.dll" target="ref\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Persistence.dll" target="ref\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Transport.dll" target="ref\net6.0" />
</files>
</package>
27 changes: 0 additions & 27 deletions src/ReactiveDomain.Policy.Debug.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,13 @@
<dependency id="System.DirectoryServices" version="8.0.0" exclude="Build,Analyzers"/>
<dependency id="System.DirectoryServices.AccountManagement" version="8.0.0" exclude="Build,Analyzers" />
</group>
<group targetFramework="net6.0">
<dependency id="ReactiveDomain" version="0.11.0.0" exclude="Build,Analyzers" />
<dependency id="DynamicData" version="8.4.1" exclude="Build,Analyzers" />
<dependency id="IdentityModel" version="4.6.0" exclude="Build,Analyzers" />
<dependency id="IdentityServer4.Storage" version="4.1.2" exclude="Build,Analyzers"/>
<dependency id="Microsoft.CSharp" version="4.7.0" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.DirectoryServices" version="8.0.0" exclude="Build,Analyzers"/>
<dependency id="System.DirectoryServices.AccountManagement" version="8.0.0" exclude="Build,Analyzers" />
</group>
</dependencies>
<references>
<group targetFramework="net8.0">
<reference file="ReactiveDomain.Policy.dll" />
<reference file="ReactiveDomain.PolicyStorage.dll" />
<reference file="ReactiveDomain.IdentityStorage.dll" />
</group>
<group targetFramework="net6.0">
<reference file="ReactiveDomain.Policy.dll" />
<reference file="ReactiveDomain.PolicyStorage.dll" />
<reference file="ReactiveDomain.IdentityStorage.dll" />
</group>
</references>
</metadata>
<files>
Expand All @@ -59,17 +44,5 @@
<file src="..\bld\Debug\net8.0\ReactiveDomain.IdentityStorage.pdb" target="lib\net8.0" />
<file src="..\bld\Debug\net8.0\ReactiveDomain.IdentityStorage.dll" target="lib\net8.0" />
<file src="..\bld\Debug\net8.0\ReactiveDomain.IdentityStorage.dll" target="ref\net8.0" />

<file src="..\bld\Debug\net6.0\ReactiveDomain.Policy.pdb" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Policy.dll" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Policy.dll" target="ref\net6.0" />

<file src="..\bld\Debug\net6.0\ReactiveDomain.PolicyStorage.pdb" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.PolicyStorage.dll" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.PolicyStorage.dll" target="ref\net6.0" />

<file src="..\bld\Debug\net6.0\ReactiveDomain.IdentityStorage.pdb" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.IdentityStorage.dll" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.IdentityStorage.dll" target="ref\net6.0" />
</files>
</package>
29 changes: 1 addition & 28 deletions src/ReactiveDomain.Policy.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<authors>Reactive Domain Group</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="expression">MIT</license>
<description>Package includes all ReactiveDomain Core assemblies</description>
<description>Package includes all ReactiveDomain Identity and Policy assemblies</description>
<copyright>Copyright © 2024 Reactive Domain Group</copyright>
<dependencies>
<group targetFramework="net8.0">
Expand All @@ -19,28 +19,13 @@
<dependency id="System.DirectoryServices" version="8.0.0" exclude="Build,Analyzers"/>
<dependency id="System.DirectoryServices.AccountManagement" version="8.0.0" exclude="Build,Analyzers" />
</group>
<group targetFramework="net6.0">
<dependency id="ReactiveDomain" version="0.11.0.0" exclude="Build,Analyzers" />
<dependency id="DynamicData" version="8.4.1" exclude="Build,Analyzers" />
<dependency id="IdentityModel" version="4.6.0" exclude="Build,Analyzers" />
<dependency id="IdentityServer4.Storage" version="4.1.2" exclude="Build,Analyzers"/>
<dependency id="Microsoft.CSharp" version="4.7.0" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.DirectoryServices" version="8.0.0" exclude="Build,Analyzers"/>
<dependency id="System.DirectoryServices.AccountManagement" version="8.0.0" exclude="Build,Analyzers" />
</group>
</dependencies>
<references>
<group targetFramework="net8.0">
<reference file="ReactiveDomain.Policy.dll" />
<reference file="ReactiveDomain.PolicyStorage.dll" />
<reference file="ReactiveDomain.IdentityStorage.dll" />
</group>
<group targetFramework="net6.0">
<reference file="ReactiveDomain.Policy.dll" />
<reference file="ReactiveDomain.PolicyStorage.dll" />
<reference file="ReactiveDomain.IdentityStorage.dll" />
</group>
</references>
</metadata>
<files>
Expand All @@ -60,17 +45,5 @@
<file src="..\bld\Release\net8.0\ReactiveDomain.IdentityStorage.pdb" target="lib\net8.0" />
<file src="..\bld\Release\net8.0\ReactiveDomain.IdentityStorage.dll" target="lib\net8.0" />
<file src="..\bld\Release\net8.0\ReactiveDomain.IdentityStorage.dll" target="ref\net8.0" />

<file src="..\bld\Release\net6.0\ReactiveDomain.Policy.pdb" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Policy.dll" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Policy.dll" target="ref\net6.0" />

<file src="..\bld\Release\net6.0\ReactiveDomain.PolicyStorage.pdb" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.PolicyStorage.dll" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.PolicyStorage.dll" target="ref\net6.0" />

<file src="..\bld\Release\net6.0\ReactiveDomain.IdentityStorage.pdb" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.IdentityStorage.dll" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.IdentityStorage.dll" target="ref\net6.0" />
</files>
</package>
13 changes: 0 additions & 13 deletions src/ReactiveDomain.Testing.Debug.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,17 @@
<dependency id="xunit" version="2.9.0" exclude="Build,Analyzers" />
<dependency id="xunit.runner.console" version="2.9.0" exclude="Build,Analyzers" />
</group>
<group targetFramework="net6.0">
<dependency id="ReactiveDomain" version="0.11.0.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.NET.Test.Sdk" version="17.10.0" exclude="Build,Analyzers" />
<dependency id="xunit" version="2.9.0" exclude="Build,Analyzers" />
<dependency id="xunit.runner.console" version="2.9.0" exclude="Build,Analyzers" />
</group>
</dependencies>
<references>
<group targetFramework="net8.0">
<reference file="ReactiveDomain.Testing.dll" />
</group>
<group targetFramework="net6.0">
<reference file="ReactiveDomain.Testing.dll" />
</group>
</references>
</metadata>
<files>
<file src="..\build\ReactiveDomain.Testing.props" target="build" />
<file src="..\bld\Debug\net8.0\ReactiveDomain.Testing.pdb" target="lib\net8.0" />
<file src="..\bld\Debug\net8.0\ReactiveDomain.Testing.dll" target="lib\net8.0" />
<file src="..\bld\Debug\net8.0\ReactiveDomain.Testing.dll" target="ref\net8.0" />

<file src="..\bld\Debug\net6.0\ReactiveDomain.Testing.pdb" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Testing.dll" target="lib\net6.0" />
<file src="..\bld\Debug\net6.0\ReactiveDomain.Testing.dll" target="ref\net6.0" />
</files>
</package>
12 changes: 0 additions & 12 deletions src/ReactiveDomain.Testing.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,17 @@
<dependency id="xunit" version="2.9.0" exclude="Build,Analyzers" />
<dependency id="xunit.runner.console" version="2.9.0" exclude="Build,Analyzers" />
</group>
<group targetFramework="net6.0">
<dependency id="ReactiveDomain" version="0.11.0.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.NET.Test.Sdk" version="17.10.0" exclude="Build,Analyzers" />
<dependency id="xunit" version="2.9.0" exclude="Build,Analyzers" />
<dependency id="xunit.runner.console" version="2.9.0" exclude="Build,Analyzers" />
</group>
</dependencies>
<references>
<group targetFramework="net8.0">
<reference file="ReactiveDomain.Testing.dll" />
</group>
<group targetFramework="net6.0">
<reference file="ReactiveDomain.Testing.dll" />
</group>
</references>
</metadata>
<files>
<file src="..\build\ReactiveDomain.Testing.props" target="build" />
<file src="..\bld\Release\net8.0\ReactiveDomain.Testing.pdb" target="lib\net8.0" />
<file src="..\bld\Release\net8.0\ReactiveDomain.Testing.dll" target="lib\net8.0" />
<file src="..\bld\Release\net8.0\ReactiveDomain.Testing.dll" target="ref\net8.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Testing.pdb" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Testing.dll" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Testing.dll" target="ref\net6.0" />
</files>
</package>
33 changes: 0 additions & 33 deletions src/ReactiveDomain.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@
<dependency id="System.Configuration.ConfigurationManager" version="8.0.0" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.PerformanceCounter" version="8.0.0" exclude="Build,Analyzers" />
</group>
<group targetFramework="net6.0">
<dependency id="EventStore.Client" version="22.0.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.CSharp" version="4.7.0" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.Reactive" version="6.0.1" exclude="Build,Analyzers" />
<dependency id="System.Configuration.ConfigurationManager" version="8.0.0" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.PerformanceCounter" version="8.0.0" exclude="Build,Analyzers" />
</group>
</dependencies>
<references>
<group targetFramework="net8.0">
Expand All @@ -34,17 +26,7 @@
<reference file="ReactiveDomain.Persistence.dll" />
<reference file="ReactiveDomain.Transport.dll" />
</group>
<group targetFramework="net6.0">
<reference file="ReactiveDomain.Core.dll" />
<reference file="ReactiveDomain.Foundation.dll" />
<reference file="ReactiveDomain.Messaging.dll" />
<reference file="ReactiveDomain.Persistence.dll" />
<reference file="ReactiveDomain.Transport.dll" />
</group>
</references>
<frameworkAssemblies>
<frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.0" />
</frameworkAssemblies>
</metadata>
<files>
<file src="..\build\ReactiveDomain.props" target="build" />
Expand All @@ -63,20 +45,5 @@
<file src="..\bld\Release\net8.0\ReactiveDomain.Messaging.dll" target="ref\net8.0" />
<file src="..\bld\Release\net8.0\ReactiveDomain.Persistence.dll" target="ref\net8.0" />
<file src="..\bld\Release\net8.0\ReactiveDomain.Transport.dll" target="ref\net8.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Core.pdb" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Foundation.pdb" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Messaging.pdb" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Persistence.pdb" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Transport.pdb" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Core.dll" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Foundation.dll" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Messaging.dll" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Persistence.dll" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Transport.dll" target="lib\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Core.dll" target="ref\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Foundation.dll" target="ref\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Messaging.dll" target="ref\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Persistence.dll" target="ref\net6.0" />
<file src="..\bld\Release\net6.0\ReactiveDomain.Transport.dll" target="ref\net6.0" />
</files>
</package>
10 changes: 5 additions & 5 deletions src/build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<Prefer32Bit>false</Prefer32Bit>
<Platforms>AnyCPU</Platforms>
<Authors>Reactive Domain Group</Authors>
<Copyright>Copyright © 2024 Reactive Domain Group</Copyright>
<Copyright>Copyright © 2025 Reactive Domain Group</Copyright>
<Description />
<AssemblyVersion>0.11.0.0</AssemblyVersion>
<FileVersion>0.11.0.0</FileVersion>
<AssemblyVersion>0.11.1.0</AssemblyVersion>
<FileVersion>0.11.1.0</FileVersion>
<NeutralLanguage />
<PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -50,7 +50,7 @@
</When>
</Choose>
<PropertyGroup>
<LibTargetFrameworks>net6.0;net8.0</LibTargetFrameworks>
<TestTargetFrameworks>net6.0;net8.0</TestTargetFrameworks>
<LibTargetFrameworks>net8.0</LibTargetFrameworks>
<TestTargetFrameworks>net8.0</TestTargetFrameworks>
</PropertyGroup>
</Project>
26 changes: 0 additions & 26 deletions tools/CreateDebugNuget.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,6 @@ function GetPackageRefFromProject([string]$Id, [string]$CsProj, [string]$Framewo
{
$compOperator = "!="
}

if ($currentCondition -match "net6.0")
{
$currentFramework = "net6.0"
}

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

$net6 = $xml | Select-XML -XPath "//package/metadata/dependencies/group[@targetFramework='net6.0']"
$net6Nodes = $net6.Node.ChildNodes

foreach($refnode in $net8Nodes)
{
if ( $refnode.id -match "ReactiveDomain")
Expand All @@ -214,24 +206,6 @@ function UpdateDependencyVersions([string]$Nuspec, [string]$CsProj)
$refnode.version = $pRef.Version
}
}

foreach($refnode in $net6Nodes)
{
if ( $refnode.id -match "ReactiveDomain")
{
$refnode.version = $RDVersion
continue
}

$pRef = GetPackageRefFromProject $refnode.id $CsProj "net6.0"
if ((($pRef.ComparisonOperator -eq "" -or $pRef.Framework -eq "") -or
($pRef.ComparisonOperator -eq "==" -and $pRef.Framework -eq "net6.0") -or
($pRef.ComparisonOperator -eq "!=" -and $pRef.Framework -ne "net6.0")) -and
($pRef.version -ne ""))
{
$refnode.version = $pRef.Version
}
}
$xml.Save($Nuspec)
Write-Host "Updated dependency versions of: $Nuspec"
}
Expand Down
Loading