Skip to content

Commit 092afba

Browse files
haackedhaacked
committed
Merge pull request #29 from pmacn/feature/buildscript_tests_update
Fix running tests in build script.
2 parents 7b0108d + f1caac0 commit 092afba

File tree

374 files changed

+149973
-6305
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

374 files changed

+149973
-6305
lines changed

‎script/build.cmd‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
@echo off
2-
"tools\nuget\nuget.exe update -self"
3-
"tools\nuget\nuget.exe" "install" "FAKE.Core" "-OutputDirectory" "tools" "-ExcludeVersion" "-version" "2.2.0"
42

53
:Build
64
cls

‎script/build.fsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#r @"..\tools\FAKE.Core\tools\FakeLib.dll"
22
open Fake
3+
open Fake.XUnit2Helper
34

45
let authors = ["Phil Haack"]
56

@@ -25,7 +26,7 @@ Target "Clean" (fun _ ->
2526
open Fake.AssemblyInfoFile
2627

2728
Target "AssemblyInfo" (fun _ ->
28-
CreateCSharpAssemblyInfo "SolutionInfo.cs"
29+
CreateCSharpAssemblyInfo ".\SolutionInfo.cs"
2930
[ Attribute.Product projectName
3031
Attribute.Version releaseNotes.AssemblyVersion
3132
Attribute.FileVersion releaseNotes.AssemblyVersion]
@@ -37,8 +38,8 @@ Target "BuildApp" (fun _ ->
3738
)
3839

3940
Target "UnitTests" (fun _ ->
40-
!! "./Tests/bin/**/Tests.dll"
41-
|> xUnit (fun p ->
41+
!! "./Tests/bin/Release/**/Tests.dll"
42+
|> xUnit2 (fun p ->
4243
{p with
4344
XmlOutput = true
4445
OutputDir = testResultsDir })

‎tools/FAKE.Core/FAKE.Core.nupkg‎

-7.92 MB
Binary file not shown.

‎tools/FAKE.Core/docs/RELEASE_NOTES.html‎

Lines changed: 673 additions & 0 deletions
Large diffs are not rendered by default.

‎tools/FAKE.Core/docs/androidpublisher.html‎

Lines changed: 342 additions & 0 deletions
Large diffs are not rendered by default.

‎tools/FAKE.Core/docs/apidocs/fake-additionalsyntax.html‎

Lines changed: 373 additions & 0 deletions
Large diffs are not rendered by default.

‎tools/FAKE.Core/docs/apidocs/fake-androidpublisher-androidpublishconfig.html‎

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>AndroidPublishConfig - FAKE - F# Make</title>
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7+
<meta name="description" content="">
8+
<meta name="author" content="Steffen Forkmann, Mauricio Scheffer, Colin Bull">
9+
10+
<script src="https://code.jquery.com/jquery-1.8.0.js"></script>
11+
<script src="https://code.jquery.com/ui/1.8.23/jquery-ui.js"></script>
12+
<script src="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/js/bootstrap.min.js"></script>
13+
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
14+
<link href="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/css/bootstrap-combined.min.css" rel="stylesheet">
15+
16+
<link type="text/css" rel="stylesheet" href="http://fsharp.github.io/FAKE/content/style.css" />
17+
<script type="text/javascript" src="http://fsharp.github.io/FAKE/content/tips.js"></script>
18+
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
19+
<!--[if lt IE 9]>
20+
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
21+
<![endif]-->
22+
</head>
23+
<body>
24+
<div class="container">
25+
<div class="masthead">
26+
<ul class="nav nav-pills pull-right">
27+
<li><a href="http://fsharp.org">fsharp.org</a></li>
28+
<li><a href="http://github.com/fsharp/fake">github page</a></li>
29+
</ul>
30+
<h3 class="muted"><a href="http://fsharp.github.io/FAKE/index.html">FAKE - F# Make</a></h3>
31+
</div>
32+
<hr />
33+
<div class="row">
34+
<div class="span9" id="main">
35+
36+
37+
38+
39+
<h1>AndroidPublishConfig</h1>
40+
<div class="xmldoc">
41+
</div>
42+
<h3>Record Fields</h3>
43+
<table class="table table-bordered member-list">
44+
<thead>
45+
<tr><td>Record Field</td><td>Description</td></tr>
46+
</thead>
47+
<tbody>
48+
<tr>
49+
<td class="member-name">
50+
51+
<code onmouseout="hideTip(event, '904', 904)" onmouseover="showTip(event, '904', 904)">
52+
AccountId
53+
</code>
54+
<div class="tip" id="904">
55+
<strong>Signature:</strong> string<br />
56+
</div>
57+
</td>
58+
<td class="xmldoc">
59+
<a href="https://github.com/fsharp/FAKE/blob/master/src/app/FakeLib/AndroidPublisher.fs#L33-33" class="github-link">
60+
<img src="../content/img/github.png" class="normal" />
61+
<img src="../content/img/github-blue.png" class="hover" />
62+
</a>
63+
64+
</td>
65+
</tr>
66+
<tr>
67+
<td class="member-name">
68+
69+
<code onmouseout="hideTip(event, '905', 905)" onmouseover="showTip(event, '905', 905)">
70+
Apk
71+
</code>
72+
<div class="tip" id="905">
73+
<strong>Signature:</strong> string<br />
74+
</div>
75+
</td>
76+
<td class="xmldoc">
77+
<a href="https://github.com/fsharp/FAKE/blob/master/src/app/FakeLib/AndroidPublisher.fs#L34-34" class="github-link">
78+
<img src="../content/img/github.png" class="normal" />
79+
<img src="../content/img/github-blue.png" class="hover" />
80+
</a>
81+
82+
</td>
83+
</tr>
84+
<tr>
85+
<td class="member-name">
86+
87+
<code onmouseout="hideTip(event, '906', 906)" onmouseover="showTip(event, '906', 906)">
88+
Certificate
89+
</code>
90+
<div class="tip" id="906">
91+
<strong>Signature:</strong> X509Certificate2<br />
92+
</div>
93+
</td>
94+
<td class="xmldoc">
95+
<a href="https://github.com/fsharp/FAKE/blob/master/src/app/FakeLib/AndroidPublisher.fs#L31-31" class="github-link">
96+
<img src="../content/img/github.png" class="normal" />
97+
<img src="../content/img/github-blue.png" class="hover" />
98+
</a>
99+
100+
</td>
101+
</tr>
102+
<tr>
103+
<td class="member-name">
104+
105+
<code onmouseout="hideTip(event, '907', 907)" onmouseover="showTip(event, '907', 907)">
106+
PackageName
107+
</code>
108+
<div class="tip" id="907">
109+
<strong>Signature:</strong> string<br />
110+
</div>
111+
</td>
112+
<td class="xmldoc">
113+
<a href="https://github.com/fsharp/FAKE/blob/master/src/app/FakeLib/AndroidPublisher.fs#L32-32" class="github-link">
114+
<img src="../content/img/github.png" class="normal" />
115+
<img src="../content/img/github-blue.png" class="hover" />
116+
</a>
117+
118+
</td>
119+
</tr>
120+
</tbody>
121+
</table>
122+
123+
</div>
124+
<div class="span3">
125+
<a href="http://fsharp.github.io/FAKE/index.html">
126+
<img src="http://fsharp.github.io/FAKE/pics/logo.png" style="width:140px;height:140px;margin:10px 0px 0px 35px;border-style:none;" />
127+
</a>
128+
129+
<ul class="nav nav-list" id="menu">
130+
131+
<li class="nav-header">FAKE - F# Make</li>
132+
133+
<li class="divider"></li>
134+
<li><a href="http://fsharp.github.io/FAKE/index.html">Home page</a></li>
135+
<li class="divider"></li>
136+
137+
<li><a href="https://www.nuget.org/packages/FAKE">Get FAKE - F# Make via NuGet</a></li>
138+
<li><a href="http://github.com/fsharp/fake">Source Code on GitHub</a></li>
139+
<li><a href="http://github.com/fsharp/fake/blob/master/License.txt">License (Apache 2)</a></li>
140+
<li><a href="http://fsharp.github.io/FAKE/RELEASE_NOTES.html">Release Notes</a></li>
141+
<li><a href="http://fsharp.github.io/FAKE//contributing.html">Contributing to FAKE - F# Make</a></li>
142+
<li><a href="http://fsharp.github.io/FAKE/users.html">Who is using FAKE?</a></li>
143+
<li><a href="http://stackoverflow.com/questions/tagged/f%23-fake">Ask a question</a></li>
144+
<li class="nav-header">Tutorials</li>
145+
<li><a href="http://fsharp.github.io/FAKE/gettingstarted.html">Getting started</a></li>
146+
<li class="divider"></li>
147+
<li><a href="http://fsharp.github.io/FAKE/nuget.html">NuGet package restore</a></li>
148+
<li><a href="http://fsharp.github.io/FAKE/fxcop.html">Using FxCop in a build</a></li>
149+
<li><a href="http://fsharp.github.io/FAKE/assemblyinfo.html">Generating AssemblyInfo</a></li>
150+
<li><a href="http://fsharp.github.io/FAKE/create-nuget-package.html">Create NuGet packages</a></li>
151+
<li><a href="http://fsharp.github.io/FAKE/specifictargets.html">Running specific targets</a></li>
152+
<li><a href="http://fsharp.github.io/FAKE/commandline.html">Running FAKE from command line</a></li>
153+
<li><a href="http://fsharp.github.io/FAKE/parallel-build.html">Running targets in parallel</a></li>
154+
<li><a href="http://fsharp.github.io/FAKE/fsc.html">Using the F# compiler from FAKE</a></li>
155+
<li><a href="http://fsharp.github.io/FAKE/customtasks.html">Creating custom tasks</a></li>
156+
<li><a href="http://fsharp.github.io/FAKE/teamcity.html">TeamCity integration</a></li>
157+
<li><a href="http://fsharp.github.io/FAKE/canopy.html">Running canopy tests</a></li>
158+
<li><a href="http://fsharp.github.io/FAKE/octopusdeploy.html">Octopus Deploy</a></li>
159+
<li><a href="http://fsharp.github.io/FAKE/typescript.html">TypeScript support</a></li>
160+
<li><a href="http://fsharp.github.io/FAKE/azurewebjobs.html">Azure WebJobs support</a></li>
161+
<li><a href="http://fsharp.github.io/FAKE/azurecloudservices.html">Azure Cloud Services support</a></li>
162+
<li><a href="http://fsharp.github.io/FAKE/androidpublisher.html">Android publisher</a></li>
163+
<li class="divider"></li>
164+
<li><a href="http://fsharp.github.io/FAKE/deploy.html">Fake.Deploy</a></li>
165+
166+
<li class="nav-header">Reference</li>
167+
168+
<li><a href="http://fsharp.github.io/FAKE/apidocs/index.html">API Reference</a></li>
169+
</ul>
170+
</div>
171+
</div>
172+
</div>
173+
<a href="http://github.com/fsharp/fake"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub"></a>
174+
</body>
175+
</html>

‎tools/FAKE.Core/docs/apidocs/fake-androidpublisher-androidpublishparams.html‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>AndroidPublishParams - FAKE - F# Make</title>
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7+
<meta name="description" content="">
8+
<meta name="author" content="Steffen Forkmann, Mauricio Scheffer, Colin Bull">
9+
10+
<script src="https://code.jquery.com/jquery-1.8.0.js"></script>
11+
<script src="https://code.jquery.com/ui/1.8.23/jquery-ui.js"></script>
12+
<script src="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/js/bootstrap.min.js"></script>
13+
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
14+
<link href="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/css/bootstrap-combined.min.css" rel="stylesheet">
15+
16+
<link type="text/css" rel="stylesheet" href="http://fsharp.github.io/FAKE/content/style.css" />
17+
<script type="text/javascript" src="http://fsharp.github.io/FAKE/content/tips.js"></script>
18+
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
19+
<!--[if lt IE 9]>
20+
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
21+
<![endif]-->
22+
</head>
23+
<body>
24+
<div class="container">
25+
<div class="masthead">
26+
<ul class="nav nav-pills pull-right">
27+
<li><a href="http://fsharp.org">fsharp.org</a></li>
28+
<li><a href="http://github.com/fsharp/fake">github page</a></li>
29+
</ul>
30+
<h3 class="muted"><a href="http://fsharp.github.io/FAKE/index.html">FAKE - F# Make</a></h3>
31+
</div>
32+
<hr />
33+
<div class="row">
34+
<div class="span9" id="main">
35+
36+
37+
38+
39+
<h1>AndroidPublishParams</h1>
40+
<div class="xmldoc">
41+
</div>
42+
<h3>Record Fields</h3>
43+
<table class="table table-bordered member-list">
44+
<thead>
45+
<tr><td>Record Field</td><td>Description</td></tr>
46+
</thead>
47+
<tbody>
48+
<tr>
49+
<td class="member-name">
50+
51+
<code onmouseout="hideTip(event, '908', 908)" onmouseover="showTip(event, '908', 908)">
52+
Config
53+
</code>
54+
<div class="tip" id="908">
55+
<strong>Signature:</strong> AndroidPublishConfig<br />
56+
</div>
57+
</td>
58+
<td class="xmldoc">
59+
<a href="https://github.com/fsharp/FAKE/blob/master/src/app/FakeLib/AndroidPublisher.fs#L39-39" class="github-link">
60+
<img src="../content/img/github.png" class="normal" />
61+
<img src="../content/img/github-blue.png" class="hover" />
62+
</a>
63+
64+
</td>
65+
</tr>
66+
<tr>
67+
<td class="member-name">
68+
69+
<code onmouseout="hideTip(event, '909', 909)" onmouseover="showTip(event, '909', 909)">
70+
Track
71+
</code>
72+
<div class="tip" id="909">
73+
<strong>Signature:</strong> string<br />
74+
</div>
75+
</td>
76+
<td class="xmldoc">
77+
<a href="https://github.com/fsharp/FAKE/blob/master/src/app/FakeLib/AndroidPublisher.fs#L38-38" class="github-link">
78+
<img src="../content/img/github.png" class="normal" />
79+
<img src="../content/img/github-blue.png" class="hover" />
80+
</a>
81+
82+
</td>
83+
</tr>
84+
</tbody>
85+
</table>
86+
87+
</div>
88+
<div class="span3">
89+
<a href="http://fsharp.github.io/FAKE/index.html">
90+
<img src="http://fsharp.github.io/FAKE/pics/logo.png" style="width:140px;height:140px;margin:10px 0px 0px 35px;border-style:none;" />
91+
</a>
92+
93+
<ul class="nav nav-list" id="menu">
94+
95+
<li class="nav-header">FAKE - F# Make</li>
96+
97+
<li class="divider"></li>
98+
<li><a href="http://fsharp.github.io/FAKE/index.html">Home page</a></li>
99+
<li class="divider"></li>
100+
101+
<li><a href="https://www.nuget.org/packages/FAKE">Get FAKE - F# Make via NuGet</a></li>
102+
<li><a href="http://github.com/fsharp/fake">Source Code on GitHub</a></li>
103+
<li><a href="http://github.com/fsharp/fake/blob/master/License.txt">License (Apache 2)</a></li>
104+
<li><a href="http://fsharp.github.io/FAKE/RELEASE_NOTES.html">Release Notes</a></li>
105+
<li><a href="http://fsharp.github.io/FAKE//contributing.html">Contributing to FAKE - F# Make</a></li>
106+
<li><a href="http://fsharp.github.io/FAKE/users.html">Who is using FAKE?</a></li>
107+
<li><a href="http://stackoverflow.com/questions/tagged/f%23-fake">Ask a question</a></li>
108+
<li class="nav-header">Tutorials</li>
109+
<li><a href="http://fsharp.github.io/FAKE/gettingstarted.html">Getting started</a></li>
110+
<li class="divider"></li>
111+
<li><a href="http://fsharp.github.io/FAKE/nuget.html">NuGet package restore</a></li>
112+
<li><a href="http://fsharp.github.io/FAKE/fxcop.html">Using FxCop in a build</a></li>
113+
<li><a href="http://fsharp.github.io/FAKE/assemblyinfo.html">Generating AssemblyInfo</a></li>
114+
<li><a href="http://fsharp.github.io/FAKE/create-nuget-package.html">Create NuGet packages</a></li>
115+
<li><a href="http://fsharp.github.io/FAKE/specifictargets.html">Running specific targets</a></li>
116+
<li><a href="http://fsharp.github.io/FAKE/commandline.html">Running FAKE from command line</a></li>
117+
<li><a href="http://fsharp.github.io/FAKE/parallel-build.html">Running targets in parallel</a></li>
118+
<li><a href="http://fsharp.github.io/FAKE/fsc.html">Using the F# compiler from FAKE</a></li>
119+
<li><a href="http://fsharp.github.io/FAKE/customtasks.html">Creating custom tasks</a></li>
120+
<li><a href="http://fsharp.github.io/FAKE/teamcity.html">TeamCity integration</a></li>
121+
<li><a href="http://fsharp.github.io/FAKE/canopy.html">Running canopy tests</a></li>
122+
<li><a href="http://fsharp.github.io/FAKE/octopusdeploy.html">Octopus Deploy</a></li>
123+
<li><a href="http://fsharp.github.io/FAKE/typescript.html">TypeScript support</a></li>
124+
<li><a href="http://fsharp.github.io/FAKE/azurewebjobs.html">Azure WebJobs support</a></li>
125+
<li><a href="http://fsharp.github.io/FAKE/azurecloudservices.html">Azure Cloud Services support</a></li>
126+
<li><a href="http://fsharp.github.io/FAKE/androidpublisher.html">Android publisher</a></li>
127+
<li class="divider"></li>
128+
<li><a href="http://fsharp.github.io/FAKE/deploy.html">Fake.Deploy</a></li>
129+
130+
<li class="nav-header">Reference</li>
131+
132+
<li><a href="http://fsharp.github.io/FAKE/apidocs/index.html">API Reference</a></li>
133+
</ul>
134+
</div>
135+
</div>
136+
</div>
137+
<a href="http://github.com/fsharp/fake"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub"></a>
138+
</body>
139+
</html>

0 commit comments

Comments
 (0)