Merge branch 'main' into feature/fix-existing-unit-tests

LEGO · Mar 30, 2024 · 3939948 · 3939948
2 parents 6f8a932 + efcf8f0
commit 3939948
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git 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
@@ -19,32 +19,29 @@
       <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>
       <AutoGen>True</AutoGen>
       <DependentUpon>Resource.resx</DependentUpon>
     </Compile>
   </ItemGroup>
-    
+
   <ItemGroup>
     <EmbeddedResource Update="Resource.resx">
       <Generator>ResXFileCodeGenerator</Generator>