Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for NetStandard 1.6 #2647

Merged
merged 5 commits into from
May 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@
*.sh -text eol=lf

# Needed for API Approvals
*.txt text eol=crlf
*.txt text eol=crlf

build.sh eol=lf
82 changes: 27 additions & 55 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,13 @@
# Akka

# Fake directories
src/.build/**



#GitExtensions
us.stackdump

#KDiff3 and other git merge tools
*.orig

#-------------------------------------------------------------------------------
#Based on https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

#MonoDevelop
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
Expand All @@ -36,18 +21,19 @@ build/
bld/
[Bb]in/
[Oo]bj/
.fake/
TestResults/
PerfResults/
*.lock.json

# Roslyn cache directories
*.ide/
# Visual Studo 2015 cache/options directory
.vs/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NBench results
[Pp]erf[Rr]esult*/

#NUNIT
# NUNIT
*.VisualState.xml
TestResult.xml

Expand Down Expand Up @@ -120,9 +106,6 @@ _TeamCity*
# NCrunch
_NCrunch_*
.*crunch*.local.xml
*.ncrunchsolution
*.v2.ncrunchproject


# MightyMoose
*.mm.*
Expand Down Expand Up @@ -150,17 +133,19 @@ publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment out the next line if you want to keep your passwords hidden
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# If using the old MSBuild-Integrated Package Restore, uncomment this:
!**/packages/repositories.config
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config

# Windows Azure Build Output
csx/
Expand All @@ -170,8 +155,7 @@ csx/
AppPackages/

# Others
sql/
*.Cache
*.[Cc]ache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
Expand All @@ -181,6 +165,7 @@ ClientBin/
*.pfx
*.publishsettings
node_modules/
bower_components/

# RIA/Silverlight projects
Generated_Code/
Expand All @@ -197,37 +182,24 @@ UpgradeLog*.htm
*.mdf
*.ldf

# make exception for Akka.Persistence.SqlServer database file
!AkkaPersistenceSqlServerSpecDb.mdf
!AkkaPersistenceSqlServerSpecDb_log.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/
/src/.Akka.boltdata/NCover/Executions/0.jf
/src/.Akka.boltdata/NCover/Executions/ProjectId/0.jf
/src/.Akka.boltdata/NCover/Executions/ProjectOrderIndex/0.jf
/src/.Akka.boltdata/NCover/Projects/0.jf
/src/.Akka.boltdata/NCover/Projects/Name/0.jf
/src/.Akka.boltdata/Settings.json
/src/.Akka.boltdata/TestResults.json
resetdev.bat
/src/packages/repositories.config
/src/.nuget
/src/.nuget/NuGet.exe

# FAKE build folder
.fake/

# Akka.Persistence Test Output
target/
# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Visual Studio 6 build log
*.plg

# API Approval received files
**/Akka.API.Tests/*.received.txt
# Visual Studio 6 workspace options file
*.opt

# include self-signed test certificate for SSL Tests
!src/core/Akka.Remote.Tests/Resources/akka-validcert.pfx
tools/
build/
.nuget/
.dotnet/
44 changes: 1 addition & 43 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -1,43 +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 NUnit.Console -ConfigFile src\.nuget\Nuget.Config -OutputDirectory src\packages\FAKE -ExcludeVersion -Version 3.2.1
src\.nuget\NuGet.exe install xunit.runner.console -ConfigFile src\.nuget\Nuget.Config -OutputDirectory src\packages\FAKE -ExcludeVersion -Version 2.0.0
src\.nuget\NuGet.exe install NBench.Runner -OutputDirectory src\packages -ExcludeVersion -Version 0.3.3
src\.nuget\NuGet.exe install Microsoft.SourceBrowser -OutputDirectory src\packages -ExcludeVersion
src\.nuget\NuGet.exe install Google.Protobuf.Tools -OutputDirectory src\packages -ExcludeVersion -Version 3.2.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" %*
Loading