Merge pull request #147 from devlead/feature/gh-146

GH146: Add .NET 8 and update to .NET 8.0.100 SDK
LitJSON · Nov 19, 2023 · b87e443 · b87e443
2 parents 4df8ec7 + 9c651e5
commit b87e443
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,18 +14,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, ubuntu-latest, macos-latest]
+        os: [windows-latest, ubuntu-latest, macos-latest]
     steps:
       - name: Get the sources
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Install .NET Core SDK
-        uses: actions/setup-dotnet@v1
+      - name: Install .NET SDK 6.0.x - 8.0.x
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: |
+            6.0.x
+            8.0.x
 
       - name: Run Cake script
-        uses: cake-build/cake-action@v1
+        uses: cake-build/cake-action@master
         env:
           GH_PACKAGES_NUGET_SOURCE: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json
           GH_PACKAGES_NUGET_APIKEY: ${{ secrets.GITHUB_TOKEN }}

diff --git a/README.md b/README.md
@@ -60,19 +60,19 @@ framework.
 #### Package manager
 
 ```PowerShell
-Install-Package LitJson -Version 0.10.0
+Install-Package LitJson -Version 0.19.0
 ```
 
 #### .NET CLI
 
 ```PowerShell
-dotnet add package LitJson --version 0.10.0
+dotnet add package LitJson --version 0.19.0
 ```
 
 #### Paket CLI
 
 ```PowerShell
-paket add LitJson --version 0.10.0
+paket add LitJson --version 0.19.0
 ```
 
 Alternatively, just copy the whole tree of files under `src/LitJSON` to your
@@ -81,11 +81,14 @@ own project's source tree and integrate it with your development environment.
 #### Requirements
 
 LitJSON currently targets and supports
+
+* .NET 8
 * .NET 6
 * .NET Standard 2.1
 * .NET Standard 2.0
 * .NET Standard 1.5
-* .NET Framework 4.5 and above
+* .NET Framework 4.8
+* .NET Framework 4.5
 * .NET Framework 4.0
 * .NET Framework 3.5 (including SQLCLR, for which [WCOMAB/SqlServerSlackAPI](https://github.com/WCOMAB/SqlServerSlackAPI) is an example of)
 * .NET Framework 2.0

diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
@@ -1,16 +1,22 @@
 strategy:
   matrix:
     linux:
-      imageName: 'ubuntu-20.04'
+      imageName: 'ubuntu-latest'
     mac:
-      imageName: 'macos-10.15'
+      imageName: 'macos-latest'
     windows:
-      imageName: 'windows-2022'
+      imageName: 'windows-latest'
 
 pool:
   vmImage: $(imageName)
 
 steps:
+- task: UseDotNet@2
+  displayName: 'Use .NET SDK 6.0.x'
+  inputs:
+    packageType: sdk
+    version: '6.0.x'
+
 - task: UseDotNet@2
   displayName: 'Use .NET Core sdk'
   inputs:

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "6.0.401",
+        "version": "8.0.100",
         "allowPrerelease": false,
         "rollForward": "feature"
     }

diff --git a/src/LitJson.Source/LitJSON.Source.csproj b/src/LitJson.Source/LitJSON.Source.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net6.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
         <IsPackable>true</IsPackable>
         <PackBuildOutput>false</PackBuildOutput>
         <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
@@ -18,11 +18,13 @@
         <RepositoryUrl>https://github.com/LitJSON/litjson</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <PackageTags>JSON;Serializer</PackageTags>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageFile Include="../LitJson/**/*.cs" Exclude="../LitJson/obj/**;../LitJson/bin/**;../LitJson/AssemblyInfo.cs" PackagePath="$(ContentTargetFolders)\cs\any\LitJson\%(RelativeDir)%(Filename).g%(Extension)" />
         <None Include="../LitJson/litjson.png" Pack="true" PackagePath="" />
+        <None Include="../../README.md" Pack="true" PackagePath="\"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/LitJson/LitJSON.csproj b/src/LitJson/LitJSON.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;net45;net48;netstandard1.5;net40;net35;net20;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net45;net48;netstandard1.5;net40;net35;net20;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -10,6 +10,7 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <SourceLinkCreate Condition="'$(OS)' == 'Windows_NT'">true</SourceLinkCreate>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
@@ -79,4 +80,8 @@ It's quick and lean, without external dependencies.</Description>
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="../../README.md" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
 </Project>
diff --git a/test/LitJSON.Tests.csproj b/test/LitJSON.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net45</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;net45</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>