.Net6

.github/workflows/CIBuild.yml

@@ -24,14 +24,28 @@ jobs:
 
     - name: Setup Visual Studio Command Prompt
       uses: microsoft/setup-msbuild@v1.0.2
-
+
+    - name: Install Android SDK
+      run: |
+         echo y>license_accepter.txt
+         echo y>>license_accepter.txt
+         echo y>>license_accepter.txt
+         echo y>>license_accepter.txt
+         echo y>>license_accepter.txt
+         echo y>>license_accepter.txt
+         echo y>>license_accepter.txt
+         echo y>>license_accepter.txt
+         cmd /c '"%ProgramFiles(x86)%\Android\android-sdk\cmdline-tools\7.0\bin\sdkmanager.bat" --licenses < license_accepter.txt'
+         cmd /c '"%ProgramFiles(x86)%\Android\android-sdk\cmdline-tools\7.0\bin\sdkmanager.bat" --install "platforms;android-24"'
+         cmd /c '"%ProgramFiles(x86)%\Android\android-sdk\cmdline-tools\7.0\bin\sdkmanager.bat" --install "platforms;android-21"'
+
     - name: Build
       run: |
         msbuild /restore /t:Build src/NmeaParser.sln /p:Configuration=Release
 
     - name: Tests
       run: |
-        dotnet test src/UnitTests/NmeaParser.Tests.NET/bin/Release/netcoreapp3.1/NmeaParser.Tests.Net.dll -v normal
+        dotnet test src/UnitTests/NmeaParser.Tests.NET/bin/Release/net6.0/NmeaParser.Tests.Net.dll -v normal
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v1

.github/workflows/ghpages.yml

@@ -28,7 +28,7 @@ jobs:
         Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/releases/download/v${env:DOCFXVERSION}/docfx.zip" -OutFile ".tools/docfx/docfx.zip"
         [System.IO.Compression.ZipFile]::ExtractToDirectory(".tools/docfx/docfx.zip", ".tools/docfx" )
       env:
-        DOCFXVERSION: 2.58
+        DOCFXVERSION: 2.59.0
 
     - name: Install .NET OMD Generator
       run: dotnet tool install --tool-path .tools/omd dotMorten.OmdGenerator --version 1.3.1
@@ -45,10 +45,10 @@ jobs:
       env:         
         DOCFX_SOURCE_BRANCH_NAME: main
       run: |
-        nuget install memberpage -Version 2.58.0 -OutputDirectory docs
+        nuget install memberpage -Version 2.59.0 -OutputDirectory docs
         .tools/docfx/docfx.exe metadata docs/docfx.json
         dotnet build docs/AppliesToGenerator\DocFXAppliesToGenerator.csproj
-        docs/AppliesToGenerator\bin\Debug\netcoreapp3.1\DocFXAppliesToGenerator.exe docs/appliesToList.json
+        docs/AppliesToGenerator\bin\Debug\net6.0\DocFXAppliesToGenerator.exe docs/appliesToList.json
         .tools/docfx/docfx.exe build docs/docfx.json
         powershell -ExecutionPolicy ByPass -command "docs\FixApiRefLinks" -Path artifacts\docs_site\api\
 

.gitignore

@@ -115,3 +115,4 @@ artifacts
 .tools
 docs/memberpage.2.58.0
 docs/AppliesToGenerator/.vs
+docs/memberpage.2.59.0

README.md

@@ -2,7 +2,7 @@ Nmea Parser
 =========
 
 Library for reading and parsing NMEA data message streams.
-It makes it easy to connect and listen for NMEA messages coming from various devices in Windows Universal, Windows Desktop/.NET and Windows Universal apps as well as Xamarin for iOS and Android.
+It makes it easy to connect and listen for NMEA messages coming from various devices in Windows Universal, Windows Desktop/.NET and Windows Universal apps as well as Xamarin/.NET for iOS and Android.
 
 
 ## Sponsoring

