Moved the .NET Standard mock-assembly project to its own directory

nunit · May 9, 2017 · f4d9d2e · f4d9d2e
1 parent e36e616
commit f4d9d2e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 11 deletions.
diff --git a/NUnit.Engine.Netstandard.sln b/NUnit.Engine.Netstandard.sln
@@ -23,7 +23,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.engine.tests.netstandard", "src\NUnitEngine\nunit.engine.tests.netstandard\nunit.engine.tests.netstandard.csproj", "{BC22F0E4-0862-4F82-A912-C9A447FECBAD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mock-assembly.netstandard", "src\NUnitEngine\mock-assembly\mock-assembly.netstandard.csproj", "{BC6C8155-2024-4F58-A006-18A15EA22A5C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mock-assembly.netstandard", "src\NUnitEngine\mock-assembly.netstandard\mock-assembly.netstandard.csproj", "{BC6C8155-2024-4F58-A006-18A15EA22A5C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.engine.netstandard", "src\NUnitEngine\nunit.engine.netstandard\nunit.engine.netstandard.csproj", "{C26FFC46-60CE-4CBA-87BD-8E9B972C0E0D}"
 EndProject

diff --git a/...assembly/mock-assembly.netstandard.csproj → ...standard/mock-assembly.netstandard.csproj b/...assembly/mock-assembly.netstandard.csproj → ...standard/mock-assembly.netstandard.csproj
@@ -15,6 +15,8 @@
   <ItemGroup>
     <Compile Include="..\..\CommonAssemblyInfo.cs" Link="Properties\CommonAssemblyInfo.cs" />
     <Compile Include="..\EngineVersion.cs" Link="Properties\EngineVersion.cs" />
+    <Compile Include="..\mock-assembly\Properties\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\mock-assembly\MockAssembly.cs" Link="MockAssembly.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NUnitEngine/mock-assembly/mock-assembly.csproj b/src/NUnitEngine/mock-assembly/mock-assembly.csproj
@@ -103,7 +103,6 @@
     <None Include="..\..\nunit.snk">
       <Link>nunit.snk</Link>
     </None>
-    <None Include="mock-assembly.project.json" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

diff --git a/src/NUnitEngine/mock-assembly/mock-assembly.project.json b/src/NUnitEngine/mock-assembly/mock-assembly.project.json
diff --git a/src/NUnitEngine/nunit.engine.tests.netstandard/nunit.engine.tests.netstandard.csproj b/src/NUnitEngine/nunit.engine.tests.netstandard/nunit.engine.tests.netstandard.csproj
@@ -42,7 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\mock-assembly\mock-assembly.netstandard.csproj" />
+    <ProjectReference Include="..\mock-assembly.netstandard\mock-assembly.netstandard.csproj" />
     <ProjectReference Include="..\nunit.engine.netstandard\nunit.engine.netstandard.csproj" />
   </ItemGroup>