Skip to content
This repository has been archived by the owner on Feb 16, 2019. It is now read-only.

Uset paket3 git depenedency for ionide-helpers #19

Merged
merged 2 commits into from
Feb 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ node_modules
Test/
Test/obj/
Test/bin/
paket-files
.paket/paket.exe
packages
Test/Script.fsx
Expand Down
10 changes: 6 additions & 4 deletions Ionide.Fsi.sln
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Ionide.Fsi", "src\Ionide.Fsi.fsproj", "{D1081029-2369-4DAA-9F33-2353C5C9ED02}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{67EDE4A4-AC6E-407A-987D-A4B6334C29F2}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
build.cmd = build.cmd
build.fsx = build.fsx
src\paket\package.json = src\fake\package.json
build.sh = build.sh
LICENSE = LICENSE
paket.dependencies = paket.dependencies
paket.lock = paket.lock
README.md = README.md
RELEASE_NOTES.md = RELEASE_NOTES.md
EndProjectSection
Expand Down
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@echo off
cls

.paket\paket.bootstrapper.exe
.paket\paket.bootstrapper.exe prerelease
if errorlevel 1 (
exit /b %errorlevel%
)
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if test "$OS" = "Windows_NT"
then
# use .Net

.paket/paket.bootstrapper.exe
.paket/paket.bootstrapper.exe prerelease
exit_code=$?
if [ $exit_code -ne 0 ]; then
exit $exit_code
Expand Down
Binary file removed lib/FunScript.TypeScript.Binding.atom.dll
Binary file not shown.
Binary file removed lib/FunScript.TypeScript.Binding.jquery.dll
Binary file not shown.
Binary file removed lib/FunScript.TypeScript.Binding.lib.dll
Binary file not shown.
Binary file removed lib/FunScript.TypeScript.Binding.node.dll
Binary file not shown.
Binary file removed lib/Ionide.Helpers.dll
Binary file not shown.
2 changes: 2 additions & 0 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
source https://nuget.org/api/v2

git git@github.com:ionide/ionide-helpers.git master build:"build.cmd"

nuget FAKE
nuget FunScript
7 changes: 6 additions & 1 deletion paket.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
NUGET
remote: https://nuget.org/api/v2
remote: https://www.nuget.org/api/v2
specs:
FAKE (4.4.1)
FunScript (1.1.94)
GIT
remote: git@github.com:ionide/ionide-helpers.git
specs:
(c710f3905e640f04eb26d1d016842b3e76ff457e)
build: build.cmd
4 changes: 2 additions & 2 deletions src/Ionide.Fsi.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</Reference>
</ItemGroup>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1')">
<ItemGroup>
<Reference Include="FunScript.Interop">
<HintPath>..\packages\FunScript\lib\net40\FunScript.Interop.dll</HintPath>
Expand All @@ -76,4 +76,4 @@
</ItemGroup>
</When>
</Choose>
</Project>
</Project>