Permalink
Browse files

Bumping up version number

Also removing dragonfly redirection nuspec - no longer needed
  • Loading branch information...
loudej committed Feb 19, 2012
1 parent 541d0a7 commit 7d3492e921b9ed2b6796b9fe24e9c4aa0ad88e83
View
@@ -1,20 +0,0 @@
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
- <metadata>
- <description>@description@</description>
- <id>@project@</id>
- <version>@build.number@</version>
- <authors>@authors@</authors>
- <owners>@authors@</owners>
- <language>en-US</language>
- <summary>@summary@</summary>
- <projectUrl>http://loudej.github.com/firefly</projectUrl>
- <licenseUrl>https://github.com/loudej/firefly/blob/master/LICENSE.txt</licenseUrl>
- <tags>http owin</tags>
- <dependencies>
- <dependency id="Firefly" version="@build.number@" />
- </dependencies>
- </metadata>
- <files>
- <file src="nothing.*" />
- </files>
-</package>
View
@@ -4,7 +4,7 @@
open Fake
// properties
-let version = "0.3"
+let version = "0.4"
let projectName = "Firefly"
let projectDescription = "Firefly is a .NET HTTP Server in an assembly."
let authors = ["Louis DeJardin"]
@@ -55,26 +55,6 @@ Target "ApplyVersion" (fun _ ->
)
Target "CompileApp" (fun _ ->
-// AssemblyInfo
-// (fun p ->
-// {p with
-// CodeLanguage = CSharp;
-// AssemblyVersion = version;
-// AssemblyTitle = "Calculator Command line tool";
-// AssemblyDescription = "Sample project for FAKE - F# MAKE";
-// Guid = "A539B42C-CB9F-4a23-8E57-AF4E7CEE5BAA";
-// OutputFileName = @".\src\app\Calculator\Properties\AssemblyInfo.cs"})
-//
-// AssemblyInfo
-// (fun p ->
-// {p with
-// CodeLanguage = CSharp;
-// AssemblyVersion = version;
-// AssemblyTitle = "Calculator library";
-// AssemblyDescription = "Sample project for FAKE - F# MAKE";
-// Guid = "EE5621DB-B86B-44eb-987F-9C94BCC98441";
-// OutputFileName = @".\src\app\CalculatorLib\Properties\AssemblyInfo.cs"})
-
MSBuild buildDir "Build" ["Configuration","Release"; "PackageVersion",version] appReferences
|> Log "AppBuild-Output: "
)
@@ -138,21 +118,32 @@ Target "PackageNuGet" (fun _ ->
OutputPath = nugetDir
AccessKey = getBuildParamOrDefault "nugetkey" ""
Publish = hasBuildParam "nugetkey" }) "Firefly.nuspec"
+)
- NuGet (fun p ->
- {p with
- ToolPath = nugetPath
- Version = version
- Project = "Dragonfly"
- Description = "Dragonfly obsolete - renamed to Firefly"
- Authors = authors
- Dependencies = []
- OutputPath = nugetDir
- AccessKey = getBuildParamOrDefault "nugetkey" ""
- Publish = hasBuildParam "nugetkey" }) "Dragonfly.nuspec"
+
+Target "InstallPackages" (fun _ ->
+ let target = (environVar "HOME") @@ ".nuget";
+ let apply files =
+ for file in files do
+ CopyFile target file
+
+ !! (nugetDir @@ "*.nupkg") |> apply
+)
+
+
+Target "UploadPackages" (fun _ ->
+ let apply files =
+ for file in files do
+ ExecProcess (fun info ->
+ info.FileName <- nugetPath
+ info.WorkingDirectory <- nugetDir |> FullName
+ info.Arguments <- sprintf "push \"%s\"" (file |> FullName)) (System.TimeSpan.FromMinutes 5.)
+
+ !! (nugetDir @@ "*.nupkg") |> apply
)
+
let Phase name = (
Target name (fun _ -> trace "----------")
name
@@ -176,6 +167,8 @@ Phase "Default" <== ["Package"]
"Compile" <== ["CompileApp"; "CompileTest"]
"Test" <== ["xUnitTest"]
"Package" <== ["PackageZip"; "PackageNuGet"]
+"Install" <== ["InstallPackages"]
+"Deploy" <== ["UploadPackages"]
// start build
Run <| getBuildParamOrDefault "target" "Default"
@@ -29,7 +29,7 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-// [assembly: AssemblyVersion("0.3")]
+// [assembly: AssemblyVersion("0.4")]
-[assembly: AssemblyVersion("0.3")]
-[assembly: AssemblyFileVersion("0.3")]
+[assembly: AssemblyVersion("0.4")]
+[assembly: AssemblyFileVersion("0.4")]
@@ -29,7 +29,7 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-// [assembly: AssemblyVersion("0.3")]
+// [assembly: AssemblyVersion("0.4")]
-[assembly: AssemblyVersion("0.3")]
-[assembly: AssemblyFileVersion("0.3")]
+[assembly: AssemblyVersion("0.4")]
+[assembly: AssemblyFileVersion("0.4")]
@@ -29,7 +29,7 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-// [assembly: AssemblyVersion("0.3")]
+// [assembly: AssemblyVersion("0.4")]
-[assembly: AssemblyVersion("0.3")]
-[assembly: AssemblyFileVersion("0.3")]
+[assembly: AssemblyVersion("0.4")]
+[assembly: AssemblyFileVersion("0.4")]
@@ -29,7 +29,7 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-// [assembly: AssemblyVersion("0.3")]
+// [assembly: AssemblyVersion("0.4")]
-[assembly: AssemblyVersion("0.3")]
-[assembly: AssemblyFileVersion("0.3")]
+[assembly: AssemblyVersion("0.4")]
+[assembly: AssemblyFileVersion("0.4")]
@@ -29,7 +29,7 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-// [assembly: AssemblyVersion("0.3")]
+// [assembly: AssemblyVersion("0.4")]
-[assembly: AssemblyVersion("0.3")]
-[assembly: AssemblyFileVersion("0.3")]
+[assembly: AssemblyVersion("0.4")]
+[assembly: AssemblyFileVersion("0.4")]
@@ -29,7 +29,7 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-// [assembly: AssemblyVersion("0.3")]
+// [assembly: AssemblyVersion("0.4")]
-[assembly: AssemblyVersion("0.3")]
-[assembly: AssemblyFileVersion("0.3")]
+[assembly: AssemblyVersion("0.4")]
+[assembly: AssemblyFileVersion("0.4")]
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
@@ -29,7 +29,7 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
+// [assembly: AssemblyVersion("0.4")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.4")]
+[assembly: AssemblyFileVersion("0.4")]

0 comments on commit 7d3492e

Please sign in to comment.