From 91929938bdab52c1acebaaa9f2a2f8f409c0df43 Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Wed, 17 Apr 2024 18:58:28 +1000
Subject: [PATCH 1/2] #103 have added i license expression to all projects

---
 .../jmespath.net.interop.csproj                  |  1 +
 .../jmespath.net.parser.csproj                   | 16 ++++++++--------
 src/jmespath.net/jmespath.net.csproj             |  6 +++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/jmespath.net.interop/jmespath.net.interop.csproj b/src/jmespath.net.interop/jmespath.net.interop.csproj
index b72e9c7..dc14d24 100644
--- a/src/jmespath.net.interop/jmespath.net.interop.csproj
+++ b/src/jmespath.net.interop/jmespath.net.interop.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>netstandard2.1;netstandard1.3;net45</TargetFrameworks>
     <AssemblyOriginatorKeyFile>../jmespath.net.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>True</SignAssembly>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
   </PropertyGroup>
 
 </Project>
diff --git a/src/jmespath.net.parser/jmespath.net.parser.csproj b/src/jmespath.net.parser/jmespath.net.parser.csproj
index c586c5b..6047618 100644
--- a/src/jmespath.net.parser/jmespath.net.parser.csproj
+++ b/src/jmespath.net.parser/jmespath.net.parser.csproj
@@ -13,7 +13,7 @@
     <PackageId>JmesPath.Net.Parser</PackageId>
     <PackageTags>jmespath;json</PackageTags>
     <PackageProjectUrl>https://github.com/jdevillard/JmesPath.Net</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/jdevillard/JmesPath.Net/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
@@ -28,21 +28,21 @@
     </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>
diff --git a/src/jmespath.net/jmespath.net.csproj b/src/jmespath.net/jmespath.net.csproj
index 6c2e035..80d043f 100644
--- a/src/jmespath.net/jmespath.net.csproj
+++ b/src/jmespath.net/jmespath.net.csproj
@@ -13,7 +13,7 @@
     <PackageId>JmesPath.Net</PackageId>
     <PackageTags>jmespath;json</PackageTags>
     <PackageProjectUrl>https://github.com/jdevillard/JmesPath.Net</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/jdevillard/JmesPath.Net/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
@@ -26,13 +26,13 @@
 
   <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>

From 1b978a2e0db710d2616c9feb359ce0c569ad8ff0 Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Thu, 18 Apr 2024 08:18:35 +1000
Subject: [PATCH 2/2] Revert whitespace

---
 src/jmespath.net.parser/jmespath.net.parser.csproj | 14 +++++++-------
 src/jmespath.net/jmespath.net.csproj               |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/jmespath.net.parser/jmespath.net.parser.csproj b/src/jmespath.net.parser/jmespath.net.parser.csproj
index 6047618..5d6d042 100644
--- a/src/jmespath.net.parser/jmespath.net.parser.csproj
+++ b/src/jmespath.net.parser/jmespath.net.parser.csproj
@@ -28,21 +28,21 @@
     </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>
diff --git a/src/jmespath.net/jmespath.net.csproj b/src/jmespath.net/jmespath.net.csproj
index 80d043f..5ad011a 100644
--- a/src/jmespath.net/jmespath.net.csproj
+++ b/src/jmespath.net/jmespath.net.csproj
@@ -26,13 +26,13 @@
 
   <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>