From cecf558c0d65ac80bd065e83bf08344daa061d21 Mon Sep 17 00:00:00 2001
From: Robert McLaws <1657085+robertmclaws@users.noreply.github.com>
Date: Tue, 26 Mar 2024 22:50:14 -0400
Subject: [PATCH] Attempting to work around
 https://github.com/dotnet/runtime/issues/96957

---
 .github/workflows/ci.yml                           |  2 +-
 .github/workflows/pr-validation.yml                |  2 +-
 .github/workflows/release.yml                      |  2 +-
 src/Directory.Build.props                          | 10 +++++++++-
 src/Simple.OData.Samples.ApiV3/app.config          |  2 +-
 .../Simple.OData.Tests.Client.Integration.csproj   |  7 -------
 .../Simple.OData.Tests.Client.csproj               |  3 ---
 .../Simple.OData.Tests.Samples.ApiV3.csproj        |  6 ------
 .../Simple.OData.Tests.Samples.ApiV4.csproj        |  6 ++----
 .../Northwind.svc                                  |  2 +-
 .../Web.config                                     | 14 +++++++-------
 11 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 24bfa50e1..b1076ded4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
       run: dotnet build "src/Simple.OData.Client.sln" --no-restore --configuration Debug --verbosity minimal
 
     - name: Test
-      run: dotnet test "src/Simple.OData.Client.sln" --no-build --verbosity minimal
+      run: dotnet test "src/Simple.OData.Client.sln" --no-build --configuration Debug --verbosity minimal
 
     - name: Create NuGet Packages
       run: dotnet pack src/Simple.OData.Client.sln --no-build --output packages /p:Configuration=debug /p:Version="${{ vars.CI_VERSION_MAJORMINOR }}-CI-${{ steps.build_date.outputs.date }}"
diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
index 19c5618df..477166fb7 100644
--- a/.github/workflows/pr-validation.yml
+++ b/.github/workflows/pr-validation.yml
@@ -28,5 +28,5 @@ jobs:
       run: dotnet build "src/Simple.OData.Client.sln" --no-restore --configuration Debug --verbosity minimal
 
     - name: Test
-      run: dotnet test "src/Simple.OData.Client.sln" --no-build --verbosity minimal
+      run: dotnet test "src/Simple.OData.Client.sln" --no-build --configuration Debug --verbosity minimal
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d39ca13bb..5e95728ea 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
       run: dotnet build "src/Simple.OData.Client.sln" --no-restore --configuration Release --verbosity minimal
 
     - name: Test
-      run: dotnet test "src/Simple.OData.Client.sln" --no-build --verbosity minimal
+      run: dotnet test "src/Simple.OData.Client.sln" --no-build --configuration Release --verbosity minimal
 
     - name: Create NuGet Packages
       run: dotnet pack src/Simple.OData.Client.sln --no-build --output packages /p:Configuration=release /p:Version="${{ vars.RELEASE_VERSION_MAJORMINOR }}"
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 53d53e5ad..8d615d4ba 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -112,10 +112,18 @@
 		</AssemblyAttribute>-->
 	</ItemGroup>
 
-	<ItemGroup Condition=" $(IsTestProject) == 'true' and $(IsSampleProject) != 'true' and $(IsBenchmarkProject) != 'true' and $(IsTestAssetProject) != 'true'">
+	<ItemGroup Condition=" $(IsTestProject) == 'true' and $(IsBenchmarkProject) != 'true' and $(IsTestAssetProject) != 'true'">
 		<PackageReference Include="FluentAssertions" Version="6.*" PrivateAssets="All" />
 		<PackageReference Include="FluentAssertions.Analyzers" Version="0.*" PrivateAssets="All" />
 		<PackageReference Include="MSTest" Version="3.*" />
+		<!-- @robertmclaws: Temporary workaround for 8.0 bug: https://github.com/microsoft/vstest/pull/4792 -->
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*-*" />
+		<PackageReference Include="Microsoft.TestPlatform" Version="17.*-*" />
+
+		<!-- @robertmclaws: We will remove these someday -->
+		<PackageReference Include="xunit" Version="2.*" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.*" />
+		<DotNetCliToolReference Include="dotnet-xunit" Version="2.*" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Simple.OData.Samples.ApiV3/app.config b/src/Simple.OData.Samples.ApiV3/app.config
index 90c7765d1..6e56df0c7 100644
--- a/src/Simple.OData.Samples.ApiV3/app.config
+++ b/src/Simple.OData.Samples.ApiV3/app.config
@@ -35,6 +35,6 @@
     </runtime>
 
     <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
 </configuration>
diff --git a/src/Simple.OData.Tests.Client.Integration/Simple.OData.Tests.Client.Integration.csproj b/src/Simple.OData.Tests.Client.Integration/Simple.OData.Tests.Client.Integration.csproj
index 69c9caa8d..972b27832 100644
--- a/src/Simple.OData.Tests.Client.Integration/Simple.OData.Tests.Client.Integration.csproj
+++ b/src/Simple.OData.Tests.Client.Integration/Simple.OData.Tests.Client.Integration.csproj
@@ -10,13 +10,6 @@
 		<DefineConstants>$(DefineConstants);MOCK_HTTP</DefineConstants>
 	</PropertyGroup>
 	
