Merge pull request #31 from gettyimages/update-sdk

Update unit tests to .NET 6

.github/workflows/build.yml

@@ -8,22 +8,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core 2.1
+    - name: Setup .NET Core 6.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 2.1.x
-    - name: Setup .NET Core 3.1
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.x
+        dotnet-version: 6.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --configuration Release --no-restore
     - name: Test
-      run: |
-        dotnet test --configuration Release --no-build --no-restore --verbosity normal -f netcoreapp2.1
-        dotnet test --configuration Release --no-build --no-restore --verbosity normal -f netcoreapp3.1
+      run: dotnet test --configuration Release --no-build --no-restore --verbosity normal -f net6
     - uses: actions/upload-artifact@v1
       with:
         name: artifacts

.github/workflows/publish.yml

@@ -9,14 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core 2.1
+    - name: Setup .NET Core 6.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 2.1.x
-    - name: Setup .NET Core 3.1
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.x
+        dotnet-version: 6.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: 'Get Previous tag'
@@ -29,9 +25,7 @@ jobs:
     - name: Build
       run: dotnet build --configuration Release --no-restore
     - name: Test
-      run: |
-        dotnet test --configuration Release --no-build --no-restore --verbosity normal -f netcoreapp2.1
-        dotnet test --configuration Release --no-build --no-restore --verbosity normal -f netcoreapp3.1
+      run: dotnet test --configuration Release --no-build --no-restore --verbosity normal -f net6
     - uses: actions/upload-artifact@v1
       with:
         name: artifacts
@@ -44,7 +38,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-dotnet@v1
       with:
-          dotnet-version: '3.1.x' # SDK Version to use.
+          dotnet-version: '6.0.x' # SDK Version to use.
     - uses: actions/download-artifact@v1
       with:
         name: artifacts

GettyImages.Api/SdkException.cs

@@ -26,7 +26,7 @@ internal SdkException(string message, Exception innerException, HttpStatusCode?
 
         internal static async Task GenerateSdkExceptionAsync(HttpResponseMessage httpResponse, string message = null)
         {
-            if (string.IsNullOrEmpty(message))
+            if (httpResponse.Content != null && string.IsNullOrEmpty(message))
             {
                 var resultContentAsString = await httpResponse.Content.ReadAsStringAsync();
 

Makefile

@@ -0,0 +1,8 @@
+default: build
+
+build:
+	dotnet restore --force
+	dotnet build
+
+test:
+	dotnet test UnitTests

UnitTests/UnitTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
 

UnitTests/WebHelper/WebHelperTests.cs

@@ -14,16 +14,10 @@ public async Task Check500CodeTest()
         {
             var httpResponse = new HttpResponseMessage();
             httpResponse.StatusCode = (HttpStatusCode) 500;
-
             var testHandler = new TestHandler(httpResponse);
-
             var response = ApiClient.GetApiClientWithClientCredentials("apiKey", "apiSecret", testHandler)
                 .SearchImages().WithPhrase("cat");
-
-            var ex = await Assert.ThrowsAsync<NullReferenceException>(async () => await response.ExecuteAsync());
-
-            Assert.Equal("Object reference not set to an instance of an object.", ex.Message);
-
+            var ex = await Assert.ThrowsAsync<SdkException>(async () => await response.ExecuteAsync());
             Assert.True(testHandler.NumberOfCallsSendAsync >= 2);
         }
     }