Merge branch 'hotfix-2.1.1'

Particular · Mar 12, 2015 · 16362f8 · 16362f8
2 parents 84d8770 + 188c307
commit 16362f8
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 122 deletions.
diff --git a/Octopus/DeploymentProcess.json b/Octopus/DeploymentProcess.json
diff --git a/Octopus/Project.json b/Octopus/Project.json
diff --git a/src/.nuget/packages.config b/src/.nuget/packages.config
diff --git a/src/NServiceBus.SqlServer.UnitTests/ErrorQueueSettingsTests.cs b/src/NServiceBus.SqlServer.UnitTests/ErrorQueueSettingsTests.cs
@@ -0,0 +1,31 @@
+namespace NServiceBus.SqlServer.UnitTests
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Configuration;
+    using NServiceBus.Config.ConfigurationSource;
+    using NServiceBus.Features;
+    using NServiceBus.Settings;
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class ErrorQueueSettingsTests
+    {
+        [Test]
+        public void It_can_try_to_obtain_the_error_queue_name_from_the_registry()
+        {
+            var settingsHolder = new SettingsHolder();
+            settingsHolder.Set<IConfigurationSource>(new ConfigurationSource());
+            settingsHolder.Set("TypesToScan", new List<Type>());
+            Assert.Throws<ConfigurationErrorsException>(() => ErrorQueueSettings.GetConfiguredErrorQueue(settingsHolder));
+        }
+
+        private class ConfigurationSource : IConfigurationSource
+        {
+            public T GetConfiguration<T>() where T : class, new()
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/NServiceBus.SqlServer.UnitTests/NServiceBus.SqlServer.UnitTests.csproj b/src/NServiceBus.SqlServer.UnitTests/NServiceBus.SqlServer.UnitTests.csproj
@@ -56,6 +56,7 @@
     <Compile Include="CicruitBreakerConfigTests.cs" />
     <Compile Include="ConfigTest.cs" />
     <Compile Include="ConnectionConfigTests.cs" />
+    <Compile Include="ErrorQueueSettingsTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/NServiceBus.SqlServer.sln b/src/NServiceBus.SqlServer.sln
@@ -14,9 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{5EC71DFE-E04B-423C-8DCA-B43AD01F802E}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\packages.config = .nuget\packages.config
-	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NServiceBus.SqlServer.UnitTests", "NServiceBus.SqlServer.UnitTests\NServiceBus.SqlServer.UnitTests.csproj", "{E7F3CFFC-9577-4868-AB8B-D839C02786EA}"
 EndProject

diff --git a/src/NServiceBus.SqlServer/ErrorQueueSettings.cs b/src/NServiceBus.SqlServer/ErrorQueueSettings.cs
@@ -30,8 +30,8 @@ public static Address GetConfiguredErrorQueue(ReadOnlySettings settings)
             }
             else
             {
-                var regRederType = Type.GetType("NServiceBus.Utils.RegistryReader, NServiceBus", true);
-                var readMethod = regRederType.GetMethod("Read", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
+                var regRederType = Type.GetType("NServiceBus.Utils.RegistryReader, NServiceBus.Core", true);
+                var readMethod = regRederType.GetMethod("Read", BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
                 var registryErrorQueue = (string)readMethod.Invoke(null,new object[]{"ErrorQueue", null});
                 if (!string.IsNullOrWhiteSpace(registryErrorQueue))
                 {

diff --git a/src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj b/src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj
@@ -15,7 +15,7 @@
     <AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBus.snk</AssemblyOriginatorKeyFile>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>89d13314</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>3ead7d6a</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -136,9 +136,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Fody.1.24.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.24.0\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\NuGetPackager.0.4.13\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.4.13\build\NuGetPackager.targets'))" />
     <Error Condition="!Exists('..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets'))" />
+    <Error Condition="!Exists('..\packages\NuGetPackager.0.5.2\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.5.2\build\NuGetPackager.targets'))" />
   </Target>
-  <Import Project="..\packages\NuGetPackager.0.4.13\build\NuGetPackager.targets" Condition="Exists('..\packages\NuGetPackager.0.4.13\build\NuGetPackager.targets')" />
   <Import Project="..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" />
+  <Import Project="..\packages\NuGetPackager.0.5.2\build\NuGetPackager.targets" Condition="Exists('..\packages\NuGetPackager.0.5.2\build\NuGetPackager.targets')" />
 </Project>
diff --git a/src/NServiceBus.SqlServer/packages.config b/src/NServiceBus.SqlServer/packages.config
@@ -4,5 +4,5 @@
   <package id="GitVersionTask" version="2.0.1" targetFramework="net45" developmentDependency="true" />
   <package id="Janitor.Fody" version="0.6.1.0" targetFramework="net45" />
   <package id="NServiceBus" version="5.0.0" targetFramework="net45" />
-  <package id="NuGetPackager" version="0.4.13" targetFramework="net45" />
+  <package id="NuGetPackager" version="0.5.2" targetFramework="net45" />
 </packages>