Skip to content

Commit f1391ea

Browse files
committed
Update all dependencies
1 parent 88448e7 commit f1391ea

File tree

10 files changed

+28
-61
lines changed

10 files changed

+28
-61
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,3 +188,4 @@ src/reveal.js
188188
.fake
189189
docs/tools/FSharp.Formatting.svclog
190190
FSharp.Formatting.svclog
191+
_NCrunch*

RELEASE_NOTES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### 1.1.1 - 04.01.2016
2+
* Updated all dependencies
3+
14
### 1.1.0 - 10.11.2015
25
* Updated to reveal.js 3.2.0
36
* Update FSharp.Formatting to 2.12.0

paket.dependencies

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ group Build
1111

1212
group Test
1313
source https://nuget.org/api/v2
14-
nuget NUnit
15-
nuget NUnit.Runners
14+
nuget NUnit ~> 2
15+
nuget NUnit.Runners ~> 2
1616
github forki/FsUnit FsUnit.fs

paket.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
NUGET
2-
remote: https://nuget.org/api/v2
2+
remote: https://www.nuget.org/api/v2
33
specs:
4-
FSharp.Compiler.Service (1.4.0.6)
5-
FSharp.Formatting (2.12.0)
6-
FSharp.Compiler.Service (1.4.0.6)
7-
FSharpVSPowerTools.Core (2.1.0)
8-
FSharpVSPowerTools.Core (2.1.0)
9-
FSharp.Compiler.Service (>= 1.4.0.6)
4+
FSharp.Compiler.Service (1.4.2.3)
5+
FSharp.Formatting (2.13.0)
6+
FSharp.Compiler.Service (>= 1.4.2 < 1.5.0)
7+
FSharpVSPowerTools.Core (>= 2.2.0 < 2.3.0)
8+
FSharpVSPowerTools.Core (2.2.0)
9+
FSharp.Compiler.Service (>= 1.4.2.0)
1010
GITHUB
1111
remote: fsprojects/reveal.js
1212
specs:
1313
FULLPROJECT (822a9c937c902807e376713760e1f07845951d5a)
1414
GROUP Build
1515
NUGET
16-
remote: https://nuget.org/api/v2
16+
remote: https://www.nuget.org/api/v2
1717
specs:
18-
FAKE (4.8.0)
18+
FAKE (4.12.0)
1919
Microsoft.Bcl (1.1.10)
2020
Microsoft.Bcl.Build (>= 1.0.14)
2121
Microsoft.Bcl.Build (1.0.21) - import_targets: false
2222
Microsoft.Net.Http (2.2.29)
2323
Microsoft.Bcl (>= 1.1.10)
2424
Microsoft.Bcl.Build (>= 1.0.14)
25-
Octokit (0.16.0)
25+
Octokit (0.17.0)
2626
Microsoft.Net.Http
2727
SourceLink.Fake (1.1.0)
2828
GITHUB
2929
remote: fsharp/FAKE
3030
specs:
31-
modules/Octokit/Octokit.fsx (545fb5d2cc7901bcbfd8f7f1a53da8f7f169deda)
31+
modules/Octokit/Octokit.fsx (3834900476aed462f35ce3acc3ea5c4708971e43)
3232
Octokit
3333
GROUP Test
3434
NUGET
35-
remote: https://nuget.org/api/v2
35+
remote: https://www.nuget.org/api/v2
3636
specs:
3737
NUnit (2.6.4)
3838
NUnit.Runners (2.6.4)
3939
GITHUB
4040
remote: forki/FsUnit
4141
specs:
42-
FsUnit.fs (2b809d33e4a06da78babd838abc817dd559c9c41)
42+
FsUnit.fs (ddee2d57be2afd2b5a0327b87dd5b8d1dea947ce)

src/FsReveal/AssemblyInfo.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ open System.Reflection
44
[<assembly: AssemblyTitleAttribute("FsReveal")>]
55
[<assembly: AssemblyProductAttribute("FsReveal")>]
66
[<assembly: AssemblyDescriptionAttribute("FsReveal parses markdown or F# script files and generates reveal.js slides.")>]
7-
[<assembly: AssemblyVersionAttribute("1.1.0")>]
8-
[<assembly: AssemblyFileVersionAttribute("1.1.0")>]
7+
[<assembly: AssemblyVersionAttribute("1.1.1")>]
8+
[<assembly: AssemblyFileVersionAttribute("1.1.1")>]
99
do ()
1010

1111
module internal AssemblyVersionInformation =
12-
let [<Literal>] Version = "1.1.0"
12+
let [<Literal>] Version = "1.1.1"

