even more changes... still nothing

akkadotnet · Sep 3, 2017 · d89eda8 · d89eda8
1 parent 39f86ba
commit d89eda8
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 17 deletions.
diff --git a/Hyperion.Tests.FSharpData/AssemblyInfo.fs b/Hyperion.Tests.FSharpData/AssemblyInfo.fs
@@ -22,7 +22,7 @@ open System.Runtime.InteropServices
 [<assembly: ComVisible(false)>]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[<assembly: Guid("95180489-6e07-4658-afe9-6228b304708c")>]
+[<assembly: Guid("11c1fa09-ffd3-4243-a592-8e2326078bcf")>]
 
 // Version information for an assembly consists of the following four values:
 // 

diff --git a/Hyperion.Tests.FSharpData/Hyperion.Tests.FSharpData.fsproj b/Hyperion.Tests.FSharpData/Hyperion.Tests.FSharpData.fsproj
@@ -5,11 +5,11 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>95180489-6e07-4658-afe9-6228b304708c</ProjectGuid>
+    <ProjectGuid>11c1fa09-ffd3-4243-a592-8e2326078bcf</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>Hyperion.Tests.FSharpData</RootNamespace>
     <AssemblyName>Hyperion.Tests.FSharpData</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>Hyperion.Tests.FSharpData</Name>
@@ -55,15 +55,17 @@
     <Content Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="mscorlib" />
     <Reference Include="FSharp.Core">
-      <HintPath>..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.dll</HintPath>
+      <Name>FSharp.Core</Name>
+      <AssemblyName>FSharp.Core.dll</AssemblyName>
+      <HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
     </Reference>
-    <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.ValueTuple">
-      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+      <HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
     </Reference>
   </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Hyperion.Tests.FSharpData/packages.config b/Hyperion.Tests.FSharpData/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FSharp.Core" version="4.2.3" targetFramework="net45" />
-  <package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />
+  <package id="System.ValueTuple" version="4.3.1" targetFramework="net46" />
 </packages>
diff --git a/Hyperion.Tests/Hyperion.Tests.csproj b/Hyperion.Tests/Hyperion.Tests.csproj
@@ -5,14 +5,15 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Hyperion.Tests.FSharpData\Hyperion.Tests.FSharpData.fsproj" />
     <ProjectReference Include="..\Hyperion\Hyperion.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="FSharp.Core" Version="4.2.3" />
     <PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.1" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
   </ItemGroup>

diff --git a/Hyperion.sln b/Hyperion.sln
@@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2F3D4EC4
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyperion.Benchmarks", "Hyperion.Benchmarks\Hyperion.Benchmarks.csproj", "{E75D8FEE-AC61-4A37-9731-9D316551E863}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Hyperion.Tests.FSharpData", "Hyperion.Tests.FSharpData\Hyperion.Tests.FSharpData.fsproj", "{11C1FA09-FFD3-4243-A592-8E2326078BCF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -37,6 +39,10 @@ Global
 		{E75D8FEE-AC61-4A37-9731-9D316551E863}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E75D8FEE-AC61-4A37-9731-9D316551E863}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E75D8FEE-AC61-4A37-9731-9D316551E863}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11C1FA09-FFD3-4243-A592-8E2326078BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11C1FA09-FFD3-4243-A592-8E2326078BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11C1FA09-FFD3-4243-A592-8E2326078BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11C1FA09-FFD3-4243-A592-8E2326078BCF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/build.fsx b/build.fsx
@@ -54,7 +54,7 @@ Target "Build" (fun _ ->
     let additionalArgs = if versionSuffix.Length > 0 then [sprintf "/p:VersionSuffix=%s" versionSuffix] else []  
 
     if (isWindows) then
-        let projects = !! "./**/*.csproj"// ++ "./**/*.fsproj"
+        let projects = !! "./**/*.csproj" ++ "./**/*.fsproj"
 
         let runSingleProject project =
             DotNetCli.Build

diff --git a/build.ps1 b/build.ps1
@@ -29,12 +29,12 @@ Param(
     [string[]]$ScriptArgs
 )
 
-$FakeVersion = "4.50.0"
+$FakeVersion = "4.63.0"
 $NBenchVersion = "0.3.4"
 $DotNetChannel = "preview";
-$DotNetVersion = "1.0.4";
-$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1";
-$NugetVersion = "3.5.0";
+$DotNetVersion = "2.0.0";
+$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/v$DotNetVersion/scripts/obtain/dotnet-install.ps1";
+$NugetVersion = "4.3.0";
 $NugetUrl = "https://dist.nuget.org/win-x86-commandline/v$NugetVersion/nuget.exe"
 
 # Make sure tools folder exists

diff --git a/build.sh b/build.sh
@@ -8,10 +8,10 @@ SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 TOOLS_DIR=$SCRIPT_DIR/tools
 NUGET_EXE=$TOOLS_DIR/nuget.exe
 NUGET_URL=https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe
-FAKE_VERSION=4.50.0
+FAKE_VERSION=4.63.0
 FAKE_EXE=$TOOLS_DIR/FAKE/tools/FAKE.exe
-DOTNET_VERSION=1.0.0
-DOTNET_INSTALLER_URL=https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh
+DOTNET_VERSION=2.0.0
+DOTNET_INSTALLER_URL=https://raw.githubusercontent.com/dotnet/cli/v$DOTNET_VERSION/scripts/obtain/dotnet-install.sh
 
 # Define default arguments.
 TARGET="Default"

diff --git a/common.props b/common.props
@@ -12,5 +12,6 @@
   </PropertyGroup>
   <PropertyGroup>
     <XunitVersion>2.3.0-beta4-*</XunitVersion>
+    <TestSdkVersion>15.3.0</TestSdkVersion>
   </PropertyGroup>
 </Project>