-
Notifications
You must be signed in to change notification settings - Fork 527
Add a Modern PCL project that also support CoreClr #200
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
Changes from all commits
3dce0d8
5749dd8
c6ee924
6bbe40b
531bb82
3248d8e
c5a7bb8
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,4 +12,5 @@ dist | |
| packages/ | ||
| AppPackages | ||
| .vs/ | ||
| TestResults/ | ||
| TestResults/ | ||
| *.nuget.targets | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
|
|
||
| <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> | ||
| <metadata> | ||
| <id>Portable.Ninject</id> | ||
|
|
@@ -19,47 +18,64 @@ | |
| <summary>IoC container for .NET</summary> | ||
| <releaseNotes>Xamarin support for iOS and Android</releaseNotes> | ||
| <tags>Ninject ioc di portable pcl xamarin ios android monotouch monoandroid</tags> | ||
| <dependencies> | ||
| <group targetFramework="dotnet"> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would recommend using
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I actually tried. But for some reason it didn't work. |
||
| <dependency id="System.Collections" version="4.0.10" /> | ||
| <dependency id="System.ComponentModel" version="4.0.0" /> | ||
| <dependency id="System.Diagnostics.Debug" version="4.0.10" /> | ||
| <dependency id="System.IO" version="4.0.10" /> | ||
| <dependency id="System.IO.FileSystem" version="4.0.0" /> | ||
| <dependency id="System.Linq" version="4.0.0" /> | ||
| <dependency id="System.Linq.Expressions" version="4.0.10" /> | ||
| <dependency id="System.Reflection" version="4.0.10" /> | ||
| <dependency id="System.Reflection.Emit.ILGeneration" version="4.0.0" /> | ||
| <dependency id="System.Reflection.Emit.LightWeight" version="4.0.0" /> | ||
| <dependency id="System.Reflection.Extensions" version="4.0.0" /> | ||
| <dependency id="System.Reflection.Primitives" version="4.0.0" /> | ||
| <dependency id="System.Reflection.TypeExtensions" version="4.0.0" /> | ||
| <dependency id="System.Runtime" version="4.0.20" /> | ||
| <dependency id="System.Runtime.Extensions" version="4.0.10" /> | ||
| <dependency id="System.Threading" version="4.0.10" /> | ||
| <dependency id="System.Threading.Tasks" version="4.0.10" /> | ||
| <dependency id="System.Threading.Timer" version="4.0.0" /> | ||
| </group> | ||
| </dependencies> | ||
| </metadata> | ||
| <files> | ||
|
|
||
| <!-- PCL --> | ||
| <file src="src\Ninject\bin\PCL\Release\Ninject.dll" target="lib\portable-net451+win81+wpa81+monotouch+monoandroid+Xamarin.iOS\Ninject.dll" /> | ||
| <file src="src\Ninject\bin\PCL\Release\Ninject.pdb" target="lib\portable-net451+win81+wpa81+monotouch+monoandroid+Xamarin.iOS\Ninject.pdb" /> | ||
| <file src="src\Ninject\bin\PCL\Release\Ninject.xml" target="lib\portable-net451+win81+wpa81+monotouch+monoandroid+Xamarin.iOS\Ninject.xml" /> | ||
|
|
||
| <!-- .NET 4.5.1 --> | ||
| <file src="src\Ninject\bin\Net4\Release\Ninject.dll" target="lib\net451\Ninject.dll" /> | ||
| <file src="src\Ninject\bin\Net4\Release\Ninject.pdb" target="lib\net451\Ninject.pdb" /> | ||
| <file src="src\Ninject\bin\Net4\Release\Ninject.xml" target="lib\net451\Ninject.xml" /> | ||
|
|
||
| <!-- Win8.1 --> | ||
| <file src="src\Ninject\bin\WinRT\Release\Ninject.dll" target="lib\win81\Ninject.dll" /> | ||
| <file src="src\Ninject\bin\WinRT\Release\Ninject.pdb" target="lib\win81\Ninject.pdb" /> | ||
| <file src="src\Ninject\bin\WinRT\Release\Ninject.xml" target="lib\win81\Ninject.xml" /> | ||
| <file src="src\Ninject\bin\WinRT\Release\Ninject.pri" target="lib\win81\Ninject.pri" /> | ||
|
|
||
| <!-- Wpa81 --> | ||
| <file src="src\Ninject\bin\Wpa81\Release\Ninject.dll" target="lib\Wpa81\Ninject.dll" /> | ||
| <file src="src\Ninject\bin\Wpa81\Release\Ninject.pdb" target="lib\Wpa81\Ninject.pdb" /> | ||
| <file src="src\Ninject\bin\Wpa81\Release\Ninject.xml" target="lib\Wpa81\Ninject.xml" /> | ||
| <file src="src\Ninject\bin\Wpa81\Release\Ninject.pri" target="lib\Wpa81\Ninject.pri" /> | ||
|
|
||
| <!-- iOS Classic --> | ||
| <!-- iOS Classic --> | ||
| <file src="src\Ninject\bin\iPhone\Release\Ninject.dll" target="lib\monotouch\Ninject.dll" /> | ||
| <file src="src\Ninject\bin\iPhone\Release\Ninject.pdb" target="lib\monotouch\Ninject.pdb" /> | ||
| <file src="src\Ninject\bin\iPhone\Release\Ninject.xml" target="lib\monotouch\Ninject.xml" /> | ||
|
|
||
| <!-- iOS Unified --> | ||
| <file src="src\Ninject\bin\iOS-Unified\Release\Ninject.dll" target="lib\Xamarin.iOS\Ninject.dll" /> | ||
| <file src="src\Ninject\bin\iOS-Unified\Release\Ninject.pdb" target="lib\Xamarin.iOS\Ninject.pdb" /> | ||
| <file src="src\Ninject\bin\iOS-Unified\Release\Ninject.xml" target="lib\Xamarin.iOS\Ninject.xml" /> | ||
|
|
||
| <!-- Android --> | ||
| <!-- Android --> | ||
| <file src="src\Ninject\bin\Android\Release\Ninject.dll" target="lib\monoandroid\Ninject.dll" /> | ||
| <file src="src\Ninject\bin\Android\Release\Ninject.pdb" target="lib\monoandroid\Ninject.pdb" /> | ||
| <file src="src\Ninject\bin\Android\Release\Ninject.xml" target="lib\monoandroid\Ninject.xml" /> | ||
|
|
||
|
|
||
| <!-- dotnet --> | ||
| <file src="src\Ninject\bin\dotnet\Release\Ninject.dll" target="lib\dotnet\Ninject.dll" /> | ||
| <file src="src\Ninject\bin\dotnet\Release\Ninject.pdb" target="lib\dotnet\Ninject.pdb" /> | ||
| <file src="src\Ninject\bin\dotnet\Release\Ninject.xml" target="lib\dotnet\Ninject.xml" /> | ||
| <file src="src\**\*.cs" target="src" exclude="src\_ReSharper.*\**\*.*;packages\**\*.*;src\**\Debug\**\*.*;" /> | ||
| </files> | ||
| </package> | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "projects": [ | ||
| "wrap" | ||
| ] | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| #if !WINRT | ||
| #if !WINRT && !DNXCORE50 | ||
| namespace Ninject.Tests.Integration.ThreadScopeTests | ||
| { | ||
| using System; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion> | ||
| <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> | ||
| </PropertyGroup> | ||
| <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" /> | ||
| <PropertyGroup Label="Globals"> | ||
| <ProjectGuid>f177d383-f30f-4e09-b5c8-034525582fa8</ProjectGuid> | ||
| <RootNamespace>Ninject.dotnet</RootNamespace> | ||
| <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath> | ||
| <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <SchemaVersion>2.0</SchemaVersion> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\Ninject.dotnet\Ninject-dotnet.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> | ||
| </ItemGroup> | ||
| <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" /> | ||
| </Project> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| { | ||
| "version": "1.0.0-*", | ||
| "description": "Ninject dotnet Tests", | ||
| "compile": [ | ||
| "../../Ninject.Test/**/*.cs" | ||
| ], | ||
|
|
||
| "dependencies": { | ||
| "xunit": "2.1.0", | ||
| "xunit.runner.dnx": "2.1.0-beta6-build191" | ||
| }, | ||
|
|
||
| "commands": { | ||
| "test": "xunit.runner.dnx" | ||
| }, | ||
|
|
||
| "frameworks": { | ||
| "dnxcore50": { | ||
| "compilationOptions": { | ||
| "define": [ "DOTNET", "NO_MOQ" ] | ||
| }, | ||
| "dependencies": { | ||
| "FluentAssertions": "4.0.1", | ||
| "moq.netcore": "4.4.0-beta8", | ||
| "Ninject": "99.99.99-dev" | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand why adding a Modern PCL project creates so many configurations.