From 7b453c9ff2270927fccf1495b64924db31441fb7 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Mon, 19 Jun 2023 22:11:24 +1000
Subject: [PATCH] feat: update to expecto 10 (#120)

BREAKING-CHANGE: major expecto update and drops support for older .NET framework versions.
---
 .github/workflows/ci.yml                               | 10 ----------
 Directory.Packages.props                               |  4 ++--
 src/Directory.Build.props                              |  2 +-
 .../YoloDev.Expecto.TestSdk.fsproj                     |  4 +---
 .../build/{net5.0 => net6.0}/_._                       |  0
 .../build/netcoreapp3.1/YoloDev.Expecto.TestSdk.props  | 10 ----------
 src/YoloDev.Expecto.TestSdk/build/netcoreapp3.1/_._    |  0
 test/Directory.Build.props                             |  2 +-
 8 files changed, 5 insertions(+), 27 deletions(-)
 rename src/YoloDev.Expecto.TestSdk/build/{net5.0 => net6.0}/_._ (100%)
 delete mode 100644 src/YoloDev.Expecto.TestSdk/build/netcoreapp3.1/YoloDev.Expecto.TestSdk.props
 delete mode 100644 src/YoloDev.Expecto.TestSdk/build/netcoreapp3.1/_._

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8f06a3a..bd51b2b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,16 +27,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: 🔽 Setup dotnet 3.1
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: "3.1.x"
-
-      - name: 🔽 Setup dotnet 5
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: "5.0.x"
-
       - name: 🔽 Setup dotnet from global.json
         uses: actions/setup-dotnet@v3
 
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 5c59af8..ba02f7a 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,8 +1,8 @@
 <Project>
 
   <ItemGroup>
-    <PackageVersion Include="Expecto" Version="[9.0, 10.0)" />
-    <PackageVersion Include="FSharp.Core" Version="[4.6.2,)" />
+    <PackageVersion Include="Expecto" Version="[10.0, 11.0)" />
+    <PackageVersion Include="FSharp.Core" Version="[7.0.200,)" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
     <PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.6.2" />
     <PackageVersion Include="System.Collections.Immutable" Version="[6.0.0,)" />
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index ace1b1d..167b3e0 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <DebugType>portable</DebugType>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 
diff --git a/src/YoloDev.Expecto.TestSdk/YoloDev.Expecto.TestSdk.fsproj b/src/YoloDev.Expecto.TestSdk/YoloDev.Expecto.TestSdk.fsproj
index b3c4f78..9fe7a84 100644
--- a/src/YoloDev.Expecto.TestSdk/YoloDev.Expecto.TestSdk.fsproj
+++ b/src/YoloDev.Expecto.TestSdk/YoloDev.Expecto.TestSdk.fsproj
@@ -20,9 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="build/netcoreapp3.1/YoloDev.Expecto.TestSdk.props" Pack="true" PackagePath="build\netcoreapp3.1\" />
-    <None Include="build/netcoreapp3.1/_._" Pack="true" PackagePath="lib\netcoreapp3.1\" Visible="false" />
-    <None Include="build/net5.0/_._" Pack="true" PackagePath="lib\net5.0\" Visible="false" />
+    <None Include="build/net6.0/_._" Pack="true" PackagePath="lib\net6.0\" Visible="false" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/YoloDev.Expecto.TestSdk/build/net5.0/_._ b/src/YoloDev.Expecto.TestSdk/build/net6.0/_._
similarity index 100%
rename from src/YoloDev.Expecto.TestSdk/build/net5.0/_._
rename to src/YoloDev.Expecto.TestSdk/build/net6.0/_._
diff --git a/src/YoloDev.Expecto.TestSdk/build/netcoreapp3.1/YoloDev.Expecto.TestSdk.props b/src/YoloDev.Expecto.TestSdk/build/netcoreapp3.1/YoloDev.Expecto.TestSdk.props
deleted file mode 100644
index ea8a622..0000000
--- a/src/YoloDev.Expecto.TestSdk/build/netcoreapp3.1/YoloDev.Expecto.TestSdk.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project>
-  <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)expecto.visualstudio.dotnetcore.testadapter.dll">
-      <Link>expecto.visualstudio.dotnetcore.testadapter.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </None>
-    <ProjectCapability Include="TestContainer" />
-  </ItemGroup>
-</Project>
diff --git a/src/YoloDev.Expecto.TestSdk/build/netcoreapp3.1/_._ b/src/YoloDev.Expecto.TestSdk/build/netcoreapp3.1/_._
deleted file mode 100644
index e69de29..0000000
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 87e6fe2..c88745f 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>