Merge pull request #14 from ChrisPulman/UpdateMQTT

Author: ChrisPulman

.github/workflows/BuildOnly.yml

@@ -1,31 +1,48 @@
 name: MQTTnet.Rx.Modbus CI-BuildOnly
 
 on:
-  push:
-    branches: [ "main" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ main ]
 
 jobs:
-  build-and-release:
+  ci-build-and-test:
 
     runs-on: windows-2022
- 
+    outputs:
+      nbgv: ${{ steps.nbgv.outputs.SemVer2 }}
     steps:
+    - name: Get Current Visual Studio Information
+      shell: bash
+      run: |
+        dotnet tool update -g dotnet-vs
+        echo "-- About RELEASE --"
+        vs where release
+
+    - name: Update Visual Studio Latest Release
+      shell: bash
+      run: |
+        echo "-- Update RELEASE --"
+        vs update release Enterprise
+        vs modify release Enterprise +mobile +desktop +uwp +web
+        echo "-- About RELEASE Updated --"
+        vs where release
+        
     - name: Checkout
       uses: actions/checkout@v3
       with:
        fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+            6.0.x
+            7.0.x
 
     - name: Add MSBuild to PATH
-      uses: glennawatson/setup-msbuild@v1.0.3
+      uses: microsoft/setup-msbuild@v1.1.3
       with:
-        prerelease: true
+        vs-prerelease: true
 
     - name: NBGV
       id: nbgv
@@ -43,7 +60,7 @@ jobs:
       working-directory: src
 
     - name: Run Unit Tests and Generate Coverage
-      uses: glennawatson/coverlet-msbuild@v1
+      uses: glennawatson/coverlet-msbuild@v2.1
       with:
         project-files: 'src/**/*Tests*.csproj'
         no-build: true

.github/workflows/dotnet.yml

@@ -8,22 +8,41 @@ jobs:
   build-and-release:
 
     runs-on: windows-2022
- 
+    outputs:
+      nbgv: ${{ steps.nbgv.outputs.SemVer2 }}
     steps:
+    - name: Get Current Visual Studio Information
+      shell: bash
+      run: |
+        dotnet tool update -g dotnet-vs
+        echo "-- About RELEASE --"
+        vs where release
+
+    - name: Update Visual Studio Latest Release
+      shell: bash
+      run: |
+        echo "-- Update RELEASE --"
+        vs update release Enterprise
+        vs modify release Enterprise +mobile +desktop +uwp +web
+        echo "-- About RELEASE Updated --"
+        vs where release
+        
     - name: Checkout
       uses: actions/checkout@v3
       with:
        fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+            6.0.x
+            7.0.x
 
     - name: Add MSBuild to PATH
-      uses: glennawatson/setup-msbuild@v1.0.3
+      uses: microsoft/setup-msbuild@v1.1.3
       with:
-        prerelease: true
+        vs-prerelease: true
 
     - name: NBGV
       id: nbgv
@@ -40,18 +59,6 @@ jobs:
       run: msbuild /t:build,pack /nowarn:MSB4011 /maxcpucount /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=Release MQTTnet.Rx.Modbus.sln
       working-directory: src
 
-    - name: Run Unit Tests and Generate Coverage
-      uses: glennawatson/coverlet-msbuild@v1
-      with:
-        project-files: 'src/**/*Tests*.csproj'
-        no-build: true
-        include-filter: 'MQTTnet.Rx.Modbus*'
-        output-format: cobertura
-        configuration: Release
-
-    - name: Upload Code Coverage
-      uses: codecov/codecov-action@v3
-
     - name: Create NuGet Artifacts
       uses: actions/upload-artifact@master
       with:

Directory.Build.props

@@ -47,13 +47,13 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsTestProject)' == 'true'">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Moq" Version="4.18.2" />
+    <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

Version.json

@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3",
+    "version": "0.7",
     "publicReleaseRefSpec": [
         "^refs/heads/master$",
         "^refs/heads/main$"

src/MQTTnet.Rx.Modbus/MQTTnet.Rx.Modbus.csproj

@@ -1,18 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="ModbusRx" Version="0.8.0" />
-    <PackageReference Include="MQTTnet.Rx.Client" Version="0.5.0" />
+    <PackageReference Include="MQTTnet.Rx.Client" Version="0.7.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
 
-  <ItemGroup>
-  </ItemGroup>
-
 </Project>