Add NeutralResourcesLanguageAttribute to shared assembly infos

clairernovotny · Nov 25, 2012 · 609cb9b · 609cb9b
1 parent 0cefdb9
commit 609cb9b
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 147 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,5 +9,6 @@ dist
 *.cache
 *.dotCover
 Portable.Ninject*.nupkg
+Portable.CommonServiceLocator*.nupkg
 /src/Ninject.SilverlightTests/Bin
 /TestResults/*
diff --git 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
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Portable.CommonServiceLocator.NinjectAdapter</id>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
         <title>CommonServiceLocator.NinjectAdapter (Portable)</title>
         <authors>Oren Novotny</authors>
         <owners />
@@ -12,12 +12,13 @@
 Targets .NET 4, SL4, WP7.1, WinRT</description>
         <summary>An adapter to implement CommonServiceLocator on top of Ninject 3.0</summary>
         <dependencies>
-            <dependency id="Portable.Ninject" version="3.0.2.0" />
+            <dependency id="Portable.Ninject" version="3.0.5" />
             <dependency id="Portable.CommonServiceLocator" version="1.2" />
         </dependencies>
     </metadata>
     <files>
-        <file src="src\CommonServiceLocator.NinjectAdapter\bin\Release\CommonServiceLocator.NinjectAdapter.Portable.dll" target="lib\portable-net4+sl4+wp71+win8\CommonServiceLocator.NinjectAdapter.Portable.dll" />
-        <file src="src\CommonServiceLocator.NinjectAdapter\bin\Release\CommonServiceLocator.NinjectAdapter.Portable.pdb" target="lib\portable-net4+sl4+wp71+win8\CommonServiceLocator.NinjectAdapter.Portable.pdb" />
+        <file src="src\CommonServiceLocator.NinjectAdapter\bin\Release\CommonServiceLocator.NinjectAdapter.dll" target="lib\portable-net4+sl4+wp71+win8\CommonServiceLocator.NinjectAdapter.dll" />
+        <file src="src\CommonServiceLocator.NinjectAdapter\bin\Release\CommonServiceLocator.NinjectAdapter.pdb" target="lib\portable-net4+sl4+wp71+win8\CommonServiceLocator.NinjectAdapter.pdb" />
+        <file src="src\**\*.cs" target="src" exclude="src\_ReSharper.*\**\*.*;packages\**\*.*;src\**\Debug\**\*.*;" /> 
     </files>
 </package>
diff --git a/Portable.Ninject.nuspec b/Portable.Ninject.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>Portable.Ninject</id>
-        <version>3.0.4</version>
+        <version>3.0.5</version>
         <title>Ninject for Portable Class Libraries</title>
         <authors>Oren Novotny</authors>
         <owners />

diff --git a/pack.cmd b/pack.cmd
@@ -1 +1,2 @@
-.nuget\nuget.exe pack Portable.Ninject.nuspec -Symbols
+.nuget\nuget.exe pack Portable.Ninject.nuspec -Symbols
+.nuget\nuget.exe pack Portable.CommonServiceLocator.NinjectAdapter.nuspec -Symbols
diff --git a/packages/Portable.CommonServiceLocator.1.2/Portable.CommonServiceLocator.1.2.nuspec b/packages/Portable.CommonServiceLocator.1.2/Portable.CommonServiceLocator.1.2.nuspec
diff --git a/src/CommonServiceLocator.NinjectAdapter/CommonServiceLocator.NinjectAdapter.Portable.csproj b/src/CommonServiceLocator.NinjectAdapter/CommonServiceLocator.NinjectAdapter.Portable.csproj
diff --git a/src/CommonServiceLocator.NinjectAdapter/CommonServiceLocator.NinjectAdapter.csproj b/src/CommonServiceLocator.NinjectAdapter/CommonServiceLocator.NinjectAdapter.csproj
@@ -36,22 +36,25 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkProfile>Profile88</TargetFrameworkProfile>
+    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\.NET4\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;PCL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\.NET4\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;PCL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -60,24 +63,14 @@
     </DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AutomatedRelease|AnyCPU' ">
-    <OutputPath>bin\.NET4\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;PCL</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Portable.CommonServiceLocator.1.2\lib\net35\Microsoft.Practices.ServiceLocation.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
@@ -112,7 +105,15 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.ServiceLocation">
+      <HintPath>..\..\packages\Portable.CommonServiceLocator.1.2\lib\portable-net4+sl4+wp7+win8\Microsoft.Practices.ServiceLocation.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="$(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.

diff --git a/src/Ninject/Ninject.WP.csproj b/src/Ninject/Ninject.WP.csproj
@@ -69,6 +69,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\SharedAssemblyInfo.cs">
+      <Link>Properties\SharedAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="Activation\Blocks\ActivationBlock.cs" />
     <Compile Include="Activation\Caching\ActivationCache.cs" />
     <Compile Include="Activation\Caching\Cache.cs" />

diff --git a/src/Ninject/Ninject.WinRT.csproj b/src/Ninject/Ninject.WinRT.csproj
@@ -46,6 +46,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\SharedAssemblyInfo.cs">
+      <Link>Properties\SharedAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="Activation\Blocks\ActivationBlock.cs" />
     <Compile Include="Activation\Caching\ActivationCache.cs" />
     <Compile Include="Activation\Caching\Cache.cs" />

diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Reflection;
+using System.Resources;
 using System.Runtime.InteropServices;
 
 //------------------------------------------------------------------------------
@@ -22,3 +23,4 @@
 #endif
 [assembly: CLSCompliantAttribute(true)]
 
+[assembly: NeutralResourcesLanguage("en")]