Merge pull request #1 from panesofglass/master

Update Web API lab
dmohl · Jul 7, 2013 · 51f3be6 · 51f3be6
2 parents 3d35d53 + 8bf01d6
commit 51f3be6
Show file tree

Hide file tree

Showing 357 changed files with 23,372 additions and 238 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,6 +49,7 @@ x64/
 build/
 [Bb]in/
 [Oo]bj/
+test/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
@@ -130,7 +131,8 @@ publish/
 
 # NuGet Packages Directory
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
+packages/
+.build/
 
 # Windows Azure Build Output
 csx

diff --git a/WebApi Lab/WebAPI Complete/GuitarExample/Console/Program.fs b/WebApi Lab/WebAPI Complete/GuitarExample/Console/Program.fs
diff --git a/WebApi Lab/WebAPI Complete/GuitarExample/Console/System.Net.Http.fs b/WebApi Lab/WebAPI Complete/GuitarExample/Console/System.Net.Http.fs
diff --git a/WebApi Lab/WebAPI Lab Starter/GuitarExample/Console/Program.fs b/WebApi Lab/WebAPI Lab Starter/GuitarExample/Console/Program.fs
diff --git a/WebApi Lab/WebAPI Lab Starter/GuitarExample/Console/System.Net.Http.fs b/WebApi Lab/WebAPI Lab Starter/GuitarExample/Console/System.Net.Http.fs
diff --git a/WebApi Lab/WebAPI Complete/.gitignore → WebApiLab/WebAPIComplete/.gitignore b/WebApi Lab/WebAPI Complete/.gitignore → WebApiLab/WebAPIComplete/.gitignore
diff --git a/...i Lab/WebAPI Complete/.nuget/NuGet.Config → WebApiLab/WebAPIComplete/.nuget/NuGet.Config b/...i Lab/WebAPI Complete/.nuget/NuGet.Config → WebApiLab/WebAPIComplete/.nuget/NuGet.Config
diff --git a/WebApi Lab/WebAPI Complete/.nuget/NuGet.exe → WebApiLab/WebAPIComplete/.nuget/NuGet.exe b/WebApi Lab/WebAPI Complete/.nuget/NuGet.exe → WebApiLab/WebAPIComplete/.nuget/NuGet.exe
diff --git a/... Lab/WebAPI Complete/.nuget/NuGet.targets → ...piLab/WebAPIComplete/.nuget/NuGet.targets b/... Lab/WebAPI Complete/.nuget/NuGet.targets → ...piLab/WebAPIComplete/.nuget/NuGet.targets
diff --git a/WebApiLab/WebAPIComplete/Build.proj b/WebApiLab/WebAPIComplete/Build.proj
@@ -0,0 +1,41 @@
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+  <Root>$(MSBuildThisFileDirectory)</Root>
+  <SolutionDir>$(Root)</SolutionDir>
+  <FAKE>$(Root)/packages/FAKE.2.1.204-alpha/tools/FAKE.exe</FAKE>
+  <FakeTemp>$(Root)/.build/FAKE.tmp</FakeTemp>
+ </PropertyGroup>
+ <Target Name="InstallNuGet">
+  <MakeDir Directories="$(Root)/.nuget" />
+  <MSBuild Projects="$(Root)/.nuget/NuGet.targets"
+           Properties="DownloadNuGetExe=true;ProjectDir=$(Root);SolutionDir=$(Root)"
+           Targets="RestorePackages" />
+ </Target>
+ <Target Name="InstallFake"
+         DependsOnTargets="InstallNuGet"
+         Condition="!Exists('$(FakeTemp)')">
+   <MakeDir Directories=".build" />
+   <Exec Command='"$(Root)/.nuget/nuget.exe" install FAKE -Pre -out .build'
+         WorkingDirectory="$(Root)"
+         LogStandardErrorAsError="true"/>
+   <ItemGroup>
+     <FAKEExe Include="$(Root)/.build/FAKE*/tools/FAKE.exe" />
+   </ItemGroup>
+   <Copy SourceFiles="@(FAKEExe)" DestinationFiles="$(FakeTemp)" />
+ </Target>
+ <Target Name="LocateFake" DependsOnTargets="InstallFake">
+   <ItemGroup>
+     <FAKE Include="$(Root)/.build/FAKE*/tools/FAKE.exe" />
+   </ItemGroup>
+ </Target>
+ <Target Name="Build" DependsOnTargets="LocateFake">
+  <Exec Command="&quot;@(FAKE)&quot; boot auto"
+        WorkingDirectory="$(Root)"
+        LogStandardErrorAsError="true" />
+ </Target>
+ <Target Name="Clean" DependsOnTargets="LocateFake">
+  <Exec Command="&quot;$(FAKE)&quot; build.fsx Clean"
+        WorkingDirectory="$(Root)"
+        LogStandardErrorAsError="true" />
+ </Target>
+</Project>
diff --git a/WebApi Lab/WebAPI Complete/GuitarExample.sln → WebApiLab/WebAPIComplete/GuitarExample.sln b/WebApi Lab/WebAPI Complete/GuitarExample.sln → WebApiLab/WebAPIComplete/GuitarExample.sln
@@ -5,7 +5,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuitarExampleWeb", "GuitarE
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GuitarExampleWebApp", "GuitarExample\GuitarExampleWebApp\GuitarExampleWebApp.fsproj", "{A126575F-C66E-42BF-A70F-655D4C3F0069}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Console", "GuitarExample\Console\Console.fsproj", "{8995A0B8-D7D7-404E-8763-B8687214BF7B}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GuitarExampleWebApp.Tests", "tests\GuitarExampleWebApp.Tests\GuitarExampleWebApp.Tests.fsproj", "{8995A0B8-D7D7-404E-8763-B8687214BF7B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{B483A23C-6571-49ED-9B42-8E5B7794C692}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/...Example/GuitarExampleWeb/Content/Site.css → ...Example/GuitarExampleWeb/Content/Site.css b/...Example/GuitarExampleWeb/Content/Site.css → ...Example/GuitarExampleWeb/Content/Site.css
diff --git a/...uitarExample/GuitarExampleWeb/Global.asax → ...uitarExample/GuitarExampleWeb/Global.asax b/...uitarExample/GuitarExampleWeb/Global.asax → ...uitarExample/GuitarExampleWeb/Global.asax
diff --git a/.../GuitarExampleWeb/GuitarExampleWeb.csproj → .../GuitarExampleWeb/GuitarExampleWeb.csproj b/.../GuitarExampleWeb/GuitarExampleWeb.csproj → .../GuitarExampleWeb/GuitarExampleWeb.csproj
@@ -131,16 +131,15 @@
     <Content Include="Index.cshtml" />
     <Content Include="Scripts\jquery-1.10.1.min.map" />
   </ItemGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <Content Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\GuitarExampleWebApp\GuitarExampleWebApp.fsproj">
-      <Project>{A126575F-C66E-42BF-A70F-655D4C3F0069}</Project>
+      <Project>{a126575f-c66e-42bf-a70f-655d4c3f0069}</Project>
       <Name>GuitarExampleWebApp</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

diff --git a/...itarExample/GuitarExampleWeb/Index.cshtml → ...itarExample/GuitarExampleWeb/Index.cshtml b/...itarExample/GuitarExampleWeb/Index.cshtml → ...itarExample/GuitarExampleWeb/Index.cshtml
diff --git a/...itarExampleWeb/Properties/AssemblyInfo.cs → ...itarExampleWeb/Properties/AssemblyInfo.cs b/...itarExampleWeb/Properties/AssemblyInfo.cs → ...itarExampleWeb/Properties/AssemblyInfo.cs
diff --git a/...Web/Scripts/jquery-1.10.1.intellisense.js → ...Web/Scripts/jquery-1.10.1.intellisense.js b/...Web/Scripts/jquery-1.10.1.intellisense.js → ...Web/Scripts/jquery-1.10.1.intellisense.js
diff --git a/...GuitarExampleWeb/Scripts/jquery-1.10.1.js → ...GuitarExampleWeb/Scripts/jquery-1.10.1.js b/...GuitarExampleWeb/Scripts/jquery-1.10.1.js → ...GuitarExampleWeb/Scripts/jquery-1.10.1.js
diff --git a/...arExampleWeb/Scripts/jquery-1.10.1.min.js → ...arExampleWeb/Scripts/jquery-1.10.1.min.js b/...arExampleWeb/Scripts/jquery-1.10.1.min.js → ...arExampleWeb/Scripts/jquery-1.10.1.min.js
diff --git a/...rExampleWeb/Scripts/jquery-1.10.1.min.map → ...rExampleWeb/Scripts/jquery-1.10.1.min.map b/...rExampleWeb/Scripts/jquery-1.10.1.min.map → ...rExampleWeb/Scripts/jquery-1.10.1.min.map
diff --git a/...xample/GuitarExampleWeb/Scripts/script.js → ...xample/GuitarExampleWeb/Scripts/script.js b/...xample/GuitarExampleWeb/Scripts/script.js → ...xample/GuitarExampleWeb/Scripts/script.js
diff --git a/...Example/GuitarExampleWeb/Web.Debug.config → ...Example/GuitarExampleWeb/Web.Debug.config b/...Example/GuitarExampleWeb/Web.Debug.config → ...Example/GuitarExampleWeb/Web.Debug.config
diff --git a/...ample/GuitarExampleWeb/Web.Release.config → ...ample/GuitarExampleWeb/Web.Release.config b/...ample/GuitarExampleWeb/Web.Release.config → ...ample/GuitarExampleWeb/Web.Release.config
diff --git a/...GuitarExample/GuitarExampleWeb/Web.config → ...GuitarExample/GuitarExampleWeb/Web.config b/...GuitarExample/GuitarExampleWeb/Web.config → ...GuitarExample/GuitarExampleWeb/Web.config
diff --git a/...rExample/GuitarExampleWeb/packages.config → ...rExample/GuitarExampleWeb/packages.config b/...rExample/GuitarExampleWeb/packages.config → ...rExample/GuitarExampleWeb/packages.config
diff --git a/...itarExample/GuitarExampleWebApp/Global.fs → ...itarExample/GuitarExampleWebApp/Global.fs b/...itarExample/GuitarExampleWebApp/Global.fs → ...itarExample/GuitarExampleWebApp/Global.fs
@@ -73,19 +73,22 @@ module Api =
         | MissingGuitar -> return request.CreateResponse(HttpStatusCode.BadRequest)
     }
 