docs/AppliesToGenerator/DocFXAppliesToGenerator.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 </Project>

docs/BuildDoc.cmd

@@ -1,6 +1,6 @@
 @ECHO OFF
 
-SET DocFXVersion=2.58
+SET DocFXVersion=2.59.0
 SET DocFxFolder=%~dp0..\.tools\docfx
 
 REM Download DocFx
@@ -20,13 +20,14 @@ dotnet tool install --tool-path %~dp0../.tools/omd dotMorten.OmdGenerator --vers
 mkdir %~dp0../artifacts/docs/api
 %~dp0..\.tools\omd\generateomd /source=%~dp0../src/NmeaParser /output=%~dp0../artifacts/docs/api/omd.html /preprocessors=NETSTANDARD1_4;NETSTANDARD
 
-%~dp0..\.tools\nuget install memberpage -Version 2.58.0 -OutputDirectory %~dp0
+%~dp0..\.tools\nuget install memberpage -Version %DocFXVersion% -OutputDirectory %~dp0
+
 REM Build the output site (HTML) from the generated metadata and input files (uses configuration in docfx.json in this folder)
 %DocFxFolder%\v%DocFXVersion%\docfx.exe metadata %~dp0\docfx.json
 
 REM Build applies-to version/framework info 
 dotnet build AppliesToGenerator\DocFXAppliesToGenerator.csproj
-AppliesToGenerator\bin\Debug\netcoreapp3.1\DocFXAppliesToGenerator.exe appliesToList.json
+AppliesToGenerator\bin\Debug\net6.0\DocFXAppliesToGenerator.exe appliesToList.json
 
 %DocFxFolder%\v%DocFXVersion%\docfx.exe build %~dp0\docfx.json
 

docs/appliesToList.json

@@ -5,33 +5,65 @@
       "PlatformName": ".NET Standard 1.4",
       "Versions" : [
          { "Name" : "GitHub", "Manifest": "../artifacts/docs/api/netstd/.manifest" },
+         { "Name" : "v2.3", "Manifest": "manifests/v2.3/netstd/.manifest" },
          { "Name" : "v2.2", "Manifest": "manifests/v2.2/netstd/.manifest" },
          { "Name" : "v2.1", "Manifest": "manifests/v2.1/netstd/.manifest" },
          { "Name" : "v2.0", "Manifest": "manifests/v2.0/netstd/.manifest" },
       ]
     },
