Reworked Project Files

ChilliCream · Oct 8, 2023 · 1e8ed54 · 1e8ed54
1 parent 4f45cf1
commit 1e8ed54
Show file tree

Hide file tree

Showing 7 changed files with 2,177 additions and 109 deletions.
diff --git a/src/HotChocolate/OpenApi/Directory.Build.props b/src/HotChocolate/OpenApi/Directory.Build.props
@@ -0,0 +1,10 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />
+
+  <PropertyGroup>
+    <TargetFrameworks>$(Library3TargetFrameworks)</TargetFrameworks>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/HotChocolate/OpenApi/src/Directory.Build.props b/src/HotChocolate/OpenApi/src/Directory.Build.props
@@ -0,0 +1,4 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Nullable.props', '$(MSBuildThisFileDirectory)..\'))" />
+</Project>
diff --git a/src/HotChocolate/OpenApi/src/HotChocolate.OpenApi/HotChocolate.OpenApi.csproj b/src/HotChocolate/OpenApi/src/HotChocolate.OpenApi/HotChocolate.OpenApi.csproj
@@ -3,23 +3,12 @@
     <PropertyGroup>
       <AssemblyName>HotChocolate.OpenApi</AssemblyName>
       <RootNamespace>HotChocolate.OpenApi</RootNamespace>
-      <TargetFramework>net8.0</TargetFramework>
-      <ImplicitUsings>enable</ImplicitUsings>
-      <Nullable>enable</Nullable>
-      <ImplicitUsings>enable</ImplicitUsings>
-      <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
       <InternalsVisibleTo Include="HotChocolate.OpenApi.Tests"/>
     </ItemGroup>
 
-    <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.1.23419.4" />
-      <PackageReference Include="Microsoft.OpenApi" Version="1.6.6" />
-      <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.6" />
-    </ItemGroup>
-
     <ItemGroup>
       <ProjectReference Include="..\..\..\Core\src\Abstractions\HotChocolate.Abstractions.csproj" />
       <ProjectReference Include="..\..\..\Core\src\Core\HotChocolate.Core.csproj" />
@@ -28,6 +17,18 @@
       <ProjectReference Include="..\..\..\Skimmed\src\Skimmed\Skimmed.csproj" />
     </ItemGroup>
 
+    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+      <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+      <PackageReference Include="Microsoft.OpenApi" Version="1.6.6" />
+      <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.6" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+      <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.1.23419.4" />
+      <PackageReference Include="Microsoft.OpenApi" Version="1.6.6" />
+      <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.6" />
+    </ItemGroup>
+
     <ItemGroup>
       <EmbeddedResource Update="Properties\OpenApiResources.resx">
         <Generator>ResXFileCodeGenerator</Generator>