Merge pull request #81 from pusher/develop

Develop
pusher · Apr 16, 2021 · 681e890 · 681e890
2 parents 1e8bd35 + f7cbaf9
commit 681e890
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,5 +27,12 @@ jobs:
         PUSHER_APP_SECRET: ${{ secrets.CI_APP_SECRET }}
         PUSHER_APP_CLUSTER: ${{ secrets.CI_APP_CLUSTER }}
       run: vstest.console.exe "./PusherServer.Tests/bin/Release/net45/PusherServer.Tests.dll" /TestAdapterPath:"./PusherServer.Tests/bin/Release/net45/"
-    - name: Test pack
-      run: msbuild /t:Pack /p:configuration=release PusherServer/PusherServer.csproj
+    - name: Write code signing key
+      env:
+        CI_CODE_SIGN_KEY: ${{ secrets.CI_CODE_SIGN_KEY }}
+      run: |
+        ./StrongName/WritePusherKey.ps1
+    - name: Test strong name signing
+      run: msbuild /p:SignAssembly=true /p:deterministic=true /p:msbuildArchitecture=x64 /p:configuration=Release pusher-dotnet-server.sln
+    - name: Test pack with strong named assembly
+      run: msbuild /t:Pack /p:SignAssembly=true /p:configuration=release PusherServer/PusherServer.csproj
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,13 +13,13 @@ jobs:
     - uses: actions/checkout@v2
     - name: Setup MS Build
       uses: microsoft/[email protected]
+    - name: Restore dependencies
+      run: nuget restore pusher-dotnet-server.sln
     - name: Write code signing key
       env:
         CI_CODE_SIGN_KEY: ${{ secrets.CI_CODE_SIGN_KEY }}
       run: |
         ./StrongName/WritePusherKey.ps1
-    - name: Restore dependencies
-      run: nuget restore pusher-dotnet-server.sln
     - name: Build
       run: msbuild /p:SignAssembly=true /p:deterministic=true /p:msbuildArchitecture=x64 /p:configuration=Release pusher-dotnet-server.sln
     - name: Pack

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 4.6.1
+* [FIXED] PusherClient test integration to 2.1.0.
+
 ## 4.6.0
 * [ADDED] Strong name to the PusherServer assembly.
 

diff --git a/PusherServer.Tests/AcceptanceTests/Trigger.cs b/PusherServer.Tests/AcceptanceTests/Trigger.cs
@@ -193,7 +193,7 @@ public async Task It_should_be_received_by_a_client_async()
             Assert.IsTrue(channel.IsSubscribed, nameof(channel.IsSubscribed));
             Assert.IsTrue(eventReceived.WaitOne(TimeSpan.FromSeconds(5)), "Expected to receive an event");
             Assert.IsNotNull(eventData, nameof(eventData));
-            Assert.IsFalse(eventData.Contains(testData.Message), testData.Message);
+            Assert.IsTrue(eventData.Contains(testData.Message), testData.Message);
         }
 
         [Test]

diff --git a/PusherServer.Tests/PusherServer.Tests.csproj b/PusherServer.Tests/PusherServer.Tests.csproj
@@ -28,7 +28,7 @@
     <PackageReference Include="nunit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Include="NSubstitute" Version="1.10.0.0" />
-    <PackageReference Include="PusherClient" Version="2.0.1" />
+    <PackageReference Include="PusherClient" Version="2.1.0" />
     <PackageReference Include="WebSocket4Net" Version="0.15.2" />
   </ItemGroup>
 

diff --git a/Root.Build.props b/Root.Build.props
@@ -12,7 +12,7 @@
     <PackageTags>pusher channels realtime websocket</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>icon-128.png</PackageIcon>
-    <Version>4.6.0</Version>
+    <Version>4.6.1</Version>
     <AssemblyVersion>$(Version).0</AssemblyVersion>
     <FileVersion>$(Version).0</FileVersion>
   </PropertyGroup>