Skip to content

Commit 6205157

Browse files
StefHStefH
authored
Add netstandard2.0 and upgrade Newtonsoft.Json to 13.0.4 (#118)
* Add netstandard2.0 * Upgrade Newtonsoft.Json to 13.0.4 * net8.0 * update readme * .
1 parent 2843add commit 6205157

10 files changed

Lines changed: 40 additions & 32 deletions

File tree

‎.github/workflows/build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: ⚙️ Setup .NET
2020
uses: actions/setup-dotnet@v4
2121
with:
22-
dotnet-version: "6.0.x"
22+
dotnet-version: "8.0.x"
2323

2424
- name: 📦 Restore dependencies
2525
run: dotnet restore jmespath.net.sln

‎.github/workflows/publish.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: ⚙️ Setup .NET
2020
uses: actions/setup-dotnet@v4
2121
with:
22-
dotnet-version: "6.0.x"
22+
dotnet-version: "8.0.x"
2323

2424
- name: 🔓 Decrypt strong-name key
2525
run: bin/EncryptDecryptFile.PS1

‎README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
# JMESPath.Net
22

3-
A fully compliant implementation of [JMESPath](http://jmespath.org/specification.html) for .Net Core.
3+
A fully compliant implementation of [JMESPath](http://jmespath.org/specification.html) for .NET.
44

5-
[![Build status](https://ci.appveyor.com/api/projects/status/va3p48ufrj0pxl1t/branch/master?svg=true)](https://ci.appveyor.com/project/jdevillard/jmespath-net/branch/master)
5+
#### Build
6+
[![.NET Build and Compliance](https://github.com/jmespath-community/csharp-jmespath/actions/workflows/build.yaml/badge.svg)](https://github.com/jmespath-community/csharp-jmespath/actions/workflows/build.yaml)
7+
8+
#### NuGet
9+
[![NuGet Badge](https://shields.io/nuget/v/JMESPath.Net)](https://www.nuget.org/packages/JMESPath.Net)
610

711
# Getting started
812

‎jmespath.net.sln‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.28315.86
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.3.11520.95 d18.3
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{65D019ED-1B19-47DD-8C89-4FBABAA860D8}"
77
ProjectSection(SolutionItems) = preProject
8-
appveyor.yml = appveyor.yml
98
global.json = global.json
109
README.md = README.md
1110
EndProjectSection
@@ -22,7 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jmespathnet.compliance", "t
2221
EndProject
2322
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jmespathnet.tests", "tests\jmespathnet.tests\jmespathnet.tests.csproj", "{43EC8A0D-27A8-476C-8806-ED18FCC8B2F2}"
2423
EndProject
25-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JmesPath.net.parser", "src\jmespath.net.parser\jmespath.net.parser.csproj", "{A3301284-F70F-45E2-ABC9-A19D66A10712}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jmespath.net.parser", "src\jmespath.net.parser\jmespath.net.parser.csproj", "{A3301284-F70F-45E2-ABC9-A19D66A10712}"
2625
EndProject
2726
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{7D92C6D8-FB53-48C0-80F4-9120675714CC}"
2827
ProjectSection(SolutionItems) = preProject
@@ -33,6 +32,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jpnet", "tools\jpnet\jpnet.
3332
EndProject
3433
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jmespath.net.interop", "src\jmespath.net.interop\jmespath.net.interop.csproj", "{887093C1-A2AD-45C7-9B79-9F496D02826F}"
3534
EndProject
35+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Actions", "Actions", "{8D3D4399-AAB6-414E-9FE4-14A955FEFEE1}"
36+
ProjectSection(SolutionItems) = preProject
37+
.github\workflows\build.yaml = .github\workflows\build.yaml
38+
.github\workflows\publish.yaml = .github\workflows\publish.yaml
39+
EndProjectSection
40+
EndProject
3641
Global
3742
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3843
Debug|Any CPU = Debug|Any CPU
@@ -74,6 +79,7 @@ Global
7479
{A3301284-F70F-45E2-ABC9-A19D66A10712} = {6D7773F3-76FA-4E25-A85C-7AA1AD5668D8}
7580
{4F2BFBEA-D4D6-4064-9D9D-3881D5463152} = {CF8C1543-B634-47F5-BF43-4508F64E0554}
7681
{887093C1-A2AD-45C7-9B79-9F496D02826F} = {6D7773F3-76FA-4E25-A85C-7AA1AD5668D8}
82+
{8D3D4399-AAB6-414E-9FE4-14A955FEFEE1} = {65D019ED-1B19-47DD-8C89-4FBABAA860D8}
7783
EndGlobalSection
7884
GlobalSection(ExtensibilityGlobals) = postSolution
7985
SolutionGuid = {759AACA1-7B3D-4EA9-AAC6-CA9150656A98}

‎src/jmespath.net.interop/jmespath.net.interop.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>netstandard2.1;netstandard1.3;net45</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;netstandard2.0;netstandard1.3;net45</TargetFrameworks>
55
<AssemblyOriginatorKeyFile>../jmespath.net.snk</AssemblyOriginatorKeyFile>
66
<SignAssembly>True</SignAssembly>
77
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

‎src/jmespath.net.parser/jmespath.net.parser.csproj‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,21 @@
55
<AssemblyTitle>JmesPath.Net.Parser</AssemblyTitle>
66
<Authors>Jeremie Devillard;Maxime Labelle;Atif Aziz</Authors>
77
<VersionPrefix>42.43.44</VersionPrefix>
8-
<TargetFrameworks>netstandard2.1;netstandard1.3;net45</TargetFrameworks>
8+
<TargetFrameworks>netstandard2.1;netstandard2.0;netstandard1.3;net45</TargetFrameworks>
99
<AssemblyName>JmePath.Net.Parser</AssemblyName>
1010
<AssemblyOriginatorKeyFile>../jmespath.net.snk</AssemblyOriginatorKeyFile>
1111
<SignAssembly>true</SignAssembly>
1212
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1313
<PackageId>JmesPath.Net.Parser</PackageId>
1414
<PackageTags>jmespath;json</PackageTags>
15-
<PackageProjectUrl>https://github.com/jdevillard/JmesPath.Net</PackageProjectUrl>
15+
<PackageProjectUrl>https://github.com/jmespath-community/csharp-jmespath</PackageProjectUrl>
1616
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1717
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1818
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1919
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
2020
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
2121
</PropertyGroup>
22+
2223
<ItemGroup>
2324
<YaccFile Include="JmesPathParser.y">
2425
<OutputFile>JmesPathParser.g.cs</OutputFile>
@@ -28,21 +29,22 @@
2829
</LexFile>
2930
<Compile Include="JmesPathScanner.g.cs" Condition="!Exists( 'JmesPathScanner.g.cs' )" />
3031
<Compile Include="JmesPathParser.g.cs" Condition="!Exists( 'JmesPathParser.g.cs' )" />
31-
<Compile Include="GplexBuffers.cs" Condition="!Exists( 'GplexBuffers.cs' )" />
32-
<Compile Include="ShiftReduceParserCode.cs" Condition="!Exists( 'ShiftReduceParserCode.cs' )" />
32+
<Compile Include="GplexBuffers.cs" Condition="!Exists( 'GplexBuffers.cs' )" />
33+
<Compile Include="ShiftReduceParserCode.cs" Condition="!Exists( 'ShiftReduceParserCode.cs' )" />
3334
</ItemGroup>
35+
3436
<ItemGroup>
3537
<ProjectReference Include="..\jmespath.net.interop\jmespath.net.interop.csproj" />
3638
</ItemGroup>
3739

3840
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
39-
<!-- Use GplexBuffers and ShiftReduceParserCode from the net13 folder instead, which are modified for use of netstandard 1.3 -->
40-
<Compile Remove="ShiftReduceParserCode.cs" />
41-
<Compile Remove="GplexBuffers.cs" />
42-
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
41+
<!-- Use GplexBuffers and ShiftReduceParserCode from the net13 folder instead, which are modified for use of netstandard 1.3 -->
42+
<Compile Remove="ShiftReduceParserCode.cs" />
43+
<Compile Remove="GplexBuffers.cs" />
44+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
4345
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
4446
</ItemGroup>
45-
47+
4648
<ItemGroup>
4749
<PackageReference Include="YaccLexTools" Version="1.2.2" PrivateAssets="All" />
4850
</ItemGroup>

‎src/jmespath.net/jmespath.net.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<AssemblyTitle>JmesPath.Net</AssemblyTitle>
66
<VersionPrefix>42.43.44</VersionPrefix>
77
<Authors>Jeremie Devillard;Maxime Labelle</Authors>
8-
<TargetFrameworks>netstandard2.1;netstandard1.3;net45</TargetFrameworks>
8+
<TargetFrameworks>netstandard2.1;netstandard2.0;netstandard1.3;net45</TargetFrameworks>
99
<AssemblyName>JmesPath.Net</AssemblyName>
1010
<AssemblyOriginatorKeyFile>../jmespath.net.snk</AssemblyOriginatorKeyFile>
1111
<SignAssembly>true</SignAssembly>
1212
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1313
<PackageId>JmesPath.Net</PackageId>
1414
<PackageTags>jmespath;json</PackageTags>
15-
<PackageProjectUrl>https://github.com/jdevillard/JmesPath.Net</PackageProjectUrl>
15+
<PackageProjectUrl>https://github.com/jmespath-community/csharp-jmespath</PackageProjectUrl>
1616
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1717
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1818
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -21,18 +21,18 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
24+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
2525
</ItemGroup>
2626

2727
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
2828
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
29-
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
29+
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
3030
</ItemGroup>
3131

3232
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
3333
<Reference Include="System" />
3434
<Reference Include="Microsoft.CSharp" />
35-
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
35+
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

‎tests/jmespathnet.tests/jmespathnet.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>net452;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net452;net8.0</TargetFrameworks>
55
<AssemblyName>jmespathnet.tests</AssemblyName>
66
<PackageId>jmespathnet.tests</PackageId>
77
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>

‎tools/jmespathnet.compliance/jmespathnet.compliance.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AssemblyName>jmespathnet.compliance</AssemblyName>
66
<OutputType>Exe</OutputType>
77
<PackageId>jmespathnet.compliance</PackageId>
@@ -14,8 +14,4 @@
1414
<ProjectReference Include="..\..\src\jmespath.net\jmespath.net.csproj" />
1515
</ItemGroup>
1616

17-
<ItemGroup>
18-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
19-
</ItemGroup>
20-
21-
</Project>
17+
</Project>

‎tools/jpnet/jpnet.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

0 commit comments

Comments
 (0)