Skip to content

Commit

Permalink
Merge pull request #41 from IntelliTect/v7.0-nuget
Browse files Browse the repository at this point in the history
Submodule and nuget support for TestTools
  • Loading branch information
kamonson authored Oct 30, 2018
2 parents 64c2068 + 8fa5c4d commit 61497b1
Show file tree
Hide file tree
Showing 21 changed files with 32 additions and 39 deletions.
2 changes: 1 addition & 1 deletion src/Chapter01.Tests/Chapter01.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Chapter02.Tests/Chapter02.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Chapter03.Tests/Chapter03.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/Chapter04.Tests/Chapter04.Tests.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/Chapter05.Tests/Chapter05.Tests.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Chapter06.Tests/Chapter06.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 2 additions & 3 deletions src/Chapter07.Tests/Chapter07.Tests.csproj
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion src/Chapter08.Tests/Chapter08.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Chapter09.Tests/Chapter09.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion src/Chapter10.Tests/Chapter10.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<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" />
<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="..\Chapter10\Chapter10.csproj" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Chapter12.Tests/Chapter12.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Chapter13.Tests/Chapter13.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Chapter14.Tests/Chapter14.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<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" />
<PackageReference Include="MSTest.TestFramework" Version="1.2.0-beta" />
<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>
Expand Down
2 changes: 1 addition & 1 deletion src/Chapter15.Tests/Chapter15.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Chapter16.Tests/Chapter16.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Chapter17.Tests/Chapter17.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Chapter18.Tests/Chapter18.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 2 additions & 6 deletions src/Chapter19.Tests/Chapter19.Tests.csproj
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 2 additions & 6 deletions src/Chapter20.Tests/Chapter20.Tests.csproj
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 2 additions & 6 deletions src/Chapter21.Tests/Chapter21.Tests.csproj
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 6 additions & 0 deletions src/ChapterTests.targets
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit 61497b1

Please sign in to comment.