From 609cb9b6a3bcf79f336367fb6e21957826de26ae Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sun, 25 Nov 2012 15:13:48 -0500 Subject: [PATCH] Add NeutralResourcesLanguageAttribute to shared assembly infos --- .gitignore | 1 + Ninject.sln | 31 -------- ...CommonServiceLocator.NinjectAdapter.nuspec | 9 ++- Portable.Ninject.nuspec | 2 +- pack.cmd | 3 +- .../Portable.CommonServiceLocator.1.2.nuspec | 16 ---- ...viceLocator.NinjectAdapter.Portable.csproj | 77 ------------------- ...CommonServiceLocator.NinjectAdapter.csproj | 35 +++++---- src/Ninject/Ninject.WP.csproj | 3 + src/Ninject/Ninject.WinRT.csproj | 3 + src/SharedAssemblyInfo.cs | 2 + 11 files changed, 35 insertions(+), 147 deletions(-) delete mode 100644 packages/Portable.CommonServiceLocator.1.2/Portable.CommonServiceLocator.1.2.nuspec delete mode 100644 src/CommonServiceLocator.NinjectAdapter/CommonServiceLocator.NinjectAdapter.Portable.csproj diff --git a/.gitignore b/.gitignore index afc8f731..4e12e91c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,6 @@ dist *.cache *.dotCover Portable.Ninject*.nupkg +Portable.CommonServiceLocator*.nupkg /src/Ninject.SilverlightTests/Bin /TestResults/* \ No newline at end of file diff --git a/Ninject.sln b/Ninject.sln index 3213fa68..84577ef8 100644 --- a/Ninject.sln +++ b/Ninject.sln @@ -39,8 +39,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ninject.SL4", "src\Ninject\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ninject.SilverlightTests", "src\Ninject.SilverlightTests\Ninject.SilverlightTests.csproj", "{033B09D3-8532-419A-B906-36F8EB605B30}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonServiceLocator.NinjectAdapter.Portable", "src\CommonServiceLocator.NinjectAdapter\CommonServiceLocator.NinjectAdapter.Portable.csproj", "{DE69195E-F254-4F09-B784-7752809D0EA9}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Phone", "Phone", "{D9374370-4F49-48DC-B89E-552A0743DAFD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ninject.WindowsPhone7Tests", "src\Ninject.WindowsPhone7Tests\Ninject.WindowsPhone7Tests.csproj", "{F7314647-1C1F-4960-A693-AA773C54C13D}" @@ -424,34 +422,6 @@ Global {033B09D3-8532-419A-B906-36F8EB605B30}.Release|Mixed Platforms.Build.0 = Release|Any CPU {033B09D3-8532-419A-B906-36F8EB605B30}.Release|Windows Phone.ActiveCfg = Release|Any CPU {033B09D3-8532-419A-B906-36F8EB605B30}.Release|x86.ActiveCfg = Release|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.AutomatedRelease|Any CPU.ActiveCfg = Release|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.AutomatedRelease|Any CPU.Build.0 = Release|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.AutomatedRelease|ARM.ActiveCfg = Release|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.AutomatedRelease|Mixed Platforms.ActiveCfg = Release|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.AutomatedRelease|Mixed Platforms.Build.0 = Release|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.AutomatedRelease|Windows Phone.ActiveCfg = Release|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.AutomatedRelease|x86.ActiveCfg = Release|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Debug .NET 4.0|Any CPU.ActiveCfg = Debug|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Debug .NET 4.0|Any CPU.Build.0 = Debug|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Debug .NET 4.0|ARM.ActiveCfg = Debug|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Debug .NET 4.0|Mixed Platforms.ActiveCfg = Debug|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Debug .NET 4.0|Mixed Platforms.Build.0 = Debug|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Debug .NET 4.0|Windows Phone.ActiveCfg = Debug|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Debug .NET 4.0|x86.ActiveCfg = Debug|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Debug|ARM.ActiveCfg = Debug|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Debug|Windows Phone.ActiveCfg = Debug|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Debug|x86.ActiveCfg = Debug|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Release|Any CPU.Build.0 = Release|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Release|ARM.ActiveCfg = Release|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Release|Windows Phone.ActiveCfg = Release|Any CPU - {DE69195E-F254-4F09-B784-7752809D0EA9}.Release|x86.ActiveCfg = Release|Any CPU {F7314647-1C1F-4960-A693-AA773C54C13D}.AutomatedRelease|Any CPU.ActiveCfg = Release|Any CPU {F7314647-1C1F-4960-A693-AA773C54C13D}.AutomatedRelease|Any CPU.Build.0 = Release|Any CPU {F7314647-1C1F-4960-A693-AA773C54C13D}.AutomatedRelease|Any CPU.Deploy.0 = Release|Any CPU @@ -573,7 +543,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {9BD94717-484B-4EB1-AF32-8D4244F02E8E} = {C6D6D07A-67A0-4E16-8A41-415942C38137} {7E7DE343-8DBD-42EE-94ED-036E9E0F5411} = {C6D6D07A-67A0-4E16-8A41-415942C38137} {90F46524-0716-4180-8A5F-1CD1EB5686F6} = {C6D6D07A-67A0-4E16-8A41-415942C38137} {C9F6CFE7-44B2-4D55-9307-33C34C045468} = {C6D6D07A-67A0-4E16-8A41-415942C38137} diff --git a/Portable.CommonServiceLocator.NinjectAdapter.nuspec b/Portable.CommonServiceLocator.NinjectAdapter.nuspec index daa7955a..5c7546ea 100644 --- a/Portable.CommonServiceLocator.NinjectAdapter.nuspec +++ b/Portable.CommonServiceLocator.NinjectAdapter.nuspec @@ -2,7 +2,7 @@ Portable.CommonServiceLocator.NinjectAdapter - 1.2.1 + 1.2.2 CommonServiceLocator.NinjectAdapter (Portable) Oren Novotny @@ -12,12 +12,13 @@ Targets .NET 4, SL4, WP7.1, WinRT An adapter to implement CommonServiceLocator on top of Ninject 3.0 - + - - + + + \ No newline at end of file diff --git a/Portable.Ninject.nuspec b/Portable.Ninject.nuspec index dc8791e2..76a38e99 100644 --- a/Portable.Ninject.nuspec +++ b/Portable.Ninject.nuspec @@ -2,7 +2,7 @@ Portable.Ninject - 3.0.4 + 3.0.5 Ninject for Portable Class Libraries Oren Novotny diff --git a/pack.cmd b/pack.cmd index df765bcf..2af14e95 100644 --- a/pack.cmd +++ b/pack.cmd @@ -1 +1,2 @@ -.nuget\nuget.exe pack Portable.Ninject.nuspec -Symbols \ No newline at end of file +.nuget\nuget.exe pack Portable.Ninject.nuspec -Symbols +.nuget\nuget.exe pack Portable.CommonServiceLocator.NinjectAdapter.nuspec -Symbols \ No newline at end of file diff --git a/packages/Portable.CommonServiceLocator.1.2/Portable.CommonServiceLocator.1.2.nuspec b/packages/Portable.CommonServiceLocator.1.2/Portable.CommonServiceLocator.1.2.nuspec deleted file mode 100644 index b638c727..00000000 --- a/packages/Portable.CommonServiceLocator.1.2/Portable.CommonServiceLocator.1.2.nuspec +++ /dev/null @@ -1,16 +0,0 @@ - - - - Portable.CommonServiceLocator - 1.2 - CommonServiceLocator (with PCL version) - Oren Novotny - Oren Novotny - http://commonservicelocator.codeplex.com/license - http://commonservicelocator.codeplex.com/ - false - The Common Service Locator library contains a shared interface for service location which application and framework developers can reference. The library provides an abstraction over IoC containers and service locators. Using the library allows an application to indirectly access the capabilities without relying on hard references. The hope is that using this library, third-party applications and frameworks can begin to leverage IoC/Service Location without tying themselves down to a specific implementation. - The Common Service Locator library contains a shared interface for service location which application and framework developers can reference. The library provides an abstraction over IoC containers and service locators. Using the library allows an application to indirectly access the capabilities without relying on hard references. The hope is that using this library, third-party applications and frameworks can begin to leverage IoC/Service Location without tying themselves down to a specific implementation. - en-US - - \ No newline at end of file diff --git a/src/CommonServiceLocator.NinjectAdapter/CommonServiceLocator.NinjectAdapter.Portable.csproj b/src/CommonServiceLocator.NinjectAdapter/CommonServiceLocator.NinjectAdapter.Portable.csproj deleted file mode 100644 index c7eb9eb2..00000000 --- a/src/CommonServiceLocator.NinjectAdapter/CommonServiceLocator.NinjectAdapter.Portable.csproj +++ /dev/null @@ -1,77 +0,0 @@ - - - - - 10.0 - Debug - AnyCPU - {DE69195E-F254-4F09-B784-7752809D0EA9} - Library - Properties - CommonServiceLocator.NinjectAdapter.Portable - CommonServiceLocator.NinjectAdapter.Portable - v4.0 - Profile88 - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\ - true - - - true - full - false - bin\Debug\ - TRACE;DEBUG;PCL - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE;PCL - prompt - 4 - - - true - - - ..\Ninject.snk - - - - - {a07b8562-3304-4ef3-8a48-76af89690545} - Ninject.Common - - - - - Properties\SharedAssemblyInfo.cs - - - - - - - Ninject.snk - - - - - - ..\..\packages\Portable.CommonServiceLocator.1.2\lib\portable-net4+sl4+wp7+win8\Microsoft.Practices.ServiceLocation.dll - - - - - - \ No newline at end of file diff --git a/src/CommonServiceLocator.NinjectAdapter/CommonServiceLocator.NinjectAdapter.csproj b/src/CommonServiceLocator.NinjectAdapter/CommonServiceLocator.NinjectAdapter.csproj index 0f5c8a51..73ac709e 100644 --- a/src/CommonServiceLocator.NinjectAdapter/CommonServiceLocator.NinjectAdapter.csproj +++ b/src/CommonServiceLocator.NinjectAdapter/CommonServiceLocator.NinjectAdapter.csproj @@ -36,13 +36,16 @@ v4.0 ..\..\ true + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Profile88 + 10.0 true full false - bin\.NET4\Debug\ - DEBUG;TRACE + bin\Debug\ + TRACE;DEBUG;PCL prompt 4 AllRules.ruleset @@ -50,8 +53,8 @@ pdbonly true - bin\.NET4\Release\ - TRACE + bin\Release\ + TRACE;PCL prompt 4 true @@ -60,24 +63,14 @@ - bin\.NET4\Release\ - TRACE + bin\Release\ + TRACE;PCL true pdbonly AnyCPU prompt AllRules.ruleset - - - False - ..\..\packages\Portable.CommonServiceLocator.1.2\lib\net35\Microsoft.Practices.ServiceLocation.dll - - - - 3.5 - - Properties\SharedAssemblyInfo.cs @@ -112,7 +105,15 @@ true - + + + + + + ..\..\packages\Portable.CommonServiceLocator.1.2\lib\portable-net4+sl4+wp7+win8\Microsoft.Practices.ServiceLocation.dll + + +