Skip to content

Commit

Permalink
Merge pull request #147 from devlead/feature/gh-146
Browse files Browse the repository at this point in the history
GH146: Add .NET 8 and update to .NET 8.0.100 SDK
  • Loading branch information
devlead authored Nov 19, 2023
2 parents 4df8ec7 + 9c651e5 commit b87e443
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 15 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
12 changes: 9 additions & 3 deletions azure-pipelines.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.401",
"version": "8.0.100",
"allowPrerelease": false,
"rollForward": "feature"
}
Expand Down
4 changes: 3 additions & 1 deletion src/LitJson.Source/LitJSON.Source.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down
7 changes: 6 additions & 1 deletion src/LitJson/LitJSON.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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'">
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion test/LitJSON.Tests.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down

0 comments on commit b87e443

Please sign in to comment.