-	<ItemGroup>
-		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-		<PackageReference Include="xunit" Version="2.*" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.*" />
-		<DotNetCliToolReference Include="dotnet-xunit" Version="2.*" />
-	</ItemGroup>
-	
 	<ItemGroup>
 		<None Include="app.config" />
 	</ItemGroup>
diff --git a/src/Simple.OData.Tests.Client/Simple.OData.Tests.Client.csproj b/src/Simple.OData.Tests.Client/Simple.OData.Tests.Client.csproj
index 3d36196ea..750ce90e7 100644
--- a/src/Simple.OData.Tests.Client/Simple.OData.Tests.Client.csproj
+++ b/src/Simple.OData.Tests.Client/Simple.OData.Tests.Client.csproj
@@ -10,10 +10,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="13.*" />
-		<PackageReference Include="xunit" Version="2.*" />
 		<PackageReference Include="Moq" Version="4.*" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.*" />
-		<DotNetCliToolReference Include="dotnet-xunit" Version="2.*" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Simple.OData.Tests.Samples.ApiV3/Simple.OData.Tests.Samples.ApiV3.csproj b/src/Simple.OData.Tests.Samples.ApiV3/Simple.OData.Tests.Samples.ApiV3.csproj
index 1d2884e3b..ab65b5ad9 100644
--- a/src/Simple.OData.Tests.Samples.ApiV3/Simple.OData.Tests.Samples.ApiV3.csproj
+++ b/src/Simple.OData.Tests.Samples.ApiV3/Simple.OData.Tests.Samples.ApiV3.csproj
@@ -8,12 +8,6 @@
 		<DefineConstants>$(DefineConstants);MOCK_HTTP</DefineConstants>
 	</PropertyGroup>
 	
-	<ItemGroup>
-		<PackageReference Include="xunit" Version="2.*" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.*" />
-		<DotNetCliToolReference Include="dotnet-xunit" Version="2.*" />
-	</ItemGroup>
-	
 	<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
 		<PackageReference Include="Microsoft.Owin.Hosting" Version="4.*" />
 		<PackageReference Include="Microsoft.Owin.Testing" Version="4.*" />
diff --git a/src/Simple.OData.Tests.Samples.ApiV4/Simple.OData.Tests.Samples.ApiV4.csproj b/src/Simple.OData.Tests.Samples.ApiV4/Simple.OData.Tests.Samples.ApiV4.csproj
index b1357966c..cfa0a9cfe 100644
--- a/src/Simple.OData.Tests.Samples.ApiV4/Simple.OData.Tests.Samples.ApiV4.csproj
+++ b/src/Simple.OData.Tests.Samples.ApiV4/Simple.OData.Tests.Samples.ApiV4.csproj
@@ -9,11 +9,9 @@
 	</PropertyGroup>
 	
 	<ItemGroup>
-		<PackageReference Include="xunit" Version="2.*" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.*" />
-		<DotNetCliToolReference Include="dotnet-xunit" Version="2.*" />
+		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.*" />
 	</ItemGroup>
-	
+
 	<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
 		<PackageReference Include="Microsoft.Owin.Hosting" Version="4.*" />
 		<PackageReference Include="Microsoft.Owin.Testing" Version="4.*" />
diff --git a/src/Simple.OData.Tests.Shared.NorthwindService/Northwind.svc b/src/Simple.OData.Tests.Shared.NorthwindService/Northwind.svc
index ff79e2b4e..75705f2c1 100644
--- a/src/Simple.OData.Tests.Shared.NorthwindService/Northwind.svc
+++ b/src/Simple.OData.Tests.Shared.NorthwindService/Northwind.svc
@@ -1,3 +1,3 @@
 
 
-<%@ ServiceHost Language="C#" Factory="System.Data.Services.DataServiceHostFactory, Microsoft.Data.Services, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" Service="Simple.OData.Tests.Shared.NorthwindModel.NorthwindService" %>
+<%@ ServiceHost Language="C#" Factory="System.Data.Services.DataServiceHostFactory, Microsoft.Data.Services, Version=5.8.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" Service="Simple.OData.Tests.Shared.NorthwindModel.NorthwindService" %>
diff --git a/src/Simple.OData.Tests.Shared.NorthwindService/Web.config b/src/Simple.OData.Tests.Shared.NorthwindService/Web.config
index da05e2335..efe71f472 100644
--- a/src/Simple.OData.Tests.Shared.NorthwindService/Web.config
+++ b/src/Simple.OData.Tests.Shared.NorthwindService/Web.config
@@ -26,11 +26,11 @@
       </system.Web>
   -->
   <system.web>
-    <compilation debug="true" targetFramework="4.5.2">
+    <compilation debug="true" targetFramework="4.8">
       <assemblies>
       </assemblies>
     </compilation>
-    <httpRuntime targetFramework="4.5" />
+    <httpRuntime targetFramework="4.8" />
   </system.web>
   <system.serviceModel>
     <behaviors>
@@ -60,23 +60,23 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.8.5.0" newVersion="5.8.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.8.5.0" newVersion="5.8.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.8.5.0" newVersion="5.8.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Data.Services" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.8.5.0" newVersion="5.8.5.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>