Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: ⚙️ Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: "6.0.x"
dotnet-version: "8.0.x"

- name: 📦 Restore dependencies
run: dotnet restore jmespath.net.sln
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: ⚙️ Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: "6.0.x"
dotnet-version: "8.0.x"

- name: 🔓 Decrypt strong-name key
run: bin/EncryptDecryptFile.PS1
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# JMESPath.Net

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

[![Build status](https://ci.appveyor.com/api/projects/status/va3p48ufrj0pxl1t/branch/master?svg=true)](https://ci.appveyor.com/project/jdevillard/jmespath-net/branch/master)
#### Build
[![.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)

#### NuGet
[![NuGet Badge](https://shields.io/nuget/v/JMESPath.Net)](https://www.nuget.org/packages/JMESPath.Net)

# Getting started

Expand Down
14 changes: 10 additions & 4 deletions jmespath.net.sln
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28315.86
# Visual Studio Version 18
VisualStudioVersion = 18.3.11520.95 d18.3
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{65D019ED-1B19-47DD-8C89-4FBABAA860D8}"
ProjectSection(SolutionItems) = preProject
appveyor.yml = appveyor.yml
global.json = global.json
README.md = README.md
EndProjectSection
Expand All @@ -22,7 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jmespathnet.compliance", "t
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jmespathnet.tests", "tests\jmespathnet.tests\jmespathnet.tests.csproj", "{43EC8A0D-27A8-476C-8806-ED18FCC8B2F2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JmesPath.net.parser", "src\jmespath.net.parser\jmespath.net.parser.csproj", "{A3301284-F70F-45E2-ABC9-A19D66A10712}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jmespath.net.parser", "src\jmespath.net.parser\jmespath.net.parser.csproj", "{A3301284-F70F-45E2-ABC9-A19D66A10712}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{7D92C6D8-FB53-48C0-80F4-9120675714CC}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -33,6 +32,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jpnet", "tools\jpnet\jpnet.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jmespath.net.interop", "src\jmespath.net.interop\jmespath.net.interop.csproj", "{887093C1-A2AD-45C7-9B79-9F496D02826F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Actions", "Actions", "{8D3D4399-AAB6-414E-9FE4-14A955FEFEE1}"
ProjectSection(SolutionItems) = preProject
.github\workflows\build.yaml = .github\workflows\build.yaml
.github\workflows\publish.yaml = .github\workflows\publish.yaml
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -74,6 +79,7 @@ Global
{A3301284-F70F-45E2-ABC9-A19D66A10712} = {6D7773F3-76FA-4E25-A85C-7AA1AD5668D8}
{4F2BFBEA-D4D6-4064-9D9D-3881D5463152} = {CF8C1543-B634-47F5-BF43-4508F64E0554}
{887093C1-A2AD-45C7-9B79-9F496D02826F} = {6D7773F3-76FA-4E25-A85C-7AA1AD5668D8}
{8D3D4399-AAB6-414E-9FE4-14A955FEFEE1} = {65D019ED-1B19-47DD-8C89-4FBABAA860D8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {759AACA1-7B3D-4EA9-AAC6-CA9150656A98}
Expand Down
2 changes: 1 addition & 1 deletion src/jmespath.net.interop/jmespath.net.interop.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;netstandard1.3;net45</TargetFrameworks>
<AssemblyOriginatorKeyFile>../jmespath.net.snk</AssemblyOriginatorKeyFile>
<SignAssembly>True</SignAssembly>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
Expand Down
20 changes: 11 additions & 9 deletions src/jmespath.net.parser/jmespath.net.parser.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,21 @@
<AssemblyTitle>JmesPath.Net.Parser</AssemblyTitle>
<Authors>Jeremie Devillard;Maxime Labelle;Atif Aziz</Authors>
<VersionPrefix>42.43.44</VersionPrefix>
<TargetFrameworks>netstandard2.1;netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;netstandard1.3;net45</TargetFrameworks>
<AssemblyName>JmePath.Net.Parser</AssemblyName>
<AssemblyOriginatorKeyFile>../jmespath.net.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<PackageId>JmesPath.Net.Parser</PackageId>
<PackageTags>jmespath;json</PackageTags>
<PackageProjectUrl>https://github.com/jdevillard/JmesPath.Net</PackageProjectUrl>
<PackageProjectUrl>https://github.com/jmespath-community/csharp-jmespath</PackageProjectUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>

<ItemGroup>
<YaccFile Include="JmesPathParser.y">
<OutputFile>JmesPathParser.g.cs</OutputFile>
Expand All @@ -28,21 +29,22 @@
</LexFile>
<Compile Include="JmesPathScanner.g.cs" Condition="!Exists( 'JmesPathScanner.g.cs' )" />
<Compile Include="JmesPathParser.g.cs" Condition="!Exists( 'JmesPathParser.g.cs' )" />
<Compile Include="GplexBuffers.cs" Condition="!Exists( 'GplexBuffers.cs' )" />
<Compile Include="ShiftReduceParserCode.cs" Condition="!Exists( 'ShiftReduceParserCode.cs' )" />
<Compile Include="GplexBuffers.cs" Condition="!Exists( 'GplexBuffers.cs' )" />
<Compile Include="ShiftReduceParserCode.cs" Condition="!Exists( 'ShiftReduceParserCode.cs' )" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\jmespath.net.interop\jmespath.net.interop.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<!-- Use GplexBuffers and ShiftReduceParserCode from the net13 folder instead, which are modified for use of netstandard 1.3 -->
<Compile Remove="ShiftReduceParserCode.cs" />
<Compile Remove="GplexBuffers.cs" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
<!-- Use GplexBuffers and ShiftReduceParserCode from the net13 folder instead, which are modified for use of netstandard 1.3 -->
<Compile Remove="ShiftReduceParserCode.cs" />
<Compile Remove="GplexBuffers.cs" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="YaccLexTools" Version="1.2.2" PrivateAssets="All" />
</ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/jmespath.net/jmespath.net.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<AssemblyTitle>JmesPath.Net</AssemblyTitle>
<VersionPrefix>42.43.44</VersionPrefix>
<Authors>Jeremie Devillard;Maxime Labelle</Authors>
<TargetFrameworks>netstandard2.1;netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.1;netstandard2.0;netstandard1.3;net45</TargetFrameworks>
<AssemblyName>JmesPath.Net</AssemblyName>
<AssemblyOriginatorKeyFile>../jmespath.net.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<PackageId>JmesPath.Net</PackageId>
<PackageTags>jmespath;json</PackageTags>
<PackageProjectUrl>https://github.com/jdevillard/JmesPath.Net</PackageProjectUrl>
<PackageProjectUrl>https://github.com/jmespath-community/csharp-jmespath</PackageProjectUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
Expand All @@ -21,18 +21,18 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/jmespathnet.tests/jmespathnet.tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;net6.0</TargetFrameworks>
<TargetFrameworks>net452;net8.0</TargetFrameworks>
<AssemblyName>jmespathnet.tests</AssemblyName>
<PackageId>jmespathnet.tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
Expand Down
10 changes: 3 additions & 7 deletions tools/jmespathnet.compliance/jmespathnet.compliance.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>jmespathnet.compliance</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>jmespathnet.compliance</PackageId>
Expand All @@ -14,8 +14,4 @@
<ProjectReference Include="..\..\src\jmespath.net\jmespath.net.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>

</Project>
</Project>
2 changes: 1 addition & 1 deletion tools/jpnet/jpnet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
Loading