Skip to content

Commit 719b497

Browse files
droyaddroyad
authored
Merge pull request #2 from DbUp/core6
Update to DbUp-core 6.0 and all the references
2 parents 0da2b57 + 364f48b commit 719b497

14 files changed

+33
-85
lines changed

‎src/Directory.Build.props

-14
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,4 @@
1010
<LangVersion>latest</LangVersion>
1111
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1212
</PropertyGroup>
13-
14-
<PropertyGroup Condition="'$(TF_BUILD)' == 'true' Or '$(CI)' == 'true'">
15-
16-
<!-- Perform a deterministic build, so our binaries aren't impacted by build server environmental factors (e.g. file paths). -->
17-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
18-
19-
<!-- Embed source files that are not tracked by the source control manager in the PDB -->
20-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
21-
22-
<!-- Recommended: Embed symbols containing Source Link in the main file (exe/dll) -->
23-
<DebugType>embedded</DebugType>
24-
25-
</PropertyGroup>
26-
2713
</Project>

‎src/Sample/Sample.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<OutputType>Exe</OutputType>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<ProjectReference Include="..\dbup-firebird\dbup-firebird.csproj"/>
10-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0"/>
10+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0"/>
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎src/Tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.verified.txt ‎src/Tests/ApprovalFiles/DatabaseSupportTests.VerifyBasicSupport.approved.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
DB Operation: Open connection
22
Info: Beginning database upgrade
3-
Info: Checking whether journal table exists..
3+
Info: Checking whether journal table exists
44
DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'schemaversions'
55
DB Operation: Dispose command
66
Info: Journal table does not exist
77
Info: Executing Database Server script 'Script0001.sql'
8-
Info: Checking whether journal table exists..
8+
Info: Checking whether journal table exists
99
DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'schemaversions'
1010
DB Operation: Dispose command
1111
Info: Creating the "schemaversions" table

‎src/Tests/ApprovalFiles/DatabaseSupportTests.VerifyJournalCreationIfNameChanged.verified.txt ‎src/Tests/ApprovalFiles/DatabaseSupportTests.VerifyJournalCreationIfNameChanged.approved.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
DB Operation: Open connection
22
Info: Beginning database upgrade
3-
Info: Checking whether journal table exists..
3+
Info: Checking whether journal table exists
44
DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'TestSchemaVersions'
55
DB Operation: Dispose command
66
Info: Journal table does not exist
77
Info: Executing Database Server script 'Script0001.sql'
8-
Info: Checking whether journal table exists..
8+
Info: Checking whether journal table exists
99
DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'TestSchemaVersions'
1010
DB Operation: Dispose command
1111
Info: Creating the "TestSchemaVersions" table

‎src/Tests/ApprovalFiles/DatabaseSupportTests.VerifyVariableSubstitutions.verified.txt ‎src/Tests/ApprovalFiles/DatabaseSupportTests.VerifyVariableSubstitutions.approved.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
DB Operation: Open connection
22
Info: Beginning database upgrade
3-
Info: Checking whether journal table exists..
3+
Info: Checking whether journal table exists
44
DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'schemaversions'
55
DB Operation: Dispose command
66
Info: Journal table does not exist
77
Info: Executing Database Server script 'Script0001.sql'
8-
Info: Checking whether journal table exists..
8+
Info: Checking whether journal table exists
99
DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'schemaversions'
1010
DB Operation: Dispose command
1111
Info: Creating the "schemaversions" table

‎src/Tests/ApprovalFiles/NoPublicApiChanges.Run.Net.verified.cs

-43
This file was deleted.

‎src/Tests/ApprovalFiles/NoPublicApiChanges.Run.DotNet.verified.cs ‎src/Tests/ApprovalFiles/NoPublicApiChanges.Run.approved.cs

File renamed without changes.

‎src/Tests/DatabaseSupportTests.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if !NETCORE
2-
using DbUp.Builder;
1+
using DbUp.Builder;
32
using DbUp.Firebird;
43
using DbUp.Tests.Common;
54

@@ -20,4 +19,3 @@ protected override UpgradeEngineBuilder AddCustomNamedJournalToBuilder(UpgradeEn
2019
=> new FirebirdTableJournal(connectionManagerFactory, logFactory, tableName)
2120
);
2221
}
23-
#endif

‎src/Tests/NoPublicApiChanges.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if !NETCORE
2-
using DbUp.Tests.Common;
1+
using DbUp.Tests.Common;
32

43
namespace DbUp.Tests.Providers.Firebird;
54

