Upgraded to AutoFixture 4

mwhelan · mwhelan · commit dafeb60e37a5 · 2017-11-02T21:03:22.000Z
diff --git a/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj b/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net45</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Castle.Core" Version="4.1.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="NSubstitute" Version="2.0.3" />
-    <PackageReference Include="Shouldly" Version="2.8.3" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0-preview2-25405-01" />
-    <PackageReference Include="xunit" Version="2.3.0-beta3-build3705" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta3-build3705" />
+    <PackageReference Include="Castle.Core" Version="4.2.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20171031-01" />
+    <PackageReference Include="NSubstitute" Version="3.1.0" />
+    <PackageReference Include="Shouldly" Version="3.0.0-beta0003" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TestStack.Dossier/AnonymousValueFixture.cs b/TestStack.Dossier/AnonymousValueFixture.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using Ploeh.AutoFixture;
+using AutoFixture;
 using TestStack.Dossier.DataSources.Dictionaries;
 using TestStack.Dossier.Suppliers;
 
diff --git a/TestStack.Dossier/EquivalenceClasses/EnumEquivalenceClasses.cs b/TestStack.Dossier/EquivalenceClasses/EnumEquivalenceClasses.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 using System.Linq;
-using Ploeh.AutoFixture;
+using AutoFixture;
 
 namespace TestStack.Dossier.EquivalenceClasses
 {
diff --git a/TestStack.Dossier/EquivalenceClasses/IntegerEquivalenceClasses.cs b/TestStack.Dossier/EquivalenceClasses/IntegerEquivalenceClasses.cs
@@ -1,5 +1,5 @@
 ﻿using System.Linq;
-using Ploeh.AutoFixture;
+using AutoFixture;
 
 namespace TestStack.Dossier.EquivalenceClasses
 {
diff --git a/TestStack.Dossier/EquivalenceClasses/StringEquivalenceClasses.cs b/TestStack.Dossier/EquivalenceClasses/StringEquivalenceClasses.cs
@@ -1,6 +1,6 @@
 ﻿using System.Text;
-using Ploeh.AutoFixture;
-using Ploeh.AutoFixture.Kernel;
+using AutoFixture;
+using AutoFixture.Kernel;
 
 namespace TestStack.Dossier.EquivalenceClasses
 {
@@ -48,7 +48,8 @@ public object Resolve(object request)
         /// <returns>The generated string</returns>
         public static string StringStartingWith(this AnonymousValueFixture fixture, string prefix)
         {
-            return fixture.Fixture.Create(prefix);
+            //return fixture.Fixture.Create<string>(prefix);
+            return string.Format("{0}{1}", prefix, fixture.Fixture.Create<string>());
         }
 
         /// <summary>
diff --git a/TestStack.Dossier/Factories/AllPropertiesFactory.cs b/TestStack.Dossier/Factories/AllPropertiesFactory.cs
@@ -1,4 +1,4 @@
-using Ploeh.AutoFixture;
+using AutoFixture;
 
 namespace TestStack.Dossier.Factories
 {
diff --git a/TestStack.Dossier/Factories/AutoFixtureFactory.cs b/TestStack.Dossier/Factories/AutoFixtureFactory.cs
@@ -1,4 +1,4 @@
-using Ploeh.AutoFixture;
+using AutoFixture;
 
 namespace TestStack.Dossier.Factories
 {
diff --git a/TestStack.Dossier/Suppliers/DefaultValueTypeValueSupplier.cs b/TestStack.Dossier/Suppliers/DefaultValueTypeValueSupplier.cs
@@ -1,8 +1,8 @@
 ﻿using System;
 using System.Linq;
 using System.Reflection;
-using Ploeh.AutoFixture;
-using Ploeh.AutoFixture.Kernel;
+using AutoFixture;
+using AutoFixture.Kernel;
 
 namespace TestStack.Dossier.Suppliers
 {
diff --git a/TestStack.Dossier/TestStack.Dossier.csproj b/TestStack.Dossier/TestStack.Dossier.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.5;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.5;net452</TargetFrameworks>
     <AssemblyName>TestStack.Dossier</AssemblyName>
     <PackageId>TestStack.Dossier</PackageId>
-    <PackageVersion>3.5.0</PackageVersion>
+    <PackageVersion>4.0.0</PackageVersion>
     <Authors>Robert Moore, Michael Whelan, TestStack</Authors>
     <Description>
       TestStack.Dossier provides you with the code infrastructure to easily and quickly generate test fixture data for your automated tests in a terse, readable and maintainable way using the Test Data Builder, anonymous value and equivalence class patterns. Formerly called NTestDataBuilder.
@@ -149,8 +149,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Castle.Core" Version="4.1.1" />
-    <PackageReference Include="NSubstitute" Version="2.0.3" />
+    <PackageReference Include="AutoFixture" Version="4.0.0-rc1" />
+    <PackageReference Include="Castle.Core" Version="4.2.1" />
+    <PackageReference Include="NSubstitute" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
@@ -159,10 +160,4 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">
-    <PackageReference Include="AutoFixture">
-      <Version>4.0.0-alpha.230</Version>
-    </PackageReference>
-  </ItemGroup>
-
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Linq;`
`3`		`-using Ploeh.AutoFixture;`
	`3`	`+using AutoFixture;`
`4`	`4`
`5`	`5`	`namespace TestStack.Dossier.EquivalenceClasses`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using System.Linq;`
`2`		`-using Ploeh.AutoFixture;`
	`2`	`+using AutoFixture;`
`3`	`3`
`4`	`4`	`namespace TestStack.Dossier.EquivalenceClasses`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Text;`
`2`		`-using Ploeh.AutoFixture;`
`3`		`-using Ploeh.AutoFixture.Kernel;`
	`2`	`+using AutoFixture;`
	`3`	`+using AutoFixture.Kernel;`
`4`	`4`
`5`	`5`	`namespace TestStack.Dossier.EquivalenceClasses`
`6`	`6`	`{`
`@@ -48,7 +48,8 @@ public object Resolve(object request)`
`48`	`48`	`/// <returns>The generated string</returns>`
`49`	`49`	`public static string StringStartingWith(this AnonymousValueFixture fixture, string prefix)`
`50`	`50`	`{`
`51`		`- return fixture.Fixture.Create(prefix);`
	`51`	`+ //return fixture.Fixture.Create<string>(prefix);`
	`52`	`+ return string.Format("{0}{1}", prefix, fixture.Fixture.Create<string>());`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Ploeh.AutoFixture;`
	`1`	`+using AutoFixture;`
`2`	`2`
`3`	`3`	`namespace TestStack.Dossier.Factories`
`4`	`4`	`{`