Merge branch 'master' into master-us

appveyor.yml

@@ -0,0 +1,36 @@
+configuration: Release
+
+init:
+  - cmd: set
+
+install:
+  - cmd: appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+  - cmd: nuget install GitVersion.CommandLine -SolutionDir %APPVEYOR_BUILD_FOLDER% -Verbosity quiet -ExcludeVersion -pre  
+  - cmd: nuget install gitlink -SolutionDir %APPVEYOR_BUILD_FOLDER% -Verbosity quiet -ExcludeVersion -pre
+
+before_build:
+  - cmd: nuget restore Ninject.sln
+  - cmd: '.\packages\GitVersion.CommandLine\tools\GitVersion.exe /l console /output buildserver /updateAssemblyInfo'
+
+build:
+  verbosity: normal
+  parallel: true
+  project: Ninject.sln
+
+after_build:
+  - cmd: '.\packages\gitlink\lib\net45\GitLink.exe . -f src\Humanizer.sln -u https://github.com/MehdiK/Humanizer -s %APPVEYOR_REPO_COMMIT% -errorsaswarnings'
+  - cmd: nuget pack src\Portable.Ninject.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%" -NoPackageAnalysis
+  - cmd: nuget pack src\Portable.CommonServiceLocator.NinjectAdapter.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%" -NoPackageAnalysis
+  - cmd: appveyor PushArtifact "Portable.Ninject.%GitVersion_NuGetVersion%.nupkg"  
+  - cmd: appveyor PushArtifact "Portable.CommonServiceLocator.NinjectAdapter.%GitVersion_NuGetVersion%.nupkg"  
+
+test:
+  assemblies:
+    - '**\Ninject.Tests.dll'
+
+deploy:
+  provider: NuGet
+  server: https://www.myget.org/F/ninject/api/v2/package
+  api_key:
+    secure: bmqlJK8a5HYiUXOT99HXT1j7JiM5+fpR4kHhxIC30oaaEXbv94f0fKdiKlU1QC/l
+  artifact: /.*\.nupkg/

nuget.config

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="xUnit CI Builds" value="https://www.myget.org/F/xunit/" />    
-    <add key="xUnit Xamarin CI Builds" value="https://www.myget.org/F/xunit-xamarin/" />
+    <add key="xUnit CI Builds" value="https://www.myget.org/F/xunit/api/v2" />    
+    <add key="xUnit Devices CI Builds" value="https://www.myget.org/F/xunit-xamarin/api/v2" />
+    <add key="Ninject CI Builds" value="https://www.myget.org/F/ninject/api/v2" />
   </packageSources>
   <disabledPackageSources />
   <activePackageSource>