chore:updated build scripts and nuspec files

.env.example

@@ -1,11 +1 @@
-export NUGET_API_KEY=
-
-declare -a PROJECTS=(
-    "ServiceBase"
-    "ServiceBase.Mvc"
-    "ServiceBase.PayPal"
-    "ServiceBase.Events.RabbitMQ"
-    "ServiceBase.Notification.SendGrid"
-    "ServiceBase.Notification.Smtp"
-    "ServiceBase.Notification.Twilio"
-)
+NUGET_API_KEY=

BuildNugets.ps1

@@ -0,0 +1,15 @@
+# Set version
+$VERSION = "6.0.2"
+
+# Restore dependencies
+dotnet restore ./ServiceBase.sln
+
+# Build
+dotnet build ./ServiceBase.sln --no-restore --configuration Release /property:Version=$VERSION
+
+# Pack all the nugets
+$csprojFiles = Get-ChildItem -Path .\src -Filter *.csproj -Recurse
+foreach ($csprojFile in $csprojFiles) {
+	$projectName = $csprojFile.BaseName
+    nuget pack ./src/$projectName/$projectName.nuspec -OutputDirectory ./artifacts/packages -Properties Configuration=Release -version $VERSION -IncludeReferencedProjects
+}

Cleanup.ps1

@@ -0,0 +1 @@
+Get-ChildItem -Path . -Include bin,obj,artifacts -Recurse -Directory | Remove-Item -Recurse -Force

Coverage.ps1

