From e19221e9776aff1e9e16acadc074cf084550ac25 Mon Sep 17 00:00:00 2001 From: mgortman Date: Wed, 10 Feb 2016 03:43:18 -0800 Subject: [PATCH] set version to 0.2.3 --- RELEASE_NOTES.md | 5 +++++ build.fsx | 13 +++++++++++-- src/SharedAssemblyInfo.cs | 6 ++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 66a6946eb..ed5dcf56f 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,8 @@ +#### 0.2.3 February 10 +- Critical fix to handling of async operations when initiated from outside the event loop (#66). +- Fix to enable setting socket-related options through SetOption on Bootstrap (#68). +- build changes to allow signing assemblies + #### 0.2.2 January 30 - `ResourceLeakDetector` fix (#64) - Assigned GUID on default internal logger `EventSource` diff --git a/build.fsx b/build.fsx index c8b318c8d..b23a2faa0 100644 --- a/build.fsx +++ b/build.fsx @@ -70,9 +70,17 @@ open AssemblyInfoFile Target "AssemblyInfo" (fun _ -> let version = release.AssemblyVersion + let signKey = getBuildParamOrDefault "signkey" "" + let delaySign = + match signKey with + | s as string when s.Length > 0 -> Some(true) + | _ -> None + CreateCSharpAssemblyInfoWithConfig "src/SharedAssemblyInfo.cs" [ Attribute.Company company Attribute.Copyright copyright + Attribute.KeyFile signKey + Attribute.DelaySign delaySign Attribute.Version version Attribute.FileVersion version ] <| AssemblyInfoFileConfig(false) ) @@ -160,6 +168,7 @@ Target "CleanNuget" (fun _ -> // Publish to nuget.org if nugetkey is specified let createNugetPackages _ = + let nugetSuffix = getBuildParamOrDefault "nugetSuffix" "" let mutable dirName = 1 let removeDir dir = let del _ = @@ -182,7 +191,7 @@ let createNugetPackages _ = let releaseDir = projectDir @@ @"bin\Release" let packages = projectDir @@ "packages.config" let packageDependencies = if (fileExists packages) then (getDependencies packages) else [] - let dependencies = packageDependencies @ getDependencies project + let dependencies = packageDependencies @ (getDependencies project |> List.map (fun x -> fst x + nugetSuffix, snd x)) let releaseVersion = getProjectVersion project let pack outputDir symbolPackage = @@ -192,7 +201,7 @@ let createNugetPackages _ = Description = description Authors = authors Copyright = copyright - Project = project + Project = project + nugetSuffix Properties = ["Configuration", "Release"] ReleaseNotes = release.Notes |> String.concat "\n" Version = releaseVersion diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs index 84b3d8c5d..2bb5debe3 100644 --- a/src/SharedAssemblyInfo.cs +++ b/src/SharedAssemblyInfo.cs @@ -3,5 +3,7 @@ [assembly: AssemblyCompanyAttribute("DotNetty")] [assembly: AssemblyCopyrightAttribute("Copyright © 2015")] -[assembly: AssemblyVersionAttribute("0.2.1")] -[assembly: AssemblyFileVersionAttribute("0.2.1")] +[assembly: AssemblyKeyFileAttribute("")] +[assembly: AssemblyDelaySignAttribute(false)] +[assembly: AssemblyVersionAttribute("0.2.3")] +[assembly: AssemblyFileVersionAttribute("0.2.3")]