Merge pull request #2 from DbUp/core6

Update to DbUp-core 6.0 and all the references
DbUp · Jul 26, 2024 · 719b497 · 719b497
2 parents 0da2b57 + 364f48b
commit 719b497
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 85 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -10,18 +10,4 @@
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true' Or '$(CI)' == 'true'">
-
-    <!-- Perform a deterministic build, so our binaries aren't impacted by build server environmental factors (e.g. file paths). -->
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-
-    <!-- Embed source files that are not tracked by the source control manager in the PDB -->
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-
-    <!-- Recommended: Embed symbols containing Source Link in the main file (exe/dll) -->
-    <DebugType>embedded</DebugType>
-
-  </PropertyGroup>
-
 </Project>
diff --git a/src/Sample/Sample.csproj b/src/Sample/Sample.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\dbup-firebird\dbup-firebird.csproj"/>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...portTests.VerifyBasicSupport.verified.txt → ...portTests.VerifyBasicSupport.approved.txt b/...portTests.VerifyBasicSupport.verified.txt → ...portTests.VerifyBasicSupport.approved.txt
@@ -1,11 +1,11 @@
 DB Operation: Open connection
 Info:         Beginning database upgrade
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'schemaversions'
 DB Operation: Dispose command
 Info:         Journal table does not exist
 Info:         Executing Database Server script 'Script0001.sql'
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'schemaversions'
 DB Operation: Dispose command
 Info:         Creating the "schemaversions" table

diff --git a/...JournalCreationIfNameChanged.verified.txt → ...JournalCreationIfNameChanged.approved.txt b/...JournalCreationIfNameChanged.verified.txt → ...JournalCreationIfNameChanged.approved.txt
@@ -1,11 +1,11 @@
 DB Operation: Open connection
 Info:         Beginning database upgrade
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'TestSchemaVersions'
 DB Operation: Dispose command
 Info:         Journal table does not exist
 Info:         Executing Database Server script 'Script0001.sql'
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'TestSchemaVersions'
 DB Operation: Dispose command
 Info:         Creating the "TestSchemaVersions" table

diff --git a/....VerifyVariableSubstitutions.verified.txt → ....VerifyVariableSubstitutions.approved.txt b/....VerifyVariableSubstitutions.verified.txt → ....VerifyVariableSubstitutions.approved.txt
@@ -1,11 +1,11 @@
 DB Operation: Open connection
 Info:         Beginning database upgrade
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'schemaversions'
 DB Operation: Dispose command
 Info:         Journal table does not exist
 Info:         Executing Database Server script 'Script0001.sql'
-Info:         Checking whether journal table exists..
+Info:         Checking whether journal table exists
 DB Operation: Execute scalar command: select 1 from RDB$RELATIONS where RDB$SYSTEM_FLAG = 0 and RDB$RELATION_NAME = 'schemaversions'
 DB Operation: Dispose command
 Info:         Creating the "schemaversions" table

diff --git a/src/Tests/ApprovalFiles/NoPublicApiChanges.Run.Net.verified.cs b/src/Tests/ApprovalFiles/NoPublicApiChanges.Run.Net.verified.cs
diff --git a/...NoPublicApiChanges.Run.DotNet.verified.cs → ...lFiles/NoPublicApiChanges.Run.approved.cs b/...NoPublicApiChanges.Run.DotNet.verified.cs → ...lFiles/NoPublicApiChanges.Run.approved.cs
diff --git a/src/Tests/DatabaseSupportTests.cs b/src/Tests/DatabaseSupportTests.cs
@@ -1,5 +1,4 @@
-#if !NETCORE
-using DbUp.Builder;
+using DbUp.Builder;
 using DbUp.Firebird;
 using DbUp.Tests.Common;
 
@@ -20,4 +19,3 @@ protected override UpgradeEngineBuilder AddCustomNamedJournalToBuilder(UpgradeEn
                 => new FirebirdTableJournal(connectionManagerFactory, logFactory, tableName)
         );
 }
-#endif
diff --git a/src/Tests/NoPublicApiChanges.cs b/src/Tests/NoPublicApiChanges.cs
@@ -1,5 +1,4 @@
-#if !NETCORE
-using DbUp.Tests.Common;
+using DbUp.Tests.Common;
 
 namespace DbUp.Tests.Providers.Firebird;
 
