Project now compatible with VS 2015

mzabani · Jul 26, 2017 · 4b35bd4 · 4b35bd4
1 parent 7d92bce
commit 4b35bd4
Show file tree

Hide file tree

Showing 13 changed files with 280 additions and 110 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,212 @@
-*.dll
-*.mdb
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
-/Fos/bin
-/Fos/obj
-/Fos.Tests/test-results
-/Fos.Tests/bin
-/StressTesting
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+build/
+bld/
+[Bb]in/
+[Oo]bj/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+## TODO: Comment the next line if you want to checkin your
+## web deploy settings but do note that will include unencrypted
+## passwords
+#*.pubxml
+
+*.publishproj
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+
+# Windows Azure Build Output
+csx/
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# LightSwitch generated files
+GeneratedArtifacts/
+_Pvt_Extensions/
+ModelManifest.xml
diff --git a/Fos.Tests/Browser/Browser.cs b/Fos.Tests/Browser/Browser.cs
@@ -1,25 +1,22 @@
+using FastCgiNet;
+using FastCgiNet.Requests;
+using FastCgiNet.Streams;
 using System;
-using System.Collections.Generic;
-using System.Net;
 using System.Linq;
+using System.Net;
 using System.Net.Sockets;
-using System.IO;
-using FastCgiNet;
-using FastCgiNet.Streams;
-using FastCgiNet.Requests;
 
 namespace Fos.Tests
 {
-	/// <summary>
-	/// This class helps you simulate a browser by creating the appropriate FastCgi records that a webserver would create.
-	/// </summary>
-	class Browser : IDisposable
+    /// <summary>
+    /// This class helps you simulate a browser by creating the appropriate FastCgi records that a webserver would create.
+    /// </summary>
+    class Browser : IDisposable
 	{
 		private System.Net.IPAddress FastCgiServer;
 		private int FastCgiServerPort;
         private int MaxPollTime = 10000000;
-
-        protected FastCgiStream ResponseStream;
+
         protected WebServerSocketRequest Request;
         protected ushort RequestId
         {
@@ -70,9 +67,6 @@ public void Dispose()
         {
             if (Request != null)
                 Request.Dispose();
-
-            if (ResponseStream != null)
-                ResponseStream.Dispose();
         }
 
 		public Browser(System.Net.IPAddress fcgiServer, int port)

diff --git a/Fos.Tests/CustomPagesTests.cs b/Fos.Tests/CustomPagesTests.cs
@@ -14,9 +14,9 @@ public class CustomPagesTests
 	{
 		private System.Net.IPAddress ListenOn;
 		private int ListenPort;
-		
-		[TestFixtureSetUp]
-		public void Setup()
+
+        [OneTimeSetUp]
+        public void Setup()
 		{
 			ListenOn = System.Net.IPAddress.Loopback;
 			ListenPort = 9007;

diff --git a/Fos.Tests/Fos.Tests.csproj b/Fos.Tests/Fos.Tests.csproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +9,8 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Fos.Tests</RootNamespace>
     <AssemblyName>Fos.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -19,6 +21,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -27,19 +30,23 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="nunit.framework">
-      <Private>False</Private>
+    <Reference Include="FastCgiNet, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\FastCgiNet.0.1.0\lib\net40\FastCgiNet.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="System.Core" />
-    <Reference Include="Owin">
-      <HintPath>..\..\FCgiDev\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.7.1\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="FastCgiNet">
-      <HintPath>..\packages\FastCgiNet.0.1.0\lib\net40\FastCgiNet.dll</HintPath>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+      <Private>True</Private>
     </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Startup.cs" />
@@ -66,12 +73,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Middleware\" />
-    <Folder Include="Browser\" />
-    <Folder Include="Logger\" />
-    <Folder Include="Streams\" />
+    <None Include="packages.config" />
   </ItemGroup>
 </Project>
diff --git a/Fos.Tests/Logger/AbruptConnectionClosing.cs b/Fos.Tests/Logger/AbruptConnectionClosing.cs
@@ -12,7 +12,7 @@ namespace Fos.Tests
     [TestFixture]
     public class AbruptConnectionClosing : SocketTests
     {
-        [Ignore]
+        [Ignore("CloseConnectionAbruptlyBeforeSendingAnyRecord")]
         public void CloseConnectionAbruptlyBeforeSendingAnyRecord()
         {
             var logger = new OneRequestTestLogger();
@@ -60,12 +60,12 @@ public void CloseConnectionAbruptlyAfterSendingBeginRequestRecord()
             }
         }
 
-        [Ignore]
+        [Ignore("CloseConnectionAbruptlyAfterSendingIncompleteDataWithoutEmptyParamsRecord")]
         public void CloseConnectionAbruptlyAfterSendingIncompleteDataWithoutEmptyParamsRecord()
         {
         }
 
-        [Ignore]
+        [Ignore("CloseConnectionAbruptlyAfterSendingIncompleteDataWithEmptyParamsRecord")]
         public void CloseConnectionAbruptlyAfterSendingIncompleteDataWithEmptyParamsRecord()
         {
         }

diff --git a/Fos.Tests/OwinContextTests.cs b/Fos.Tests/OwinContextTests.cs
@@ -12,7 +12,7 @@ public class OwinContextTests
 	{
 		private CancellationTokenSource TokenSource;
 
-		[TestFixtureSetUp]
+        [OneTimeSetUp]
 		public void Setup()
 		{
 			TokenSource = new CancellationTokenSource();

diff --git a/Fos.Tests/packages.config b/Fos.Tests/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FastCgiNet" version="0.1.0" targetFramework="net40" />
+  <package id="NUnit" version="3.7.1" targetFramework="net40" />
   <package id="Owin" version="1.0" targetFramework="net40" />
 </packages>