Skip to content

Commit b87e443

Browse files
authored
Merge pull request #147 from devlead/feature/gh-146
GH146: Add .NET 8 and update to .NET 8.0.100 SDK
2 parents 4df8ec7 + 9c651e5 commit b87e443

7 files changed

Lines changed: 35 additions & 15 deletions

File tree

.github/workflows/build.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,22 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
os: [windows-2022, ubuntu-latest, macos-latest]
17+
os: [windows-latest, ubuntu-latest, macos-latest]
1818
steps:
1919
- name: Get the sources
2020
uses: actions/checkout@v3
2121
with:
2222
fetch-depth: 0
2323

24-
- name: Install .NET Core SDK
25-
uses: actions/setup-dotnet@v1
24+
- name: Install .NET SDK 6.0.x - 8.0.x
25+
uses: actions/setup-dotnet@v3
26+
with:
27+
dotnet-version: |
28+
6.0.x
29+
8.0.x
2630
2731
- name: Run Cake script
28-
uses: cake-build/cake-action@v1
32+
uses: cake-build/cake-action@master
2933
env:
3034
GH_PACKAGES_NUGET_SOURCE: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json
3135
GH_PACKAGES_NUGET_APIKEY: ${{ secrets.GITHUB_TOKEN }}

README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,19 @@ framework.
6060
#### Package manager
6161

6262
```PowerShell
63-
Install-Package LitJson -Version 0.10.0
63+
Install-Package LitJson -Version 0.19.0
6464
```
6565

6666
#### .NET CLI
6767

6868
```PowerShell
69-
dotnet add package LitJson --version 0.10.0
69+
dotnet add package LitJson --version 0.19.0
7070
```
7171

7272
#### Paket CLI
7373

7474
```PowerShell
75-
paket add LitJson --version 0.10.0
75+
paket add LitJson --version 0.19.0
7676
```
7777

7878
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.
8181
#### Requirements
8282

8383
LitJSON currently targets and supports
84+
85+
* .NET 8
8486
* .NET 6
8587
* .NET Standard 2.1
8688
* .NET Standard 2.0
8789
* .NET Standard 1.5
88-
* .NET Framework 4.5 and above
90+
* .NET Framework 4.8
91+
* .NET Framework 4.5
8992
* .NET Framework 4.0
9093
* .NET Framework 3.5 (including SQLCLR, for which [WCOMAB/SqlServerSlackAPI](https://github.com/WCOMAB/SqlServerSlackAPI) is an example of)
9194
* .NET Framework 2.0

azure-pipelines.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
strategy:
22
matrix:
33
linux:
4-
imageName: 'ubuntu-20.04'
4+
imageName: 'ubuntu-latest'
55
mac:
6-
imageName: 'macos-10.15'
6+
imageName: 'macos-latest'
77
windows:
8-
imageName: 'windows-2022'
8+
imageName: 'windows-latest'
99

1010
pool:
1111
vmImage: $(imageName)
1212

1313
steps:
14+
- task: UseDotNet@2
15+
displayName: 'Use .NET SDK 6.0.x'
16+
inputs:
17+
packageType: sdk
18+
version: '6.0.x'
19+
1420
- task: UseDotNet@2
1521
displayName: 'Use .NET Core sdk'
1622
inputs:

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.401",
3+
"version": "8.0.100",
44
"allowPrerelease": false,
55
"rollForward": "feature"
66
}

src/LitJson.Source/LitJSON.Source.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0</TargetFrameworks>
3+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
44
<IsPackable>true</IsPackable>
55
<PackBuildOutput>false</PackBuildOutput>
66
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
@@ -18,11 +18,13 @@
1818
<RepositoryUrl>https://github.com/LitJSON/litjson</RepositoryUrl>
1919
<RepositoryType>git</RepositoryType>
2020
<PackageTags>JSON;Serializer</PackageTags>
21+
<PackageReadmeFile>README.md</PackageReadmeFile>
2122
</PropertyGroup>
2223

2324
<ItemGroup>
2425
<PackageFile Include="../LitJson/**/*.cs" Exclude="../LitJson/obj/**;../LitJson/bin/**;../LitJson/AssemblyInfo.cs" PackagePath="$(ContentTargetFolders)\cs\any\LitJson\%(RelativeDir)%(Filename).g%(Extension)" />
2526
<None Include="../LitJson/litjson.png" Pack="true" PackagePath="" />
27+
<None Include="../../README.md" Pack="true" PackagePath="\"/>
2628
</ItemGroup>
2729

2830
<ItemGroup>

src/LitJson/LitJSON.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;netstandard2.0;net45;net48;netstandard1.5;net40;net35;net20;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;netstandard2.0;net45;net48;netstandard1.5;net40;net35;net20;net6.0;net8.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -10,6 +10,7 @@
1010
<EmbedUntrackedSources>true</EmbedUntrackedSources>
1111
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1212
<SourceLinkCreate Condition="'$(OS)' == 'Windows_NT'">true</SourceLinkCreate>
13+
<PackageReadmeFile>README.md</PackageReadmeFile>
1314
</PropertyGroup>
1415

1516
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
@@ -79,4 +80,8 @@ It's quick and lean, without external dependencies.</Description>
7980
</PackageReference>
8081
</ItemGroup>
8182

83+
<ItemGroup>
84+
<None Include="../../README.md" Pack="true" PackagePath="\"/>
85+
</ItemGroup>
86+
8287
</Project>

test/LitJSON.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net45</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net6.0;net45</TargetFrameworks>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

0 commit comments

Comments
 (0)