From 8fa5c4d450d7291e0151d09f5ac7d9e4991a56b1 Mon Sep 17 00:00:00 2001
From: Kyle Amonson <kyle.amonson@IntelliTect.com>
Date: Tue, 30 Oct 2018 15:57:41 -0700
Subject: [PATCH] Changes to csproj to support using nuget 1.0.0-* if no
 submodules are present

---
 src/Chapter01.Tests/Chapter01.Tests.csproj | 2 +-
 src/Chapter02.Tests/Chapter02.Tests.csproj | 2 +-
 src/Chapter03.Tests/Chapter03.Tests.csproj | 2 +-
 src/Chapter04.Tests/Chapter04.Tests.csproj | 4 ++--
 src/Chapter05.Tests/Chapter05.Tests.csproj | 4 ++--
 src/Chapter06.Tests/Chapter06.Tests.csproj | 2 +-
 src/Chapter07.Tests/Chapter07.Tests.csproj | 5 ++---
 src/Chapter08.Tests/Chapter08.Tests.csproj | 2 +-
 src/Chapter09.Tests/Chapter09.Tests.csproj | 2 +-
 src/Chapter10.Tests/Chapter10.Tests.csproj | 2 +-
 src/Chapter12.Tests/Chapter12.Tests.csproj | 2 +-
 src/Chapter13.Tests/Chapter13.Tests.csproj | 2 +-
 src/Chapter14.Tests/Chapter14.Tests.csproj | 2 +-
 src/Chapter15.Tests/Chapter15.Tests.csproj | 2 +-
 src/Chapter16.Tests/Chapter16.Tests.csproj | 2 +-
 src/Chapter17.Tests/Chapter17.Tests.csproj | 2 +-
 src/Chapter18.Tests/Chapter18.Tests.csproj | 2 +-
 src/Chapter19.Tests/Chapter19.Tests.csproj | 8 ++------
 src/Chapter20.Tests/Chapter20.Tests.csproj | 8 ++------
 src/Chapter21.Tests/Chapter21.Tests.csproj | 8 ++------
 src/ChapterTests.targets                   | 6 ++++++
 21 files changed, 32 insertions(+), 39 deletions(-)
 create mode 100644 src/ChapterTests.targets

diff --git a/src/Chapter01.Tests/Chapter01.Tests.csproj b/src/Chapter01.Tests/Chapter01.Tests.csproj
index 27ad70433..81b78a2e0 100644
--- a/src/Chapter01.Tests/Chapter01.Tests.csproj
+++ b/src/Chapter01.Tests/Chapter01.Tests.csproj
@@ -5,13 +5,13 @@
     <ProductName>Chapter01.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter01\Chapter01.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Chapter02.Tests/Chapter02.Tests.csproj b/src/Chapter02.Tests/Chapter02.Tests.csproj
index 0c03dbcdb..6a023f117 100644
--- a/src/Chapter02.Tests/Chapter02.Tests.csproj
+++ b/src/Chapter02.Tests/Chapter02.Tests.csproj
@@ -5,13 +5,13 @@
     <ProductName>Chapter02.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter02\Chapter02.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Chapter03.Tests/Chapter03.Tests.csproj b/src/Chapter03.Tests/Chapter03.Tests.csproj
index 26fee8f04..c58fc72db 100644
--- a/src/Chapter03.Tests/Chapter03.Tests.csproj
+++ b/src/Chapter03.Tests/Chapter03.Tests.csproj
@@ -5,13 +5,13 @@
     <ProductName>Chapter03.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter03\Chapter03.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Chapter04.Tests/Chapter04.Tests.csproj b/src/Chapter04.Tests/Chapter04.Tests.csproj
