From 456229d6e9c8571bc5b593fdf34b56676b68cc20 Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Sat, 30 Mar 2024 09:24:22 +1100
Subject: [PATCH] #172 Add net 6 as TFM to make STJ conditional

---
 Common.Build.props                     |  2 +-
 src/LEGO.AsyncAPI/LEGO.AsyncAPI.csproj | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Common.Build.props b/Common.Build.props
index f4f9797f..78aa4707 100644
--- a/Common.Build.props
+++ b/Common.Build.props
@@ -2,7 +2,7 @@
   <!-- Common Properties used by all assemblies -->
   <PropertyGroup>
     <LangVersion>10</LangVersion>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net6</TargetFrameworks>
     <ImplicitUsings>disable</ImplicitUsings>
     <Company>The LEGO Group</Company>
     <PackageProjectUrl>https://github.com/LEGO/AsyncAPI.NET</PackageProjectUrl>
diff --git a/src/LEGO.AsyncAPI/LEGO.AsyncAPI.csproj b/src/LEGO.AsyncAPI/LEGO.AsyncAPI.csproj
index c26d0242..3bfe1c9c 100644
--- a/src/LEGO.AsyncAPI/LEGO.AsyncAPI.csproj
+++ b/src/LEGO.AsyncAPI/LEGO.AsyncAPI.csproj
@@ -19,24 +19,21 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Text.Json" Version="8.0.2" />
+    <PackageReference Include="System.Text.Json" Version="8.0.2" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
 
 	  <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
 		  <_Parameter1>$(MSBuildProjectName).Tests</_Parameter1>
 	  </AssemblyAttribute>
   </ItemGroup>
-	
+
   <ItemGroup>
-    <None Include="..\..\README.md">
-        <Pack>True</Pack>
-        <PackagePath>\</PackagePath>
-    </None>
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
-    
+
   <ItemGroup>
     <InternalsVisibleTo Include="LEGO.AsyncAPI.Tests" />
   </ItemGroup>
-    
+
   <ItemGroup>
     <Compile Update="Resource.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -44,7 +41,7 @@
       <DependentUpon>Resource.resx</DependentUpon>
     </Compile>
   </ItemGroup>
-    
+
   <ItemGroup>
     <EmbeddedResource Update="Resource.resx">
       <Generator>ResXFileCodeGenerator</Generator>