Skip to content

Commit

Permalink
Merge pull request #2 from HEskandari/upgrade-to-net46
Browse files Browse the repository at this point in the history
Upgrade to .NET 4.6
  • Loading branch information
HEskandari committed May 24, 2016
2 parents db7e0ae + ad86fde commit 12f6a5f
Show file tree
Hide file tree
Showing 342 changed files with 104,713 additions and 38,233 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
binaries
bin
obj
_ReSharper.*
Expand All @@ -8,3 +9,7 @@ _ReSharper.*
*.sln.cache
[Dd]ebug.log
[Rr]elease.log
.vs
.fake
packages
publish
4 changes: 4 additions & 0 deletions Build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@echo off
cls

lib\FAKE\FAKE.exe build.fsx %*
79 changes: 79 additions & 0 deletions Build.fsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
#r "./lib/FAKE/FakeLib.dll"
open Fake
open AssemblyInfoFile

let OutputDir = "./binaries/"
let PublishDir = "./publish/"
let Solution = "FarsiLibrary.sln"
let ToolsFolder = "./lib/"
let PackagesFolder = "./packages"
let TestAssembly = "FarsiLibrary.UnitTest.dll"
let TestRunnerPath = "./packages/NUnit.Runners.2.6.4/tools"
let SolutionItems = "./Solution Items/"

let GeneratePackage packageName =
let assemblyFile = OutputDir + packageName + ".dll"
let nugetSpec = SolutionItems + packageName + ".nuspec"
let version = GetAssemblyVersionString assemblyFile
tracefn "Generating nuget package for %s version %s ..." packageName version

NuGet (fun p ->
{p with
Version = version
OutputPath = PublishDir
WorkingDir = OutputDir
Publish = false })
nugetSpec

Target "EnsureDir" (fun _ ->
trace "Ensuring directories exists..."
ensureDirectory OutputDir
ensureDirectory PublishDir
)

Target "Clean" (fun _ ->
trace "Cleaning the output folder..."
CleanDirs [ OutputDir; PublishDir ]
)

Target "RestorePackages" (fun _ ->
Solution
|> RestoreMSSolutionPackages (fun p ->
{ p with
ToolPath = findNuget ToolsFolder;
OutputPath = PackagesFolder })
)

Target "Build" (fun _ ->
!! Solution
|> MSBuildRelease OutputDir "Build"
|> Log "BuildSource output: "
)

Target "Test" (fun _ ->
!! (OutputDir + TestAssembly)
|> NUnit (fun p ->
{p with
ToolPath = TestRunnerPath;
DisableShadowCopy = true;
OutputFile = OutputDir + "TestResults.xml"})
)

Target "PackageAll" (fun _ ->
GeneratePackage "FarsiLibrary.Utils"
GeneratePackage "FarsiLibrary.WPF"
GeneratePackage "FarsiLibrary.Win"
GeneratePackage "FarsiLibrary.Win.DevExpress"
)

"EnsureDir"
==> "Clean"
==> "Restorepackages"
==> "Build"

"Build"
==> "Test"
==> "PackageAll"

RunTargetOrDefault "Test"

13 changes: 0 additions & 13 deletions BuildCore.bat

This file was deleted.

3 changes: 0 additions & 3 deletions CSharp.targets

This file was deleted.

2 changes: 0 additions & 2 deletions DoBuild-Debug.bat

This file was deleted.

2 changes: 0 additions & 2 deletions DoBuild-Release.bat

This file was deleted.

34 changes: 0 additions & 34 deletions FarsiLibrary.Demos.Web/Cultures.aspx

This file was deleted.

72 changes: 0 additions & 72 deletions FarsiLibrary.Demos.Web/Cultures.aspx.cs

This file was deleted.

79 changes: 0 additions & 79 deletions FarsiLibrary.Demos.Web/Cultures.aspx.designer.cs

This file was deleted.

17 changes: 0 additions & 17 deletions FarsiLibrary.Demos.Web/CustomRendering.aspx

This file was deleted.

39 changes: 0 additions & 39 deletions FarsiLibrary.Demos.Web/CustomRendering.aspx.cs

This file was deleted.

0 comments on commit 12f6a5f

Please sign in to comment.