Merge pull request #577 from martincostello/Test-Hatchet-Job

Test tidy up
justeattakeaway · Oct 12, 2019 · 4744d40 · 4744d40
2 parents 322a343 + 38baade
commit 4744d40
Show file tree

Hide file tree

Showing 26 changed files with 88 additions and 49 deletions.
diff --git a/Build.ps1 b/Build.ps1
@@ -26,6 +26,7 @@ $testProjects = @(
 
 if ($EnableIntegrationTests -eq $true) {
     $testProjects += (Join-Path $solutionPath "tests\JustSaying.IntegrationTests\JustSaying.IntegrationTests.csproj");
+    $testProjects += (Join-Path $solutionPath "tests\JustSaying.Extensions.DependencyInjection.StructureMap.Tests\JustSaying.Extensions.DependencyInjection.StructureMap.Tests.csproj");
 }
 
 $dotnetVersion = (Get-Content $sdkFile | Out-String | ConvertFrom-Json).sdk.version

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,11 +1,18 @@
 <Project>
   <PropertyGroup>
     <AnalyzersPackageVersion>2.9.2</AnalyzersPackageVersion>
-    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
+    <DotNetTestSdkVersion>16.2.0</DotNetTestSdkVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>2.2.0</MicrosoftExtensionsDependencyInjectionVersion>
+    <NewtonsoftJsonVersion>12.0.2</NewtonsoftJsonVersion>
+    <XUnitVersion>2.4.1</XUnitVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AwsSdkSnsVersion>3.3.101.30</AwsSdkSnsVersion>
+    <AwsSdkSqsVersion>3.3.100.41</AwsSdkSqsVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19324-01" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
     <PackageReference Include="OpenCover" Version="4.7.922" PrivateAssets="All" />
     <PackageReference Include="ReportGenerator" Version="4.2.2" PrivateAssets="All" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="$(AnalyzersPackageVersion)" PrivateAssets="All" />
@@ -16,14 +23,13 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)justeat-oss.snk</AssemblyOriginatorKeyFile>
     <Authors>JUSTEAT_OSS</Authors>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
     <Company>Just Eat</Company>
     <Copyright>Copyright (c) Just Eat 2015-$([System.DateTime]::Now.ToString(yyyy))</Copyright>
     <Description>A light-weight message bus on top of AWS SNS and SQS</Description>
     <MinVerMinimumMajorMinor>7.0</MinVerMinimumMajorMinor>
     <MinVerTagPrefix>v</MinVerTagPrefix>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <!-- Disable Source Link on Mono, to workaround https://github.com/dotnet/sourcelink/issues/155 -->
-    <EnableSourceLink Condition=" '$(OS)' != 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">false</EnableSourceLink>
     <EnableSourceControlManagerQueries>$(EnableSourceLink)</EnableSourceControlManagerQueries>
     <PackageIconUrl>https://avatars3.githubusercontent.com/u/1516790?s=64</PackageIconUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -36,8 +42,7 @@
     <RepositoryType>git</RepositoryType>
     <LangVersion>latest</LangVersion>
     <RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
-    <SignAssembly>false</SignAssembly>
-    <DefineConstants Condition=" '$(SignAssembly)' == 'true' ">$(DefineConstants);STRONG_NAME</DefineConstants>
+    <SignAssembly>true</SignAssembly>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <CLSCompliant>true</CLSCompliant>
     <ComVisible>false</ComVisible>

diff --git a/JustSaying.sln b/JustSaying.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.10
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29318.209
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4B4A4A0C-31C2-482B-A7D8-094C60C4D0B5}"
 	ProjectSection(SolutionItems) = preProject
@@ -16,9 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		global.json = global.json
 		LICENSE.md = LICENSE.md
 		README.md = README.md