@@ -10,4 +9,3 @@ public NoPublicApiChanges()
     {
     }
 }
-#endif
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net462;net8</TargetFrameworks>
+        <TargetFramework>net8</TargetFramework>
         <AssemblyName>Tests</AssemblyName>
         <RootNamespace>DbUp.Firebird.Tests</RootNamespace>
-        <!--    <ImplicitUsings>enable</ImplicitUsings> Can't use implict usings with net46 -->
+        <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\dbup-firebird\dbup-firebird.csproj"/>
-        <PackageReference Include="DbUp.Tests.Common" Version="5.0.37"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-        <PackageReference Include="xunit" Version="2.6.6"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+        <PackageReference Include="DbUp.Tests.Common" Version="6.0.0-beta.146"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
+        <PackageReference Include="xunit" Version="2.9.0"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/src/dbup-firebird.sln.DotSettings b/src/dbup-firebird.sln.DotSettings
@@ -5,5 +5,8 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQ/@EntryIndexedValue">SQ</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<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>
+	<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>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
 	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String></wpf:ResourceDictionary>
diff --git a/src/dbup-firebird/FirebirdScriptExecutor.cs b/src/dbup-firebird/FirebirdScriptExecutor.cs
@@ -47,9 +47,9 @@ protected override void ExecuteCommandsWithinExceptionHandler(int index, SqlScri
             }
             catch (FbException fbException)
             {
-                Log().WriteInformation("Firebird exception has occured in script: '{0}'", script.Name);
-                Log().WriteError("Script block number: {0}; Firebird error code: {1}; SQLSTATE {2}; Message: {3}", index, fbException.ErrorCode, fbException.SQLSTATE, fbException.Message);
-                Log().WriteError(fbException.ToString());
+                Log().LogInformation("Firebird exception has occured in script: '{0}'", script.Name);
+                Log().LogError("Script block number: {0}; Firebird error code: {1}; SQLSTATE {2}; Message: {3}", index, fbException.ErrorCode, fbException.SQLSTATE, fbException.Message);
+                Log().LogError(fbException.ToString());
                 throw;
             }
         }

diff --git a/src/dbup-firebird/FirebirdTableJournal.cs b/src/dbup-firebird/FirebirdTableJournal.cs
@@ -55,9 +55,9 @@ protected override void OnTableCreated(Func<IDbCommand> dbCommandFactory)
         {
             var unquotedTableName = UnquoteSqlObjectName(FqSchemaTableName);
             ExecuteCommand(dbCommandFactory, CreateGeneratorSql(unquotedTableName));
-            Log().WriteInformation($"The {GeneratorName(unquotedTableName)} generator has been created");
+            Log().LogInformation($"The {GeneratorName(unquotedTableName)} generator has been created");
             ExecuteCommand(dbCommandFactory, CreateTriggerSql(unquotedTableName));
-            Log().WriteInformation($"The {TriggerName(unquotedTableName)} trigger has been created");
+            Log().LogInformation($"The {TriggerName(unquotedTableName)} trigger has been created");
         }
 
         protected override string DoesTableExistSql()

diff --git a/src/dbup-firebird/dbup-firebird.csproj b/src/dbup-firebird/dbup-firebird.csproj
@@ -6,7 +6,7 @@
     <Company>DbUp Contributors</Company>
     <Product>DbUp</Product>
     <Copyright>Copyright © DbUp Contributors 2015</Copyright>
-    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>dbup-firebird</AssemblyName>
     <RootNamespace>DbUp.Firebird</RootNamespace>
     <PackageId>dbup-firebird</PackageId>
@@ -17,9 +17,15 @@
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(CI)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild> <!-- Perform a deterministic build, so our binaries aren't impacted by build server environmental factors (e.g. file paths). -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources> <!-- Embed source files that are not tracked by the source control manager in the PDB -->
+    <DebugType>embedded</DebugType> <!-- Recommended: Embed symbols containing Source Link in the main file (exe/dll) -->
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="dbup-core" Version="5.0.37"/>
-    <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="9.1.1"/>
+    <PackageReference Include="dbup-core" Version="6.0.0-beta.146"/>
+    <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="10.3.1" />
   </ItemGroup>
 
   <ItemGroup>