migrated to .net 4.6.1

removed /bin and /obj and other VS-generated things from the source
smalgin · Mar 14, 2017 · 87a2f0d · 87a2f0d
1 parent 602b56f
commit 87a2f0d
Show file tree

Hide file tree

Showing 41 changed files with 419 additions and 167 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,26 @@
+**.user
+**/obj
+**/bin
+**/res
+**.tlb
+**.tlh
+**.olb
+**.dll
+**.obj
+**.exe
+**.ncb
+**.suo
+**.bak
+**.log
+**.sdf
+**.opensdf
+**.ipch
+/vs
+/src/FingerTree/bin
+/src/FingerTree/obj
+/src/FingerTree.UnitTests/bin
+/src/FingerTree.UnitTests/obj
+/src/FNSeq/bin
+/src/FNSeq/obj
+/src/TestDotNetCollection/bin
+/src/TestDotNetCollection/obj
diff --git a/src/.vs/FingerTree/v14/.suo b/src/.vs/FingerTree/v14/.suo
diff --git a/src/FNSeq/FNSeq.csproj b/src/FNSeq/FNSeq.csproj
@@ -1,63 +1,66 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9CDD93A8-3350-4F13-A001-F640BF28B96D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FNSeq</RootNamespace>
-    <AssemblyName>FNSeq</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="FNSeq.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\FingerTree\FingerTree.csproj">
-      <Project>{51807875-B25D-4F87-8B8D-5100E5F26BAD}</Project>
-      <Name>FingerTree</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9CDD93A8-3350-4F13-A001-F640BF28B96D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>FNSeq</RootNamespace>
+    <AssemblyName>FNSeq</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="FNSeq.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FingerTree\FingerTree.csproj">
+      <Project>{51807875-B25D-4F87-8B8D-5100E5F26BAD}</Project>
+      <Name>FingerTree</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
diff --git a/src/FNSeq/bin/Debug/FNSeq.dll b/src/FNSeq/bin/Debug/FNSeq.dll
diff --git a/src/FNSeq/bin/Debug/FNSeq.pdb b/src/FNSeq/bin/Debug/FNSeq.pdb
diff --git a/src/FNSeq/bin/Debug/FingerTree.dll b/src/FNSeq/bin/Debug/FingerTree.dll
diff --git a/src/FNSeq/bin/Debug/FingerTree.pdb b/src/FNSeq/bin/Debug/FingerTree.pdb
diff --git a/src/FNSeq/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/src/FNSeq/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/src/FNSeq/obj/Debug/FNSeq.csproj.FileListAbsolute.txt b/src/FNSeq/obj/Debug/FNSeq.csproj.FileListAbsolute.txt
diff --git a/src/FNSeq/obj/Debug/FNSeq.csprojResolveAssemblyReference.cache b/src/FNSeq/obj/Debug/FNSeq.csprojResolveAssemblyReference.cache
diff --git a/src/FNSeq/obj/Debug/FNSeq.dll b/src/FNSeq/obj/Debug/FNSeq.dll
diff --git a/src/FNSeq/obj/Debug/FNSeq.pdb b/src/FNSeq/obj/Debug/FNSeq.pdb
diff --git a/src/FingerTree.UnitTests/App.config b/src/FingerTree.UnitTests/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+    </startup>
+</configuration>
diff --git a/src/FingerTree.UnitTests/FingerTree.UnitTests.csproj b/src/FingerTree.UnitTests/FingerTree.UnitTests.csproj
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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>
+    <ProjectGuid>{78137E75-6466-4EDA-AACF-0EC4405741CA}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>FingerTree.UnitTests</RootNamespace>
+    <AssemblyName>FingerTree.UnitTests</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <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.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="OrderedSequenceUnitTests.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FingerTree\FingerTree.csproj">
+      <Project>{51807875-b25d-4f87-8b8d-5100e5f26bad}</Project>
+      <Name>FingerTree</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
diff --git a/src/FingerTree.UnitTests/OrderedSequenceUnitTests.cs b/src/FingerTree.UnitTests/OrderedSequenceUnitTests.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FingerTree.UnitTests
+{
+    public class OrderedSequenceUnitTests
+    {
+        public void TestCharOrderedSequence()
+        {
+            var os = new OrderedSequence<char, uint>(
+                new Key<char, uint>(uint.MinValue, (c) => { return c; }));
+
+            var src = new List<char>
+            {
+                'z',
+                'b',
+                'h',
+                'a',
+                'a',
+                'c',
+                'e',
+                'j'
+            };
+
+            foreach (var s in src)
+                os = os.Insert(s);
+
+            var expected = new List<char>
+            {
+                'a',
+                'a',
+                'b',
+                'c',
+                'e',
+                'h',
+                'j',
+                'z',
+            };
+
+            var tseq = os.ToSequence();
+
+            var tseqEnum = tseq.GetEnumerator();
+            tseqEnum.MoveNext();
+
+            foreach (var es in expected)
+            {
+                if (0 != es.CompareTo(tseqEnum.Current))
+                    throw new Exception("TestCharOrderedSequence failed.");
+                tseqEnum.MoveNext();
+            }
+        }
+
+        public void TestStringOrderedSequence()
+        {
+            var os = new OrderedSequence<string, string>(
+                new Key<string, string>(string.Empty, (s) => { return s; }));
+
+            var src = new List<string>
+            {
+                "zaz",
+                "zab",
+                "zah",
+                "aaz",
+                "abz",
+                "acd",
+                "eeh",
+                "heh"
+            };
+
+            foreach (var s in src)
+                os = os.Insert(s);
+
+            var expected = new List<string>
+            {
+                "aaz",
+                "abz",
+                "acd",
+                "eeh",
+                "heh",
+                "zab",
+                "zah",
+                "zaz",
+            };
+
+            var tseq = os.ToSequence();
+
+            var tseqEnum = tseq.GetEnumerator();
+            tseqEnum.MoveNext();
+
+            foreach (var es in expected)
+            {
+                if(0 != es.CompareTo(tseqEnum.Current))
+                    throw new Exception("TestStringOrderedSequence failed.");
+                tseqEnum.MoveNext();
+            }
+
+        }
+    }
+}
diff --git a/src/FingerTree.UnitTests/Program.cs b/src/FingerTree.UnitTests/Program.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FingerTree.UnitTests
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            var t1 = new OrderedSequenceUnitTests();
+            t1.TestCharOrderedSequence();
+            t1.TestStringOrderedSequence();
+
+            Console.ReadKey();
+        }
+    }
+}
diff --git a/src/FingerTree.UnitTests/Properties/AssemblyInfo.cs b/src/FingerTree.UnitTests/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("FingerTree.UnitTests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("FingerTree.UnitTests")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("78137e75-6466-4eda-aacf-0ec4405741ca")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]