@@ -0,0 +1,25 @@
+# Stop script execution on error
+$ErrorActionPreference = "Stop"
+
+# Install report generator
+Write-Host "Installing ReportGenerator..."
+nuget install -Verbosity quiet -OutputDirectory ./packages -Version 5.1.10 ReportGenerator
+
+# Run all tests
+$testProjects = Get-ChildItem -Path ./test -Filter *.csproj -Recurse
+foreach ($testProject in $testProjects) {
+    Write-Host "Running tests on project $testProject..."
+    dotnet test $testProject.FullName --no-build --collect:"XPlat Code Coverage"
+}
+
+# Generate report
+Write-Host "Generating report..."
+dotnet ./packages/ReportGenerator.5.1.10/tools/net6.0/ReportGenerator.dll `
+    -reports:./test/*/TestResults/*/*.xml `
+    -targetdir:./TestReport `
+    -historydir:./TestReport/history
+
+# Remove all test reports
+Write-Host "Removing test reports..."
+Get-ChildItem -Path ./test -Filter TestResults -Recurse -Directory | Remove-Item -Recurse -Force
+Write-Host "Done."

README.md

@@ -13,4 +13,3 @@ ServiceBase is built against NET 6 using the RTM tooling that ships with Visual
 -   Install [.NET 6](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
 -   Use [Visual Studio 2022](https://visualstudio.microsoft.com/vs/) to build it
 
-The scripts `coverage.sh` and `deploy.sh` run on WSL

SyncNuspec.ps1

@@ -0,0 +1,30 @@
+$directory = Get-Location
+$csprojFiles = Get-ChildItem -Path $directory -Filter *.csproj -Recurse
+
+foreach ($csprojPath in $csprojFiles) {
+
+
+    $nuspecPath = $csprojPath.FullName -replace '\.csproj$', '.nuspec'
+    if (-not (Test-Path -Path $nuspecPath)) {
+        Write-Host "No nuspec file found for $csprojPath, skipping..."
+        continue
+    }
+
+	Write-Host "Updating nuspec file for: $csprojPath"
+
+    [xml]$csprojFile = Get-Content -Path $csprojPath.FullName
+    [xml]$nuspecFile = Get-Content -Path $nuspecPath
+
+    $packageReferences = $csprojFile.Project.ItemGroup.PackageReference
+
+    foreach ($packageReference in $packageReferences) {
+        $id = $packageReference.Include
+        $version = $packageReference.Version
+        $nuspecDependency = $nuspecFile.package.metadata.dependencies.group.dependency | Where-Object { $_.id -eq $id }
+        if ($null -ne $nuspecDependency) {
+            $nuspecDependency.version = $version
+        }
+    }
+
+    $nuspecFile.Save($nuspecPath)
+}

src/ServiceBase.Events.RabbitMQ/ServiceBase.Events.RabbitMQ.nuspec

@@ -14,11 +14,11 @@
     <dependencies>
       <group targetFramework="net6.0">
         <dependency id="Newtonsoft.Json.Bson" version="1.0.2" exclude="Build,Analyzers" />
-        <dependency id="RabbitMQ.Client" version="6.4.0" exclude="Build,Analyzers" />
+        <dependency id="RabbitMQ.Client" version="6.5.0" exclude="Build,Analyzers" />
       </group>
     </dependencies>
   </metadata>
   <files>
     <file src="bin\Release\net6.0\ServiceBase.Events.RabbitMQ.dll" target="lib\net6.0\ServiceBase.Events.RabbitMQ.dll" />
   </files>
-</package>
+</package>

src/ServiceBase.Mvc/ServiceBase.Mvc.nuspec

@@ -13,11 +13,11 @@
     <tags>servicebase mvc</tags>
     <dependencies>
       <group targetFramework="net6.0">
-        <dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
+        <dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
       </group>
     </dependencies>
   </metadata>
   <files>
     <file src="bin\Release\net6.0\ServiceBase.Mvc.dll" target="lib\net6.0\ServiceBase.Mvc.dll" />
   </files>
-</package>
+</package>

src/ServiceBase.Notification.Plivo/ServiceBase.Notification.Plivo.nuspec

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-    <metadata>
-        <id>ServiceBase.Notification.Plivo</id>
-        <version>$version$</version>
-        <authors>Russlan Akiev</authors>
-        <owners>Russlan Akiev</owners>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <projectUrl>https://github.com/aruss/ServiceBase</projectUrl>
-        <description>Plivo SMS sender for ServiceBase.Notification.Sms</description>
-        <copyright>Copyright (c) Russlan Akiev. All rights reserved.</copyright>
-        <license type="expression">MIT</license>
-        <tags>servicebase plivo sms</tags>
-        <dependencies>
-            <group targetFramework="net6.0">
-                <dependency id="ServiceBase" version="5.0.1" exclude="Build,Analyzers" />
-            </group>
-        </dependencies>
-    </metadata>
-    <files>
-        <file src="bin\Release\net6.0\ServiceBase.Notification.Plivo.dll" target="lib\net6.0\ServiceBase.Notification.Plivo.dll" />
-    </files>
-</package>
+  <metadata>
+    <id>ServiceBase.Notification.Plivo</id>
+    <version>$version$</version>
+    <authors>Russlan Akiev</authors>
+    <owners>Russlan Akiev</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <projectUrl>https://github.com/aruss/ServiceBase</projectUrl>
+    <description>Plivo SMS sender for ServiceBase.Notification.Sms</description>
+    <copyright>Copyright (c) Russlan Akiev. All rights reserved.</copyright>
+    <license type="expression">MIT</license>
+    <tags>servicebase plivo sms</tags>
+    <dependencies>
+      <group targetFramework="net6.0">
+        <dependency id="ServiceBase" version="5.0.1" exclude="Build,Analyzers" />
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="bin\Release\net6.0\ServiceBase.Notification.Plivo.dll" target="lib\net6.0\ServiceBase.Notification.Plivo.dll" />
+  </files>
+</package>

src/ServiceBase.Notification.SendGrid/ServiceBase.Notification.SendGrid.nuspec

@@ -20,4 +20,4 @@
   <files>
     <file src="bin\Release\net6.0\ServiceBase.Notification.SendGrid.dll" target="lib\net6.0\ServiceBase.Notification.SendGrid.dll" />
   </files>
-</package>
+</package>

src/ServiceBase.Notification.Smtp/ServiceBase.Notification.Smtp.nuspec

@@ -19,4 +19,4 @@
   <files>
     <file src="bin\Release\net6.0\ServiceBase.Notification.Smtp.dll" target="lib\net6.0\ServiceBase.Notification.Smtp.dll" />
   </files>
-</package>
+</package>

src/ServiceBase.Notification.Twilio/ServiceBase.Notification.Twilio.nuspec

@@ -19,4 +19,4 @@
   <files>
     <file src="bin\Release\net6.0\ServiceBase.Notification.Twilio.dll" target="lib\net6.0\ServiceBase.Notification.Twilio.dll" />
   </files>
-</package>
+</package>

src/ServiceBase.PayPal/ServiceBase.PayPal.nuspec

@@ -13,11 +13,11 @@
     <tags>servicebase paypal payment</tags>
     <dependencies>
       <group targetFramework="net6.0">
-        <dependency id="Microsoft.Extensions.Http" version="6.0.0" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Http" version="7.0.0" exclude="Build,Analyzers" />
       </group>
     </dependencies>
   </metadata>
   <files>
     <file src="bin\Release\net6.0\ServiceBase.PayPal.dll" target="lib\net6.0\ServiceBase.PayPal.dll" />
   </files>
-</package>
+</package>

src/ServiceBase/ServiceBase.nuspec

@@ -13,15 +13,15 @@
     <tags>servicebase</tags>
     <dependencies>
       <group targetFramework="net6.0">
-        <dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
+        <dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
         <dependency id="Serilog" version="2.12.0" exclude="Build,Analyzers" />
-        <dependency id="Serilog.AspNetCore" version="6.0.1" exclude="Build,Analyzers" />
-        <dependency id="Serilog.Extensions.Logging" version="3.1.0" exclude="Build,Analyzers" />
-        <dependency id="Serilog.Settings.Configuration" version="3.4.0" exclude="Build,Analyzers" />
+        <dependency id="Serilog.AspNetCore" version="7.0.0" exclude="Build,Analyzers" />
+        <dependency id="Serilog.Extensions.Logging" version="7.0.0" exclude="Build,Analyzers" />
+        <dependency id="Serilog.Settings.Configuration" version="7.0.0" exclude="Build,Analyzers" />
       </group>
     </dependencies>
   </metadata>
   <files>
     <file src="bin\Release\net6.0\ServiceBase.dll" target="lib\net6.0\ServiceBase.dll" />
   </files>
-</package>
+</package>