@@ -10,4 +9,3 @@ public NoPublicApiChanges()
109
{
1110
}
1211
}
13-
#endif

‎src/Tests/Tests.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net462;net8</TargetFrameworks>
4+
<TargetFramework>net8</TargetFramework>
55
<AssemblyName>Tests</AssemblyName>
66
<RootNamespace>DbUp.Firebird.Tests</RootNamespace>
7-
<!-- <ImplicitUsings>enable</ImplicitUsings> Can't use implict usings with net46 -->
7+
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
1212
<ProjectReference Include="..\dbup-firebird\dbup-firebird.csproj"/>
13-
<PackageReference Include="DbUp.Tests.Common" Version="5.0.37"/>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
15-
<PackageReference Include="xunit" Version="2.6.6"/>
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
13+
<PackageReference Include="DbUp.Tests.Common" Version="6.0.0-beta.146"/>
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
15+
<PackageReference Include="xunit" Version="2.9.0"/>
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>

‎src/dbup-firebird.sln.DotSettings

+3
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,8 @@
55
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQ/@EntryIndexedValue">SQ</s:String>
66
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
77
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
8+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
9+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
10+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
811
<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
912
<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String></wpf:ResourceDictionary>

‎src/dbup-firebird/FirebirdScriptExecutor.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ protected override void ExecuteCommandsWithinExceptionHandler(int index, SqlScri
4747
}
4848
catch (FbException fbException)
4949
{
50-
Log().WriteInformation("Firebird exception has occured in script: '{0}'", script.Name);
51-
Log().WriteError("Script block number: {0}; Firebird error code: {1}; SQLSTATE {2}; Message: {3}", index, fbException.ErrorCode, fbException.SQLSTATE, fbException.Message);
52-
Log().WriteError(fbException.ToString());
50+
Log().LogInformation("Firebird exception has occured in script: '{0}'", script.Name);
51+
Log().LogError("Script block number: {0}; Firebird error code: {1}; SQLSTATE {2}; Message: {3}", index, fbException.ErrorCode, fbException.SQLSTATE, fbException.Message);
52+
Log().LogError(fbException.ToString());
5353
throw;
5454
}
5555
}

‎src/dbup-firebird/FirebirdTableJournal.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ protected override void OnTableCreated(Func<IDbCommand> dbCommandFactory)
5555
{
5656
var unquotedTableName = UnquoteSqlObjectName(FqSchemaTableName);
5757
ExecuteCommand(dbCommandFactory, CreateGeneratorSql(unquotedTableName));
58-
Log().WriteInformation($"The {GeneratorName(unquotedTableName)} generator has been created");
58+
Log().LogInformation($"The {GeneratorName(unquotedTableName)} generator has been created");
5959
ExecuteCommand(dbCommandFactory, CreateTriggerSql(unquotedTableName));
60-
Log().WriteInformation($"The {TriggerName(unquotedTableName)} trigger has been created");
60+
Log().LogInformation($"The {TriggerName(unquotedTableName)} trigger has been created");
6161
}
6262

6363
protected override string DoesTableExistSql()

‎src/dbup-firebird/dbup-firebird.csproj

+9-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Company>DbUp Contributors</Company>
77
<Product>DbUp</Product>
88
<Copyright>Copyright © DbUp Contributors 2015</Copyright>
9-
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
9+
<TargetFramework>netstandard2.0</TargetFramework>
1010
<AssemblyName>dbup-firebird</AssemblyName>
1111
<RootNamespace>DbUp.Firebird</RootNamespace>
1212
<PackageId>dbup-firebird</PackageId>
@@ -17,9 +17,15 @@
1717
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1818
</PropertyGroup>
1919

20+
<PropertyGroup Condition="'$(CI)' == 'true'">
21+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild> <!-- Perform a deterministic build, so our binaries aren't impacted by build server environmental factors (e.g. file paths). -->
22+
<EmbedUntrackedSources>true</EmbedUntrackedSources> <!-- Embed source files that are not tracked by the source control manager in the PDB -->
23+
<DebugType>embedded</DebugType> <!-- Recommended: Embed symbols containing Source Link in the main file (exe/dll) -->
24+
</PropertyGroup>
25+
2026
<ItemGroup>
21-
<PackageReference Include="dbup-core" Version="5.0.37"/>
22-
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="9.1.1"/>
27+
<PackageReference Include="dbup-core" Version="6.0.0-beta.146"/>
28+
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="10.3.1" />
2329
</ItemGroup>
2430

2531
<ItemGroup>

0 commit comments

Comments
 (0)