Upgraded to AutoFixture 4 and support for netstandard1.5

mwhelan · mwhelan · commit d52c5b306016 · 2017-09-17T17:59:32.000+01:00
diff --git a/NuGet.config b/NuGet.config
@@ -0,0 +1,8 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+  <packageSources>
+    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="myget AutoFixture" value="https://www.myget.org/F/autofixture/api/v3/index.json" />
+  </packageSources>
+</configuration>
diff --git a/TestStack.Dossier.Tests/DataSources/Dictionaries/Resources/FileDataConventions.cs b/TestStack.Dossier.Tests/DataSources/Dictionaries/Resources/FileDataConventions.cs
@@ -13,7 +13,7 @@ public class FileDataConventions
         [Fact]
         public void ApplyConventions()
         {
-            var assembly = typeof(IAnonymousValueSupplier).Assembly;
+            var assembly = typeof(IAnonymousValueSupplier).GetTypeInfo().Assembly;
             var resources = assembly
                 .GetManifestResourceNames()
                 .Where(x => x.EndsWith(".txt"))
diff --git a/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj b/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Castle.Core" Version="4.1.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170727-01" />
+    <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" />
diff --git a/TestStack.Dossier/DataSources/Dictionaries/CachedFileDictionaryRepository.cs b/TestStack.Dossier/DataSources/Dictionaries/CachedFileDictionaryRepository.cs
@@ -22,7 +22,7 @@ public IList<string> GetWordsFrom(string dictionary)
             else
             {
                 var resourceName = string.Format("TestStack.Dossier.DataSources.Dictionaries.Resources.{0}", name);
-                words = GetWordsFromEmbeddedResource(GetType().Assembly, resourceName).ToList();
+                words = GetWordsFromEmbeddedResource(GetType().GetTypeInfo().Assembly, resourceName).ToList();
             }
 
             return words;
diff --git a/TestStack.Dossier/Suppliers/DefaultValueSupplier.cs b/TestStack.Dossier/Suppliers/DefaultValueSupplier.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Reflection;
 
 namespace TestStack.Dossier.Suppliers
 {
@@ -17,7 +18,7 @@ public bool CanSupplyValue(Type type, string propertyName)
         public object GenerateAnonymousValue(AnonymousValueFixture any, Type type, string propertyName)
         {
             // See stackoverflow: http://stackoverflow.com/questions/325426/programmatic-equivalent-of-defaulttype
-            if (type.IsValueType)
+            if (type.GetTypeInfo().IsValueType)
             {
                 return Activator.CreateInstance(type);
             }
diff --git a/TestStack.Dossier/Suppliers/DefaultValueTypeValueSupplier.cs b/TestStack.Dossier/Suppliers/DefaultValueTypeValueSupplier.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Linq;
+using System.Reflection;
 using Ploeh.AutoFixture;
 using Ploeh.AutoFixture.Kernel;
 
@@ -13,7 +14,7 @@ public class DefaultValueTypeValueSupplier : IAnonymousValueSupplier
         /// <inerhitdoc />
         public bool CanSupplyValue(Type type, string propertyName)
         {
-            return type.IsValueType;
+            return type.GetTypeInfo().IsValueType;
         }
 
         /// <inerhitdoc />
diff --git a/TestStack.Dossier/TestStack.Dossier.csproj b/TestStack.Dossier/TestStack.Dossier.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
+    <TargetFrameworks>netstandard1.5;net45</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -139,9 +139,20 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="3.50.4" />
     <PackageReference Include="Castle.Core" Version="4.1.1" />
     <PackageReference Include="NSubstitute" Version="2.0.3" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
+    <PackageReference Include="AutoFixture">
+      <Version>4.0.0-alpha.230</Version>
+    </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
`@@ -13,7 +13,7 @@ public class FileDataConventions`
`13`	`13`	`[Fact]`
`14`	`14`	`public void ApplyConventions()`
`15`	`15`	`{`
`16`		`- var assembly = typeof(IAnonymousValueSupplier).Assembly;`
	`16`	`+ var assembly = typeof(IAnonymousValueSupplier).GetTypeInfo().Assembly;`
`17`	`17`	`var resources = assembly`
`18`	`18`	`.GetManifestResourceNames()`
`19`	`19`	`.Where(x => x.EndsWith(".txt"))`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public IList<string> GetWordsFrom(string dictionary)`
`22`	`22`	`else`
`23`	`23`	`{`
`24`	`24`	`var resourceName = string.Format("TestStack.Dossier.DataSources.Dictionaries.Resources.{0}", name);`
`25`		`- words = GetWordsFromEmbeddedResource(GetType().Assembly, resourceName).ToList();`
	`25`	`+ words = GetWordsFromEmbeddedResource(GetType().GetTypeInfo().Assembly, resourceName).ToList();`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`return words;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Reflection;`
`2`	`3`
`3`	`4`	`namespace TestStack.Dossier.Suppliers`
`4`	`5`	`{`
`@@ -17,7 +18,7 @@ public bool CanSupplyValue(Type type, string propertyName)`
`17`	`18`	`public object GenerateAnonymousValue(AnonymousValueFixture any, Type type, string propertyName)`
`18`	`19`	`{`
`19`	`20`	`// See stackoverflow: http://stackoverflow.com/questions/325426/programmatic-equivalent-of-defaulttype`
`20`		`- if (type.IsValueType)`
	`21`	`+ if (type.GetTypeInfo().IsValueType)`
`21`	`22`	`{`
`22`	`23`	`return Activator.CreateInstance(type);`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Linq;`
	`3`	`+using System.Reflection;`
`3`	`4`	`using Ploeh.AutoFixture;`
`4`	`5`	`using Ploeh.AutoFixture.Kernel;`
`5`	`6`
`@@ -13,7 +14,7 @@ public class DefaultValueTypeValueSupplier : IAnonymousValueSupplier`
`13`	`14`	`/// <inerhitdoc />`
`14`	`15`	`public bool CanSupplyValue(Type type, string propertyName)`
`15`	`16`	`{`
`16`		`- return type.IsValueType;`
	`17`	`+ return type.GetTypeInfo().IsValueType;`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`/// <inerhitdoc />`