Project cleanup

scottbilas · Nov 11, 2023 · 192da63 · 192da63
1 parent 99b8074
commit 192da63
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 23 deletions.
diff --git a/perftests/Core.PerfTests/Core.PerfTests.csproj b/perftests/Core.PerfTests/Core.PerfTests.csproj
@@ -2,10 +2,6 @@
   <PropertyGroup><OkFeatures>Core</OkFeatures></PropertyGroup>
   <Import Project="$(OkTargetsRoot)Exe.targets"/>
 
-  <PropertyGroup>
-    <RootNamespace />
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="benchmarkdotnet" />
   </ItemGroup>

diff --git a/src/Flog.Cli/Flog.Cli.csproj b/src/Flog.Cli/Flog.Cli.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <AssemblyName>okflog</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RootNamespace />
     <DefineConstants Condition="'$(Configuration)'=='Debug'">ENABLE_SCREEN_RECORDER</DefineConstants>
   </PropertyGroup>
 

diff --git a/src/Loggo.Cli/Loggo.Cli.csproj b/src/Loggo.Cli/Loggo.Cli.csproj
@@ -4,7 +4,6 @@
 
   <PropertyGroup>
     <AssemblyName>loggo</AssemblyName>
-    <RootNamespace />
   </PropertyGroup>
 
 </Project>
diff --git a/src/MachMode.Cli/MachMode.Cli.csproj b/src/MachMode.Cli/MachMode.Cli.csproj
@@ -4,7 +4,6 @@
 
   <PropertyGroup>
     <AssemblyName>machmode</AssemblyName>
-    <RootNamespace />
   </PropertyGroup>
 
 </Project>
diff --git a/src/MachMode.Cli/MachModeCli-Tests.csproj b/src/MachMode.Cli/MachModeCli-Tests.csproj
@@ -2,10 +2,6 @@
   <PropertyGroup><OkFeatures>NiceIO</OkFeatures></PropertyGroup>
   <Import Project="$(OkTargetsRoot)Tests.targets" />
 
-  <PropertyGroup>
-    <RootNamespace>MachModeCli.Tests</RootNamespace>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="MachMode.Cli.csproj" />
   </ItemGroup>

diff --git a/src/PmlTool.Cli/PmlTool.Cli.csproj b/src/PmlTool.Cli/PmlTool.Cli.csproj
@@ -4,7 +4,6 @@
 
   <PropertyGroup>
     <AssemblyName>pmltool</AssemblyName>
-    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ProcMonUtils/ProcMonUtils-Tests.csproj b/src/ProcMonUtils/ProcMonUtils-Tests.csproj
@@ -2,10 +2,6 @@
   <PropertyGroup><OkFeatures>NiceIO</OkFeatures></PropertyGroup>
   <Import Project="$(OkTargetsRoot)Tests.targets" />
 
-  <PropertyGroup>
-    <RootNamespace>ProcMonUtils.Tests</RootNamespace>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="ProcMonUtils.csproj" />
   </ItemGroup>

diff --git a/src/Unity.Cli/Unity.Cli.csproj b/src/Unity.Cli/Unity.Cli.csproj
@@ -4,7 +4,6 @@
 
   <PropertyGroup>
     <AssemblyName>okunity</AssemblyName>
-    <RootNamespace />
   </PropertyGroup>
 
   <!-- some experiments i did a while ago...

diff --git a/src/Unity/Unity-Tests.csproj b/src/Unity/Unity-Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="$(OkTargetsRoot)Tests.targets" />
 
   <PropertyGroup>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!-- match the main project -->
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!-- match the main project (set in Exe.targets) -->
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/_TestUtils/TestUtils.csproj b/src/_TestUtils/TestUtils.csproj
@@ -2,11 +2,6 @@
   <PropertyGroup><OkFeatures>NiceIO</OkFeatures></PropertyGroup>
   <Import Project="$(OkTargetsRoot)Tests.targets" />
 
-  <ItemGroup>
-    <ProjectReference Include="$(OkSrcRoot)NiceIO\NiceIO.csproj" />
-    <Using Include="NiceIO" />
-  </ItemGroup>
-
   <PropertyGroup>
     <RootNamespace>OkTools.TestUtils</RootNamespace>
   </PropertyGroup>

diff --git a/targets/Exe.targets b/targets/Exe.targets
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <OutputPath>$(OkExeOutputPath)</OutputPath>
+    <RootNamespace />
 
     <!-- publishing defaults -->
     <PublishDir>$(OkExePublishDir)</PublishDir>
@@ -11,5 +12,8 @@
     <SelfContained>false</SelfContained>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <OkFeatures>$(OkFeatures);Exe</OkFeatures>
+  </PropertyGroup>
   <Import Project="Library.targets" />
 </Project>