Update Other Dependencies

Author: droyad

src/Tests/OracleConnectionManagerTests.cs

@@ -31,5 +31,25 @@ public void CanParseMultilineScript()
 
             result.Count().ShouldBe(2);
         }
+<<<<<<< Updated upstream
+=======
+
+        [Fact]
+        public void CanParseWithoutCommentTest()
+        {
+            var multiCommand = @"
+-- inline comment that should be ignored
+/*
+   multiline comment that should be ignored
+*/
+create table FOO /*comment*/(text VARCHAR(255) NOT NULL DEFAULT '/*not a comment*/ --not a comment')/ -- inline comment that should be ignored
+";
+            var connectionManager = new OracleConnectionManager("connectionstring", new OracleCommandSplitter('/'));
+            var result = connectionManager.SplitScriptIntoCommands(multiCommand);
+
+            result.Count().ShouldBe(1, "there is more than 1 command");
+            result.Single().ShouldBe("create table FOO (text VARCHAR(255) NOT NULL DEFAULT '/*not a comment*/ --not a comment')", "the command not match");
+        }
+>>>>>>> Stashed changes
     }
 }

src/Tests/Tests.csproj

@@ -10,10 +10,17 @@
 
   <ItemGroup>
     <ProjectReference Include="..\dbup-oracle\dbup-oracle.csproj"/>
+<<<<<<< Updated upstream
     <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.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
+>>>>>>> Stashed changes
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

src/dbup-oracle/dbup-oracle.csproj

@@ -17,6 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+<<<<<<< Updated upstream
     <PackageReference Include="dbup-core" Version="5.0.37"/>
   </ItemGroup>
 
@@ -26,6 +27,10 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <PackageReference Include="Oracle.ManagedDataAccess" Version="12.2.1100" />
+=======
+    <PackageReference Include="dbup-core" Version="6.0.4" />
+    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.6.1" />
+>>>>>>> Stashed changes
   </ItemGroup>
 
   <ItemGroup>