Merge Core.Test project into /core folder

Makes things a little bit cleaner. Needed to modify the two project files to have different /obj folders, otherwise there are conflicts. Reference dotnet/msbuild#1603 (comment)
GProulx · Mar 20, 2021 · 2045dc7 · 2045dc7
1 parent e0b8db5
commit 2045dc7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/Rewrap.sln b/Rewrap.sln
@@ -6,7 +6,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VS", "vs\VS.csproj", "{2673
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Core", "core\Core.fsproj", "{2AAAD6E7-324C-465F-83C3-A6B45C469C28}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Core.Test", "core.test\Core.Test.fsproj", "{24398B66-2AA9-4587-821E-0515E30B79B7}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Core.Test", "core\Core.Test.fsproj", "{24398B66-2AA9-4587-821E-0515E30B79B7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/core.test/Core.Test.fsproj → core/Core.Test.fsproj b/core.test/Core.Test.fsproj → core/Core.Test.fsproj
@@ -1,10 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <BaseIntermediateOutputPath>obj\test\</BaseIntermediateOutputPath>
   </PropertyGroup>
 
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
   <ItemGroup>
     <Compile Include="Tests.fs" />
   </ItemGroup>

diff --git a/core/Core.fsproj b/core/Core.fsproj
@@ -1,10 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Rewrap.Core</AssemblyName>
+    <BaseIntermediateOutputPath>obj\core\</BaseIntermediateOutputPath>
   </PropertyGroup>
 
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
   <ItemGroup>
     <Compile Include="Prelude.fs" />
     <Compile Include="Nonempty.fs" />

diff --git a/core.test/Tests.fs → core/Tests.fs b/core.test/Tests.fs → core/Tests.fs