index 83e17c9f3..e888458c5 100644
--- a/src/Chapter04.Tests/Chapter04.Tests.csproj
+++ b/src/Chapter04.Tests/Chapter04.Tests.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <ProductName>Chapter04.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter04\Chapter04.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Chapter05.Tests/Chapter05.Tests.csproj b/src/Chapter05.Tests/Chapter05.Tests.csproj
index ae4944c32..9daca36ee 100644
--- a/src/Chapter05.Tests/Chapter05.Tests.csproj
+++ b/src/Chapter05.Tests/Chapter05.Tests.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <ProductName>Chapter05.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter05\Chapter05.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Chapter06.Tests/Chapter06.Tests.csproj b/src/Chapter06.Tests/Chapter06.Tests.csproj
index bc7c73036..37dec632d 100644
--- a/src/Chapter06.Tests/Chapter06.Tests.csproj
+++ b/src/Chapter06.Tests/Chapter06.Tests.csproj
@@ -5,13 +5,13 @@
     <ProductName>Chapter08.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter06\Chapter06.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Chapter07.Tests/Chapter07.Tests.csproj b/src/Chapter07.Tests/Chapter07.Tests.csproj
index 701e9e1d5..81749dded 100644
--- a/src/Chapter07.Tests/Chapter07.Tests.csproj
+++ b/src/Chapter07.Tests/Chapter07.Tests.csproj
@@ -1,18 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <ProductName>Chapter07.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter07\Chapter07.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Chapter08.Tests/Chapter08.Tests.csproj b/src/Chapter08.Tests/Chapter08.Tests.csproj
index e70948c77..bd9e5e2ed 100644
--- a/src/Chapter08.Tests/Chapter08.Tests.csproj
+++ b/src/Chapter08.Tests/Chapter08.Tests.csproj
@@ -5,13 +5,13 @@
     <ProductName>Chapter08.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter08\Chapter08.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Chapter09.Tests/Chapter09.Tests.csproj b/src/Chapter09.Tests/Chapter09.Tests.csproj
index 8e78adf22..d99fc43c3 100644
--- a/src/Chapter09.Tests/Chapter09.Tests.csproj
+++ b/src/Chapter09.Tests/Chapter09.Tests.csproj
@@ -5,13 +5,13 @@
     <ProductName>Chapter09.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter09\Chapter09.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Chapter10.Tests/Chapter10.Tests.csproj b/src/Chapter10.Tests/Chapter10.Tests.csproj
index 91c7265b3..acbc60065 100644
--- a/src/Chapter10.Tests/Chapter10.Tests.csproj
+++ b/src/Chapter10.Tests/Chapter10.Tests.csproj
@@ -5,6 +5,7 @@
     <ProductName>Chapter10.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
@@ -12,7 +13,6 @@
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter10\Chapter10.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Chapter12.Tests/Chapter12.Tests.csproj b/src/Chapter12.Tests/Chapter12.Tests.csproj
index 95db85a66..1c9d2ca64 100644
--- a/src/Chapter12.Tests/Chapter12.Tests.csproj
+++ b/src/Chapter12.Tests/Chapter12.Tests.csproj
@@ -5,13 +5,13 @@
     <ProductName>Chapter12.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter12\Chapter12.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Chapter13.Tests/Chapter13.Tests.csproj b/src/Chapter13.Tests/Chapter13.Tests.csproj
index bd31f36dd..2a4309f1b 100644
--- a/src/Chapter13.Tests/Chapter13.Tests.csproj
+++ b/src/Chapter13.Tests/Chapter13.Tests.csproj
@@ -5,13 +5,13 @@
     <ProductName>Chapter13.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter13\Chapter13.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Chapter14.Tests/Chapter14.Tests.csproj b/src/Chapter14.Tests/Chapter14.Tests.csproj
index 235795936..d79faaad4 100644
--- a/src/Chapter14.Tests/Chapter14.Tests.csproj
+++ b/src/Chapter14.Tests/Chapter14.Tests.csproj
@@ -5,6 +5,7 @@
     <ProductName>Chapter14.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
@@ -12,7 +13,6 @@
     <PackageReference Include="System.Reflection" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter14\Chapter14.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Chapter15.Tests/Chapter15.Tests.csproj b/src/Chapter15.Tests/Chapter15.Tests.csproj
