diff --git a/appveyor.yml b/appveyor.yml
index 4fe86ab..23cc66b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,11 +15,8 @@ dotnet_csproj:
   informational_version: '{version}'
 
 install:
-- cmd: >- 
-
-
-- sh: >-
-    if(!$isLinux)
+- ps: >-
+    if(!$isLinux -AND !$isWindows)
     {
         # Install .NET 5.0 on macOS
         curl -fsSL https://download.visualstudio.microsoft.com/download/pr/0871336f-9a83-4ce4-80ca-625d03003369/2eb78456e0b106e9515dc03898d3867a/dotnet-sdk-5.0.100-osx-x64.tar.gz -o dotnet-sdk.tar.gz    
@@ -28,21 +25,25 @@ install:
     }
 
 build_script:
-- cmd: >-
+- ps: >-
     dotnet --info
     
-    dotnet publish SerialDisk/Serialdisk.csproj -r win-x64 -c Release --self-contained true --output ./bin/Release/SCE/win-x64 /p:PublishTrimmed=true /p:PublishSingleFile=true
-    
-    dotnet publish SerialDisk/Serialdisk.csproj -r win-x86 -c Release --self-contained true --output ./bin/Release/SCE/win-x86 /p:PublishTrimmed=true /p:PublishSingleFile=true
-    
-    dotnet publish SerialDisk/Serialdisk.csproj -r win-x64 -c Release --self-contained false --output ./bin/Release/FDE/win-x64
-    
-    dotnet publish SerialDisk/Serialdisk.csproj -r win-x86 -c Release --self-contained false --output ./bin/Release/FDE/win-x86
-
-- sh: >-
-    dotnet --info
+    if($isWindows)
+    {
+        # Publish and package Self Contained Executables
+        
+        dotnet publish SerialDisk/Serialdisk.csproj -r win-x64 -c Release --self-contained true --output ./bin/Release/SCE/win-x64 /p:PublishTrimmed=true /p:PublishSingleFile=true
+        
+        dotnet publish SerialDisk/Serialdisk.csproj -r win-x86 -c Release --self-contained true --output ./bin/Release/SCE/win-x86 /p:PublishTrimmed=true /p:PublishSingleFile=true
+        
+        # Publish and package Framework Dependant Executables
+        
+        dotnet publish SerialDisk/Serialdisk.csproj -r win-x64 -c Release --self-contained false --output ./bin/Release/FDE/win-x64
+        
+        dotnet publish SerialDisk/Serialdisk.csproj -r win-x86 -c Release --self-contained false --output ./bin/Release/FDE/win-x86
+    }
 
-    if($isLinux)
+    elseif($isLinux)
     {
         # Publish and package Self Contained Executables
         
@@ -74,25 +75,27 @@ build_script:
     }
 
 on_success:
-- cmd: >-
-    7z a -mx=9 serialdisk_2.5_sce_win-x64.zip ./bin/Release/SCE/win-x64/*
-
-    appveyor PushArtifact serialdisk_2.5_sce_win-x64.zip
+- ps: >-
+    if($isWindows)
+    {
+        7z a -mx=9 serialdisk_2.5_sce_win-x64.zip ./bin/Release/SCE/win-x64/*
 
-    7z a -mx=9 serialdisk_2.5_sce_win-x86.zip ./bin/Release/SCE/win-x86/*
+        appveyor PushArtifact serialdisk_2.5_sce_win-x64.zip
 
-    appveyor PushArtifact serialdisk_2.5_sce_win-x86.zip
+        7z a -mx=9 serialdisk_2.5_sce_win-x86.zip ./bin/Release/SCE/win-x86/*
 
-    7z a -mx=9 serialdisk_2.5_fde_win-x64.zip ./bin/Release/FDE/win-x64/*
+        appveyor PushArtifact serialdisk_2.5_sce_win-x86.zip
 
-    appveyor PushArtifact serialdisk_2.5_fde_win-x64.zip
+        7z a -mx=9 serialdisk_2.5_fde_win-x64.zip ./bin/Release/FDE/win-x64/*
 
-    7z a -mx=9 serialdisk_2.5_fde_win-x86.zip ./bin/Release/FDE/win-x86/*
+        appveyor PushArtifact serialdisk_2.5_fde_win-x64.zip
 
-    appveyor PushArtifact serialdisk_2.5_fde_win-x86.zip
+        7z a -mx=9 serialdisk_2.5_fde_win-x86.zip ./bin/Release/FDE/win-x86/*
 
-- sh: >-
-    if($isLinux)
+        appveyor PushArtifact serialdisk_2.5_fde_win-x86.zip
+    }
+    
+    elseif($isLinux)
     {
         tar -czf serialdisk_2.5_sce_linux-x64.tar.gz -C ./bin/Release/SCE serialdisk-linux-x64
 
@@ -131,12 +134,7 @@ on_success:
     }
 
 test_script:
-- cmd: >-
-    dotnet clean
-
-    dotnet test --test-adapter-path:. --logger:Appveyor -nodereuse:false
-
-- sh: >-
+- ps: >-
     dotnet clean
 
     dotnet test --test-adapter-path:. --logger:Appveyor -nodereuse:false