Remove windows only flags and migrate to nested Directory.Build.props

ktsu-dev · Feb 13, 2024 · 278490d · 278490d
1 parent b5b7af4
commit 278490d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/.project.props b/.project.props
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,5 @@
 <Project>
 
-  <Import Project=".project.props" />
-
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -10,6 +8,7 @@
     <AssemblyName>$(RootNamespace)</AssemblyName>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <AnalysisLevel>latest-all</AnalysisLevel>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <WarningLevel>9999</WarningLevel>
@@ -18,8 +17,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\.project.props" />
+    <None Include="Directory.Build.props" />
     <None Include="..\$(PackageLicenseFile)" Pack="True" PackagePath="" Visible="False" />
+    <InternalsVisibleTo Include="$(RootNamespace).Test" />
   </ItemGroup>
 
 </Project>
diff --git a/ImGuiApp/Directory.Build.props b/ImGuiApp/Directory.Build.props
@@ -0,0 +1,12 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionSuffix>alpha.7</VersionSuffix>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PackageDescription>A library for custom widgets using ImGui.NET.</PackageDescription>
+    <PackageDescription>A bootstrap library to give you an environment to build an ImGUI.NET application with.</PackageDescription>
+  </PropertyGroup>
+
+</Project>
diff --git a/ImGuiApp/ImGuiApp.cs b/ImGuiApp/ImGuiApp.cs
@@ -81,7 +81,7 @@ public static void Start(string windowTitle, ImGuiAppWindowState initialWindowSt
 
 			// This is where you'll do any rendering beneath the ImGui context
 			// Here, we just have a blank screen.
-			gl?.ClearColor(Color.FromArgb(255, (int)(.45f * 255), (int)(.55f * 255), (int)(.60f * 255)));
+			gl?.ClearColor(System.Drawing.Color.FromArgb(255, (int)(.45f * 255), (int)(.55f * 255), (int)(.60f * 255)));
 			gl?.Clear((uint)ClearBufferMask.ColorBufferBit);
 
 			RenderMenu(menuDelegate);