Make the generated schema be more consistent with the serializer behaviour

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     tags:
-      - v[0-9]+.[0-9]+.[0-9]+
+      - v[0-9]+.[0-9]+.[0-9]+*
     branches:
       - master
   pull_request:
@@ -16,30 +16,54 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use dotnet CLI
+
+      - name: Use dotnet CLI 6
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "6.0.x" # SDK Version to use.
+
+      - name: Use dotnet CLI 8
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "5.0.x" # SDK Version to use.
+          dotnet-version: "8.0.x" # SDK Version to use.
+
+      - name: Set env
+        if: startsWith( github.ref, 'refs/tags/v' )
+        run: |
+          RELEASE_VERSION="${GITHUB_REF#refs/*/}"
+          echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV
+          echo "Version=${RELEASE_VERSION:1}" >> $GITHUB_ENV
+
       - name: Build
         run: |
           dotnet restore
           dotnet build -c Release --no-restore
-      - name: Test
-        run: dotnet test -c Release --no-restore --no-build --framework net5.0 --logger "GitHubActions;report-warnings=false"
+
+      - name: Test net6.0
+        run: dotnet test -c Release --no-restore --no-build --framework net6.0 --logger "GitHubActions;report-warnings=false"
+
+      - name: Test net8.0
+        run: dotnet test -c Release --no-restore --no-build --framework net8.0 --logger "GitHubActions;report-warnings=false"
+
       - name: Pack
         run: dotnet pack -c Release --no-restore --no-build --include-symbols -o out
+
+      - name: Upload Test Results
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: verify-test-results
+          path: |
+            **/*.received.*
       - name: Upload artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: nupkg
           path: ./out
-      - name: Set env
-        if: startsWith( github.ref, 'refs/tags/v' )
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Push
         if: startsWith( github.ref, 'refs/tags/v' )
         env:
           API_KEY: ${{ secrets.NUGET_API_KEY }}
           SOURCE: "https://api.nuget.org/v3/index.json"
         run: |
-          dotnet nuget push ./out/FSharp.Data.JsonSchema.${RELEASE_VERSION:1}.nupkg --skip-duplicate --no-symbols true --source $SOURCE --api-key $API_KEY
+          dotnet nuget push ./out/*FSharp.Data.JsonSchema.${RELEASE_VERSION:1}.nupkg --skip-duplicate --no-symbols --source $SOURCE --api-key $API_KEY

.gitignore

@@ -1,6 +1,9 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+# Verify Tests received files
+*.received.*
+
 # User-specific files
 *.suo
 *.user

build.ps1

@@ -1,4 +1,4 @@
 dotnet restore
 dotnet build -c Release --no-restore
-dotnet test -c Release --no-restore --no-build --framework net5.0
+dotnet test -c Release --no-restore --no-build --framework net8.0
 dotnet pack -c Release -o bin --no-restore --no-build

build.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
+
+set -euo pipefail
+
 dotnet restore
 dotnet build -c Release --no-restore
-dotnet test -c Release --no-restore --no-build --framework net5.0
+dotnet test -c Release --no-restore --no-build --framework net8.0
 dotnet pack -c Release -o bin --no-restore --no-build

src/Directory.Build.props

@@ -1,6 +1,7 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>2.0.2</VersionPrefix>
+    <VersionPrefix>2.1.2</VersionPrefix>
+    <Version>$(Version)</Version>
     <Owners>Ryan Riley</Owners>
     <Authors>Ryan Riley</Authors>
     <PackageProjectUrl>https://github.com/panesofglass/FSharp.Data.JsonSchema</PackageProjectUrl>
@@ -16,10 +17,10 @@
 
     <!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
- 
+
     <!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  
+
     <!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>

src/FSharp.Data.JsonSchema/FSharp.Data.JsonSchema.fsproj

@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
+    <PackageId Condition="$(GITHUB_REPOSITORY_OWNER) != 'fsprojects' and $(GITHUB_REPOSITORY_OWNER) != ''">$(GITHUB_REPOSITORY_OWNER).FSharp.Data.JsonSchema</PackageId>
+    <Version>$(Version)</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Serializer.fs" />
     <Compile Include="JsonSchema.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FSharp.SystemTextJson" Version="0.17.*" />
+    <PackageReference Include="FSharp.SystemTextJson" Version="1.1.23" />
     <PackageReference Include="NJsonSchema" Version="10.*" />
   </ItemGroup>
-</Project>
+</Project>