src/FsReveal/FsReveal.fsproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</Reference>
9494
</ItemGroup>
9595
</When>
96-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
96+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(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')">
9797
<ItemGroup>
9898
<Reference Include="FSharp.Compiler.Service">
9999
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
@@ -104,7 +104,7 @@
104104
</When>
105105
</Choose>
106106
<Choose>
107-
<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')">
107+
<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')">
108108
<ItemGroup>
109109
<Reference Include="CSharpFormat">
110110
<HintPath>..\..\packages\FSharp.Formatting\lib\net40\CSharpFormat.dll</HintPath>
@@ -150,7 +150,7 @@
150150
</When>
151151
</Choose>
152152
<Choose>
153-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
153+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(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')">
154154
<ItemGroup>
155155
<Reference Include="FSharpVSPowerTools.Core">
156156
<HintPath>..\..\packages\FSharpVSPowerTools.Core\lib\net45\FSharpVSPowerTools.Core.dll</HintPath>

tests/FsReveal.Tests/FsReveal.Tests.fsproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
</Reference>
107107
</ItemGroup>
108108
</When>
109-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
109+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(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')">
110110
<ItemGroup>
111111
<Reference Include="FSharp.Compiler.Service">
112112
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
@@ -117,7 +117,7 @@
117117
</When>
118118
</Choose>
119119
<Choose>
120-
<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')">
120+
<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')">
121121
<ItemGroup>
122122
<Reference Include="CSharpFormat">
123123
<HintPath>..\..\packages\FSharp.Formatting\lib\net40\CSharpFormat.dll</HintPath>
@@ -163,7 +163,7 @@
163163
</When>
164164
</Choose>
165165
<Choose>
166-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
166+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(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')">
167167
<ItemGroup>
168168
<Reference Include="FSharpVSPowerTools.Core">
169169
<HintPath>..\..\packages\FSharpVSPowerTools.Core\lib\net45\FSharpVSPowerTools.Core.dll</HintPath>

tests/FsReveal.Tests/SectionsSpecs.fs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,40 +84,23 @@ let testTemplate ="{slides}"
8484

8585

8686
let expectedOutput = """<section >
87-
8887
<h3>Slide 1</h3>
89-
9088
</section>
91-
9289
<section >
93-
9490
<section >
95-
9691
<h3>Slide 2</h3>
97-
9892
</section>
99-
10093
<section author="Karlkim Suwanmongkol" description="Introduction to FsReveal" theme="Night" title="FsReveal" transition="default">
101-
10294
<h4>Slide 2.1</h4>
103-
10495
</section>
105-
10696
<section author="Karlkim Suwanmongkol" description="Introduction to FsReveal" theme="Night" title="FsReveal" transition="default">
107-
10897
<h4>Sldie 2.2</h4>
109-
11098
</section>
111-
11299
</section>
113-
114100
<section >
115-
116101
<h3>Slide 3</h3>
117-
118102
</section>
119103
120-
121104
"""
122105

123106
[<Test>]

tests/FsReveal.Tests/SlidePropertySpecs.fs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,33 +67,22 @@ let testTemplate ="{slides}"
6767
let normalizeLineBreaks (text:string) = text.Replace("\r\n","\n").Replace("\n","\n")
6868

6969
let expectedOutput = """<section >
70-
7170
<ul>
7271
<li>no property</li>
7372
<li>background-repeat : repeat</li>
7473
</ul>
75-
7674
<h3>Section 1</h3>
77-
7875
</section>
79-
8076
<section data-background="images/smalllogo.png" data-background-repeat="repeat" data-background-size="100px">
81-
8277
<h3>Section 2</h3>
83-
8478
<ul>
8579
<li>Some bullet point</li>
8680
</ul>
87-
8881
</section>
89-
9082
<section >
91-
9283
<h3>Section 3</h3>
93-
9484
</section>
9585
96-
9786
"""
9887

9988
[<Test>]

tests/FsReveal.Tests/SpeakerNotesSpecs.fs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,18 @@ Normal Text
2828
"""
2929

3030
let expectedOutput = """<section >
31-
3231
<h3>Slide 1</h3>
33-
3432
<p>Normal Text</p>
35-
3633
<aside class="notes">
3734
Oh hey, these are some notes.<br/>
3835
And some more<br/>
3936
</aside>
40-
4137
</section>
42-
4338
<section >
44-
4539
<h3>Slide 2</h3>
46-
4740
<p>Normal Text</p>
48-
4941
</section>
5042
51-
5243
"""
5344

5445
[<Test>]

0 commit comments

Comments
 (0)