Merge pull request #215 from Particular/support15-approvals

Switch to Particular.Approvals
Particular · Dec 20, 2018 · b0bb4ae · b0bb4ae
2 parents 0a96982 + d58ddf7
commit b0bb4ae
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 98 deletions.
diff --git a/src/NServiceBus.Persistence.AzureStorage.AcceptanceTests/app.config b/src/NServiceBus.Persistence.AzureStorage.AcceptanceTests/app.config
diff --git a/src/NServiceBus.Persistence.AzureStorage.ComponentTests/APIApprovals.cs b/src/NServiceBus.Persistence.AzureStorage.ComponentTests/APIApprovals.cs
@@ -1,17 +1,15 @@
-using System.Runtime.CompilerServices;
-using NServiceBus;
-using NServiceBus.Persistence.AzureStorage.ComponentTests;
+using NServiceBus;
 using NUnit.Framework;
+using Particular.Approvals;
 using PublicApiGenerator;
 
 [TestFixture]
 public class APIApprovals
 {
     [Test]
-    [MethodImpl(MethodImplOptions.NoInlining)]
     public void ApproveAzureStorageQueueTransport()
     {
         var publicApi = ApiGenerator.GeneratePublicApi(typeof(AzureStoragePersistence).Assembly);
-        TestApprover.Verify(publicApi);
+        Approver.Verify(publicApi);
     }
 }
diff --git a/src/NServiceBus.Persistence.AzureStorage.ComponentTests/ApprovalTestConfig.cs b/src/NServiceBus.Persistence.AzureStorage.ComponentTests/ApprovalTestConfig.cs
diff --git a/...ce.AzureStorage.ComponentTests/NServiceBus.Persistence.AzureStorage.ComponentTests.csproj b/...ce.AzureStorage.ComponentTests/NServiceBus.Persistence.AzureStorage.ComponentTests.csproj
@@ -14,7 +14,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NServiceBus" Version="6.3.3" />
-    <PackageReference Include="ApprovalTests" Version="3.0.13" />
     <PackageReference Include="Microsoft.Azure.KeyVault.Core" Version="2.0.4" />
     <PackageReference Include="Microsoft.Data.Edm" Version="5.8.2" />
     <PackageReference Include="Microsoft.Data.OData" Version="5.8.2" />
@@ -25,8 +24,9 @@
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Particular.Approvals" Version="0.2.0" />
     <PackageReference Include="Particular.CodeRules" Version="0.2.0" />
-    <PackageReference Include="PublicApiGenerator" Version="7.0.1" />
+    <PackageReference Include="PublicApiGenerator" Version="8.0.1" />
     <ProjectReference Include="..\NServiceBus.Persistence.AzureStorage\NServiceBus.Persistence.AzureStorage.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/NServiceBus.Persistence.AzureStorage.ComponentTests/TestApprover.cs b/src/NServiceBus.Persistence.AzureStorage.ComponentTests/TestApprover.cs
diff --git a/src/NServiceBus.Persistence.AzureStorage.ComponentTests/app.config b/src/NServiceBus.Persistence.AzureStorage.ComponentTests/app.config
@@ -1,37 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.1.4.0" newVersion="8.1.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.8.1.0" newVersion="5.8.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.8.1.0" newVersion="5.8.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.8.1.0" newVersion="5.8.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.0.0" newVersion="5.6.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
   <system.serviceModel>
     <extensions>
       <!-- In this extension section we are introducing all known service bus extensions. User can remove the ones they don't need. -->