Skip to content

Remove unresolved merge conflict markers from Directory.Packages.props #861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SimonCropp wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove unresolved merge conflict markers from Directory.Packages.props #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75a1342
Remove unresolved merge conflict markers from Directory.Packages.props
SimonCropp Sep 23, 2026
85c93e1
refs or cleanup
SimonCropp Sep 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,30 @@
<PackageVersion Include="LocalDb" Version="26.2.0" />
<PackageVersion Include="EfLocalDb" Version="26.2.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.12" />
<<<<<<< HEAD
=======
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
>>>>>>> 1d6277dc7600ad64bee9e92ff7411ba2ae4458ef
<PackageVersion Include="NUnit" Version="4.6.1" />
<PackageVersion Include="NUnit3TestAdapter" Version="6.3.0" />
<PackageVersion Include="Verify.AngleSharp" Version="5.1.2" />
<PackageVersion Include="Verify.DiffPlex" Version="3.3.1" />
<PackageVersion Include="Verify.EntityFramework" Version="15.4.0" />
<PackageVersion Include="Verify.EntityFramework" Version="15.5.0" />
<PackageVersion Include="Verify.Http" Version="7.5.1" />
<PackageVersion Include="Verify.ImageMagick" Version="3.10.0" />
<PackageVersion Include="Verify.ImageSharp" Version="5.0.1" />
<PackageVersion Include="Verify.Nunit" Version="33.1.0" />
<PackageVersion Include="Verify.Nunit" Version="33.1.4" />
<PackageVersion Include="Verify.SqlServer" Version="12.2.0" />
<PackageVersion Include="Verify.SystemJson" Version="1.4.1" />
<PackageVersion Include="Verify.WinForms" Version="6.0.0" />
<PackageVersion Include="Verify.Xaml" Version="5.0.0" />
<PackageVersion Include="Verify.XunitV3" Version="33.1.0" />
<PackageVersion Include="Verify.XunitV3" Version="33.1.4" />
<PackageVersion Include="xunit.v3" Version="4.0.1" />
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
<PackageVersion Include="xunit.v3.extensibility.core" Version="4.0.1" />
<PackageVersion Include="Microsoft.Sbom.Targets" Version="4.1.12" />
<PackageVersion Include="Microsoft.Sbom.Targets" Version="4.1.13" />
<!-- transitive pin to avoid CVE. no direct PackageReference: net10.0 supplies it in the shared framework -->
<PackageVersion Include="System.Text.Json" Version="10.0.12" />
<PackageVersion Include="Argon" Version="0.37.0" />
<PackageVersion Include="DiffEngine" Version="20.3.1" />
<PackageVersion Include="EmptyFiles" Version="8.18.2" />
<PackageVersion Include="DiffEngine" Version="20.5.1" />
<PackageVersion Include="EmptyFiles" Version="8.19.0" />
<PackageVersion Include="SimpleInfoName" Version="3.2.0" />
<PackageVersion Include="Verify" Version="33.1.0" />
<PackageVersion Include="Verify" Version="33.1.4" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Sample/Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
<PackageReference Include="Verify.SqlServer" />
<PackageReference Include="Verify.SystemJson" />
<PackageReference Include="xunit.v3" />
<PackageReference Include="Verify.XunitV3" VersionOverride="33.0.1" />
<PackageReference Include="Verify.XunitV3" VersionOverride="33.1.4" />
<PackageReference Include="Argon" />
<PackageReference Include="DiffEngine" />
<PackageReference Include="EmptyFiles" />
<PackageReference Include="SimpleInfoName" />
<PackageReference Include="Verify" VersionOverride="33.0.1" />
<PackageReference Include="Verify" VersionOverride="33.1.4" />
<PackageReference Include="Verify.AngleSharp" />
<PackageReference Include="Verify.ImageMagick" />
<PackageReference Include="Verify.EntityFramework" />
Expand Down
4 changes: 2 additions & 2 deletions WinFormsAppTests/WinFormsAppTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
<PackageReference Include="Verify.DiffPlex" />
<PackageReference Include="Verify.WinForms" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="Verify.Nunit" VersionOverride="33.0.1" />
<PackageReference Include="Verify.Nunit" VersionOverride="33.1.4" />
<PackageReference Include="Argon" />
<PackageReference Include="DiffEngine" />
<PackageReference Include="EmptyFiles" />
<PackageReference Include="SimpleInfoName" />
<PackageReference Include="Verify" VersionOverride="33.0.1" />
<PackageReference Include="Verify" VersionOverride="33.1.4" />
<PackageReference Include="Verify.ImageMagick" />
<ProjectReference Include="..\WinFormsApp\WinFormsApp.csproj" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions WpfAppTests/WpfAppTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
<PackageReference Include="Verify.DiffPlex" />
<PackageReference Include="Verify.ImageMagick" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="Verify.Nunit" VersionOverride="33.0.1" />
<PackageReference Include="Verify.Nunit" VersionOverride="33.1.4" />
<PackageReference Include="Argon" />
<PackageReference Include="DiffEngine" />
<PackageReference Include="EmptyFiles" />
<PackageReference Include="SimpleInfoName" />
<PackageReference Include="Verify" VersionOverride="33.0.1" />
<PackageReference Include="Verify" VersionOverride="33.1.4" />
<PackageReference Include="Verify.Xaml" />
<ProjectReference Include="..\WpfApp\WpfApp.csproj" />
</ItemGroup>
Expand Down