From 88fe33ac8617bd9816715369edd27fa3b6785d59 Mon Sep 17 00:00:00 2001
From: Jens Schmidt <jens.schmidt@a-w.com>
Date: Tue, 4 Jul 2023 11:44:58 +0200
Subject: [PATCH 1/2] Sprint.Testing.Microsoft supports netstandrd2.0

---
 .../Spring.Testing.Microsoft.csproj                        | 7 +------
 .../Spring.Testing.Microsoft.Tests.csproj                  | 6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.csproj b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.csproj
index 8806fa2f8..ac0a8d72d 100644
--- a/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.csproj
+++ b/src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.csproj
@@ -1,21 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>$(TargetFullFrameworkVersion)</TargetFramework>
+    <TargetFrameworks>netstandard2.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
     <Description>Interfaces and classes that provide Microsoft Unit Testing integration in Spring.Net</Description>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
     <ProjectReference Include="..\Spring.Data\Spring.Data.csproj" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="MSTest.TestFramework" />
   </ItemGroup>
-
   <ItemGroup>
     <Using Remove="System.Net.Http" />
   </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj
index fbc2fac30..ebe33959f 100644
--- a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj
+++ b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(TargetFullFrameworkVersion)</TargetFramework>
+    <TargetFrameworks>net6.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="MSTest.TestAdapter" />
     <PackageReference Include="MSTest.TestFramework" />
-  </ItemGroup>
+  </ItemGroup>  
   <ItemGroup>
     <None Include="app.config" />
     <EmbeddedResource Include="Testing\Microsoft\TestApplicationContext.xml" />

From 694e7bdee4b01411b448c1d779bd6a7ff15682fd Mon Sep 17 00:00:00 2001
From: Jens Schmidt <jens.schmidt@a-w.com>
Date: Tue, 4 Jul 2023 15:27:56 +0200
Subject: [PATCH 2/2] Fix Test, there is no sqlserver-2 dbprovider in
 Spring.Data.Common.dbproviders_netcore.xml

---
 .../Spring.Testing.Microsoft.Tests.csproj     |  5 +++--
 .../TestApplicationContext_netcore.xml        | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 test/Spring/Spring.Testing.Microsoft.Tests/Testing/Microsoft/TestApplicationContext_netcore.xml

diff --git a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj
index ebe33959f..2ce01bad3 100644
--- a/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj
+++ b/test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net6.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>  
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
     <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
@@ -16,6 +16,7 @@
   </ItemGroup>  
   <ItemGroup>
     <None Include="app.config" />
-    <EmbeddedResource Include="Testing\Microsoft\TestApplicationContext.xml" />
+    <EmbeddedResource Include="Testing\Microsoft\TestApplicationContext_netcore.xml" Condition=" '$(TargetFramework)' == 'net6.0' " LogicalName="Spring.Testing.Microsoft.TestApplicationContext.xml" />
+    <EmbeddedResource Include="Testing\Microsoft\TestApplicationContext.xml" Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' " LogicalName="Spring.Testing.Microsoft.TestApplicationContext.xml" />    
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Testing.Microsoft.Tests/Testing/Microsoft/TestApplicationContext_netcore.xml b/test/Spring/Spring.Testing.Microsoft.Tests/Testing/Microsoft/TestApplicationContext_netcore.xml
new file mode 100644
index 000000000..33e20e66d
--- /dev/null
+++ b/test/Spring/Spring.Testing.Microsoft.Tests/Testing/Microsoft/TestApplicationContext_netcore.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database">
+
+  <db:provider id="DbProvider"
+               provider="SqlServer"
+               connectionString="Data Source=.\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+
+
+  <object id="transactionManager"  type="Spring.Transaction.CallCountingTransactionManager, Spring.Data.Tests">
+
+  </object>
+  
+  <object name="Joe" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name" value="Joe"/>
+  </object>
+  
+  
+</objects>
\ No newline at end of file