Skip to content

Commit

Permalink
Merge pull request #705 from Ste1io/update-tests-targets
Browse files Browse the repository at this point in the history
Upgrade target frameworks to net472,dotnetcore3.1 (tests)
  • Loading branch information
Ste1io authored Oct 20, 2023
2 parents 53e928c + d7fc45c commit 32319b6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
26 changes: 13 additions & 13 deletions PetaPoco.Tests.Integration/PetaPoco.Tests.Integration.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
<AssemblyTitle>PetaPoco.Tests.Integration</AssemblyTitle>
<Description>A Tiny ORMish thing for your POCO's.</Description>
<Company>Collaborating Platypus</Company>
Expand Down Expand Up @@ -45,13 +45,13 @@
<EmbeddedResource Remove="Scripts\SqlServerCeBuildDatabase.sql" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<Compile Remove="Databases\MSAccessTests\**" />
<Compile Remove="Providers\MSAccessTestProvider.cs" />
<EmbeddedResource Remove="Scripts\MSAccessBuildDatabase.sql" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
<ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.1'">
<COMReference Include="ADOX">
<WrapperTool>tlbimp</WrapperTool>
<VersionMinor>0</VersionMinor>
Expand All @@ -65,25 +65,25 @@

<ItemGroup>
<PackageReference Include="Castle.Core" Version="4.2.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.0" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.0" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.0" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.0" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
<PackageReference Include="Moq" Version="[4.8.2,4.20)" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Shouldly" Version="4.0.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="xunit" Version="2.5.1" />
<PackageReference Include="xunit" Version="2.5.3" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.analyzers" Version="1.3.0" />
<PackageReference Include="xunit.assert" Version="2.5.1" />
<PackageReference Include="xunit.core" Version="2.5.1" />
<PackageReference Include="xunit.extensibility.core" Version="2.5.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.5.1" />
<PackageReference Include="xunit.analyzers" Version="1.4.0" />
<PackageReference Include="xunit.assert" Version="2.5.3" />
<PackageReference Include="xunit.core" Version="2.5.3" />
<PackageReference Include="xunit.extensibility.core" Version="2.5.3" />
<PackageReference Include="xunit.extensibility.execution" Version="2.5.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />

<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="7.5.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.6" />
<PackageReference Include="Microsoft.SqlServer.Compact" Version="4.0.8876.1" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
<PackageReference Include="Microsoft.SqlServer.Compact" Version="4.0.8876.1" Condition="'$(TargetFramework)' != 'netcoreapp3.1'" />
<PackageReference Include="MySql.Data" Version="8.0.21" />
<PackageReference Include="MySqlConnector" Version="1.0.1" />
<PackageReference Include="Npgsql" Version="4.1.4" />
Expand Down
4 changes: 2 additions & 2 deletions PetaPoco.Tests.Unit/PetaPoco.Tests.Unit.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
<AssemblyTitle>PetaPoco.Tests.Unit</AssemblyTitle>
<Description>A Tiny ORMish thing for your POCO's.</Description>
<Company>Collaborating Platypus</Company>
Expand All @@ -17,7 +17,7 @@
<PackageReference Include="Castle.Core" Version="4.2.1" />
<PackageReference Include="Moq" Version="[4.8.2,4.20)" />
<PackageReference Include="Shouldly" Version="3.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="xunit" Version="2.5.1" />
Expand Down

0 comments on commit 32319b6

Please sign in to comment.