Skip to content

Commit 77bdf4a

Browse files
committed
Update Other Dependencies
1 parent 7aefa3d commit 77bdf4a

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

src/Tests/Tests.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,19 @@
1010

1111
<ItemGroup>
1212
<ProjectReference Include="..\dbup-sqlite\dbup-sqlite.csproj"/>
13+
<<<<<<< Updated upstream
1314
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.0" />
1415
<PackageReference Include="DbUp.Tests.Common" Version="6.0.4" />
1516
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1617
<PackageReference Include="xunit" Version="2.9.2" />
1718
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
19+
=======
20+
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.10" />
21+
<PackageReference Include="DbUp.Tests.Common" Version="6.0.15" />
22+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
23+
<PackageReference Include="xunit" Version="2.9.3" />
24+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
25+
>>>>>>> Stashed changes
1826
<PrivateAssets>all</PrivateAssets>
1927
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2028
</PackageReference>

src/dbup-sqlite/dbup-sqlite.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,13 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26+
<<<<<<< Updated upstream
2627
<PackageReference Include="dbup-core" Version="6.0.4" />
2728
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.0" />
29+
=======
30+
<PackageReference Include="dbup-core" Version="6.0.15" />
31+
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.10" />
32+
>>>>>>> Stashed changes
2833
</ItemGroup>
2934

3035
<ItemGroup>

0 commit comments

Comments
 (0)