Skip to content

Commit

Permalink
Added net45 targets so that those projects would pick up the `net45…
Browse files Browse the repository at this point in the history
…` version of dbup-core
  • Loading branch information
droyad committed Feb 7, 2018
1 parent 2b3c826 commit a410867
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/dbup-firebird/dbup-firebird.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>DbUp makes it easy to deploy and upgrade SQL Server databases. This package adds Firebird support.</Description>
<AssemblyTitle>DbUp Firebird Support</AssemblyTitle>
<Authors>Paul Stovell;Jim Burger;Jake Ginnivan;Damian Maclennan</Authors>
<TargetFramework>net40</TargetFramework>
<TargetFrameworks>net40;net45</TargetFrameworks>
<AssemblyName>dbup-firebird</AssemblyName>
<AssemblyOriginatorKeyFile>../dbup.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion src/dbup-mysql/dbup-mysql.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>DbUp makes it easy to deploy and upgrade SQL Server databases. This package adds MySql support.</Description>
<AssemblyTitle>DbUp MySql Support</AssemblyTitle>
<Authors>Paul Stovell;Jim Burger;Jake Ginnivan;Damian Maclennan</Authors>
<TargetFramework>net35</TargetFramework>
<TargetFrameworks>net35;net45</TargetFrameworks>
<AssemblyName>dbup-mysql</AssemblyName>
<AssemblyOriginatorKeyFile>../dbup.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion src/dbup-postgresql/dbup-postgresql.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>DbUp makes it easy to deploy and upgrade SQL Server databases. This package adds PostgreSQL support.</Description>
<AssemblyTitle>DbUp PostgreSQL Support</AssemblyTitle>
<Authors>Paul Stovell;Jim Burger;Jake Ginnivan;Damian Maclennan</Authors>
<TargetFramework>net35</TargetFramework>
<TargetFrameworks>net35;net45</TargetFrameworks>
<AssemblyName>dbup-postgresql</AssemblyName>
<AssemblyOriginatorKeyFile>../dbup.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand Down
4 changes: 2 additions & 2 deletions src/dbup-sqlce/dbup-sqlce.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>DbUp makes it easy to deploy and upgrade SQL Server databases. This package adds SqlCe support. It works with SQL CE 4.0 SP1, which can be downloaded from https://www.microsoft.com/en-us/download/details.aspx?id=30709</Description>
<AssemblyTitle>DbUp SQL CE Support</AssemblyTitle>
<Authors>Paul Stovell;Jim Burger;Jake Ginnivan;Damian Maclennan</Authors>
<TargetFramework>net40</TargetFramework>
<TargetFrameworks>net40;net45</TargetFrameworks>
<AssemblyName>dbup-sqlce</AssemblyName>
<AssemblyOriginatorKeyFile>../dbup.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand All @@ -24,7 +24,7 @@
<ProjectReference Include="..\dbup-core\dbup-core.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' OR '$(TargetFramework)' == 'net45' ">
<PackageReference Include="Microsoft.SqlServer.Compact" Version="4.0.8876.1" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
Expand Down
6 changes: 3 additions & 3 deletions src/dbup-sqlite-mono/dbup-sqlite-mono.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>DbUp makes it easy to deploy and upgrade SQL Server databases. This package adds SQLite support.</Description>
<AssemblyTitle>DbUp SQLite Support targeting Mono</AssemblyTitle>
<Authors>Paul Stovell;Jim Burger;Jake Ginnivan;Damian Maclennan</Authors>
<TargetFramework>net40</TargetFramework>
<TargetFrameworks>net40;net45</TargetFrameworks>
<AssemblyName>dbup-sqlite-mono</AssemblyName>
<AssemblyOriginatorKeyFile>../dbup.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand All @@ -20,15 +20,15 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40' OR '$(TargetFramework)' == 'net45' ">
<DefineConstants>$(DefineConstants);MONO</DefineConstants>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\dbup-core\dbup-core.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' OR '$(TargetFramework)' == 'net45' ">
<PackageReference Include="Mono.Data.Sqlite.Portable" Version="1.0.3.5" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
Expand Down
4 changes: 2 additions & 2 deletions src/dbup-sqlite/dbup-sqlite.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>DbUp makes it easy to deploy and upgrade SQL Server databases. This package adds SQLite support.</Description>
<AssemblyTitle>DbUp SQLite Support</AssemblyTitle>
<Authors>Paul Stovell;Jim Burger;Jake Ginnivan;Damian Maclennan</Authors>
<TargetFrameworks>netstandard1.3;net40</TargetFrameworks>
<TargetFrameworks>netstandard1.3;net40;net45</TargetFrameworks>
<AssemblyName>dbup-sqlite</AssemblyName>
<AssemblyOriginatorKeyFile>../dbup.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand All @@ -31,7 +31,7 @@
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' OR '$(TargetFramework)' == 'net45' ">
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.98.1" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
Expand Down
5 changes: 2 additions & 3 deletions src/dbup-tests/Engine/Output/LoggingTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ namespace DbUp.Tests.Engine.Output
{
public class LoggingTests
{
#if SUPPORTS_LIBLOG
[Fact]
public void WhenNoLoggerIsSpecified_LoggingShouldGoToAutodiscoveredLogger()
{
var scriptExecutor = Substitute.For<IScriptExecutor>();

var defaultLogger = Serilog.Log.Logger;
try
{
Expand All @@ -42,7 +41,7 @@ public void WhenNoLoggerIsSpecified_LoggingShouldGoToAutodiscoveredLogger()
Serilog.Log.Logger = defaultLogger;
}
}

#endif


class InMemorySink : ILogEventSink
Expand Down

0 comments on commit a410867

Please sign in to comment.