Skip to content

Commit 5654b5f

Browse files
authored
Add netstandard2.0 support to Spring.Testing.Microsoft (#237)
Co-authored-by: Jens Schmidt <[email protected]>
1 parent 2d5c33a commit 5654b5f

File tree

3 files changed

+26
-11
lines changed

3 files changed

+26
-11
lines changed
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFramework>$(TargetFullFrameworkVersion)</TargetFramework>
3+
<TargetFrameworks>netstandard2.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
54
<Description>Interfaces and classes that provide Microsoft Unit Testing integration in Spring.Net</Description>
65
</PropertyGroup>
7-
86
<ItemGroup>
97
<ProjectReference Include="..\Spring.Core\Spring.Core.csproj" />
108
<ProjectReference Include="..\Spring.Data\Spring.Data.csproj" />
119
</ItemGroup>
12-
1310
<ItemGroup>
1411
<PackageReference Include="MSTest.TestFramework" />
1512
</ItemGroup>
16-
1713
<ItemGroup>
1814
<Using Remove="System.Net.Http" />
1915
</ItemGroup>
20-
2116
</Project>
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFullFrameworkVersion)</TargetFramework>
4-
</PropertyGroup>
3+
<TargetFrameworks>net6.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
4+
</PropertyGroup>
55
<ItemGroup>
66
<ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.csproj" />
77
<ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.csproj" />
@@ -13,9 +13,10 @@
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1414
<PackageReference Include="MSTest.TestAdapter" />
1515
<PackageReference Include="MSTest.TestFramework" />
16-
</ItemGroup>
16+
</ItemGroup>
1717
<ItemGroup>
1818
<None Include="app.config" />
19-
<EmbeddedResource Include="Testing\Microsoft\TestApplicationContext.xml" />
19+
<EmbeddedResource Include="Testing\Microsoft\TestApplicationContext_netcore.xml" Condition=" '$(TargetFramework)' == 'net6.0' " LogicalName="Spring.Testing.Microsoft.TestApplicationContext.xml" />
20+
<EmbeddedResource Include="Testing\Microsoft\TestApplicationContext.xml" Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' " LogicalName="Spring.Testing.Microsoft.TestApplicationContext.xml" />
2021
</ItemGroup>
2122
</Project>
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<objects xmlns="http://www.springframework.net"
3+
xmlns:db="http://www.springframework.net/database">
4+
5+
<db:provider id="DbProvider"
6+
provider="SqlServer"
7+
connectionString="Data Source=.\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
8+
9+
10+
<object id="transactionManager" type="Spring.Transaction.CallCountingTransactionManager, Spring.Data.Tests">
11+
12+
</object>
13+
14+
<object name="Joe" type="Spring.Objects.TestObject, Spring.Core.Tests">
15+
<property name="Name" value="Joe"/>
16+
</object>
17+
18+
19+
</objects>

0 commit comments

Comments
 (0)