Merge pull request #21 from KuraiAndras/remove-nuke

Remove nuke, clean up stuff

Author: KuraiAndras

.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-sonarscanner": {
+      "version": "10.2.0",
+      "commands": [
+        "dotnet-sonarscanner"
+      ],
+      "rollForward": false
+    }
+  }
+}

.editorconfig

@@ -19,7 +19,7 @@ tab_width = 4
 
 # New line preferences
 end_of_line = crlf
-insert_final_newline = false
+insert_final_newline = true
 
 #### .NET Coding Conventions ####
 [*.{cs,vb}]
@@ -179,6 +179,9 @@ csharp_style_prefer_top_level_statements = true:silent
 # IDE0055: Fix formatting
 dotnet_diagnostic.IDE0055.severity = warning
 
+# xUnit2024: Do not use boolean asserts for simple equality tests
+dotnet_diagnostic.xUnit2024.severity = warning
+
 [*.{cs,vb}]
 
 # Naming rules

.github/workflows/publish.yml

@@ -1,19 +1,3 @@
-# ------------------------------------------------------------------------------
-# <auto-generated>
-#
-#     This code was generated.
-#
-#     - To turn off auto-generation set:
-#
-#         [GitHubActions (AutoGenerate = false)]
-#
-#     - To trigger manual generation invoke:
-#
-#         nuke --generate-configuration GitHubActions_Publish --host GitHubActions
-#
-# </auto-generated>
-# ------------------------------------------------------------------------------
-
 name: Publish
 
 on:
@@ -22,16 +6,21 @@ on:
       - '*'
 
 jobs:
-  windows-latest:
-    name: windows-latest
-    runs-on: windows-latest
+  publish:
+    name: publish
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Run './build.cmd PushToNuGet'
-        run: ./build.cmd PushToNuGet
-        env:
-          NugetApiKey: ${{ secrets.NUGET_API_KEY }}
-          NugetApiUrl: ${{ secrets.NUGET_API_URL }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: actions/setup-dotnet@v4
+
+      - name: Pack
+        run: |
+          dotnet pack ./MediatR.Courier --configuration Release --output ./artifacts /p:Version="${GITHUB_REF_NAME}"
+
+      - name: Publish
+        run: |
+          dotnet nuget push ./artifacts/ --api-key "${{ secrets.NUGET_API_KEY }}"

.github/workflows/run-ci.yml

@@ -1,44 +1,54 @@
-# ------------------------------------------------------------------------------
-# <auto-generated>
-#
-#     This code was generated.
-#
-#     - To turn off auto-generation set:
-#
-#         [GitHubActions (AutoGenerate = false)]
-#
-#     - To trigger manual generation invoke:
-#
-#         nuke --generate-configuration GitHubActions_run-ci --host GitHubActions
-#
-# </auto-generated>
-# ------------------------------------------------------------------------------
-
 name: run-ci
 
 on:
   push:
     branches:
       - master
-      - develop
   pull_request:
     branches:
       - master
-      - develop
 
 jobs:
-  windows-latest:
-    name: windows-latest
+  ci:
+    name: ci
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Run './build.cmd Test SonarEnd InstallJava'
-        run: ./build.cmd Test SonarEnd InstallJava
-        env:
-          SonarHostUrl: ${{ secrets.SONAR_HOST_URL }}
-          SonarProjectKey: ${{ secrets.SONAR_PROJECT_KEY }}
-          SonarToken: ${{ secrets.SONAR_TOKEN }}
-          SonarOrganization: ${{ secrets.SONAR_ORGANIZATION }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: actions/setup-dotnet@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: 'zulu'
+      
+      - name: Restore Tools
+        run: |
+          dotnet tool restore
+
+      - name: Sonar Begin
+        run: |
+          dotnet dotnet-sonarscanner begin `
+          /k:"KuraiAndras_MediatR.Courier" `
+          /o:"kuraiandras" `
+          /d:sonar.token="${{ secrets.SONAR_TOKEN }}" `
+          /d:sonar.host.url="https://sonarcloud.io" `
+          /d:sonar.cs.opencover.reportsPaths=**/coverage.opencover.xml `
+          /d:sonar.cs.vstest.reportsPaths="**/*.trx" `
+          /d:sonar.scanner.scanAll=false `
+          /d:sonar.coverage.exclusions="MediatR.Courier.Examples.Wpf.Core/**/*.cs" `
+
+      - name: Restore NuGet packages
+        run: dotnet restore
+
+      - name: Build
+        run: dotnet build --no-restore
+
+      - name: Run Tests
+        run: dotnet test --no-build --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
+
+      - name: Sonar End
+        run: dotnet dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 7.0.0
+- Removed Nuke
+- Updated to .NET 8
+- Fixed sonarcloud
+- Removed old azure devops pipelines
+- Pipelines now fully written in github actions
+- Updated dependencies
+
 # 6.0.0
 - Update MediatR to version 12
 - Deprecate DI package
@@ -9,4 +17,4 @@
 
 # 5.0.0
 - Update MediatR to version 10
-- Update target framework to netstandard2.1
+- Update target framework to netstandard2.1

Directory.Build.props

@@ -20,9 +20,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="Roslynator.Analyzers" Version="4.2.0" PrivateAssets="all" />
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="8.53.0.62665" PrivateAssets="all" />
+    <PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25" PrivateAssets="All" />
+    <PackageReference Include="Roslynator.Analyzers" Version="4.13.1" PrivateAssets="all" />
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="10.11.0.117924" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>