-    let guitarsResource = route "guitars" (get getGuitars; post postGuitar)
+    let guitarsResource = route "guitars" (get getGuitars <|> post postGuitar)
 
-(**
- * Run the app in ASP.NET
- *)
-type Global() =
-    inherit System.Web.HttpApplication() 
 
-    member this.Start() =
-        let config = GlobalConfiguration.Configuration
+type WebApiConfig() =
+    static member Register(config: HttpConfiguration) =
         config
         |> HttpResource.register [ Api.guitarsResource ]
         |> ignore
 
         config.Formatters.JsonFormatter.SerializerSettings.ContractResolver <-
             Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
+
+(**
+ * Run the app in ASP.NET
+ *)
+type Global() =
+    inherit System.Web.HttpApplication() 
+    member this.Start() =
+        WebApiConfig.Register GlobalConfiguration.Configuration
diff --git a/...rExampleWebApp/GuitarExampleWebApp.fsproj → ...rExampleWebApp/GuitarExampleWebApp.fsproj b/...rExampleWebApp/GuitarExampleWebApp.fsproj → ...rExampleWebApp/GuitarExampleWebApp.fsproj
diff --git a/...le/GuitarExampleWebApp/System.Net.Http.fs → ...le/GuitarExampleWebApp/System.Net.Http.fs b/...le/GuitarExampleWebApp/System.Net.Http.fs → ...le/GuitarExampleWebApp/System.Net.Http.fs
diff --git a/...le/GuitarExampleWebApp/System.Web.Http.fs → ...le/GuitarExampleWebApp/System.Web.Http.fs b/...le/GuitarExampleWebApp/System.Web.Http.fs → ...le/GuitarExampleWebApp/System.Web.Http.fs
diff --git a/...ample/GuitarExampleWebApp/packages.config → ...ample/GuitarExampleWebApp/packages.config b/...ample/GuitarExampleWebApp/packages.config → ...ample/GuitarExampleWebApp/packages.config
diff --git a/WebApiLab/WebAPIComplete/build.bat b/WebApiLab/WebAPIComplete/build.bat
@@ -0,0 +1,5 @@
+@echo off
+cls
+%WINDIR%\Microsoft.Net\Framework\v4.0.30319\MSBuild.exe Build.proj
+pause
+