Added support for NetStandard
This commit is contained in:
Родитель
f76129ec20
Коммит
a0ed5db639
|
@ -17,14 +17,17 @@
|
|||
[Rr]eleases/
|
||||
x64/
|
||||
x86/
|
||||
build/
|
||||
bld/
|
||||
[Bb]in/
|
||||
[Oo]bj/
|
||||
.fake/
|
||||
TestResults/
|
||||
PerfResults/
|
||||
*.lock.json
|
||||
|
||||
# Visual Studio 2015 cache/options directory
|
||||
# Visual Studo 2015 cache/options directory
|
||||
.vs/
|
||||
# Uncomment if you have tasks that create the project's static files in wwwroot
|
||||
#wwwroot/
|
||||
|
||||
# MSTest test Results
|
||||
[Tt]est[Rr]esult*/
|
||||
|
@ -39,10 +42,6 @@ TestResult.xml
|
|||
[Rr]eleasePS/
|
||||
dlldata.c
|
||||
|
||||
# DNX
|
||||
project.lock.json
|
||||
artifacts/
|
||||
|
||||
*_i.c
|
||||
*_p.c
|
||||
*_i.h
|
||||
|
@ -75,7 +74,6 @@ _Chutzpah*
|
|||
ipch/
|
||||
*.aps
|
||||
*.ncb
|
||||
*.opendb
|
||||
*.opensdf
|
||||
*.sdf
|
||||
*.cachefile
|
||||
|
@ -84,7 +82,6 @@ ipch/
|
|||
*.psess
|
||||
*.vsp
|
||||
*.vspx
|
||||
*.sap
|
||||
|
||||
# TFS 2012 Local Workspace
|
||||
$tf/
|
||||
|
@ -97,7 +94,7 @@ _ReSharper*/
|
|||
*.[Rr]e[Ss]harper
|
||||
*.DotSettings.user
|
||||
|
||||
# JustCode is a .NET coding add-in
|
||||
# JustCode is a .NET coding addin-in
|
||||
.JustCode
|
||||
|
||||
# TeamCity is a build add-in
|
||||
|
@ -109,7 +106,6 @@ _TeamCity*
|
|||
# NCrunch
|
||||
_NCrunch_*
|
||||
.*crunch*.local.xml
|
||||
nCrunchTemp_*
|
||||
|
||||
# MightyMoose
|
||||
*.mm.*
|
||||
|
@ -150,33 +146,18 @@ publish/
|
|||
!**/packages/build/
|
||||
# Uncomment if necessary however generally it will be regenerated when needed
|
||||
#!**/packages/repositories.config
|
||||
# NuGet v3's project.json files produces more ignoreable files
|
||||
*.nuget.props
|
||||
*.nuget.targets
|
||||
|
||||
# Microsoft Azure Build Output
|
||||
# Windows Azure Build Output
|
||||
csx/
|
||||
*.build.csdef
|
||||
|
||||
# Microsoft Azure Emulator
|
||||
ecf/
|
||||
rcf/
|
||||
|
||||
# Microsoft Azure ApplicationInsights config file
|
||||
ApplicationInsights.config
|
||||
|
||||
# Windows Store app package directory
|
||||
AppPackages/
|
||||
BundleArtifacts/
|
||||
|
||||
# Visual Studio cache files
|
||||
# files ending in .cache can be ignored
|
||||
*.[Cc]ache
|
||||
# but keep track of directories ending in .cache
|
||||
!*.[Cc]ache/
|
||||
|
||||
# Others
|
||||
*.[Cc]ache
|
||||
ClientBin/
|
||||
[Ss]tyle[Cc]op.*
|
||||
~$*
|
||||
*~
|
||||
*.dbmdl
|
||||
|
@ -184,7 +165,7 @@ ClientBin/
|
|||
*.pfx
|
||||
*.publishsettings
|
||||
node_modules/
|
||||
orleans.codegen.cs
|
||||
bower_components/
|
||||
|
||||
# RIA/Silverlight projects
|
||||
Generated_Code/
|
||||
|
@ -209,9 +190,6 @@ UpgradeLog*.htm
|
|||
# Microsoft Fakes
|
||||
FakesAssemblies/
|
||||
|
||||
# GhostDoc plugin setting file
|
||||
*.GhostDoc.xml
|
||||
|
||||
# Node.js Tools for Visual Studio
|
||||
.ntvs_analysis.dat
|
||||
|
||||
|
@ -221,16 +199,7 @@ FakesAssemblies/
|
|||
# Visual Studio 6 workspace options file
|
||||
*.opt
|
||||
|
||||
# Visual Studio LightSwitch build output
|
||||
**/*.HTMLClient/GeneratedArtifacts
|
||||
**/*.DesktopClient/GeneratedArtifacts
|
||||
**/*.DesktopClient/ModelManifest.xml
|
||||
**/*.Server/GeneratedArtifacts
|
||||
**/*.Server/ModelManifest.xml
|
||||
_Pvt_Extensions
|
||||
|
||||
# Paket dependency manager
|
||||
.paket/paket.exe
|
||||
|
||||
# FAKE - F# Make
|
||||
.fake/
|
||||
tools/
|
||||
build/
|
||||
.nuget/
|
||||
.dotnet/
|
39
build.cmd
39
build.cmd
|
@ -1,38 +1 @@
|
|||
@echo off
|
||||
|
||||
pushd %~dp0
|
||||
|
||||
SETLOCAL
|
||||
SET CACHED_NUGET=%LocalAppData%\NuGet\NuGet.exe
|
||||
|
||||
IF EXIST %CACHED_NUGET% goto copynuget
|
||||
echo Downloading latest version of NuGet.exe...
|
||||
IF NOT EXIST %LocalAppData%\NuGet md %LocalAppData%\NuGet
|
||||
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://www.nuget.org/nuget.exe' -OutFile '%CACHED_NUGET%'"
|
||||
|
||||
:copynuget
|
||||
IF EXIST src\.nuget\nuget.exe goto restore
|
||||
md src\.nuget
|
||||
copy %CACHED_NUGET% src\.nuget\nuget.exe > nul
|
||||
|
||||
:restore
|
||||
|
||||
src\.nuget\NuGet.exe update -self
|
||||
|
||||
|
||||
pushd %~dp0
|
||||
|
||||
src\.nuget\NuGet.exe update -self
|
||||
|
||||
src\.nuget\NuGet.exe install FAKE -ConfigFile src\.nuget\Nuget.Config -OutputDirectory src\packages -ExcludeVersion -Version 4.16.1
|
||||
src\.nuget\NuGet.exe install xunit.runner.console -ConfigFile src\.nuget\Nuget.Config -OutputDirectory src\packages\FAKE -ExcludeVersion -Version 2.0.0
|
||||
|
||||
if not exist src\packages\SourceLink.Fake\tools\SourceLink.fsx (
|
||||
src\.nuget\nuget.exe install SourceLink.Fake -ConfigFile src\.nuget\Nuget.Config -OutputDirectory src\packages -ExcludeVersion
|
||||
)
|
||||
rem cls
|
||||
|
||||
set encoding=utf-8
|
||||
src\packages\FAKE\tools\FAKE.exe build.fsx %*
|
||||
|
||||
popd
|
||||
PowerShell.exe -file "build.ps1" %*
|
424
build.fsx
424
build.fsx
|
@ -1,395 +1,109 @@
|
|||
#I @"src/packages/FAKE/tools"
|
||||
#I @"tools/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
|
||||
open Fake.DotNetCli
|
||||
open Fake.DocFxHelper
|
||||
|
||||
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-2017 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"]
|
||||
// Variables
|
||||
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 output = __SOURCE_DIRECTORY__ @@ "build"
|
||||
let outputTests = output @@ "tests"
|
||||
let outputBinaries = output @@ "binaries"
|
||||
let outputNuGet = output @@ "nuget"
|
||||
|
||||
let binDir = "bin"
|
||||
let testOutput = FullName "TestResults"
|
||||
let perfOutput = FullName "PerfResults"
|
||||
Target "Clean" (fun _ ->
|
||||
CleanDir output
|
||||
CleanDir outputTests
|
||||
CleanDir outputBinaries
|
||||
CleanDir outputNuGet
|
||||
|
||||
let nugetDir = binDir @@ "nuget"
|
||||
let workingDir = binDir @@ "build"
|
||||
let nugetExe = FullName @"src\.nuget\NuGet.exe"
|
||||
let docDir = "bin" @@ "doc"
|
||||
CleanDirs !! "./**/bin"
|
||||
CleanDirs !! "./**/obj"
|
||||
)
|
||||
|
||||
open Fake.RestorePackageHelper
|
||||
Target "RestorePackages" (fun _ ->
|
||||
"./src/Akka.DI.AutoFac.sln"
|
||||
|> RestoreMSSolutionPackages (fun p ->
|
||||
{ p with
|
||||
OutputPath = "./src/packages"
|
||||
Retries = 4 })
|
||||
)
|
||||
Target "RestorePackages" (fun _ ->
|
||||
DotNetCli.Restore
|
||||
(fun p ->
|
||||
{ p with
|
||||
Project = "./src/Akka.DI.AutoFac.sln"
|
||||
NoCache = false })
|
||||
)
|
||||
|
||||
Target "Build" (fun _ ->
|
||||
DotNetCli.Build
|
||||
(fun p ->
|
||||
{ p with
|
||||
Project = "./src/Akka.DI.AutoFac.sln"
|
||||
Configuration = configuration })
|
||||
)
|
||||
|
||||
//--------------------------------------------------------------------------------
|
||||
// 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
|
||||
// Tests targets
|
||||
//--------------------------------------------------------------------------------
|
||||
|
||||
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 "RunTests" (fun _ ->
|
||||
let projects = !! "./**/*.Tests.csproj"
|
||||
|
||||
Target "BuildRelease" DoNothing
|
||||
|
||||
let runSingleProject project =
|
||||
DotNetCli.RunCommand
|
||||
(fun p ->
|
||||
{ p with
|
||||
WorkingDir = (Directory.GetParent project).FullName
|
||||
TimeOut = TimeSpan.FromMinutes 10. })
|
||||
(sprintf "xunit -parallel none -teamcity -xml %s_xunit.xml" (outputTests @@ fileNameWithoutExt project))
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------
|
||||
// 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"
|
||||
|
||||
mkdir testOutput
|
||||
|
||||
let xunitToolPath = findToolInSubPath "xunit.console.exe" "src/packages/xunit.runner.console*/tools"
|
||||
printfn "Using XUnit runner: %s" xunitToolPath
|
||||
let runSingleAssembly assembly =
|
||||
let assemblyName = Path.GetFileNameWithoutExtension(assembly)
|
||||
xUnit2
|
||||
(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)
|
||||
projects |> Seq.iter (runSingleProject)
|
||||
)
|
||||
|
||||
//--------------------------------------------------------------------------------
|
||||
// Nuget targets
|
||||
//--------------------------------------------------------------------------------
|
||||
|
||||
open NuGet.Update
|
||||
//--------------------------------------------------------------------------------
|
||||
// Upgrade nuget package versions for dev and production
|
||||
Target "CreateNuget" (fun _ ->
|
||||
let envBuildNumber = environVarOrDefault "APPVEYOR_BUILD_NUMBER" "0"
|
||||
let branch = environVarOrDefault "APPVEYOR_REPO_BRANCH" ""
|
||||
let versionSuffix = if branch.Equals("dev") then (sprintf "beta-%s" envBuildNumber) else ""
|
||||
|
||||
let updateNugetPackages _ =
|
||||
printfn "Updating NuGet dependencies"
|
||||
let projects = !! "./**/Akka.DI.AutoFac.csproj"
|
||||
|
||||
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 ->
|
||||
let runSingleProject project =
|
||||
DotNetCli.Pack
|
||||
(fun p ->
|
||||
{ p with
|
||||
ConfigFile = Some (getConfigFile isPreRelease)
|
||||
Prerelease = isPreRelease
|
||||
ToolPath = nugetExe
|
||||
RepositoryPath = "src/Packages"
|
||||
Ids = ["Akka.DI.Core"; "Akka.DI.TestKit"]
|
||||
}) config
|
||||
Project = project
|
||||
Configuration = configuration
|
||||
AdditionalArgs = ["--include-symbols"]
|
||||
VersionSuffix = versionSuffix
|
||||
OutputPath = outputNuGet })
|
||||
|
||||
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=<key> [nugetpublishurl=<url>]] "
|
||||
" [symbolskey=<key> symbolspublishurl=<url>] "
|
||||
" [nugetprerelease=<prefix>]"
|
||||
""
|
||||
"Arguments for Nuget target:"
|
||||
" nugetprerelease=<prefix> Creates a pre-release package."
|
||||
" The version will be version-prefix<date>"
|
||||
" 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=<key>"
|
||||
" build Nuget nugetKey=<key for nuget.org>"
|
||||
""
|
||||
"For pushing the ordinary nuget packages to another place than nuget.org specify the url"
|
||||
" nugetkey=<key> nugetpublishurl=<url> "
|
||||
""
|
||||
"For pushing symbols packages specify:"
|
||||
" symbolskey=<key> symbolspublishurl=<url> "
|
||||
""
|
||||
"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"
|
||||
""]
|
||||
projects |> Seq.iter (runSingleProject)
|
||||
)
|
||||
|
||||
//--------------------------------------------------------------------------------
|
||||
// Target dependencies
|
||||
//--------------------------------------------------------------------------------
|
||||
|
||||
Target "BuildRelease" DoNothing
|
||||
Target "All" DoNothing
|
||||
Target "Nuget" DoNothing
|
||||
|
||||
// build dependencies
|
||||
"Clean" ==> "AssemblyInfo" ==> "RestorePackages" ==> "UpdateDependencies" ==> "Build" ==> "CopyOutput" ==> "BuildRelease"
|
||||
"Clean" ==> "RestorePackages" ==> "Build" ==> "BuildRelease"
|
||||
|
||||
// tests dependencies
|
||||
"CleanTests" ==> "RunTests"
|
||||
"Clean" ==> "RestorePackages" ==> "RunTests"
|
||||
|
||||
// nuget dependencies
|
||||
"CleanNuget" ==> "CreateNuget"
|
||||
"CleanNuget" ==> "BuildRelease" ==> "Nuget"
|
||||
"Clean" ==> "RestorePackages" ==> "Build" ==> "CreateNuget"
|
||||
|
||||
Target "All" DoNothing
|
||||
// all
|
||||
"BuildRelease" ==> "All"
|
||||
"RunTests" ==> "All"
|
||||
"Nuget" ==> "All"
|
||||
|
||||
RunTargetOrDefault "Help"
|
||||
RunTargetOrDefault "All"
|
|
@ -0,0 +1,129 @@
|
|||
<#
|
||||
.SYNOPSIS
|
||||
This is a Powershell script to bootstrap a Fake build.
|
||||
.DESCRIPTION
|
||||
This Powershell script will download NuGet if missing, restore NuGet tools (including Fake)
|
||||
and execute your Fake build script with the parameters you provide.
|
||||
.PARAMETER Target
|
||||
The build script target to run.
|
||||
.PARAMETER Configuration
|
||||
The build configuration to use.
|
||||
.PARAMETER Verbosity
|
||||
Specifies the amount of information to be displayed.
|
||||
.PARAMETER WhatIf
|
||||
Performs a dry run of the build script.
|
||||
No tasks will be executed.
|
||||
.PARAMETER ScriptArgs
|
||||
Remaining arguments are added here.
|
||||
#>
|
||||
|
||||
[CmdletBinding()]
|
||||
Param(
|
||||
[string]$Target = "Default",
|
||||
[ValidateSet("Release", "Debug")]
|
||||
[string]$Configuration = "Release",
|
||||
[ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
|
||||
[string]$Verbosity = "Verbose",
|
||||
[switch]$WhatIf,
|
||||
[Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
|
||||
[string[]]$ScriptArgs
|
||||
)
|
||||
|
||||
$FakeVersion = "4.61.2"
|
||||
$DotNetChannel = "preview";
|
||||
$DotNetVersion = "1.0.4";
|
||||
$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1";
|
||||
$NugetVersion = "4.1.0";
|
||||
$NugetUrl = "https://dist.nuget.org/win-x86-commandline/v$NugetVersion/nuget.exe"
|
||||
|
||||
# Make sure tools folder exists
|
||||
$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
|
||||
$ToolPath = Join-Path $PSScriptRoot "tools"
|
||||
if (!(Test-Path $ToolPath)) {
|
||||
Write-Verbose "Creating tools directory..."
|
||||
New-Item -Path $ToolPath -Type directory | out-null
|
||||
}
|
||||
|
||||
###########################################################################
|
||||
# INSTALL .NET CORE CLI
|
||||
###########################################################################
|
||||
|
||||
Function Remove-PathVariable([string]$VariableToRemove)
|
||||
{
|
||||
$path = [Environment]::GetEnvironmentVariable("PATH", "User")
|
||||
if ($path -ne $null)
|
||||
{
|
||||
$newItems = $path.Split(';', [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove }
|
||||
[Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "User")
|
||||
}
|
||||
|
||||
$path = [Environment]::GetEnvironmentVariable("PATH", "Process")
|
||||
if ($path -ne $null)
|
||||
{
|
||||
$newItems = $path.Split(';', [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove }
|
||||
[Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "Process")
|
||||
}
|
||||
}
|
||||
|
||||
# Get .NET Core CLI path if installed.
|
||||
$FoundDotNetCliVersion = $null;
|
||||
if (Get-Command dotnet -ErrorAction SilentlyContinue) {
|
||||
$FoundDotNetCliVersion = dotnet --version;
|
||||
}
|
||||
|
||||
if($FoundDotNetCliVersion -ne $DotNetVersion) {
|
||||
$InstallPath = Join-Path $PSScriptRoot ".dotnet"
|
||||
if (!(Test-Path $InstallPath)) {
|
||||
mkdir -Force $InstallPath | Out-Null;
|
||||
}
|
||||
(New-Object System.Net.WebClient).DownloadFile($DotNetInstallerUri, "$InstallPath\dotnet-install.ps1");
|
||||
& $InstallPath\dotnet-install.ps1 -Channel $DotNetChannel -Version $DotNetVersion -InstallDir $InstallPath;
|
||||
|
||||
Remove-PathVariable "$InstallPath"
|
||||
$env:PATH = "$InstallPath;$env:PATH"
|
||||
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
|
||||
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
|
||||
}
|
||||
|
||||
###########################################################################
|
||||
# INSTALL NUGET
|
||||
###########################################################################
|
||||
|
||||
# Make sure nuget.exe exists.
|
||||
$NugetPath = Join-Path $ToolPath "nuget.exe"
|
||||
if (!(Test-Path $NugetPath)) {
|
||||
Write-Host "Downloading NuGet.exe..."
|
||||
(New-Object System.Net.WebClient).DownloadFile($NugetUrl, $NugetPath);
|
||||
}
|
||||
|
||||
###########################################################################
|
||||
# INSTALL FAKE
|
||||
###########################################################################
|
||||
# Make sure Fake has been installed.
|
||||
|
||||
$FakeExePath = Join-Path $ToolPath "FAKE/tools/FAKE.exe"
|
||||
if (!(Test-Path $FakeExePath)) {
|
||||
Write-Host "Installing Fake..."
|
||||
Invoke-Expression "&`"$NugetPath`" install Fake -ExcludeVersion -Version $FakeVersion -OutputDirectory `"$ToolPath`"" | Out-Null;
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
Throw "An error occured while restoring Fake from NuGet."
|
||||
}
|
||||
}
|
||||
|
||||
###########################################################################
|
||||
# RUN BUILD SCRIPT
|
||||
###########################################################################
|
||||
|
||||
# Build the argument list.
|
||||
$Arguments = @{
|
||||
target=$Target;
|
||||
configuration=$Configuration;
|
||||
verbosity=$Verbosity;
|
||||
dryrun=$WhatIf;
|
||||
}.GetEnumerator() | %{"--{0}=`"{1}`"" -f $_.key, $_.value };
|
||||
|
||||
# Start Fake
|
||||
Write-Host "Running build script..."
|
||||
Invoke-Expression "$FakeExePath `"build.fsx`" $ScriptArgs $Arguments"
|
||||
|
||||
exit $LASTEXITCODE
|
|
@ -1,12 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<solution>
|
||||
<add key="disableSourceControlIntegration" value="true" />
|
||||
</solution>
|
||||
<packageSources>
|
||||
<add key="NuGet official" value="https://www.nuget.org/api/v2/" />
|
||||
<!-- Official package source -->
|
||||
<add key="Akka.NET Nightly Build" value="https://www.myget.org/F/akkadotnet/api/v2" />
|
||||
<!-- Nightly package source -->
|
||||
</packageSources>
|
||||
</configuration>
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<solution>
|
||||
<add key="disableSourceControlIntegration" value="true" />
|
||||
</solution>
|
||||
<packageSources>
|
||||
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
|
||||
</packageSources>
|
||||
</configuration>
|
Двоичные данные
src/.nuget/nuget.exe
Двоичные данные
src/.nuget/nuget.exe
Двоичный файл не отображается.
|
@ -1,120 +1,24 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{81AADD01-5545-4409-B20C-AA85956E588B}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Akka.DI.AutoFac.Tests</RootNamespace>
|
||||
<AssemblyName>Akka.DI.AutoFac.Tests</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
|
||||
<RestorePackages>true</RestorePackages>
|
||||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
<TargetFrameworkProfile />
|
||||
<AssemblyTitle>Akka.DI.AutoFac.Tests</AssemblyTitle>
|
||||
<TargetFrameworks>net452;netcoreapp1.1</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Akka.DI.AutoFac\Akka.DI.AutoFac.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Akka.DI.TestKit" Version="1.3.0-beta-17" />
|
||||
<PackageReference Include="Akka.TestKit.Xunit2" Version="1.3.0-beta-17" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
|
||||
<PackageReference Include="xunit" Version="2.3.0-beta3-*" />
|
||||
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta3-*" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta3-*" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Akka, Version=1.2.3.41, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Akka.1.2.3\lib\net45\Akka.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Akka.DI.Core, Version=1.2.3.41, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Akka.DI.Core.1.2.3\lib\net45\Akka.DI.Core.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Akka.DI.TestKit, Version=1.2.3.41, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Akka.DI.TestKit.1.2.3\lib\net45\Akka.DI.TestKit.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Akka.TestKit, Version=1.2.3.41, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Akka.TestKit.1.2.3\lib\net45\Akka.TestKit.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Akka.TestKit.Xunit2, Version=1.2.3.41, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Akka.TestKit.Xunit2.1.2.3\lib\net45\Akka.TestKit.Xunit2.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<HintPath>..\Packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
|
||||
<HintPath>..\Packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
|
||||
<HintPath>..\Packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
|
||||
<HintPath>..\Packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
|
||||
<HintPath>..\Packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="AutoFacDependencyResolverSpecs.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Akka.DI.AutoFac\Akka.DI.AutoFac.csproj">
|
||||
<Project>{88854526-09d3-4f15-98f8-060838d958d1}</Project>
|
||||
<Name>Akka.DI.AutoFac</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
|
@ -9,18 +9,6 @@ using System.Reflection;
|
|||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("Akka.DI.AutoFac.Tests")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("Akka.DI.AutoFac.Tests")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2015")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Setting ComVisible to false makes the types in this assembly not visible
|
||||
// to COM components. If you need to access a type in this assembly from
|
||||
// COM, set the ComVisible attribute to true on that type.
|
||||
|
@ -28,16 +16,3 @@ using System.Runtime.InteropServices;
|
|||
|
||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||
[assembly: Guid("7eee576a-035e-4020-abc8-62c8b07cc761")]
|
||||
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
// 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("1.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
|
|
|
@ -1,49 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Akka" version="1.2.3" targetFramework="net452" />
|
||||
<package id="Akka.DI.Core" version="1.2.3" targetFramework="net452" />
|
||||
<package id="Akka.DI.TestKit" version="1.2.3" targetFramework="net452" />
|
||||
<package id="Akka.TestKit" version="1.2.3" targetFramework="net452" />
|
||||
<package id="Akka.TestKit.Xunit2" version="1.2.3" targetFramework="net452" />
|
||||
<package id="Autofac" version="4.6.0" targetFramework="net452" />
|
||||
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net452" />
|
||||
<package id="NETStandard.Library" version="1.6.1" targetFramework="net452" />
|
||||
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
|
||||
<package id="System.Collections" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net452" />
|
||||
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Globalization" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.IO" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.IO.Compression" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Linq" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Net.Http" version="4.3.2" targetFramework="net452" />
|
||||
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.ObjectModel" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Reflection" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Runtime" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Threading" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net452" />
|
||||
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net452" />
|
||||
<package id="xunit" version="2.2.0" targetFramework="net452" />
|
||||
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
|
||||
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />
|
||||
<package id="xunit.core" version="2.2.0" targetFramework="net452" />
|
||||
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
|
||||
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
|
||||
</packages>
|
|
@ -1,83 +1,27 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{88854526-09D3-4F15-98F8-060838D958D1}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Akka.DI.AutoFac</RootNamespace>
|
||||
<AssemblyName>Akka.DI.AutoFac</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
|
||||
<RestorePackages>true</RestorePackages>
|
||||
<AssemblyTitle>Akka.DI.AutoFac</AssemblyTitle>
|
||||
<Description>AutoFac Dependency Injection (DI) support for Akka.NET</Description>
|
||||
<TargetFrameworks>net45;netstandard1.6</TargetFrameworks>
|
||||
<PackageTags>akka;actors;actor model;Akka;concurrency;autofac</PackageTags>
|
||||
<Copyright>Copyright © 2013-2017 Akka.NET Team</Copyright>
|
||||
<Authors>Akka.NET Team</Authors>
|
||||
<VersionPrefix>1.3.0</VersionPrefix>
|
||||
<PackageIconUrl>http://getakka.net/images/AkkaNetLogo.Normal.png</PackageIconUrl>
|
||||
<PackageProjectUrl>https://github.com/akkadotnet/Akka.DI.AutoFac</PackageProjectUrl>
|
||||
<PackageLicenseUrl>https://github.com/akkadotnet/Akka.DI.AutoFac/blob/master/LICENSE</PackageLicenseUrl>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Akka" Version="1.3.0-beta-17" />
|
||||
<PackageReference Include="Akka.DI.Core" Version="1.3.0-beta-17" />
|
||||
<PackageReference Include="Autofac" Version="4.6.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<DocumentationFile>bin\Release\Akka.DI.AutoFac.xml</DocumentationFile>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Akka, Version=1.2.3.41, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Akka.1.2.3\lib\net45\Akka.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Akka.DI.Core, Version=1.2.3.41, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Akka.DI.Core.1.2.3\lib\net45\Akka.DI.Core.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="..\SharedAssemblyInfo.cs">
|
||||
<Link>Properties\SharedAssemblyInfo.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="AutoFacDependencyResolver.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Akka.DI.AutoFac.nuspec" />
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
|
||||
</Project>
|
|
@ -1,20 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
|
||||
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||
<id>@project@</id>
|
||||
<title>@project@@title@</title>
|
||||
<version>@build.number@</version>
|
||||
<authors>@authors@</authors>
|
||||
<owners>@authors@</owners>
|
||||
<description>AutoFac Dependency Injection (DI) support for Akka.NET</description>
|
||||
<licenseUrl>https://github.com/akkadotnet/akka.net/blob/master/LICENSE</licenseUrl>
|
||||
<projectUrl>https://github.com/akkadotnet/akka.net</projectUrl>
|
||||
<iconUrl>http://getakka.net/images/AkkaNetLogo.Normal.png</iconUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<releaseNotes>@releaseNotes@</releaseNotes>
|
||||
<copyright>@copyright@</copyright>
|
||||
<tags>@tags@ DI AutoFac</tags>
|
||||
@dependencies@
|
||||
@references@
|
||||
</metadata>
|
||||
</package>
|
|
@ -39,7 +39,7 @@ namespace Akka.DI.AutoFac
|
|||
if (system == null) throw new ArgumentNullException("system");
|
||||
if (container == null) throw new ArgumentNullException("container");
|
||||
this.container = container;
|
||||
typeCache = new ConcurrentDictionary<string, Type>(StringComparer.InvariantCultureIgnoreCase);
|
||||
typeCache = new ConcurrentDictionary<string, Type>(StringComparer.OrdinalIgnoreCase);
|
||||
this.system = system;
|
||||
this.system.AddDependencyResolver(this);
|
||||
this.references = new ConditionalWeakTable<ActorBase, ILifetimeScope>();
|
||||
|
@ -59,7 +59,7 @@ namespace Akka.DI.AutoFac
|
|||
ComponentRegistry.
|
||||
Registrations.
|
||||
Where(registration => registration.Activator.LimitType.
|
||||
Name.Equals(actorName, StringComparison.InvariantCultureIgnoreCase)).
|
||||
Name.Equals(actorName, StringComparison.OrdinalIgnoreCase)).
|
||||
Select(registration => registration.Activator.LimitType).
|
||||
FirstOrDefault());
|
||||
|
||||
|
|
|
@ -8,15 +8,6 @@
|
|||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("Akka.DI.AutoFac")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyProduct("Akka.DI.AutoFac")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Setting ComVisible to false makes the types in this assembly not visible
|
||||
// to COM components. If you need to access a type in this assembly from
|
||||
// COM, set the ComVisible attribute to true on that type.
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Akka" version="1.2.3" targetFramework="net45" />
|
||||
<package id="Akka.DI.Core" version="1.2.3" targetFramework="net45" />
|
||||
<package id="Autofac" version="4.6.0" targetFramework="net45" />
|
||||
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
|
||||
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net45" />
|
||||
</packages>
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<solution>
|
||||
<add key="disableSourceControlIntegration" value="true" />
|
||||
</solution>
|
||||
<packageSources>
|
||||
<clear />
|
||||
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
|
||||
<add key="netcorenightly" value="https://www.myget.org/F/akkadotnet-netcore/api/v3/index.json" />
|
||||
</packageSources>
|
||||
</configuration>
|
|
@ -1,8 +0,0 @@
|
|||
// <auto-generated/>
|
||||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyCompanyAttribute("Akka.NET Team")]
|
||||
[assembly: AssemblyCopyrightAttribute("Copyright © 2013-2017 Akka.NET Team")]
|
||||
[assembly: AssemblyTrademarkAttribute("")]
|
||||
[assembly: AssemblyVersionAttribute("1.2.3.0")]
|
||||
[assembly: AssemblyFileVersionAttribute("1.2.3.0")]
|
Загрузка…
Ссылка в новой задаче