modernize ScanRat solution and project file, scanrat is now portable …

…library with profile 259
pragmatrix · Dec 9, 2015 · a8a6bcd · a8a6bcd
1 parent 11944f3
commit a8a6bcd
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 190 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,9 @@
 bin/
 obj/
-*.user
-*.suo
+/.vs/
 /packages/
+*.user
 *.nupkg
 *.ncrunchproject
 *.ncrunchsolution
 /_NCrunch_ScanRat/
-/.nuget/NuGet.exe
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
diff --git a/ScanRat.Tests/ScanRat.Tests.fsproj b/ScanRat.Tests/ScanRat.Tests.fsproj
@@ -9,12 +9,11 @@
     <OutputType>Library</OutputType>
     <RootNamespace>ScanRat.Tests</RootNamespace>
     <AssemblyName>ScanRat.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <Name>ScanRat.Tests</Name>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <TargetFrameworkProfile />
-    <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
+    <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -88,7 +87,6 @@
     </Otherwise>
   </Choose>
   <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/ScanRat.Tests/app.config b/ScanRat.Tests/app.config
@@ -4,9 +4,19 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
-        <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0" />
-        <bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.0.0" />
+        <bindingRedirect oldVersion="2.0.0.0" newVersion="4.4.0.0" />
+        <bindingRedirect oldVersion="2.3.0.0" newVersion="4.4.0.0" />
+        <bindingRedirect oldVersion="2.3.5.0" newVersion="4.4.0.0" />
+        <bindingRedirect oldVersion="4.0.0.0" newVersion="4.4.0.0" />
+        <bindingRedirect oldVersion="4.3.0.0" newVersion="4.4.0.0" />
+        <bindingRedirect oldVersion="3.3.1.0" newVersion="4.4.0.0" />
+        <bindingRedirect oldVersion="2.3.5.1" newVersion="4.4.0.0" />
+        <bindingRedirect oldVersion="3.78.3.1" newVersion="4.4.0.0" />
+        <bindingRedirect oldVersion="3.259.3.1" newVersion="4.4.0.0" />
+        <bindingRedirect oldVersion="4.3.1.0" newVersion="4.4.0.0" />
+        <bindingRedirect oldVersion="3.47.4.0" newVersion="4.4.0.0" />
+        <bindingRedirect oldVersion="3.78.4.0" newVersion="4.4.0.0" />
+        <bindingRedirect oldVersion="3.259.4.0" newVersion="4.4.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
@@ -15,6 +25,6 @@
     </assemblyBinding>
   </runtime>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
   </startup>
 </configuration>
diff --git a/ScanRat.sln b/ScanRat.sln
@@ -1,17 +1,12 @@
 
-Microsoft Visual Studio Solution File, Format Version 13.00
-# Visual Studio 2013
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ScanRat", "ScanRat\ScanRat.fsproj", "{8FD7D789-18D7-45A4-8D66-F7D1C37B8D3F}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ScanRat.Tests", "ScanRat.Tests\ScanRat.Tests.fsproj", "{B924A3B9-30A5-4A84-8FAD-3DD711907E09}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{41EA9610-2A7A-4E0E-9EB9-1512A7876BF9}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/ScanRat/combinators.fs → ScanRat/Combinators.fs b/ScanRat/combinators.fs → ScanRat/Combinators.fs
diff --git a/ScanRat/matcher.fs → ScanRat/Matcher.fs b/ScanRat/matcher.fs → ScanRat/Matcher.fs
diff --git a/ScanRat/ScanRat.fsproj b/ScanRat/ScanRat.fsproj
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>8fd7d789-18d7-45a4-8d66-f7d1c37b8d3f</ProjectGuid>
+    <ProjectGuid>{8fd7d789-18d7-45a4-8d66-f7d1c37b8d3f}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>ScanRat</RootNamespace>
     <AssemblyName>ScanRat</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+    <TargetProfile>netcore</TargetProfile>
+    <TargetFSharpCoreVersion>3.259.4.0</TargetFSharpCoreVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Name>ScanRat</Name>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <Tailcalls>true</Tailcalls>
+    <Tailcalls>false</Tailcalls>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <WarningLevel>5</WarningLevel>
@@ -33,36 +35,22 @@
     <WarningLevel>5</WarningLevel>
     <DocumentationFile>bin\Release\ScanRat.XML</DocumentationFile>
   </PropertyGroup>
-  <PropertyGroup>
-    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '11.0'">
-      <PropertyGroup>
-        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
+  <ItemGroup>
+    <Reference Include="FSharp.Core">
+      <Name>FSharp.Core</Name>
+      <AssemblyName>FSharp.Core.dll</AssemblyName>
+      <HintPath>$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETCore\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="Matcher.fs" />
     <Compile Include="Combinators.fs" />
     <Compile Include="ScanRat.fs" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Numerics" />
-  </ItemGroup>
+  <PropertyGroup>
+    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">12</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.Portable.FSharp.Targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">