Update fsproj configuration with some extras (#20)

insurello · Jul 21, 2022 · 33b4463 · 33b4463
1 parent 5b407e1
commit 33b4463
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 67 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -15,24 +15,16 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+      - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.101
+          dotnet-version: "6.0.202"
 
-      - name: dotnet restore
-        env:
-          DOTNET_NOLOGO: true
-        run: |
+      - run: |
           dotnet restore
           dotnet tool restore
+        env:
+          DOTNET_NOLOGO: true
 
-      - name: fantomas
-        run: |
-          dotnet tool run fantomas -- --check --recurse src/
-
-      - name: Build
-        run: dotnet build --configuration Release --no-restore
-
-      - name: Test
-        run: dotnet test --no-restore --verbosity normal
+      - run: dotnet fantomas -- --check --recurse src/
+      - run: dotnet build --configuration Release --no-restore -warnaserror
+      - run: dotnet test --no-build
diff --git a/.github/workflows/publish_to_NuGet.yml b/.github/workflows/publish_to_NuGet.yml
@@ -10,15 +10,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: dotnet restore
-      - name: Build
-        run: dotnet build --configuration Release --no-restore
-      - name: Test
-        run: dotnet test --no-restore --verbosity normal
-      - name: Create the package
-        run: dotnet pack --configuration Release -o Release -p:PackageVersion=${GITHUB_REF/refs\/tags\/v/''} --include-source
-      - name: Publish the package to NuGet
+
+      - run: dotnet restore
+      - run: dotnet build --configuration Release --no-restore -warnaserror
+      - run: dotnet test --no-build
+      - run: dotnet pack --configuration Release -o Release -p:PackageVersion=${GITHUB_REF/refs\/tags\/v/''}
+      - run: dotnet nuget push Release/*.nupkg --skip-duplicate --source https://api.nuget.org/v3/index.json -k ${NUGET_AUTH_TOKEN}
         env:
           NUGET_AUTH_TOKEN: ${{secrets.NUGET_AUTH_TOKEN}}
-        run: dotnet nuget push Release/*.nupkg --skip-duplicate --source https://api.nuget.org/v3/index.json -k ${NUGET_AUTH_TOKEN}
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -1,15 +1,5 @@
 # Insurello.RabbitMqClient
 
-### Why does it exist?
-
-### Inspiration
-
-### Types
-
-### Example
-
-```fsharp
-
-```
+An F# wrapper around RabbitMq.Client version 5.
 
 [![Insurello](https://gitcdn.xyz/repo/insurello/elm-swedish-bank-account-number/master/insurello.svg)](https://jobb.insurello.se/departments/product-tech)
diff --git a/src/Insurello.RabbitMqClient/Insurello.RabbitMqClient.fsproj b/src/Insurello.RabbitMqClient/Insurello.RabbitMqClient.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <PackageId>Insurello.RabbitMqClient</PackageId>
     <Authors>Insurello</Authors>
     <Company>Insurello</Company>
@@ -12,18 +12,11 @@
 
     <!-- Source Link configuration -->
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-
-    <!-- Include PDB in the main package as current tooling is lacking.
-         Shall be removed in the future when tooling has catched up. -->
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-
     <EmbedSources>true</EmbedSources>
-
     <!-- Embed symbols containing Source Link in the main file (exe/dll) -->
     <DebugType>embedded</DebugType>
+
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -37,9 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Insurello.AsyncExtra" Version="1.0.0" />
+    <PackageReference Include="Insurello.AsyncExtra" Version="3.0.0" />
     <PackageReference Include="RabbitMq.Client" Version="5.1.2" />
   </ItemGroup>
-
-
 </Project>
diff --git a/src/Insurello.RabbitMqClient/MqClient.fs b/src/Insurello.RabbitMqClient/MqClient.fs
@@ -733,14 +733,14 @@ module MqClient =
               OnUnregistered =
                   fun _ ->
                       logError (null, "Got OnUnregistered event", ())
-                      exit 9
+                      exit 10
 
               OnConsumerCancelled =
                   fun _ ->
                       logError (null, "Got OnConsumerCancelled event", ())
-                      exit 9
+                      exit 11
 
               OnShutdown =
                   fun _ ->
                       logError (null, "Got OnShutdown event", ())
-                      exit 9 }
+                      exit 12 }