Updated to latest test library

RocketSurgeonsGuild · Sep 22, 2019 · a528270 · a528270
1 parent ddeecdd
commit a528270
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 16 deletions.
diff --git a/.build/.build.csproj b/.build/.build.csproj
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Rocket.Surgery.Nuke.DotNetCore" Version="0.5.0" />
-    <PackageReference Include="Nuke.Common" Version="0.22.0" />
+    <PackageReference Include="Rocket.Surgery.Nuke.DotNetCore" Version="0.5.1" />
+    <PackageReference Include="Nuke.Common" Version="0.22.1" />
     <PackageReference Include="GitVersion.CommandLine.DotNetCore" Version="5.0.1" />
     <PackageReference Include="ReportGenerator" Version="4.2.20" />
   </ItemGroup>

diff --git a/.build/Build.cs b/.build/Build.cs
@@ -1,10 +1,12 @@
 using Nuke.Common;
 using Nuke.Common.Execution;
 using Rocket.Surgery.Nuke.DotNetCore;
+using Rocket.Surgery.Nuke;
 
 [CheckBuildProjectConfigurations]
 [UnsetVisualStudioEnvironmentVariables]
-class Program : DotNetCoreBuild
+[PackageIcon("https://raw.githubusercontent.com/RocketSurgeonsGuild/graphics/master/png/social-square-thrust-rounded.png")]
+class Build : DotNetCoreBuild
 {
     /// <summary>
     /// Support plugins are available for:
@@ -14,7 +16,7 @@ class Program : DotNetCoreBuild
     ///   - Microsoft VSCode           https://nuke.build/vscode
     /// </summary>
 
-    public static int Main() => Execute<Program>(x => x.Default);
+    public static int Main() => Execute<Build>(x => x.Default);
 
     Target Default => _ => _.DependsOn(DotNetCore);
 }
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,6 +5,9 @@
         <Authors>David Driscoll</Authors>
         <LangVersion>8.0</LangVersion>
         <Nullable>enable</Nullable>
-        <PackageIconUrl>https://raw.githubusercontent.com/RocketSurgeonsGuild/graphics/master/png/rsg-patch-circle-color.png</PackageIconUrl>
+        <PackageIcon>images/packageicon.png</PackageIcon>
     </PropertyGroup>
+    <ItemGroup>
+        <None Include="$(MSBuildThisFileDirectory)/.tmp/packageicon.png" Condition="Exists('$(MSBuildThisFileDirectory)/.tmp/packageicon.png')" Pack="true" PackagePath="/images/"/>
+    </ItemGroup>
 </Project>
diff --git a/Packages.props b/Packages.props
@@ -20,23 +20,25 @@
     <PackageReference Update="System.Reflection.Emit.Lightweight" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'!='netstandard1.3' and '$(TargetFramework)'!='netstandard2.0' and '$(TargetFramework)'!='netcoreapp2.1'">
+    <PackageReference Update="Microsoft.Extensions.Configuration" Version="3.0.0-rc1.19456.10" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.0-rc1.19456.10" />
     <PackageReference Update="System.Interactive" Version="4.0.0-preview.8.build.9" />
     <PackageReference Update="System.Interactive.Async.Providers" Version="4.0.0-preview.8.build.9" />
     <PackageReference Update="System.Interactive.Providers" Version="4.0.0-preview.8.build.9" />
     <PackageReference Update="System.Reactive" Version="4.2.0-preview.625" />
     <PackageReference Update="System.Reactive.Observable.Aliases" Version="4.2.0-preview.625" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="Rocket.Surgery.Extensions.Testing" Version="1.2.3" />
+    <PackageReference Update="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="2.0.0" />
     <PackageReference Update="Autofac.Extras.FakeItEasy" Version="5.0.1" />
