From 946364002badab11e7ad5129f3c2bea19f10c124 Mon Sep 17 00:00:00 2001
From: Ebere Abanonu <eaba@users.noreply.github.com>
Date: Thu, 16 Feb 2023 16:39:54 +0100
Subject: [PATCH] [Fix] Build System (#86)

* [Fix] Build System

* .NET SDK 5.0.408

* [Test] .NET SDK 6

* Target Frameworks

* The Problem is [Release]

* [fix] `pr:none`
---
 build-system/azure-pipeline.template.yaml         |  4 ++--
 build-system/pr-validation.yaml                   |  2 +-
 build-system/windows-release.yaml                 |  4 +++-
 src/Directory.Build.props                         | 15 ++++++++-------
 ...ridge.Cmd.Cluster.Sharding.Repair.Tests.csproj |  4 ++--
 .../RepairTool.End2End.Tests.csproj               |  6 +++---
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/build-system/azure-pipeline.template.yaml b/build-system/azure-pipeline.template.yaml
index c462ab5..d789b05 100644
--- a/build-system/azure-pipeline.template.yaml
+++ b/build-system/azure-pipeline.template.yaml
@@ -18,9 +18,9 @@ jobs:
         submodules: recursive  # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
         persistCredentials: true
       - task: UseDotNet@2
-        displayName: 'Use .NET 5'
+        displayName: 'Use .NET 5.0.408'
         inputs:
-          version: '5.x'
+          version: 5.0.408
       # Linux or macOS
       - task: Bash@3 
         displayName: Linux / OSX Build
diff --git a/build-system/pr-validation.yaml b/build-system/pr-validation.yaml
index f42fd53..b88d7e8 100644
--- a/build-system/pr-validation.yaml
+++ b/build-system/pr-validation.yaml
@@ -18,7 +18,7 @@ jobs:
     parameters:
       name: 'windows_pr'
       displayName: 'Windows PR Validation'
-      vmImage: 'vs2017-win2016'
+      vmImage: 'windows-latest'
       scriptFileName: build.cmd
       scriptArgs: all
   - template: azure-pipeline.template.yaml
diff --git a/build-system/windows-release.yaml b/build-system/windows-release.yaml
index 0657c17..91f8576 100644
--- a/build-system/windows-release.yaml
+++ b/build-system/windows-release.yaml
@@ -2,13 +2,15 @@
 # See https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema for reference
 
 pool:
-  vmImage: vs2017-win2016
+  vmImage: windows-latest
   demands: Cmd
 
 trigger:
   branches:
     include:
       - refs/tags/*
+      
+pr: none
 
 variables:
   - name: githubConnectionName
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 9b7f0f9..6f81fc2 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -18,12 +18,13 @@
   <PropertyGroup>
     <LibraryFramework>netstandard2.0</LibraryFramework>
     <NetCoreFramework>net5</NetCoreFramework>
-    <XunitVersion>2.4.1</XunitVersion>
-    <TestSdkVersion>17.0.0</TestSdkVersion>
-    <AkkaVersion>1.4.39</AkkaVersion>
-    <PbmVersion>1.0.2</PbmVersion>
-    <DockerVersion>3.125.5</DockerVersion>
-    <FluentAssertionsVersion>6.4.0</FluentAssertionsVersion>
-    <MicrosoftExtensionsVersion>6.0.0</MicrosoftExtensionsVersion>
+	<NetTestVersion>net6</NetTestVersion>  
+    <XunitVersion>2.4.2</XunitVersion>
+    <TestSdkVersion>17.4.1</TestSdkVersion>
+    <AkkaVersion>1.4.49</AkkaVersion>
+    <PbmVersion>1.2.2</PbmVersion>
+    <DockerVersion>3.125.12</DockerVersion>
+    <FluentAssertionsVersion>6.10.0</FluentAssertionsVersion>
+    <MicrosoftExtensionsVersion>7.0.0</MicrosoftExtensionsVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Petabridge.Cmd.Cluster.Sharding.Repair.Tests/Petabridge.Cmd.Cluster.Sharding.Repair.Tests.csproj b/src/Petabridge.Cmd.Cluster.Sharding.Repair.Tests/Petabridge.Cmd.Cluster.Sharding.Repair.Tests.csproj
index 5c86d41..3e2fa43 100644
--- a/src/Petabridge.Cmd.Cluster.Sharding.Repair.Tests/Petabridge.Cmd.Cluster.Sharding.Repair.Tests.csproj
+++ b/src/Petabridge.Cmd.Cluster.Sharding.Repair.Tests/Petabridge.Cmd.Cluster.Sharding.Repair.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>$(NetCoreFramework)</TargetFramework>
         <IsPackable>false</IsPackable>
@@ -12,7 +12,7 @@
         <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
         <PackageReference Include="xunit" Version="$(XunitVersion)" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/RepairTool.End2End.Tests/RepairTool.End2End.Tests.csproj b/src/RepairTool.End2End.Tests/RepairTool.End2End.Tests.csproj
index 4b2e9e7..c037fef 100644
--- a/src/RepairTool.End2End.Tests/RepairTool.End2End.Tests.csproj
+++ b/src/RepairTool.End2End.Tests/RepairTool.End2End.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>$(NetCoreFramework)</TargetFramework>
@@ -7,9 +7,9 @@
 
     <ItemGroup>
         <PackageReference Include="Akka.Cluster.Sharding" Version="$(AkkaVersion)" />
-        <PackageReference Include="Akka.Persistence.MongoDb" Version="1.4.31" />
+        <PackageReference Include="Akka.Persistence.MongoDb" Version="1.4.35" />
         <PackageReference Include="Mongo2Go" Version="3.1.3" />
-        <PackageReference Include="Akka.Persistence.Redis" Version="1.4.31" />
+        <PackageReference Include="Akka.Persistence.Redis" Version="1.4.35" />
         <PackageReference Include="Akka.Persistence.Sqlite" Version="$(AkkaVersion)" />
         <PackageReference Include="Akka.Serialization.Hyperion" Version="$(AkkaVersion)" />
         <PackageReference Include="Akka.TestKit.Xunit2" Version="$(AkkaVersion)" />