+    { 
+      "PlatformName": ".NET 6+",
+      "Versions" : [
+         { "Name": "GitHub", "Manifest": "../artifacts/docs/api/net/.manifest" },
+         { "Name" : "v2.3", "Manifest": "manifests/v2.3/net/.manifest" }
+      ]
+    },
+    { 
+      "PlatformName": ".NET Windows",
+      "Versions" : [
+         { "Name": "GitHub", "Manifest": "../artifacts/docs/api/net-windows/.manifest" },
+         { "Name" : "v2.3", "Manifest": "manifests/v2.3/net-windows/.manifest" }
+      ]
+    },
+    { 
+      "PlatformName": ".NET Android",
+      "Versions" : [
+         { "Name": "GitHub", "Manifest": "../artifacts/docs/api/net-android/.manifest" },
+         { "Name" : "v2.3", "Manifest": "manifests/v2.3/net-android/.manifest" }
+      ]
+    },
+    { 
+      "PlatformName": ".NET iOS",
+      "Versions" : [
+         { "Name": "GitHub", "Manifest": "../artifacts/docs/api/net-ios/.manifest" },
+         { "Name" : "v2.3", "Manifest": "manifests/v2.3/net-ios/.manifest" }
+      ]
+    },
     { 
       "PlatformName": ".NET Framework",
       "Versions" : [
          { "Name" : "GitHub", "Manifest": "../artifacts/docs/api/netfx/.manifest" },
+         { "Name" : "v2.3", "Manifest": "manifests/v2.3/netfx/.manifest" },
          { "Name" : "v2.2", "Manifest": "manifests/v2.2/netfx/.manifest" },
          { "Name" : "v2.1", "Manifest": "manifests/v2.1/netfx/.manifest" },
          { "Name" : "v2.0", "Manifest": "manifests/v2.0/netfx/.manifest" }
       ]
     },
     { 
-      "PlatformName": ".NET Core",
+      "PlatformName": "UWP",
       "Versions" : [
-         { "Name": "GitHub", "Manifest": "../artifacts/docs/api/netcore/.manifest" },
-         { "Name" : "v2.2", "Manifest": "manifests/v2.2/netcore/.manifest" },
-         { "Name" : "v2.1", "Manifest": "manifests/v2.1/netcore/.manifest" },
-         { "Name" : "v2.0", "Manifest": "manifests/v2.0/netcore/.manifest" }
+         { "Name" : "GitHub", "Manifest": "../artifacts/docs/api/uwp/.manifest" },
+         { "Name" : "v2.3", "Manifest": "manifests/v2.3/uwp/.manifest" },    
+         { "Name" : "v2.2", "Manifest": "manifests/v2.2/uwp/.manifest" },    
+         { "Name" : "v2.1", "Manifest": "manifests/v2.1/uwp/.manifest" },
+         { "Name" : "v2.0", "Manifest": "manifests/v2.0/uwp/.manifest" }
       ]
     },
     { 
       "PlatformName": "Xamarin.Android",
       "Versions" : [
          { "Name": "GitHub", "Manifest": "../artifacts/docs/api/android/.manifest" },
+         { "Name" : "v2.3", "Manifest": "manifests/v2.3/android/.manifest" },
          { "Name" : "v2.2", "Manifest": "manifests/v2.2/android/.manifest" },
          { "Name" : "v2.1", "Manifest": "manifests/v2.1/android/.manifest" },
          { "Name" : "v2.0", "Manifest": "manifests/v2.0/android/.manifest" }
@@ -41,19 +73,11 @@
       "PlatformName": "Xamarin.iOS",
       "Versions" : [
          { "Name" : "GitHub", "Manifest": "../artifacts/docs/api/ios/.manifest" },
+         { "Name" : "v2.3", "Manifest": "manifests/v2.3/ios/.manifest" },    
          { "Name" : "v2.2", "Manifest": "manifests/v2.2/ios/.manifest" },    
          { "Name" : "v2.1", "Manifest": "manifests/v2.1/ios/.manifest" },
          { "Name" : "v2.0", "Manifest": "manifests/v2.0/ios/.manifest" }
       ]
     },
-    { 
-      "PlatformName": "UWP",
-      "Versions" : [
-         { "Name" : "GitHub", "Manifest": "../artifacts/docs/api/uwp/.manifest" },
-         { "Name" : "v2.2", "Manifest": "manifests/v2.2/uwp/.manifest" },    
-         { "Name" : "v2.1", "Manifest": "manifests/v2.1/uwp/.manifest" },
-         { "Name" : "v2.0", "Manifest": "manifests/v2.0/uwp/.manifest" }
-      ]
-    }
    ]
 }

docs/docfx.json

@@ -6,62 +6,95 @@
           "files": [ "NmeaParser/NmeaParser.csproj" ],
           "src" : "../src/"
         },
-	  ],
+      ],
       "dest": "../artifacts/docs/api/netstd",
       "properties": { "TargetFramework": "netstandard1.4" },
       "disableGitFeatures": false,
       "disableDefaultFilter": false
     },
