Merge pull request #17 from pactflow/deps/pact_net_5_dotnet_8

YOU54F · web-flow · commit 1348eb419e10 · 2024-10-07T21:05:06.000+01:00
chore(deps):pact-net 5/dotnet8
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dotnet-version: ["6.0.x"]
+        dotnet-version: ["8.0.x"]
         pact_provider:
           [
             # "pactflow-example-bi-directional-provider-dredd",
@@ -27,9 +27,9 @@ jobs:
             'pactflow-provider-dotnet'
           ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
-        uses: actions/setup-dotnet@v3.0.3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ matrix.dotnet-version }}
       - name: test for ${{ matrix.pact_provider }}
@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: test
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: docker pull pactfoundation/pact-cli:latest
       - name: Can I deploy?
         run: GIT_BRANCH=${GITHUB_REF:11} make can_i_deploy
@@ -57,7 +57,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: can-i-deploy
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: docker pull pactfoundation/pact-cli:latest
       - name: Deploy
         run: GIT_BRANCH=${GITHUB_REF:11} make deploy
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .vscode/
 bin/
 obj/
-.DS_Store
+.DS_Store
+pacts/
diff --git a/Makefile b/Makefile
@@ -63,7 +63,7 @@ can_i_deploy:
 	  --pacticipant ${PACTICIPANT} \
 	  --version ${GIT_COMMIT} \
 	  --to-environment production \
-	  --retry-while-unknown 0 \
+	  --retry-while-unknown 5 \
 	  --retry-interval 10
 
 deploy_app:
diff --git a/example-consumer-dotnet.sln b/example-consumer-dotnet.sln
@@ -0,0 +1,31 @@
+﻿
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tests", "tests\tests.csproj", "{306D0F6E-3E74-4F08-B888-0D1EA31A4A79}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "consumer", "src\consumer.csproj", "{2B3F7070-3C38-4B13-A8F7-A09FFF6D4299}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{306D0F6E-3E74-4F08-B888-0D1EA31A4A79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{306D0F6E-3E74-4F08-B888-0D1EA31A4A79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{306D0F6E-3E74-4F08-B888-0D1EA31A4A79}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{306D0F6E-3E74-4F08-B888-0D1EA31A4A79}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B3F7070-3C38-4B13-A8F7-A09FFF6D4299}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B3F7070-3C38-4B13-A8F7-A09FFF6D4299}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B3F7070-3C38-4B13-A8F7-A09FFF6D4299}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B3F7070-3C38-4B13-A8F7-A09FFF6D4299}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3BD4D93A-EFC4-4ED1-B541-9D6E57B626E8}
+	EndGlobalSection
+EndGlobal
diff --git a/pacts/pactflow-example-consumer-dotnet-pactflow-example-provider-dotnet.json b/pacts/pactflow-example-consumer-dotnet-pactflow-example-provider-dotnet.json
diff --git a/src/ConsumerApiClient.cs b/src/ConsumerApiClient.cs
@@ -1,16 +1,15 @@
-using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
+using System.Text.Json;
 
 namespace Consumer
 {
     public struct Product
     {
-        public string id;
-        public string type;
-        public string name;
+        public string id { get; set; }
+        public string type { get; set; }
+        public string name { get; set; }
     }
 
     public class ProductClient
@@ -25,7 +24,7 @@ public class ProductClient
 
             var resp = await response.Content.ReadAsStringAsync();
 
-            return JsonConvert.DeserializeObject<List<Product>>(resp);
+            return JsonSerializer.Deserialize<List<Product>>(resp);
         }
     }
 }
diff --git a/src/Program.cs b/src/Program.cs
@@ -1,7 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading.Tasks;
 
 namespace Consumer
 {
diff --git a/src/consumer.csproj b/src/consumer.csproj
@@ -2,15 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/ConsumerPactTests.cs b/tests/ConsumerPactTests.cs
@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 using Xunit;
 using Xunit.Abstractions;
@@ -17,9 +16,7 @@ namespace tests
 {
     public class ConsumerPactTests
     {
-        private IPactBuilderV3 pact;
-        // private readonly int port = 9222;
-
+        private readonly IPactBuilderV4 pact;
         private readonly List<object> products;
 
         public ConsumerPactTests(ITestOutputHelper output)
@@ -37,7 +34,7 @@ public ConsumerPactTests(ITestOutputHelper output)
                 LogLevel = PactLogLevel.Debug
             };
 
-            pact = Pact.V3("pactflow-example-consumer-dotnet", "pactflow-example-provider-dotnet", Config).WithHttpInteractions();
+            pact = Pact.V4("pactflow-example-consumer-dotnet", "pactflow-example-provider-dotnet", Config).WithHttpInteractions();
         }
 
         [Fact]
diff --git a/tests/tests.csproj b/tests/tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -11,11 +11,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="PactNet" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="PactNet" Version="5.0.0" />
     <PackageReference Include="PactNet.Output.Xunit" Version="1.0.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2"/>
   </ItemGroup>
   <ItemGroup>
     <None Remove="XUnitHelpers\" />

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,15 @@`
`1`		`-using System;`
`2`	`1`	`using System.Collections.Generic;`
`3`	`2`	`using System.Net.Http;`
`4`	`3`	`using System.Threading.Tasks;`
`5`		`-using Newtonsoft.Json;`
	`4`	`+using System.Text.Json;`
`6`	`5`
`7`	`6`	`namespace Consumer`
`8`	`7`	`{`
`9`	`8`	`public struct Product`
`10`	`9`	`{`
`11`		`- public string id;`
`12`		`- public string type;`
`13`		`- public string name;`
	`10`	`+ public string id { get; set; }`
	`11`	`+ public string type { get; set; }`
	`12`	`+ public string name { get; set; }`
`14`	`13`	`}`
`15`	`14`
`16`	`15`	`public class ProductClient`
`@@ -25,7 +24,7 @@ public class ProductClient`
`25`	`24`
`26`	`25`	`var resp = await response.Content.ReadAsStringAsync();`
`27`	`26`
`28`		`- return JsonConvert.DeserializeObject<List<Product>>(resp);`
	`27`	`+ return JsonSerializer.Deserialize<List<Product>>(resp);`
`29`	`28`	`}`
`30`	`29`	`}`
`31`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using System.Net.Http;`
`4`		`-using System.Threading.Tasks;`
`5`	`3`
`6`	`4`	`namespace Consumer`
`7`	`5`	`{`