Skip to content

Commit

Permalink
Merge pull request #4 from panesofglass/master
Browse files Browse the repository at this point in the history 
Fix package references and make this deployable on Azure
  • Loading branch information
@dmohl
dmohl committed Jul 9, 2013
2 parents dd3fc4b + 3427127 commit 365cbf8
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 15 deletions.
1 change: 1 addition & 0 deletions WebApiLab/AzureFSharpOwin/WebApiRole/Guitars.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Stratocaster,Fender,Yamaha,Martin
2 changes: 1 addition & 1 deletion WebApiLab/AzureFSharpOwin/WebApiRole/GuitarsApi.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module Guitars =
open System
open System.IO

let dataSource = @"c:\temp\Guitars.txt"
let dataSource = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Guitars.txt")

let getGuitars() =
if File.Exists dataSource then
Expand Down
31 changes: 17 additions & 14 deletions WebApiLab/AzureFSharpOwin/WebApiRole/WebApiRole.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,40 +81,49 @@
<Content Include="index.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Guitars.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.Owin">
<HintPath>..\..\..\Code\AzureFSharpOwin\packages\Microsoft.Owin.2.0.0-rc1-20621-413\lib\net45\Microsoft.Owin.dll</HintPath>
<HintPath>..\packages\Microsoft.Owin.2.0.0-rc1-20621-413\lib\net45\Microsoft.Owin.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.FileSystems">
<HintPath>..\packages\Microsoft.Owin.FileSystems.0.24.0-pre-20621-413\lib\net40\Microsoft.Owin.FileSystems.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Owin.Host.HttpListener">
<HintPath>..\..\..\Code\AzureFSharpOwin\packages\Microsoft.Owin.Host.HttpListener.2.0.0-rc1-20621-413\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
<HintPath>..\packages\Microsoft.Owin.Host.HttpListener.2.0.0-rc1-20621-413\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.Hosting">
<HintPath>..\..\..\Code\AzureFSharpOwin\packages\Microsoft.Owin.Hosting.2.0.0-rc1-20621-413\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
<HintPath>..\packages\Microsoft.Owin.Hosting.2.0.0-rc1-20621-413\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.StaticFiles">
<HintPath>..\packages\Microsoft.Owin.StaticFiles.0.24.0-pre-20621-413\lib\net40\Microsoft.Owin.StaticFiles.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Diagnostics">
<HintPath>C:\Program Files\Microsoft SDKs\Windows Azure\.NET SDK\v2.0\ref\Microsoft.WindowsAzure.Diagnostics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime">
<HintPath>C:\Program Files\Microsoft SDKs\Windows Azure\.NET SDK\v2.0\ref\Microsoft.WindowsAzure.ServiceRuntime.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core">
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\..\Code\AzureFSharpOwin\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\..\..\Code\AzureFSharpOwin\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference>
<Reference Include="Owin.Extensions">
<HintPath>..\..\..\Code\AzureFSharpOwin\packages\Owin.Extensions.0.8.5\lib\net40\Owin.Extensions.dll</HintPath>
<HintPath>..\packages\Owin.Extensions.0.8.5\lib\net40\Owin.Extensions.dll</HintPath>
</Reference>
<Reference Include="Owin.Types">
<HintPath>..\..\..\Code\AzureFSharpOwin\packages\Owin.Types.0.8.5\lib\net40\Owin.Types.dll</HintPath>
<HintPath>..\packages\Owin.Types.0.8.5\lib\net40\Owin.Types.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -123,12 +132,6 @@
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.0.0-rtm-130621\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<Private>false</Private>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Diagnostics, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<Private>true</Private>
</Reference>
<Reference Include="System.Web.Http">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.0.0-rtm-130621\lib\net45\System.Web.Http.dll</HintPath>
</Reference>
Expand All @@ -144,4 +147,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

0 comments on commit 365cbf8

Please sign in to comment.