-		release.ps1 = release.ps1
-		SetAppVeyorBuildVersion.ps1 = SetAppVeyorBuildVersion.ps1
-		version.props = version.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JustSaying.Models", "src\JustSaying.Models\JustSaying.Models.csproj", "{C94866D0-29A6-43F2-B3BC-DFBC51A665C4}"
@@ -71,6 +68,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JustSaying.Sample.Restauran
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JustSaying.Sample.Restaurant.OrderingApi", "samples\src\JustSaying.Sample.Restaurant.OrderingApi\JustSaying.Sample.Restaurant.OrderingApi.csproj", "{A4D0E032-3AF1-437F-AF6B-4B602B8D4C49}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JustSaying.Extensions.DependencyInjection.StructureMap.Tests", "tests\JustSaying.Extensions.DependencyInjection.StructureMap.Tests\JustSaying.Extensions.DependencyInjection.StructureMap.Tests.csproj", "{6AF4E086-6784-489C-9AB1-36F637A30094}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -121,6 +120,10 @@ Global
 		{A4D0E032-3AF1-437F-AF6B-4B602B8D4C49}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A4D0E032-3AF1-437F-AF6B-4B602B8D4C49}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4D0E032-3AF1-437F-AF6B-4B602B8D4C49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AF4E086-6784-489C-9AB1-36F637A30094}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AF4E086-6784-489C-9AB1-36F637A30094}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AF4E086-6784-489C-9AB1-36F637A30094}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6AF4E086-6784-489C-9AB1-36F637A30094}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -141,6 +144,7 @@ Global
 		{08CC5D22-2C3A-4B17-841E-55C4CCA40253} = {77C93C37-DE5B-448F-9A23-6C9D0C8465CA}
 		{B42B2446-00F6-407E-8C62-E3831B61C8B6} = {77C93C37-DE5B-448F-9A23-6C9D0C8465CA}
 		{A4D0E032-3AF1-437F-AF6B-4B602B8D4C49} = {77C93C37-DE5B-448F-9A23-6C9D0C8465CA}
+		{6AF4E086-6784-489C-9AB1-36F637A30094} = {E22A50F2-9952-4483-8AD1-09BE354FB3E4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {18FBDF85-C124-4444-9F03-D0D4F2B3A612}

diff --git a/build.sh b/build.sh
@@ -26,4 +26,5 @@ dotnet build ./src/JustSaying.Extensions.DependencyInjection.Microsoft/JustSayin
 dotnet build ./src/JustSaying.Extensions.DependencyInjection.StructureMap/JustSaying.Extensions.DependencyInjection.StructureMap.csproj --output $artifacts --configuration $configuration --framework "netstandard2.0" || exit 1
 
 dotnet test ./tests/JustSaying.UnitTests/JustSaying.UnitTests.csproj
+dotnet test ./tests/JustSaying.Extensions.DependencyInjection.StructureMap.Tests/JustSaying.Extensions.DependencyInjection.StructureMap.Tests.csproj
 dotnet test ./tests/JustSaying.IntegrationTests/JustSaying.IntegrationTests.csproj
diff --git a/src/JustSaying/Properties/InternalsVisibleTo.cs b/src/JustSaying/Properties/InternalsVisibleTo.cs
@@ -1,9 +1,4 @@
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 
-#if STRONG_NAME
-[assembly: InternalsVisibleTo("JustSaying.UnitTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009d30c64bc42ba5037aec3cf60334df3a4c140ffc1dab19fdd31c9765e4e29afa441396ff9437a764b618c6473a3b350c56d706a0fbe83915f1f250ee23eb548b30306187ac685f65caa48303dc86f08c1c24d99dc84966273c207eaa8570b440004c7f49cef4ec77bc69118610ae2b53db7d8abeb465cbcd4bd190feaf517aad")]
 [assembly: InternalsVisibleTo("JustSaying.IntegrationTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009d30c64bc42ba5037aec3cf60334df3a4c140ffc1dab19fdd31c9765e4e29afa441396ff9437a764b618c6473a3b350c56d706a0fbe83915f1f250ee23eb548b30306187ac685f65caa48303dc86f08c1c24d99dc84966273c207eaa8570b440004c7f49cef4ec77bc69118610ae2b53db7d8abeb465cbcd4bd190feaf517aad")]
-#else
-[assembly: InternalsVisibleTo("JustSaying.UnitTests")]
-[assembly: InternalsVisibleTo("JustSaying.IntegrationTests")]
-#endif
+[assembly: InternalsVisibleTo("JustSaying.UnitTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009d30c64bc42ba5037aec3cf60334df3a4c140ffc1dab19fdd31c9765e4e29afa441396ff9437a764b618c6473a3b350c56d706a0fbe83915f1f250ee23eb548b30306187ac685f65caa48303dc86f08c1c24d99dc84966273c207eaa8570b440004c7f49cef4ec77bc69118610ae2b53db7d8abeb465cbcd4bd190feaf517aad")]
diff --git a/...on.StructureMap.Tests/JustSaying.Extensions.DependencyInjection.StructureMap.Tests.csproj b/...on.StructureMap.Tests/JustSaying.Extensions.DependencyInjection.StructureMap.Tests.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);CA1707;CA2007</NoWarn>
+    <RootNamespace>JustSaying</RootNamespace>
+    <SignAssembly>false</SignAssembly>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\JustSaying.Extensions.DependencyInjection.StructureMap\JustSaying.Extensions.DependencyInjection.StructureMap.csproj" />
+    <ProjectReference Include="..\JustSaying.TestingFramework\JustSaying.TestingFramework.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="$(AwsSdkSnsVersion)" />
+    <PackageReference Include="AWSSDK.SQS" Version="$(AwsSdkSqsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(DotNetTestSdkVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
+    <PackageReference Include="StructureMap" Version="4.7.1" />
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/...ion/StructureMap/WhenUsingStructureMap.cs → ...n.StructureMap.Tests/StructureMapTests.cs b/...ion/StructureMap/WhenUsingStructureMap.cs → ...n.StructureMap.Tests/StructureMapTests.cs
@@ -4,12 +4,13 @@
 using JustSaying.Messaging;
 using JustSaying.Messaging.MessageHandling;
 using JustSaying.TestingFramework;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
 using StructureMap;
 using Xunit.Abstractions;
 
