Skip to content

Commit 4d63bb8

Browse files
Ian DavisIan Davis
authored andcommitted
Making initial migration to FAKE/Paket.
1 parent e6b2fb6 commit 4d63bb8

12 files changed

Lines changed: 108 additions & 14 deletions

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ release
1414
*.cache
1515
MSBuildOutput.txt
1616
Packages/
17-
TestResults/
17+
.fake/
18+
TestResult*
19+
.paket/paket.exe

.paket/paket.bootstrapper.exe

39 KB
Binary file not shown.

build.bat

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
@echo off
2+
cls
3+
4+
.paket\paket.bootstrapper.exe
5+
if errorlevel 1 (
6+
exit /b %errorlevel%
7+
)
8+
9+
.paket\paket.exe restore
10+
if errorlevel 1 (
11+
exit /b %errorlevel%
12+
)
13+
14+
packages\FAKE\tools\FAKE.exe build.fsx %*

build.fsx

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#r @"packages/FAKE/tools/FakeLib.dll"
2+
open Fake
3+
open Fake.FileHelper
4+
open Fake.Testing.NUnit3
5+
6+
RestorePackages()
7+
8+
let buildDir = "build"
9+
let nunit3 = "./packages/NUnit.ConsoleRunner/tools/nunit3-console.exe"
10+
11+
CreateDir buildDir
12+
13+
Target "Clean" (fun _ ->
14+
CleanDir "build"
15+
)
16+
17+
Target "Compile" (fun _ ->
18+
let buildMode = getBuildParamOrDefault "buildMode" "Release"
19+
let setParams defaults =
20+
{ defaults with
21+
Verbosity = Some(Quiet)
22+
Targets = ["Build"]
23+
Properties =
24+
[
25+
"Optimize", "True"
26+
"DebugSymbols", "True"
27+
"Configuration", buildMode
28+
]
29+
}
30+
build setParams "./Archetype.sln"
31+
|> DoNothing
32+
)
33+
34+
Target "Test" (fun _ ->
35+
!! ("src/**/bin/Release/*.Tests.dll")
36+
|> NUnit3 (fun p ->
37+
{p with
38+
ShadowCopy = false
39+
WorkingDir = "./build"
40+
ToolPath = nunit3 })
41+
)
42+
43+
"Clean"
44+
==> "Compile"
45+
==> "Test"
46+
47+
48+
RunTargetOrDefault "Test"

paket.dependencies

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
source https://nuget.org/api/v2
2+
3+
nuget FAKE
4+
nuget NUnit 3.4.1
5+
nuget NUnit.Runners 3.4.1

paket.lock

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
NUGET
2+
remote: https://www.nuget.org/api/v2
3+
FAKE (4.35)
4+
NUnit (3.4.1)
5+
NUnit.ConsoleRunner (3.4.1)
6+
NUnit.Extension.NUnitProjectLoader (3.4.1)
7+
NUnit.Extension.NUnitV2Driver (3.4.1)
8+
NUnit.Extension.NUnitV2ResultWriter (3.4.1)
9+
NUnit.Extension.TeamCityEventListener (1.0.1)
10+
NUnit.Extension.VSProjectLoader (3.4.1)
11+
NUnit.Runners (3.4.1)
12+
NUnit.ConsoleRunner (>= 3.4.1)
13+
NUnit.Extension.NUnitProjectLoader (>= 3.4.1)
14+
NUnit.Extension.NUnitV2Driver (>= 3.4.1)
15+
NUnit.Extension.NUnitV2ResultWriter (>= 3.4.1)
16+
NUnit.Extension.TeamCityEventListener (>= 1.0.1)
17+
NUnit.Extension.VSProjectLoader (>= 3.4.1)

src/Archetype.Examples/Archetype.Examples.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Archetype.Examples</RootNamespace>
1111
<AssemblyName>Archetype.Examples</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>
@@ -33,8 +33,9 @@
3333
<Prefer32Bit>false</Prefer32Bit>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="nunit.framework">
37-
<HintPath>..\Archetype.Tests\bin\Debug\nunit.framework.dll</HintPath>
36+
<Reference Include="nunit.framework, Version=2.6.1.12217, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
37+
<SpecificVersion>False</SpecificVersion>
38+
<HintPath>..\..\packages\NUnit\lib\net45\nunit.framework.dll</HintPath>
3839
</Reference>
3940
<Reference Include="System" />
4041
<Reference Include="System.Core" />

src/Archetype.Examples/NotifyPropertyChangesExamples.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ internal INotifyPropertyChanges Inpc
9595
}
9696
}
9797

98-
[Ignore]
98+
[Ignore("I don't remember")]
9999
[TestFixture]
100100
public class PersonExamples
101101
{

src/Archetype.Tests/Archetype.Tests.csproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Archetype.Tests</RootNamespace>
1111
<AssemblyName>Archetype.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,7 @@
2122
<ErrorReport>prompt</ErrorReport>
2223
<WarningLevel>4</WarningLevel>
2324
<PlatformTarget>x86</PlatformTarget>
25+
<Prefer32Bit>false</Prefer32Bit>
2426
</PropertyGroup>
2527
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2628
<DebugType>pdbonly</DebugType>
@@ -29,10 +31,12 @@
2931
<DefineConstants>TRACE</DefineConstants>
3032
<ErrorReport>prompt</ErrorReport>
3133
<WarningLevel>4</WarningLevel>
34+
<Prefer32Bit>false</Prefer32Bit>
3235
</PropertyGroup>
3336
<ItemGroup>
34-
<Reference Include="nunit.framework">
35-
<HintPath>..\..\lib\NUnit\lib\nunit.framework.dll</HintPath>
37+
<Reference Include="nunit.framework, Version=2.6.1.12217, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
38+
<SpecificVersion>False</SpecificVersion>
39+
<HintPath>..\..\packages\NUnit\lib\net45\nunit.framework.dll</HintPath>
3640
</Reference>
3741
<Reference Include="System" />
3842
<Reference Include="System.Core" />

src/Archetype.Tests/CastingTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void Dispose()
5454

5555

5656
[TestFixture]
57-
[Ignore]
57+
[Ignore("I don't remember")]
5858
public class CastingTests
5959
{
6060
[Test]

0 commit comments

Comments
 (0)