Merge branch 'hotfix-4.6.1'

Particular · May 2, 2014 · 46a05f6 · 46a05f6
2 parents c4093eb + f74c3db
commit 46a05f6
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 18 deletions.
diff --git a/ripple.config b/ripple.config
@@ -41,7 +41,7 @@
   </Nugets>
   <Groups />
   <References>
-     <IgnoreAssemblies />
+    <IgnoreAssemblies />
   </References>
   <Nuspecs>
     <Nuspec File="nservicebus.acceptancetesting.nuspec" Project="nservicebus.acceptancetesting" />

diff --git a/src/NServiceBus.Core/Properties/AssemblyInfo.cs b/src/NServiceBus.Core/Properties/AssemblyInfo.cs
@@ -1,9 +1,10 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("NServiceBus.Core")]
-[assembly: AssemblyDescription("")]
 [assembly: AssemblyCopyright("Copyright 2010-2014 NServiceBus. All rights reserved")]
 [assembly: AssemblyProduct("NServiceBus.Core")]
 [assembly: AssemblyCompany("NServiceBus Ltd.")]
-[assembly: ComVisible(false)]
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]
diff --git a/src/NServiceBus.Hosting.Windows/Properties/AssemblyInfo.cs b/src/NServiceBus.Hosting.Windows/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Generic Host Process for NServiceBus")]
@@ -7,3 +8,4 @@
 [assembly: AssemblyProduct("NServiceBus")]
 [assembly: AssemblyCompany("NServiceBus Ltd.")]
 [assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]
diff --git a/src/NServiceBus.Testing/Properties/AssemblyInfo.cs b/src/NServiceBus.Testing/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("NServiceBus Testing")]
@@ -7,3 +8,4 @@
 [assembly: AssemblyProduct("NServiceBus")]
 [assembly: AssemblyCompany("NServiceBus Ltd.")]
 [assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]
diff --git a/src/NServiceBus/NServiceBus.csproj b/src/NServiceBus/NServiceBus.csproj
@@ -27,7 +27,7 @@
     <DocumentationFile>..\..\binaries\NServiceBus.XML</DocumentationFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>1591,1573</NoWarn>
+    <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -38,7 +38,7 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\..\binaries\NServiceBus.XML</DocumentationFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <NoWarn>1591,1573</NoWarn>
+    <NoWarn>1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/NServiceBus/Properties/AssemblyInfo.cs b/src/NServiceBus/Properties/AssemblyInfo.cs
@@ -1,9 +1,11 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("NServiceBus Core")]
 [assembly: AssemblyDescription("Enterprise application framework for publish/subscribe and long-running business processes.")]
 [assembly: AssemblyCopyright("Copyright 2010-2014 NServiceBus. All rights reserved")]
 [assembly: AssemblyProduct("NServiceBus")]
 [assembly: AssemblyCompany("NServiceBus Ltd.")]
-[assembly: ComVisible(false)]		
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]
diff --git a/src/ObjectBuilder.Autofac/Properties/AssemblyInfo.cs b/src/ObjectBuilder.Autofac/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("NServiceBus Container Autofac Implementation")]
@@ -7,3 +8,4 @@
 [assembly: AssemblyProduct("NServiceBus")]
 [assembly: AssemblyCompany("NServiceBus Ltd.")]
 [assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]
diff --git a/src/ObjectBuilder.CastleWindsor/Properties/AssemblyInfo.cs b/src/ObjectBuilder.CastleWindsor/Properties/AssemblyInfo.cs
@@ -1,9 +1,11 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("NServiceBus Object Builder Castle Implementation")]
 [assembly: AssemblyDescription("Implementation of object building functionality on top of Castle Windsor.")]
 [assembly: AssemblyCopyright("Copyright 2010-2014 NServiceBus. All rights reserved")]
 [assembly: AssemblyProduct("NServiceBus")]
 [assembly: AssemblyCompany("NServiceBus Ltd.")]
-[assembly: ComVisible(false)]
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]
diff --git a/src/ObjectBuilder.Ninject/Properties/AssemblyInfo.cs b/src/ObjectBuilder.Ninject/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("NServiceBus Object Builder Ninject Implementation")]
@@ -7,3 +8,4 @@
 [assembly: AssemblyProduct("NServiceBus")]
 [assembly: AssemblyCompany("NServiceBus Ltd.")]
 [assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]
diff --git a/src/ObjectBuilder.Spring/ConfigureSpringBuilder.cs b/src/ObjectBuilder.Spring/ConfigureSpringBuilder.cs
@@ -1,5 +1,6 @@
 namespace NServiceBus
 {
+    using System;
     using ObjectBuilder.Common.Config;
     using ObjectBuilder.Spring;
     using Spring.Context.Support;
@@ -22,6 +23,7 @@ public static Configure SpringFrameworkBuilder(this Configure config)
         /// <summary>
         /// Use the Spring Framework as the container with the initialized application context
         /// </summary>
+        [CLSCompliant(false)]
         public static Configure SpringFrameworkBuilder(this Configure config,GenericApplicationContext applicationContext)
         {
             ConfigureCommon.With(config, new SpringObjectBuilder(applicationContext));

diff --git a/src/ObjectBuilder.Spring/Properties/AssemblyInfo.cs b/src/ObjectBuilder.Spring/Properties/AssemblyInfo.cs
@@ -1,10 +1,12 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("NServiceBus Object Builder Spring Implementation")]
 [assembly: AssemblyDescription("Implementation of object building functionality on top of the Spring Framework.")]
 [assembly: AssemblyCopyright("Copyright 2010-2014 NServiceBus. All rights reserved")]
 [assembly: AssemblyProduct("NServiceBus")]
 [assembly: AssemblyCompany("NServiceBus Ltd.")]
-[assembly: ComVisible(false)]		
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]
 
diff --git a/src/ObjectBuilder.Spring/SpringObjectBuilder.cs b/src/ObjectBuilder.Spring/SpringObjectBuilder.cs
@@ -29,6 +29,7 @@ public SpringObjectBuilder() : this(new GenericApplicationContext())
         /// <summary>
         /// Instantiates the builder using the given container.
         /// </summary>
+        [CLSCompliant(false)]
         public SpringObjectBuilder(GenericApplicationContext context)
         {
             this.context = context;

diff --git a/src/ObjectBuilder.StructureMap/Properties/AssemblyInfo.cs b/src/ObjectBuilder.StructureMap/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("NServiceBus Container StructureMap Implementation")]
@@ -7,3 +8,4 @@
 [assembly: AssemblyProduct("NServiceBus")]
 [assembly: AssemblyCompany("NServiceBus Ltd.")]
 [assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]
diff --git a/src/ObjectBuilder.Unity/Properties/AssemblyInfo.cs b/src/ObjectBuilder.Unity/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("NServiceBus Container Unity Implementation")]
@@ -7,3 +8,4 @@
 [assembly: AssemblyProduct("NServiceBus")]
 [assembly: AssemblyCompany("NServiceBus Ltd.")]
 [assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]