index 13a3473a4..a9a7d4853 100644
--- a/src/Chapter15.Tests/Chapter15.Tests.csproj
+++ b/src/Chapter15.Tests/Chapter15.Tests.csproj
@@ -5,13 +5,13 @@
     <ProductName>Chapter15.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter15\Chapter15.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Chapter16.Tests/Chapter16.Tests.csproj b/src/Chapter16.Tests/Chapter16.Tests.csproj
index 36a78adcf..a53152f40 100644
--- a/src/Chapter16.Tests/Chapter16.Tests.csproj
+++ b/src/Chapter16.Tests/Chapter16.Tests.csproj
@@ -5,13 +5,13 @@
     <ProductName>Chapter16.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter16\Chapter16.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Chapter17.Tests/Chapter17.Tests.csproj b/src/Chapter17.Tests/Chapter17.Tests.csproj
index 2c10b3084..c447ec7da 100644
--- a/src/Chapter17.Tests/Chapter17.Tests.csproj
+++ b/src/Chapter17.Tests/Chapter17.Tests.csproj
@@ -5,13 +5,13 @@
     <ProductName>Chapter17.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter17\Chapter17.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Chapter18.Tests/Chapter18.Tests.csproj b/src/Chapter18.Tests/Chapter18.Tests.csproj
index fb6e5d65a..434d03f91 100644
--- a/src/Chapter18.Tests/Chapter18.Tests.csproj
+++ b/src/Chapter18.Tests/Chapter18.Tests.csproj
@@ -5,13 +5,13 @@
     <ProductName>Chapter18.Tests</ProductName>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter18\Chapter18.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Chapter19.Tests/Chapter19.Tests.csproj b/src/Chapter19.Tests/Chapter19.Tests.csproj
index 5e32adc6c..46c23f4fc 100644
--- a/src/Chapter19.Tests/Chapter19.Tests.csproj
+++ b/src/Chapter19.Tests/Chapter19.Tests.csproj
@@ -1,22 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>    
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
-
+  <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
-
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter19\Chapter19.csproj" />
   </ItemGroup>
-
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-
 </Project>
diff --git a/src/Chapter20.Tests/Chapter20.Tests.csproj b/src/Chapter20.Tests/Chapter20.Tests.csproj
index 9f758847e..9e3aa687f 100644
--- a/src/Chapter20.Tests/Chapter20.Tests.csproj
+++ b/src/Chapter20.Tests/Chapter20.Tests.csproj
@@ -1,22 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>    
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
-
+  <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
-
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter20\Chapter20.csproj" />
   </ItemGroup>
-
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-
 </Project>
diff --git a/src/Chapter21.Tests/Chapter21.Tests.csproj b/src/Chapter21.Tests/Chapter21.Tests.csproj
index e8eeecbe3..bd6837622 100644
--- a/src/Chapter21.Tests/Chapter21.Tests.csproj
+++ b/src/Chapter21.Tests/Chapter21.Tests.csproj
@@ -1,22 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>    
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
-
+  <Import Project="..\Versioning.targets" />
+  <Import Project="..\ChapterTests.targets"/>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0-beta" />
     <PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
   </ItemGroup>
-
   <ItemGroup>
-    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" />
     <ProjectReference Include="..\Chapter21\Chapter21.csproj" />
   </ItemGroup>
-
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-
 </Project>
diff --git a/src/ChapterTests.targets b/src/ChapterTests.targets
new file mode 100644
index 000000000..e21a61065
--- /dev/null
+++ b/src/ChapterTests.targets
@@ -0,0 +1,6 @@
+<Project>
+  <ItemGroup>
+    <PackageReference Include="IntelliTect.TestTools.Console" Version="1.0.0-*" Condition="!Exists('..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj')" />
+    <ProjectReference Include="..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj" Condition="Exists('..\submodules\TestTools\IntelliTect.TestTools.Console\IntelliTect.TestTools.Console.csproj')" />
+  </ItemGroup>
+</Project>
\ No newline at end of file