-	{ "src": [
+    { "src": [
         {
           "files": [ "NmeaParser/NmeaParser.csproj" ],
           "src" : "../src/"
         }
-	  ],
-      "dest": "../artifacts/docs/api/netfx",
-      "properties": { "TargetFramework": "net452" },
+      ],
+      "dest": "../artifacts/docs/api/net",
+      "properties": { "TargetFramework": "net6.0" },
       "disableGitFeatures": false,
       "disableDefaultFilter": false
     },
-	{ "src": [
+    { "src": [
         {
           "files": [ "NmeaParser/NmeaParser.csproj" ],
           "src" : "../src/"
         }
-	  ],
-      "dest": "../artifacts/docs/api/netcore",
-      "properties": { "TargetFramework": "netcoreapp2.1" },
+      ],
+      "dest": "../artifacts/docs/api/netfx",
+      "properties": { "TargetFramework": "net452" },
       "disableGitFeatures": false,
       "disableDefaultFilter": false
     },
-	{ "src": [
+    { "src": [
         {
           "files": [ "NmeaParser/NmeaParser.csproj" ],
           "src" : "../src/"
         }
-	  ],
+      ],
       "dest": "../artifacts/docs/api/android",
       "properties": { "TargetFramework": "monoandroid70" },
       "disableGitFeatures": false,
       "disableDefaultFilter": false
     },
-	{ "src": [
+    { "src": [
         {
           "files": [ "NmeaParser/NmeaParser.csproj" ],
           "src" : "../src/"
         }
-	  ],
+      ],
+      "dest": "../artifacts/docs/api/net-android",
+      "properties": { "TargetFramework": "net8.0-android" },
+      "disableGitFeatures": false,
+      "disableDefaultFilter": false
+    },
+    { "src": [
+        {
+          "files": [ "NmeaParser/NmeaParser.csproj" ],
+          "src" : "../src/"
+        }
+      ],
       "dest": "../artifacts/docs/api/ios",
       "properties": { "TargetFramework": "xamarinios10" },
       "disableGitFeatures": false,
       "disableDefaultFilter": false
     },
-	{ "src": [
+    { "src": [
+        {
+          "files": [ "NmeaParser/NmeaParser.csproj" ],
+          "src" : "../src/"
+        }
+      ],
+      "dest": "../artifacts/docs/api/net-ios",
+      "properties": { "TargetFramework": "net8.0-ios" },
+      "disableGitFeatures": false,
+      "disableDefaultFilter": false
+    },
+    { "src": [
         {
           "files": [ "NmeaParser/NmeaParser.csproj" ],
           "src" : "../src/"
         }
-	  ],
+      ],
+      "dest": "../artifacts/docs/api/net-windows",
+      "properties": { "TargetFramework": "net6.0-windows10.0.19041.0" },
+      "disableGitFeatures": false,
+      "disableDefaultFilter": false
+    },
+    { "src": [
+        {
+          "files": [ "NmeaParser/NmeaParser.csproj" ],
+          "src" : "../src/"
+        }
+      ],
       "dest": "../artifacts/docs/api/uwp",
       "properties": { "TargetFramework": "uap10.0.18362" },
       "disableGitFeatures": false,
@@ -70,7 +103,7 @@
   ],
   "build": {
     "content": [
-	{
+    {
         "files": [
           "api/**/index.md"
         ]
@@ -80,7 +113,7 @@
           "api/**.yml",
           "api/**/toc.yml"         
         ],
-		"src" : "../artifacts/docs"
+        "src" : "../artifacts/docs"
       },
       {
         "files": [
@@ -98,11 +131,11 @@
           "favicon.ico"
         ]
       },
-	   {
+       {
         "files": [
            "api/omd.html"
         ],
-		"src" : "../artifacts/docs"
+        "src" : "../artifacts/docs"
       }
     ],
     "overwrite": [
@@ -134,7 +167,7 @@
     "fileMetadataFiles": [],
     "template": [
       "default",
-      "memberpage.2.58.0/content",
+      "memberpage.2.59.0/content",
       "template_overrides"
     ],
     "postProcessors": [],