diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 941d142..ab6b551 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,7 @@ -#### 1.0.7 April 7 2016 #### - +#### 1.0.8 March 28 2016 #### + +Support for Akka 1.0.8 + +#### 1.0.7 April 7 2016 #### + Support for Akka 1.0.7 \ No newline at end of file diff --git a/build.fsx b/build.fsx index 5334c82..689d338 100644 --- a/build.fsx +++ b/build.fsx @@ -1,131 +1,129 @@ -#I @"src/packages/FAKE/tools" -#r "FakeLib.dll" -#r "System.Xml.Linq" - -open System -open System.IO -open System.Text -open Fake -open Fake.FileUtils -open Fake.MSTest -open Fake.TaskRunnerHelper -open Fake.ProcessHelper - -cd __SOURCE_DIRECTORY__ - -//-------------------------------------------------------------------------------- -// Information about the project for Nuget and Assembly info files -//-------------------------------------------------------------------------------- - - -let product = "Akka.NET" -let authors = [ "Akka.NET Team" ] -let copyright = "Copyright © 2013-2016 Akka.NET Team" -let company = "Akka.NET Team" -let description = "Akka.NET is a port of the popular Java/Scala framework Akka to .NET" -let tags = ["akka";"actors";"actor";"model";"Akka";"concurrency"] -let configuration = "Release" -let toolDir = "tools" -let CloudCopyDir = toolDir @@ "CloudCopy" -let AzCopyDir = toolDir @@ "AzCopy" - -// Read release notes and version - -let parsedRelease = - File.ReadLines "RELEASE_NOTES.md" - |> ReleaseNotesHelper.parseReleaseNotes - -let envBuildNumber = System.Environment.GetEnvironmentVariable("BUILD_NUMBER") -let buildNumber = if String.IsNullOrWhiteSpace(envBuildNumber) then "0" else envBuildNumber - -let version = parsedRelease.AssemblyVersion + "." + buildNumber -let preReleaseVersion = version + "-beta" - -let isUnstableDocs = hasBuildParam "unstable" -let isPreRelease = hasBuildParam "nugetprerelease" -let release = if isPreRelease then ReleaseNotesHelper.ReleaseNotes.New(version, version + "-beta", parsedRelease.Notes) else parsedRelease - -printfn "Assembly version: %s\nNuget version; %s\n" release.AssemblyVersion release.NugetVersion -//-------------------------------------------------------------------------------- -// Directories - -let binDir = "bin" -let testOutput = FullName "TestResults" -let perfOutput = FullName "PerfResults" - -let nugetDir = binDir @@ "nuget" -let workingDir = binDir @@ "build" -let libDir = workingDir @@ @"lib\net45\" -let nugetExe = FullName @"src\.nuget\NuGet.exe" -let docDir = "bin" @@ "doc" - -open Fake.RestorePackageHelper +#I @"src/packages/FAKE/tools" +#r "FakeLib.dll" +#r "System.Xml.Linq" + +open System +open System.IO +open System.Text +open Fake +open Fake.FileUtils +open Fake.TaskRunnerHelper +open Fake.ProcessHelper + +cd __SOURCE_DIRECTORY__ + +//-------------------------------------------------------------------------------- +// Information about the project for Nuget and Assembly info files +//-------------------------------------------------------------------------------- + + +let product = "Akka.NET" +let authors = [ "Akka.NET Team" ] +let copyright = "Copyright © 2013-2016 Akka.NET Team" +let company = "Akka.NET Team" +let description = "Akka.NET is a port of the popular Java/Scala framework Akka to .NET" +let tags = ["akka";"actors";"actor";"model";"Akka";"concurrency"] +let configuration = "Release" +let toolDir = "tools" +let CloudCopyDir = toolDir @@ "CloudCopy" +let AzCopyDir = toolDir @@ "AzCopy" + +// Read release notes and version + +let parsedRelease = + File.ReadLines "RELEASE_NOTES.md" + |> ReleaseNotesHelper.parseReleaseNotes + +let envBuildNumber = System.Environment.GetEnvironmentVariable("BUILD_NUMBER") +let buildNumber = if String.IsNullOrWhiteSpace(envBuildNumber) then "0" else envBuildNumber + +let version = parsedRelease.AssemblyVersion + "." + buildNumber +let preReleaseVersion = version + "-beta" + +let isUnstableDocs = hasBuildParam "unstable" +let isPreRelease = hasBuildParam "nugetprerelease" +let release = if isPreRelease then ReleaseNotesHelper.ReleaseNotes.New(version, version + "-beta", parsedRelease.Notes) else parsedRelease + +printfn "Assembly version: %s\nNuget version; %s\n" release.AssemblyVersion release.NugetVersion +//-------------------------------------------------------------------------------- +// Directories + +let binDir = "bin" +let testOutput = FullName "TestResults" +let perfOutput = FullName "PerfResults" + +let nugetDir = binDir @@ "nuget" +let workingDir = binDir @@ "build" +let nugetExe = FullName @"src\.nuget\NuGet.exe" +let docDir = "bin" @@ "doc" + +open Fake.RestorePackageHelper Target "RestorePackages" (fun _ -> - "./src/Akka.DI.AutoFac.sln" - |> RestoreMSSolutionPackages (fun p -> - { p with - OutputPath = "./src/packages" - Retries = 4 }) - ) - -//-------------------------------------------------------------------------------- -// Clean build results - -Target "Clean" <| fun _ -> - DeleteDir binDir - -//-------------------------------------------------------------------------------- -// Generate AssemblyInfo files with the version for release notes - -open AssemblyInfoFile - -Target "AssemblyInfo" <| fun _ -> - CreateCSharpAssemblyInfoWithConfig "src/SharedAssemblyInfo.cs" [ - Attribute.Company company - Attribute.Copyright copyright - Attribute.Trademark "" - Attribute.Version version - Attribute.FileVersion version ] <| AssemblyInfoFileConfig(false) - - -//-------------------------------------------------------------------------------- -// Build the solution - -Target "Build" <| fun _ -> - - !!"src/Akka.DI.AutoFac.sln" - |> MSBuildRelease "" "Rebuild" - |> ignore - -//-------------------------------------------------------------------------------- -// Copy the build output to bin directory -//-------------------------------------------------------------------------------- - -Target "CopyOutput" <| fun _ -> - - let copyOutput project = - let src = "src" @@ project @@ @"bin/Release/" - let dst = binDir @@ project + "./src/Akka.DI.AutoFac.sln" + |> RestoreMSSolutionPackages (fun p -> + { p with + OutputPath = "./src/packages" + Retries = 4 }) + ) + +//-------------------------------------------------------------------------------- +// Clean build results + +Target "Clean" <| fun _ -> + DeleteDir binDir + +//-------------------------------------------------------------------------------- +// Generate AssemblyInfo files with the version for release notes + +open AssemblyInfoFile + +Target "AssemblyInfo" <| fun _ -> + CreateCSharpAssemblyInfoWithConfig "src/SharedAssemblyInfo.cs" [ + Attribute.Company company + Attribute.Copyright copyright + Attribute.Trademark "" + Attribute.Version version + Attribute.FileVersion version ] <| AssemblyInfoFileConfig(false) + + +//-------------------------------------------------------------------------------- +// Build the solution + +Target "Build" <| fun _ -> + + !!"src/Akka.DI.AutoFac.sln" + |> MSBuildRelease "" "Rebuild" + |> ignore + +//-------------------------------------------------------------------------------- +// Copy the build output to bin directory +//-------------------------------------------------------------------------------- + +Target "CopyOutput" <| fun _ -> + + let copyOutput project = + let src = "src" @@ project @@ @"bin/Release/" + let dst = binDir @@ project CopyDir dst src allFiles - [ "Akka.DI.AutoFac" ] - |> List.iter copyOutput - -Target "BuildRelease" DoNothing - - - -//-------------------------------------------------------------------------------- -// Tests targets -//-------------------------------------------------------------------------------- - -//-------------------------------------------------------------------------------- -// Clean test output - -Target "CleanTests" <| fun _ -> - DeleteDir testOutput -//-------------------------------------------------------------------------------- -// Run tests - + [ "Akka.DI.AutoFac" ] + |> List.iter copyOutput + +Target "BuildRelease" DoNothing + + + +//-------------------------------------------------------------------------------- +// Tests targets +//-------------------------------------------------------------------------------- + +//-------------------------------------------------------------------------------- +// Clean test output + +Target "CleanTests" <| fun _ -> + DeleteDir testOutput +//-------------------------------------------------------------------------------- +// Run tests + open Fake.Testing Target "RunTests" <| fun _ -> let xunitTestAssemblies = !! "src/**/bin/Release/Akka.DI.AutoFac.Tests.dll" @@ -140,227 +138,258 @@ Target "RunTests" <| fun _ -> (fun p -> { p with XmlOutputPath = Some (testOutput + @"\" + assemblyName + "_xunit.xml"); HtmlOutputPath = Some (testOutput + @"\" + assemblyName + "_xunit.HTML"); ToolPath = xunitToolPath; TimeOut = System.TimeSpan.FromMinutes 30.0; Parallel = ParallelMode.NoParallelization }) (Seq.singleton assembly) - xunitTestAssemblies |> Seq.iter (runSingleAssembly) - -//-------------------------------------------------------------------------------- -// Nuget targets -//-------------------------------------------------------------------------------- - -//-------------------------------------------------------------------------------- -// Clean nuget directory - -Target "CleanNuget" <| fun _ -> - CleanDir nugetDir - -//-------------------------------------------------------------------------------- -// Pack nuget for all projects -// Publish to nuget.org if nugetkey is specified - -let createNugetPackages _ = - let removeDir dir = - let del _ = - DeleteDir dir - not (directoryExists dir) - runWithRetries del 3 |> ignore - - let mutable dirId = 1 - - ensureDirectory nugetDir - for nuspec in !! "src/**/*.nuspec" do - printfn "Creating nuget packages for %s" nuspec - - let tempBuildDir = workingDir + dirId.ToString() - ensureDirectory tempBuildDir - //clean it in case this target gets run multiple times. Which if it does is a bug. But hey since TC throws an exception when the dir is actually not empty. Its a nice circuitbreaker - CleanDir tempBuildDir - - let libDir = tempBuildDir @@ @"lib\net45\" - let project = Path.GetFileNameWithoutExtension nuspec - let projectDir = Path.GetDirectoryName nuspec - let projectFile = (!! (projectDir @@ project + ".*sproj")) |> Seq.head - let releaseDir = projectDir @@ @"bin\Release" - let packages = projectDir @@ "packages.config" - let packageDependencies = if (fileExists packages) then (getDependencies packages) else [] - - let pack outputDir symbolPackage = - NuGetHelper.NuGet - (fun p -> - { p with - Description = description - Authors = authors - Copyright = copyright - Project = project - Properties = ["Configuration", "Release"] - ReleaseNotes = release.Notes |> String.concat "\n" - Version = release.NugetVersion - Tags = tags |> String.concat " " - OutputPath = outputDir - WorkingDir = tempBuildDir - SymbolPackage = symbolPackage - Dependencies = packageDependencies }) - nuspec - - // Copy dll, pdb and xml to libdir = workingDir/lib/net45/ - ensureDirectory libDir - !! (releaseDir @@ project + ".dll") - ++ (releaseDir @@ project + ".pdb") - ++ (releaseDir @@ project + ".xml") - ++ (releaseDir @@ project + ".ExternalAnnotations.xml") - |> CopyFiles libDir - - // Copy all src-files (.cs and .fs files) to workingDir/src - let nugetSrcDir = tempBuildDir @@ @"src/" - // CreateDir nugetSrcDir - - let isCs = hasExt ".cs" - let isFs = hasExt ".fs" - let isAssemblyInfo f = (filename f).Contains("AssemblyInfo") - let isSrc f = (isCs f || isFs f) && not (isAssemblyInfo f) - CopyDir nugetSrcDir projectDir isSrc - - //Remove workingDir/src/obj and workingDir/src/bin - removeDir (nugetSrcDir @@ "obj") - removeDir (nugetSrcDir @@ "bin") - - // Create both normal nuget package and symbols nuget package. - // Uses the files we copied to workingDir and outputs to nugetdir - pack nugetDir NugetSymbolPackage.Nuspec - - dirId <- dirId + 1 - -let publishNugetPackages _ = - let rec publishPackage url accessKey trialsLeft packageFile = - let tracing = enableProcessTracing - enableProcessTracing <- false - let args p = - match p with - | (pack, key, "") -> sprintf "push \"%s\" %s" pack key - | (pack, key, url) -> sprintf "push \"%s\" %s -source %s" pack key url - - tracefn "Pushing %s Attempts left: %d" (FullName packageFile) trialsLeft - try - let result = ExecProcess (fun info -> - info.FileName <- nugetExe - info.WorkingDirectory <- (Path.GetDirectoryName (FullName packageFile)) - info.Arguments <- args (packageFile, accessKey,url)) (System.TimeSpan.FromMinutes 1.0) - enableProcessTracing <- tracing - if result <> 0 then failwithf "Error during NuGet symbol push. %s %s" nugetExe (args (packageFile, "key omitted",url)) - with exn -> - if (trialsLeft > 0) then (publishPackage url accessKey (trialsLeft-1) packageFile) - else raise exn - let shouldPushNugetPackages = hasBuildParam "nugetkey" - let shouldPushSymbolsPackages = (hasBuildParam "symbolspublishurl") && (hasBuildParam "symbolskey") - - if (shouldPushNugetPackages || shouldPushSymbolsPackages) then - printfn "Pushing nuget packages" - if shouldPushNugetPackages then - let normalPackages= - !! (nugetDir @@ "*.nupkg") - -- (nugetDir @@ "*.symbols.nupkg") |> Seq.sortBy(fun x -> x.ToLower()) - for package in normalPackages do - try - publishPackage (getBuildParamOrDefault "nugetpublishurl" "") (getBuildParam "nugetkey") 3 package - with exn -> - printfn "%s" exn.Message - - if shouldPushSymbolsPackages then - let symbolPackages= !! (nugetDir @@ "*.symbols.nupkg") |> Seq.sortBy(fun x -> x.ToLower()) - for package in symbolPackages do - try - publishPackage (getBuildParam "symbolspublishurl") (getBuildParam "symbolskey") 3 package - with exn -> - printfn "%s" exn.Message - - -Target "Nuget" <| fun _ -> - createNugetPackages() - publishNugetPackages() - -Target "CreateNuget" <| fun _ -> - createNugetPackages() - -Target "PublishNuget" <| fun _ -> - publishNugetPackages() - - - -//-------------------------------------------------------------------------------- -// Help -//-------------------------------------------------------------------------------- - -Target "Help" <| fun _ -> - List.iter printfn [ - "usage:" - "build [target]" - "" - " Targets for building:" - " * Build Builds" - " * Nuget Create and optionally publish nugets packages" - " * RunTests Runs tests" - " * All Builds, run tests, creates and optionally publish nuget packages" - "" - " Other Targets" - " * Help Display this help" - " * HelpNuget Display help about creating and pushing nuget packages" - ""] - -Target "HelpNuget" <| fun _ -> - List.iter printfn [ - "usage: " - "build Nuget [nugetkey= [nugetpublishurl=]] " - " [symbolskey= symbolspublishurl=] " - " [nugetprerelease=]" - "" - "Arguments for Nuget target:" - " nugetprerelease= Creates a pre-release package." - " The version will be version-prefix" - " Example: nugetprerelease=dev =>" - " 0.6.3-dev1408191917" - "" - "In order to publish a nuget package, keys must be specified." - "If a key is not specified the nuget packages will only be created on disk" - "After a build you can find them in bin/nuget" - "" - "For pushing nuget packages to nuget.org and symbols to symbolsource.org" - "you need to specify nugetkey=" - " build Nuget nugetKey=" - "" - "For pushing the ordinary nuget packages to another place than nuget.org specify the url" - " nugetkey= nugetpublishurl= " - "" - "For pushing symbols packages specify:" - " symbolskey= symbolspublishurl= " - "" - "Examples:" - " build Nuget Build nuget packages to the bin/nuget folder" - "" - " build Nuget nugetprerelease=dev Build pre-release nuget packages" - "" - " build Nuget nugetkey=123 Build and publish to nuget.org and symbolsource.org" - "" - " build Nuget nugetprerelease=dev nugetkey=123 nugetpublishurl=http://abc" - " symbolskey=456 symbolspublishurl=http://xyz" - " Build and publish pre-release nuget packages to http://abc" - " and symbols packages to http://xyz" - ""] - -//-------------------------------------------------------------------------------- -// Target dependencies -//-------------------------------------------------------------------------------- - -// build dependencies -"Clean" ==> "AssemblyInfo" ==> "RestorePackages" ==> "Build" ==> "CopyOutput" ==> "BuildRelease" - -// tests dependencies -"CleanTests" ==> "RunTests" - -// nuget dependencies -"CleanNuget" ==> "CreateNuget" -"CleanNuget" ==> "BuildRelease" ==> "Nuget" - -Target "All" DoNothing -"BuildRelease" ==> "All" -"RunTests" ==> "All" -"Nuget" ==> "All" - + xunitTestAssemblies |> Seq.iter (runSingleAssembly) + +//-------------------------------------------------------------------------------- +// Nuget targets +//-------------------------------------------------------------------------------- + +open NuGet.Update +//-------------------------------------------------------------------------------- +// Upgrade nuget package versions for dev and production + +let updateNugetPackages _ = + printfn "Updating NuGet dependencies" + + let getConfigFile preRelease = + match preRelease with + | true -> "src/.nuget/NuGet.Dev.Config" + | false -> "src/.nuget/NuGet.Config" + + for projectFile in !! "src/**/*.csproj" do + printfn "Updating packages for %s" projectFile + let project = Path.GetFileNameWithoutExtension projectFile + let projectDir = Path.GetDirectoryName projectFile + let config = projectDir @@ "packages.config" + + NugetUpdate + (fun p -> + { p with + ConfigFile = Some (getConfigFile isPreRelease) + Prerelease = isPreRelease + ToolPath = nugetExe + RepositoryPath = "src/Packages" + Ids = ["Akka"] + }) config + +Target "UpdateDependencies" <| fun _ -> + printfn "Invoking updateNugetPackages" + updateNugetPackages() + +//-------------------------------------------------------------------------------- +// Clean nuget directory + +Target "CleanNuget" <| fun _ -> + CleanDir nugetDir + +//-------------------------------------------------------------------------------- +// Pack nuget for all projects +// Publish to nuget.org if nugetkey is specified + +let createNugetPackages _ = + let removeDir dir = + let del _ = + DeleteDir dir + not (directoryExists dir) + runWithRetries del 3 |> ignore + + let mutable dirId = 1 + + ensureDirectory nugetDir + for nuspec in !! "src/**/*.nuspec" do + printfn "Creating nuget packages for %s" nuspec + + let tempBuildDir = workingDir + dirId.ToString() + ensureDirectory tempBuildDir + //clean it in case this target gets run multiple times. Which if it does is a bug. But hey since TC throws an exception when the dir is actually not empty. Its a nice circuitbreaker + CleanDir tempBuildDir + + let libDir = tempBuildDir @@ @"lib\net45\" + let project = Path.GetFileNameWithoutExtension nuspec + let projectDir = Path.GetDirectoryName nuspec + let projectFile = (!! (projectDir @@ project + ".*sproj")) |> Seq.head + let releaseDir = projectDir @@ @"bin\Release" + let packages = projectDir @@ "packages.config" + let packageDependencies = if (fileExists packages) then (getDependencies packages) else [] + + let pack outputDir symbolPackage = + NuGetHelper.NuGet + (fun p -> + { p with + Description = description + Authors = authors + Copyright = copyright + Project = project + Properties = ["Configuration", "Release"] + ReleaseNotes = release.Notes |> String.concat "\n" + Version = release.NugetVersion + Tags = tags |> String.concat " " + OutputPath = outputDir + WorkingDir = tempBuildDir + SymbolPackage = symbolPackage + Dependencies = packageDependencies }) + nuspec + + // Copy dll, pdb and xml to libdir = workingDir/lib/net45/ + ensureDirectory libDir + !! (releaseDir @@ project + ".dll") + ++ (releaseDir @@ project + ".pdb") + ++ (releaseDir @@ project + ".xml") + ++ (releaseDir @@ project + ".ExternalAnnotations.xml") + |> CopyFiles libDir + + // Copy all src-files (.cs and .fs files) to workingDir/src + let nugetSrcDir = tempBuildDir @@ @"src/" + // CreateDir nugetSrcDir + + let isCs = hasExt ".cs" + let isFs = hasExt ".fs" + let isAssemblyInfo f = (filename f).Contains("AssemblyInfo") + let isSrc f = (isCs f || isFs f) && not (isAssemblyInfo f) + CopyDir nugetSrcDir projectDir isSrc + + //Remove workingDir/src/obj and workingDir/src/bin + removeDir (nugetSrcDir @@ "obj") + removeDir (nugetSrcDir @@ "bin") + + // Create both normal nuget package and symbols nuget package. + // Uses the files we copied to workingDir and outputs to nugetdir + pack nugetDir NugetSymbolPackage.Nuspec + + dirId <- dirId + 1 + +let publishNugetPackages _ = + let rec publishPackage url accessKey trialsLeft packageFile = + let tracing = enableProcessTracing + enableProcessTracing <- false + let args p = + match p with + | (pack, key, "") -> sprintf "push \"%s\" %s" pack key + | (pack, key, url) -> sprintf "push \"%s\" %s -source %s" pack key url + + tracefn "Pushing %s Attempts left: %d" (FullName packageFile) trialsLeft + try + let result = ExecProcess (fun info -> + info.FileName <- nugetExe + info.WorkingDirectory <- (Path.GetDirectoryName (FullName packageFile)) + info.Arguments <- args (packageFile, accessKey,url)) (System.TimeSpan.FromMinutes 1.0) + enableProcessTracing <- tracing + if result <> 0 then failwithf "Error during NuGet symbol push. %s %s" nugetExe (args (packageFile, "key omitted",url)) + with exn -> + if (trialsLeft > 0) then (publishPackage url accessKey (trialsLeft-1) packageFile) + else raise exn + let shouldPushNugetPackages = hasBuildParam "nugetkey" + let shouldPushSymbolsPackages = (hasBuildParam "symbolspublishurl") && (hasBuildParam "symbolskey") + + if (shouldPushNugetPackages || shouldPushSymbolsPackages) then + printfn "Pushing nuget packages" + if shouldPushNugetPackages then + let normalPackages= + !! (nugetDir @@ "*.nupkg") + -- (nugetDir @@ "*.symbols.nupkg") |> Seq.sortBy(fun x -> x.ToLower()) + for package in normalPackages do + try + publishPackage (getBuildParamOrDefault "nugetpublishurl" "") (getBuildParam "nugetkey") 3 package + with exn -> + printfn "%s" exn.Message + + if shouldPushSymbolsPackages then + let symbolPackages= !! (nugetDir @@ "*.symbols.nupkg") |> Seq.sortBy(fun x -> x.ToLower()) + for package in symbolPackages do + try + publishPackage (getBuildParam "symbolspublishurl") (getBuildParam "symbolskey") 3 package + with exn -> + printfn "%s" exn.Message + + +Target "Nuget" <| fun _ -> + createNugetPackages() + publishNugetPackages() + +Target "CreateNuget" <| fun _ -> + createNugetPackages() + +Target "PublishNuget" <| fun _ -> + publishNugetPackages() + + + +//-------------------------------------------------------------------------------- +// Help +//-------------------------------------------------------------------------------- + +Target "Help" <| fun _ -> + List.iter printfn [ + "usage:" + "build [target]" + "" + " Targets for building:" + " * Build Builds" + " * Nuget Create and optionally publish nugets packages" + " * RunTests Runs tests" + " * All Builds, run tests, creates and optionally publish nuget packages" + "" + " Other Targets" + " * Help Display this help" + " * HelpNuget Display help about creating and pushing nuget packages" + ""] + +Target "HelpNuget" <| fun _ -> + List.iter printfn [ + "usage: " + "build Nuget [nugetkey= [nugetpublishurl=]] " + " [symbolskey= symbolspublishurl=] " + " [nugetprerelease=]" + "" + "Arguments for Nuget target:" + " nugetprerelease= Creates a pre-release package." + " The version will be version-prefix" + " Example: nugetprerelease=dev =>" + " 0.6.3-dev1408191917" + "" + "In order to publish a nuget package, keys must be specified." + "If a key is not specified the nuget packages will only be created on disk" + "After a build you can find them in bin/nuget" + "" + "For pushing nuget packages to nuget.org and symbols to symbolsource.org" + "you need to specify nugetkey=" + " build Nuget nugetKey=" + "" + "For pushing the ordinary nuget packages to another place than nuget.org specify the url" + " nugetkey= nugetpublishurl= " + "" + "For pushing symbols packages specify:" + " symbolskey= symbolspublishurl= " + "" + "Examples:" + " build Nuget Build nuget packages to the bin/nuget folder" + "" + " build Nuget nugetprerelease=dev Build pre-release nuget packages" + "" + " build Nuget nugetkey=123 Build and publish to nuget.org and symbolsource.org" + "" + " build Nuget nugetprerelease=dev nugetkey=123 nugetpublishurl=http://abc" + " symbolskey=456 symbolspublishurl=http://xyz" + " Build and publish pre-release nuget packages to http://abc" + " and symbols packages to http://xyz" + ""] + +//-------------------------------------------------------------------------------- +// Target dependencies +//-------------------------------------------------------------------------------- + +// build dependencies +"Clean" ==> "AssemblyInfo" ==> "RestorePackages" ==> "UpdateDependencies" ==> "Build" ==> "CopyOutput" ==> "BuildRelease" +// tests dependencies +"CleanTests" ==> "RunTests" + +// nuget dependencies +"CleanNuget" ==> "CreateNuget" +"CleanNuget" ==> "BuildRelease" ==> "Nuget" + +Target "All" DoNothing +"BuildRelease" ==> "All" +"RunTests" ==> "All" +"Nuget" ==> "All" + RunTargetOrDefault "Help" \ No newline at end of file diff --git a/src/.nuget/NuGet.Dev.Config b/src/.nuget/NuGet.Dev.Config new file mode 100644 index 0000000..5dd9107 --- /dev/null +++ b/src/.nuget/NuGet.Dev.Config @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/.nuget/nuget.config b/src/.nuget/nuget.config index 2131e86..3305130 100644 --- a/src/.nuget/nuget.config +++ b/src/.nuget/nuget.config @@ -1,9 +1,9 @@ - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/src/.nuget/nuget.exe b/src/.nuget/nuget.exe index 9f8781d..31fc988 100644 Binary files a/src/.nuget/nuget.exe and b/src/.nuget/nuget.exe differ diff --git a/src/Akka.DI.AutoFac.Tests/Akka.DI.AutoFac.Tests.csproj b/src/Akka.DI.AutoFac.Tests/Akka.DI.AutoFac.Tests.csproj index 4209ec3..f04d4f2 100644 --- a/src/Akka.DI.AutoFac.Tests/Akka.DI.AutoFac.Tests.csproj +++ b/src/Akka.DI.AutoFac.Tests/Akka.DI.AutoFac.Tests.csproj @@ -1,117 +1,117 @@ - - - - - - Debug - AnyCPU - {81AADD01-5545-4409-B20C-AA85956E588B} - Library - Properties - Akka.DI.AutoFac.Tests - Akka.DI.AutoFac.Tests - v4.5 - 512 - ..\..\..\ - true - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\Akka.1.0.7\lib\net45\Akka.dll - True - - - ..\packages\Akka.DI.Core.1.0.7\lib\net45\Akka.DI.Core.dll - True - - - ..\packages\Akka.DI.TestKit.1.0.7\lib\net45\Akka.DI.TestKit.dll - True - - - ..\packages\Akka.TestKit.1.0.7\lib\net45\Akka.TestKit.dll - True - - - ..\packages\Akka.TestKit.Xunit2.1.0.7\lib\net45\Akka.TestKit.Xunit2.dll - True - - - ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - - - ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True - - - - ..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - - - - - - - ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - - - ..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll - True - - - ..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll - True - - - - - - - - - {88854526-09d3-4f15-98f8-060838d958d1} - Akka.DI.AutoFac - - - - - - - - - - Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - - - + + + + + + Debug + AnyCPU + {81AADD01-5545-4409-B20C-AA85956E588B} + Library + Properties + Akka.DI.AutoFac.Tests + Akka.DI.AutoFac.Tests + v4.5 + 512 + ..\..\..\ + true + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\Akka.1.0.8\lib\net45\Akka.dll + True + + + ..\packages\Akka.DI.Core.1.0.8\lib\net45\Akka.DI.Core.dll + True + + + ..\packages\Akka.DI.TestKit.1.0.8\lib\net45\Akka.DI.TestKit.dll + True + + + ..\packages\Akka.TestKit.1.0.8\lib\net45\Akka.TestKit.dll + True + + + ..\packages\Akka.TestKit.Xunit2.1.0.8\lib\net45\Akka.TestKit.Xunit2.dll + True + + + ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + + + ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll + True + + + + ..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + True + + + + + + + + + ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll + True + + + ..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll + True + + + ..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll + True + + + + + + + + + {88854526-09d3-4f15-98f8-060838d958d1} + Akka.DI.AutoFac + + + + + + + + + + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". + + + + \ No newline at end of file diff --git a/src/Akka.DI.AutoFac.Tests/AutoFacDependencyResolverSpecs.cs b/src/Akka.DI.AutoFac.Tests/AutoFacDependencyResolverSpecs.cs index 5f679a5..30dafe6 100644 --- a/src/Akka.DI.AutoFac.Tests/AutoFacDependencyResolverSpecs.cs +++ b/src/Akka.DI.AutoFac.Tests/AutoFacDependencyResolverSpecs.cs @@ -1,6 +1,6 @@ //----------------------------------------------------------------------- // -// Copyright (C) 2009-2016 Typesafe Inc. +// Copyright (C) 2009-2016 Lightbend Inc. // Copyright (C) 2013-2016 Akka.NET project // //----------------------------------------------------------------------- diff --git a/src/Akka.DI.AutoFac.Tests/Properties/AssemblyInfo.cs b/src/Akka.DI.AutoFac.Tests/Properties/AssemblyInfo.cs index 46812af..6a2787a 100644 --- a/src/Akka.DI.AutoFac.Tests/Properties/AssemblyInfo.cs +++ b/src/Akka.DI.AutoFac.Tests/Properties/AssemblyInfo.cs @@ -1,6 +1,6 @@ //----------------------------------------------------------------------- // -// Copyright (C) 2009-2016 Typesafe Inc. +// Copyright (C) 2009-2016 Lightbend Inc. // Copyright (C) 2013-2016 Akka.NET project // //----------------------------------------------------------------------- diff --git a/src/Akka.DI.AutoFac.Tests/packages.config b/src/Akka.DI.AutoFac.Tests/packages.config index 5ad282f..a1f41ad 100644 --- a/src/Akka.DI.AutoFac.Tests/packages.config +++ b/src/Akka.DI.AutoFac.Tests/packages.config @@ -1,16 +1,16 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Akka.DI.AutoFac/Akka.DI.AutoFac.csproj b/src/Akka.DI.AutoFac/Akka.DI.AutoFac.csproj index 7d1ad5d..94f6fc0 100644 --- a/src/Akka.DI.AutoFac/Akka.DI.AutoFac.csproj +++ b/src/Akka.DI.AutoFac/Akka.DI.AutoFac.csproj @@ -1,82 +1,82 @@ - - - - - Debug - AnyCPU - {88854526-09D3-4F15-98F8-060838D958D1} - Library - Properties - Akka.DI.AutoFac - Akka.DI.AutoFac - v4.5 - 512 - - ..\..\..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - bin\Release\Akka.DI.AutoFac.xml - - - - ..\packages\Akka.1.0.7\lib\net45\Akka.dll - True - - - ..\packages\Akka.DI.Core.1.0.7\lib\net45\Akka.DI.Core.dll - True - - - ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - - - ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True - - - - ..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - - - - - Properties\SharedAssemblyInfo.cs - - - - - - - - - - - + + + + + Debug + AnyCPU + {88854526-09D3-4F15-98F8-060838D958D1} + Library + Properties + Akka.DI.AutoFac + Akka.DI.AutoFac + v4.5 + 512 + + ..\..\..\ + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false + bin\Release\Akka.DI.AutoFac.xml + + + + ..\packages\Akka.1.0.8\lib\net45\Akka.dll + True + + + ..\packages\Akka.DI.Core.1.0.8\lib\net45\Akka.DI.Core.dll + True + + + ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + + + ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll + True + + + + ..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + True + + + + + + + Properties\SharedAssemblyInfo.cs + + + + + + + + + + + \ No newline at end of file diff --git a/src/Akka.DI.AutoFac/AutoFacDependencyResolver.cs b/src/Akka.DI.AutoFac/AutoFacDependencyResolver.cs index a792f98..5939067 100644 --- a/src/Akka.DI.AutoFac/AutoFacDependencyResolver.cs +++ b/src/Akka.DI.AutoFac/AutoFacDependencyResolver.cs @@ -1,6 +1,6 @@ //----------------------------------------------------------------------- // -// Copyright (C) 2009-2016 Typesafe Inc. +// Copyright (C) 2009-2016 Lightbend Inc. // Copyright (C) 2013-2016 Akka.NET project // //----------------------------------------------------------------------- diff --git a/src/Akka.DI.AutoFac/Properties/AssemblyInfo.cs b/src/Akka.DI.AutoFac/Properties/AssemblyInfo.cs index 830c8e3..d93e775 100644 --- a/src/Akka.DI.AutoFac/Properties/AssemblyInfo.cs +++ b/src/Akka.DI.AutoFac/Properties/AssemblyInfo.cs @@ -1,6 +1,6 @@ //----------------------------------------------------------------------- // -// Copyright (C) 2009-2016 Typesafe Inc. +// Copyright (C) 2009-2016 Lightbend Inc. // Copyright (C) 2013-2016 Akka.NET project // //----------------------------------------------------------------------- diff --git a/src/Akka.DI.AutoFac/packages.config b/src/Akka.DI.AutoFac/packages.config index 12d1aec..88a2652 100644 --- a/src/Akka.DI.AutoFac/packages.config +++ b/src/Akka.DI.AutoFac/packages.config @@ -1,8 +1,8 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs index fdfe472..c20e4fc 100644 --- a/src/SharedAssemblyInfo.cs +++ b/src/SharedAssemblyInfo.cs @@ -1,8 +1,8 @@ -// -using System.Reflection; - -[assembly: AssemblyCompanyAttribute("Akka.NET Team")] -[assembly: AssemblyCopyrightAttribute("Copyright © 2013-2016 Akka.NET Team")] -[assembly: AssemblyTrademarkAttribute("")] -[assembly: AssemblyVersionAttribute("1.0.7.0")] -[assembly: AssemblyFileVersionAttribute("1.0.7.0")] +// +using System.Reflection; + +[assembly: AssemblyCompanyAttribute("Akka.NET Team")] +[assembly: AssemblyCopyrightAttribute("Copyright © 2013-2016 Akka.NET Team")] +[assembly: AssemblyTrademarkAttribute("")] +[assembly: AssemblyVersionAttribute("1.0.8.0")] +[assembly: AssemblyFileVersionAttribute("1.0.8.0")]