See if I can support .net 4.7; but that's causing issues

Seems to be related to:dotnet/roslyn#17157 - I'm guessing I should ignore this and let the dust settle first.
EamonNerbonne · May 5, 2017 · 7f6f115 · 7f6f115
1 parent d49a03f
commit 7f6f115
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 31 deletions.
diff --git a/ValueUtils/ValueUtils.csproj b/ValueUtils/ValueUtils.csproj
@@ -10,15 +10,15 @@
     <PackageTags>ValueObject DataTransferObject DTO GetHashCode Equals IEquatable ValueType value semantics hashcode</PackageTags>
     <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
     <PackageProjectUrl>http://eamonnerbonne.github.io/ValueUtils/</PackageProjectUrl>
-    <TargetFrameworks>netstandard1.5;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard1.5;net452;net47</TargetFrameworks>
       <!--;net452-->
     <RepositoryUrl>https://github.com/EamonNerbonne/ValueUtils</RepositoryUrl>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Framework)' == 'net452' ">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net452' or '$(TargetFramework)' == 'net47' ">
     <DefineConstants>dotnet_framework</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Framework)' == 'netstandard1.5' ">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.5' ">
     <DefineConstants>dotnet_core</DefineConstants>
   </PropertyGroup>
   <ItemGroup Condition="'$(Framework)' == 'net452'">
@@ -30,7 +30,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup Condition="'$(Framework)' == 'netstandard1.5'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">
     <PackageReference Include="System.Runtime" Version="4.3.0" />
   </ItemGroup>
 </Project>
diff --git a/ValueUtilsBenchmark/ValueUtilsBenchmark.csproj b/ValueUtilsBenchmark/ValueUtilsBenchmark.csproj
@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Configuration">
     <Authors>Eamon Nerbonne</Authors>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ExpressionToCodeLib" Version="2.0.0" />
+    <PackageReference Include="ExpressionToCodeLib" Version="2.1.0" />
     <PackageReference Include="JetBrains.Annotations" Version="10.4.0" />
     <PackageReference Include="morelinq" Version="2.4.1" />
+    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
     <ProjectReference Include="..\ValueUtils\ValueUtils.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/ValueUtilsBenchmark/Program.cs → ...lsBenchmark/ValueUtilsBenchmarkProgram.cs b/ValueUtilsBenchmark/Program.cs → ...lsBenchmark/ValueUtilsBenchmarkProgram.cs
@@ -3,14 +3,12 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 using ExpressionToCodeLib;
 using MoreLinq;
 
 namespace ValueUtilsBenchmark {
-    class Program {
+    public static class ValueUtilsBenchmarkProgram {
 
         //Note: the manual hash implementations are bastardized FNV since nobody in their right mind
         // would manually split field hash codes into octets and seperately hash those with FNV.
@@ -41,7 +39,8 @@ class Program {
                 new XElement("div",
                     complicatedTable, intpairTable, duplicationTable, symmetricalTable, nestedTable);
             Console.WriteLine(tables.ToString());
-            tables.Save("BenchResults.html");
+            using (var stream = File.OpenWrite("BenchResults.html"))
+                tables.Save(stream);
         }
 
         static IEnumerable<HashAnalysisResult> BenchmarkNastyNestedCases() {

diff --git a/ValueUtilsTest/ValueUtilsTest.csproj b/ValueUtilsTest/ValueUtilsTest.csproj
@@ -1,32 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>library</OutputType>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFrameworks>netcoreapp1.1;net462</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
     <ProjectReference Include="..\ValueUtils\ValueUtils.csproj" />
-    <PackageReference Include="ExpressionToCodeLib" Version="2.0.0" />
-    <PackageReference Include="xunit" Version="2.1.0" />
-    <PackageReference Include="xunit.abstractions" Version="2.0.0" />
-    <PackageReference Include="xunit.assert" Version="2.1.0" />
-    <PackageReference Include="xunit.core" Version="2.1.0" />
-    <PackageReference Include="xunit.extensibility.core" Version="2.1.0" />
-    <PackageReference Include="xunit.extensibility.execution" Version="2.1.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.1.0" />
+    <PackageReference Include="ExpressionToCodeLib" Version="2.1.0" />
+    <PackageReference Include="xunit" Version="2.3.0-beta1-build3642" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta1-build1309" />
+    <PackageReference Include="Assent" Version="0.8.0" />
     <PackageReference Include="JetBrains.Annotations" Version="10.4.0" />
     <PackageReference Include="System.Runtime" Version="4.3.0" />
   </ItemGroup>
-  <ItemGroup Condition="'$(Framework)' == 'net462'">
-    <PackageReference Include="System.Runtime" Version="4.3.0" />
-    <PackageReference Include="System.Reflection" Version="4.1.0" />
-
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+  <ItemGroup Condition="$(TargetFramework)=='netcoreapp1.1' ">
   </ItemGroup>
 </Project>