Standardized the build process

FuzzyLab-UVA · Mar 29, 2024 · 04d0b99 · 04d0b99
1 parent fe62a8f
commit 04d0b99
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/Artwise-API.sln b/Artwise-API.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
@@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 		LICENSE = LICENSE
 		README.md = README.md
-		BaseCsproj.props = BaseCsproj.props
+		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArtwiseTests", "ArtwiseTests\ArtwiseTests.csproj", "{528DDEDE-EE02-4B41-8F87-4841534E1DB2}"
@@ -25,9 +25,6 @@ Global
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2883EA04-AAC6-449C-9BE4-1A217BB5B833}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2883EA04-AAC6-449C-9BE4-1A217BB5B833}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -42,4 +39,7 @@ Global
 		{3D3B2B49-63CC-49A9-A999-0348F48DE24E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D3B2B49-63CC-49A9-A999-0348F48DE24E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
 EndGlobal
diff --git a/ArtwiseAPI/ArtwiseAPI.csproj b/ArtwiseAPI/ArtwiseAPI.csproj
@@ -1,13 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <Import Project="..\BaseCsproj.props" />
-
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
   </PropertyGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="ArtwiseTests" />
     <ProjectReference Include="..\ArtwiseDatabase\ArtwiseDatabase.csproj" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.2" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />

diff --git a/ArtwiseDatabase/ArtwiseDatabase.csproj b/ArtwiseDatabase/ArtwiseDatabase.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\BaseCsproj.props" />
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
   </PropertyGroup>

diff --git a/ArtwiseTests/Directory.Build.props b/ArtwiseTests/Directory.Build.props
@@ -0,0 +1,3 @@
+<!-- Empty csproj to cancel out the global base csproj -->
+<!-- so we don't need to write XML documentation for unit tests -->
+<Project />
diff --git a/BaseCsproj.props → Directory.Build.props b/BaseCsproj.props → Directory.Build.props
@@ -23,4 +23,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
   </PropertyGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="ArtwiseTests" />
+  </ItemGroup>
 </Project>