-    <PackageReference Update="Bogus" Version="28.2.1" />
-    <PackageReference Update="coverlet.collector" Version="1.0.1" />
-    <PackageReference Update="coverlet.msbuild" Version="2.6.3" />
+    <PackageReference Update="Bogus" Version="28.3.1" />
+    <PackageReference Update="coverlet.collector" Version="1.1.0" />
+    <PackageReference Update="coverlet.msbuild" Version="2.7.0" />
     <PackageReference Update="FakeItEasy" Version="5.2.0" />
     <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="5.2.0" />
     <PackageReference Update="FluentAssertions" Version="5.9.0" />
     <PackageReference Update="FluentAssertions.Analyzers" Version="0.11.4" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Update="xunit" Version="2.4.1" />
     <PackageReference Update="xunit.analyzers" Version="0.10.0" />
     <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />

diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
@@ -1,7 +1,7 @@
 <Project>
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="Rocket.Surgery.Extensions.Testing" />
+        <PackageReference Include="Rocket.Surgery.Extensions.Testing.FakeItEasy" />
         <PackageReference Include="Autofac.Extras.FakeItEasy" />
         <PackageReference Include="Bogus" />
         <PackageReference Include="coverlet.collector" />

diff --git a/test/Extensions.Tests/BindingTests.cs b/test/Extensions.Tests/BindingTests.cs
@@ -15,7 +15,7 @@
 
 namespace Rocket.Surgery.Extensions.Tests
 {
-    public class JsonBinderTests : AutoTestBase
+    public class JsonBinderTests : AutoFakeTest
     {
         public JsonBinderTests(ITestOutputHelper outputHelper) : base(outputHelper)
         {

diff --git a/test/Extensions.Tests/DeconstructorExtensionsTests.cs b/test/Extensions.Tests/DeconstructorExtensionsTests.cs
@@ -6,7 +6,7 @@
 
 namespace Rocket.Surgery.Extensions.Tests
 {
-    public class DeconstructorExtensionsTests : AutoTestBase
+    public class DeconstructorExtensionsTests : AutoFakeTest
     {
         public DeconstructorExtensionsTests(ITestOutputHelper outputHelper) : base(outputHelper)
         {

diff --git a/test/Extensions.Tests/Encoding/Base3264EncodingTests.cs b/test/Extensions.Tests/Encoding/Base3264EncodingTests.cs
@@ -12,7 +12,7 @@ namespace Rocket.Surgery.Extensions.Tests.Encoding
     /// TODO: Anyone feels like it some more comprehensive testing of the crockford encoding would be helpful. Cheers, Mhano
     /// TODO: Tests evolved a bit over time, refactoring to organise might be needed if adding significant test cases.
     /// </summary>
-    public class Base3264EncodingTests : AutoTestBase
+    public class Base3264EncodingTests : AutoFakeTest
     {
         private const string Chars = @"!""#$%&'()*+,-./:;<=>?@[\]^_`{|}~€‚ƒ„…†‡ˆ‰Š‹Œ¼½¾¿ÀÁÂÃÄÅÆÇÈÏÐÑÕ×ØÛÜÝÞßåæçéíðñõö÷øüýþÿabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ electricity 電	电	電 red 紅	红	紅";
 

diff --git a/test/Extensions.Tests/Encoding/Base32UrlTests.cs b/test/Extensions.Tests/Encoding/Base32UrlTests.cs
@@ -11,7 +11,7 @@ namespace Rocket.Surgery.Extensions.Tests.Encoding
     /// TODO: Anyone feels like it some more comprehensive testing of the crockford encoding would be helpful. Cheers, Mhano
     /// TODO: Tests evolved a bit over time, refactoring to organise might be needed if adding significant test cases.
     /// </summary>
-    public class Base32UrlTests : AutoTestBase
+    public class Base32UrlTests : AutoFakeTest
 	{
 		private static readonly string[][] rfc4684TestVectors = {
 																new []{"f", "MY======"},

diff --git a/test/Extensions.Tests/PropertyGetterTests.cs b/test/Extensions.Tests/PropertyGetterTests.cs
@@ -12,7 +12,7 @@
 
 namespace Rocket.Surgery.Extensions.Tests
 {
-    public class PropertyGetterTests : AutoTestBase
+    public class PropertyGetterTests : AutoFakeTest
     {
         public PropertyGetterTests(ITestOutputHelper outputHelper) : base(outputHelper)
         {