diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 20385881..cabe3dd3 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -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 }} diff --git a/src/ReactiveDomain.Debug.nuspec b/src/ReactiveDomain.Debug.nuspec index ea8a96b0..41cd111b 100644 --- a/src/ReactiveDomain.Debug.nuspec +++ b/src/ReactiveDomain.Debug.nuspec @@ -16,14 +16,6 @@ - - - - - - - - @@ -33,13 +25,6 @@ - - - - - - - @@ -61,23 +46,5 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/ReactiveDomain.Policy.Debug.nuspec b/src/ReactiveDomain.Policy.Debug.nuspec index 7423f263..dd1e641f 100644 --- a/src/ReactiveDomain.Policy.Debug.nuspec +++ b/src/ReactiveDomain.Policy.Debug.nuspec @@ -18,16 +18,6 @@ - - - - - - - - - - @@ -35,11 +25,6 @@ - - - - - @@ -59,17 +44,5 @@ - - - - - - - - - - - - diff --git a/src/ReactiveDomain.Policy.nuspec b/src/ReactiveDomain.Policy.nuspec index ca1d592d..2e368bab 100644 --- a/src/ReactiveDomain.Policy.nuspec +++ b/src/ReactiveDomain.Policy.nuspec @@ -6,7 +6,7 @@ Reactive Domain Group false MIT - Package includes all ReactiveDomain Core assemblies + Package includes all ReactiveDomain Identity and Policy assemblies Copyright © 2024 Reactive Domain Group @@ -19,16 +19,6 @@ - - - - - - - - - - @@ -36,11 +26,6 @@ - - - - - @@ -60,17 +45,5 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ReactiveDomain.Testing.Debug.nuspec b/src/ReactiveDomain.Testing.Debug.nuspec index 02a0dd27..e9c9390e 100644 --- a/src/ReactiveDomain.Testing.Debug.nuspec +++ b/src/ReactiveDomain.Testing.Debug.nuspec @@ -16,20 +16,11 @@ - - - - - - - - - @@ -37,9 +28,5 @@ - - - - \ No newline at end of file diff --git a/src/ReactiveDomain.Testing.nuspec b/src/ReactiveDomain.Testing.nuspec index 1a6c4a1e..eeea19a7 100644 --- a/src/ReactiveDomain.Testing.nuspec +++ b/src/ReactiveDomain.Testing.nuspec @@ -16,20 +16,11 @@ - - - - - - - - - @@ -37,8 +28,5 @@ - - - \ No newline at end of file diff --git a/src/ReactiveDomain.nuspec b/src/ReactiveDomain.nuspec index f347d25b..43b05890 100644 --- a/src/ReactiveDomain.nuspec +++ b/src/ReactiveDomain.nuspec @@ -17,14 +17,6 @@ - - - - - - - - @@ -34,17 +26,7 @@ - - - - - - - - - - @@ -63,20 +45,5 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/build.props b/src/build.props index 44c51713..e54b4680 100644 --- a/src/build.props +++ b/src/build.props @@ -19,10 +19,10 @@ false AnyCPU Reactive Domain Group - Copyright © 2024 Reactive Domain Group + Copyright © 2025 Reactive Domain Group - 0.11.0.0 - 0.11.0.0 + 0.11.1.0 + 0.11.1.0 https://opensource.org/licenses/MIT true @@ -50,7 +50,7 @@ - net6.0;net8.0 - net6.0;net8.0 + net8.0 + net8.0 diff --git a/tools/CreateDebugNuget.ps1 b/tools/CreateDebugNuget.ps1 index c0fa8ca6..9ec63360 100644 --- a/tools/CreateDebugNuget.ps1 +++ b/tools/CreateDebugNuget.ps1 @@ -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") { @@ -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") @@ -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" } diff --git a/tools/CreateNuget.ps1 b/tools/CreateNuget.ps1 index d4df0f8b..888a39a9 100644 --- a/tools/CreateNuget.ps1 +++ b/tools/CreateNuget.ps1 @@ -42,7 +42,7 @@ if ($buildType -eq "debug") Write-Host ("Powershell script location is " + $PSScriptRoot) -$ReactiveDomainDll = $PSScriptRoot + "\..\bld\$configuration\net6.0\ReactiveDomain.Core.dll" +$ReactiveDomainDll = $PSScriptRoot + "\..\bld\$configuration\net8.0\ReactiveDomain.Core.dll" $RDVersion = (Get-Item $ReactiveDomainDll).VersionInfo.FileVersion $ReactiveDomainNuspec = $PSScriptRoot + "\..\src\ReactiveDomain" + $nuspecExtension $ReactiveDomainPolicyNuspec = $PSScriptRoot + "\..\src\ReactiveDomain.Policy" + $nuspecExtension @@ -81,7 +81,7 @@ class PackagRef # Parses and returns a PackagRef object (defined above) that contains: # Version - (version of the package) # ConditionOperator - (the equality operator for a framework, == or !=) -# Framework - The framework this Packageref applies to: (net8.0, net6.0) +# Framework - The framework this Packageref applies to: (net8.0) # function GetPackageRefFromProject([string]$Id, [string]$CsProj, [string]$Framework) { @@ -125,12 +125,6 @@ function GetPackageRefFromProject([string]$Id, [string]$CsProj, [string]$Framewo { $compOperator = "!=" } - - - if ($currentCondition -match "net6.0") - { - $currentFramework = "net6.0" - } if ($currentCondition -match "net8.0") { @@ -161,10 +155,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) { @@ -184,24 +174,6 @@ function UpdateDependencyVersions([string]$Nuspec, [string]$CsProj) } } - 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" }