-namespace JustSaying.IntegrationTests.Fluent.DependencyInjection.StructureMap
+namespace JustSaying
 {
     public class WhenUsingStructureMap
     {

diff --git a/tests/JustSaying.Extensions.DependencyInjection.StructureMap.Tests/xunit.runner.json b/tests/JustSaying.Extensions.DependencyInjection.StructureMap.Tests/xunit.runner.json
@@ -0,0 +1,4 @@
+{
+  "methodDisplay": "classAndMethod",
+  "methodDisplayOptions": "replaceUnderscoreWithSpace"
+}
diff --git a/tests/JustSaying.IntegrationTests/Fluent/AwsTools/WhenCreatingErrorQueue.cs b/tests/JustSaying.IntegrationTests/Fluent/AwsTools/WhenCreatingErrorQueue.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using JustSaying.AwsTools;
 using JustSaying.AwsTools.QueueCreation;
+using JustSaying.TestingFramework;
 using Microsoft.Extensions.Logging;
 using Shouldly;
 using Xunit.Abstractions;

diff --git a/tests/JustSaying.IntegrationTests/Fluent/AwsTools/WhenCreatingQueueTwice.cs b/tests/JustSaying.IntegrationTests/Fluent/AwsTools/WhenCreatingQueueTwice.cs
@@ -3,6 +3,7 @@
 using JustSaying.AwsTools;
 using JustSaying.AwsTools.MessageHandling;
 using JustSaying.Messaging.MessageSerialization;
+using JustSaying.TestingFramework;
 using Microsoft.Extensions.Logging;
 using Shouldly;
 using Xunit.Abstractions;

diff --git a/tests/JustSaying.IntegrationTests/Fluent/AwsTools/WhenRemovingServerSideEncryption.cs b/tests/JustSaying.IntegrationTests/Fluent/AwsTools/WhenRemovingServerSideEncryption.cs
@@ -2,6 +2,7 @@
 using JustSaying.AwsTools;
 using JustSaying.AwsTools.MessageHandling;
 using JustSaying.AwsTools.QueueCreation;
+using JustSaying.TestingFramework;
 using Microsoft.Extensions.Logging;
 using Shouldly;
 using Xunit.Abstractions;

diff --git a/tests/JustSaying.IntegrationTests/Fluent/AwsTools/WhenUpdatingDeliveryDelay.cs b/tests/JustSaying.IntegrationTests/Fluent/AwsTools/WhenUpdatingDeliveryDelay.cs
@@ -3,6 +3,7 @@
 using JustSaying.AwsTools;
 using JustSaying.AwsTools.MessageHandling;
 using JustSaying.AwsTools.QueueCreation;
+using JustSaying.TestingFramework;
 using Microsoft.Extensions.Logging;
 using Shouldly;
 using Xunit.Abstractions;

diff --git a/tests/JustSaying.IntegrationTests/Fluent/AwsTools/WhenUpdatingRedrivePolicy.cs b/tests/JustSaying.IntegrationTests/Fluent/AwsTools/WhenUpdatingRedrivePolicy.cs
@@ -2,6 +2,7 @@
 using JustSaying.AwsTools;
 using JustSaying.AwsTools.MessageHandling;
 using JustSaying.AwsTools.QueueCreation;
+using JustSaying.TestingFramework;
 using Microsoft.Extensions.Logging;
 using Shouldly;
 using Xunit.Abstractions;

diff --git a/tests/JustSaying.IntegrationTests/Fluent/AwsTools/WhenUpdatingRetentionPeriod.cs b/tests/JustSaying.IntegrationTests/Fluent/AwsTools/WhenUpdatingRetentionPeriod.cs
@@ -3,6 +3,7 @@
 using JustSaying.AwsTools;
 using JustSaying.AwsTools.MessageHandling;
 using JustSaying.AwsTools.QueueCreation;
+using JustSaying.TestingFramework;
 using Microsoft.Extensions.Logging;
 using Shouldly;
 using Xunit.Abstractions;

diff --git a/...pendencyInjection/Microsoft/WhenRegisteringAHandlerViaContainerWithMissingRegistration.cs b/...pendencyInjection/Microsoft/WhenRegisteringAHandlerViaContainerWithMissingRegistration.cs
@@ -1,5 +1,6 @@
 using System;
 using JustSaying.IntegrationTests.TestHandlers;
+using JustSaying.TestingFramework;
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
 using Xunit;

diff --git a/...onTests/Fluent/DependencyInjection/Microsoft/WhenRegisteringASingleHandlerViaContainer.cs b/...onTests/Fluent/DependencyInjection/Microsoft/WhenRegisteringASingleHandlerViaContainer.cs
@@ -3,6 +3,7 @@
 using JustSaying.IntegrationTests.TestHandlers;
 using JustSaying.Messaging;
 using JustSaying.Messaging.MessageHandling;
+using JustSaying.TestingFramework;
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
 using Xunit.Abstractions;

diff --git a/...Tests/Fluent/DependencyInjection/Microsoft/WhenRegisteringMultipleHandlersViaContainer.cs b/...Tests/Fluent/DependencyInjection/Microsoft/WhenRegisteringMultipleHandlersViaContainer.cs
@@ -1,6 +1,7 @@
 using System;
 using JustSaying.IntegrationTests.TestHandlers;
 using JustSaying.Messaging.MessageHandling;
+using JustSaying.TestingFramework;
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
 using Xunit;

diff --git a/...g.IntegrationTests/Fluent/DependencyInjection/Microsoft/WhenUsingCustomHandlerResolver.cs b/...g.IntegrationTests/Fluent/DependencyInjection/Microsoft/WhenUsingCustomHandlerResolver.cs
@@ -3,6 +3,7 @@
 using JustSaying.IntegrationTests.TestHandlers;
 using JustSaying.Messaging;
 using JustSaying.Messaging.MessageHandling;
+using JustSaying.TestingFramework;
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
 using Xunit.Abstractions;

diff --git a/...tSaying.IntegrationTests/Fluent/Publishing/WhenRegisteringAPublisherForMultipleRegions.cs b/...tSaying.IntegrationTests/Fluent/Publishing/WhenRegisteringAPublisherForMultipleRegions.cs
@@ -6,6 +6,7 @@
 using Amazon.SimpleNotificationService.Model;
 using JustSaying.Messaging;
 using JustSaying.Models;
+using JustSaying.TestingFramework;
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
 using Xunit.Abstractions;

diff --git a/...tegrationTests/Fluent/Subscribing/WhenRegisteringASqsTopicSubscriberForMultipleRegions.cs b/...tegrationTests/Fluent/Subscribing/WhenRegisteringASqsTopicSubscriberForMultipleRegions.cs
@@ -6,6 +6,7 @@
 using Amazon;
 using Amazon.SimpleNotificationService.Model;
 using JustSaying.Messaging;
+using JustSaying.TestingFramework;
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
 using Xunit.Abstractions;

diff --git a/....IntegrationTests/Fluent/Subscribing/WhenRegisteringLongNameMessageTypeTopicSubscriber.cs b/....IntegrationTests/Fluent/Subscribing/WhenRegisteringLongNameMessageTypeTopicSubscriber.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using JustSaying.Messaging;
 using JustSaying.Models;
+using JustSaying.TestingFramework;
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
 using Xunit.Abstractions;

diff --git a/tests/JustSaying.IntegrationTests/JustSaying.IntegrationTests.csproj b/tests/JustSaying.IntegrationTests/JustSaying.IntegrationTests.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <NoWarn>$(NoWarn);CA1001;CA1034;CA1707;CA1812;CA1822;CA2007</NoWarn>
+    <RootNamespace>JustSaying</RootNamespace>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
@@ -12,14 +11,12 @@
     <ProjectReference Include="..\JustSaying.TestingFramework\JustSaying.TestingFramework.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AWSSDK.Core" Version="3.3.103.5" />
-    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.3.101.30" />
-    <PackageReference Include="AWSSDK.SQS" Version="3.3.100.41" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="StructureMap" Version="4.7.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="$(AwsSdkSnsVersion)" />
+    <PackageReference Include="AWSSDK.SQS" Version="$(AwsSdkSqsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(DotNetTestSdkVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
   </ItemGroup>
 </Project>
diff --git a/...ying.IntegrationTests/AwsFactAttribute.cs → ...ying.TestingFramework/AwsFactAttribute.cs b/...ying.IntegrationTests/AwsFactAttribute.cs → ...ying.TestingFramework/AwsFactAttribute.cs
@@ -1,8 +1,7 @@
 using System;
-using JustSaying.TestingFramework;
 using Xunit;
 
-namespace JustSaying.IntegrationTests
+namespace JustSaying.TestingFramework
 {
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
     public sealed class AwsFactAttribute : FactAttribute

diff --git a/...ng.IntegrationTests/AwsTheoryAttribute.cs → ...ng.TestingFramework/AwsTheoryAttribute.cs b/...ng.IntegrationTests/AwsTheoryAttribute.cs → ...ng.TestingFramework/AwsTheoryAttribute.cs
@@ -1,8 +1,7 @@
 using System;
-using JustSaying.TestingFramework;
 using Xunit;
 
-namespace JustSaying.IntegrationTests
+namespace JustSaying.TestingFramework
 {
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
     public sealed class AwsTheoryAttribute : TheoryAttribute

diff --git a/tests/JustSaying.TestingFramework/JustSaying.TestingFramework.csproj b/tests/JustSaying.TestingFramework/JustSaying.TestingFramework.csproj
@@ -5,16 +5,13 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\JustSaying\JustSaying.csproj" />
     <ProjectReference Include="..\..\src\JustSaying.Extensions.DependencyInjection.Microsoft\JustSaying.Extensions.DependencyInjection.Microsoft.csproj" />
-    <ProjectReference Include="..\..\src\JustSaying.Extensions.DependencyInjection.StructureMap\JustSaying.Extensions.DependencyInjection.StructureMap.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AutoFixture" Version="4.10.0" />
-    <PackageReference Include="JustBehave" Version="2.0.0-beta-62" />
-    <PackageReference Include="JustBehave.xUnit" Version="2.0.0-beta-62" />
     <PackageReference Include="MartinCostello.Logging.XUnit" Version="0.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
     <PackageReference Include="NSubstitute" Version="4.2.0" />
     <PackageReference Include="Shouldly" Version="3.0.2" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
   </ItemGroup>
 </Project>
diff --git a/tests/JustSaying.UnitTests/JustSaying.UnitTests.csproj b/tests/JustSaying.UnitTests/JustSaying.UnitTests.csproj
@@ -1,9 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <NoWarn>$(NoWarn);CA1034;CA1051;CA1707;CA2007</NoWarn>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
@@ -12,11 +10,11 @@
     <ProjectReference Include="..\JustSaying.TestingFramework\JustSaying.TestingFramework.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AWSSDK.Core" Version="3.3.103.5" />
-    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.3.101.30" />
-    <PackageReference Include="AWSSDK.SQS" Version="3.3.100.41" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="AWSSDK.SimpleNotificationService" Version="$(AwsSdkSnsVersion)" />
+    <PackageReference Include="AWSSDK.SQS" Version="$(AwsSdkSqsVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(DotNetTestSdkVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
   </ItemGroup>
 </Project>