Skip to content
This repository was archived by the owner on Sep 29, 2020. It is now read-only.

Commit 0c4a907

Browse files
committed
Update FsReveal version
1 parent 3a99bcb commit 0c4a907

File tree

9 files changed

+13
-26
lines changed

9 files changed

+13
-26
lines changed

.nuget/NuGet.exe

-1.57 MB
Binary file not shown.

.nuget/packages.config

-9
This file was deleted.

TodoBackend.sln

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30723.0
4+
VisualStudioVersion = 12.0.31101.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TodoBackend", "TodoBackendFSharp\TodoBackend.fsproj", "{E05BCEFE-F3D1-434C-9BBB-6CB277EDBDEE}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{7A9856DF-9B81-4BBC-887A-AA82D3508ED4}"
9-
ProjectSection(SolutionItems) = preProject
10-
.nuget\packages.config = .nuget\packages.config
11-
EndProjectSection
12-
EndProject
138
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{72A8D85E-23B9-40AB-950B-BF6D50185F8E}"
149
ProjectSection(SolutionItems) = preProject
10+
build.cmd = build.cmd
11+
build.fsx = build.fsx
12+
build.sh = build.sh
1513
README.md = README.md
1614
EndProjectSection
1715
EndProject

TodoBackendFSharp/TodoBackend.fsproj

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<UsingTask AssemblyFile="$(SolutionDir)\packages\MSBuild.Extension.Pack.1.3.0\tools\net40\MSBuild.ExtensionPack.dll" TaskName="MSBuild.ExtensionPack.FileSystem.File" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -57,13 +56,11 @@
5756
<Choose>
5857
<When Condition="'$(VisualStudioVersion)' == '11.0'">
5958
<PropertyGroup>
60-
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
6159
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
6260
</PropertyGroup>
6361
</When>
6462
<Otherwise>
6563
<PropertyGroup>
66-
<TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
6764
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
6865
</PropertyGroup>
6966
</Otherwise>
@@ -115,9 +112,6 @@
115112
</FlavorProperties>
116113
</VisualStudio>
117114
</ProjectExtensions>
118-
<Target Name="BeforeBuild">
119-
<MSBuild.ExtensionPack.FileSystem.File TaskAction="Replace" RegexPattern="&lt;dependentAssembly&gt;([\s]+.)&lt;assemblyIdentity name=&quot;FSharp\.Core&quot; publicKeyToken=&quot;b03f5f7f11d50a3a&quot; culture=&quot;neutral&quot; \/&gt;([\s\S]+?)&lt;\/dependentAssembly&gt;" RegexOptionList="IgnoreCase|Singleline" Replacement="&lt;dependentAssembly&gt;&#xD;&#xA; &lt;assemblyIdentity name=&quot;FSharp.Core&quot; publicKeyToken=&quot;b03f5f7f11d50a3a&quot; culture=&quot;neutral&quot; /&gt;&#xD;&#xA; &lt;bindingRedirect oldVersion=&quot;0.0.0.0-$(TargetFSharpCoreVersion)&quot; newVersion=&quot;$(TargetFSharpCoreVersion)&quot;/&gt;&#xD;&#xA; &lt;/dependentAssembly&gt;" Files="web.config" />
120-
</Target>
121115
<ItemGroup>
122116
<None Include="Sql\CreateDatabase.sql" />
123117
<None Include="Sql\GetAll.sql" />
@@ -145,6 +139,10 @@
145139
<HintPath>..\packages\Frank.3.0.0.9\lib\net45\Frank.dll</HintPath>
146140
<Private>True</Private>
147141
</Reference>
142+
<Reference Include="FSharp.Core">
143+
<HintPath>..\packages\FSharp.Core.3.1.2.1\lib\net40\FSharp.Core.dll</HintPath>
144+
<Private>True</Private>
145+
</Reference>
148146
<Reference Include="FSharp.Data.SqlClient">
149147
<HintPath>..\packages\FSharp.Data.SqlClient.1.3.3\lib\net40\FSharp.Data.SqlClient.dll</HintPath>
150148
</Reference>
@@ -209,9 +207,6 @@
209207
<Private>True</Private>
210208
</Reference>
211209
<Reference Include="System.Web.Services" />
212-
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
213-
<Private>True</Private>
214-
</Reference>
215210
<Reference Include="System.Web.Routing" />
216211
<Reference Include="System.Web.Abstractions" />
217212
</ItemGroup>

TodoBackendFSharp/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<packages>
33
<package id="Dyfrig" version="0.7.0.44" targetFramework="net45" />
44
<package id="Frank" version="3.0.0.9" targetFramework="net45" />
5+
<package id="FSharp.Core" version="3.1.2.1" targetFramework="net45" />
56
<package id="FSharp.Data.SqlClient" version="1.3.3" targetFramework="net45" />
67
<package id="FSharpx.Core" version="1.8.41" targetFramework="net45" />
78
<package id="FsWebAddRegistryEntries" version="0.1.0.0" targetFramework="net45" />

build.cmd

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
@echo off
22
.nuget\NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion
3+
.nuget\NuGet.exe install FsReveal -Version 0.2.0 -OutputDirectory packages -ExcludeVersion
34
packages\FAKE\tools\FAKE.exe build.fsx %*

build.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ open Fake.Git
1111

1212
// Git configuration (used for publishing documentation in gh-pages branch)
1313
// The profile where the project is posted
14-
let gitHome = "git@github.com:panesofglass"
14+
let gitHome = "https://github.com/panesofglass"
1515
// The name of the project on GitHub
1616
let gitName = "TodoBackendFSharp"
1717

build.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
22

33
mono .nuget/NuGet.exe install FAKE -OutputDirectory packages -ExcludeVersion
4+
mono .nuget/NuGet.exe install FsReveal -Version 0.2.0 -OutputDirectory packages -ExcludeVersion
45
mono packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx

docs/generate.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let copyFiles() =
1010
CopyRecursive files output true |> Log "Copying file: "
1111
else ()
1212

13-
#load "../packages/FsReveal.0.0.5-beta/fsreveal/fsreveal.fsx"
13+
#load "../packages/FsReveal/fsreveal/fsreveal.fsx"
1414
open FsReveal
1515

1616
let outDir = Path.Combine(__SOURCE_DIRECTORY__, "output")

0 commit comments

Comments
 (0)