From 75a1342d849d41c7305dcd5f9b07bbbf696f9099 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Wed, 23 Sep 2026 20:30:55 +1000 Subject: [PATCH 1/2] Remove unresolved merge conflict markers from Directory.Packages.props The ec875a1 merge left conflict markers in place, which broke central package version resolution and failed restore with NU1015 for every project referencing an affected package. --- Directory.Packages.props | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 07a8efd..40053bf 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,10 +7,6 @@ -<<<<<<< HEAD -======= - ->>>>>>> 1d6277dc7600ad64bee9e92ff7411ba2ae4458ef From 85c93e13e588695db26900042cbafc5401f5bec7 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Thu, 24 Sep 2026 21:32:38 +1000 Subject: [PATCH 2/2] refs or cleanup --- Directory.Packages.props | 14 +++++++------- Sample/Sample.csproj | 4 ++-- WinFormsAppTests/WinFormsAppTests.csproj | 4 ++-- WpfAppTests/WpfAppTests.csproj | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 40053bf..3eefdfa 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -11,26 +11,26 @@ - + - + - + - + - - + + - + diff --git a/Sample/Sample.csproj b/Sample/Sample.csproj index 0692c32..95e6bc6 100644 --- a/Sample/Sample.csproj +++ b/Sample/Sample.csproj @@ -13,12 +13,12 @@ - + - + diff --git a/WinFormsAppTests/WinFormsAppTests.csproj b/WinFormsAppTests/WinFormsAppTests.csproj index 48a8251..d523855 100644 --- a/WinFormsAppTests/WinFormsAppTests.csproj +++ b/WinFormsAppTests/WinFormsAppTests.csproj @@ -10,12 +10,12 @@ - + - + diff --git a/WpfAppTests/WpfAppTests.csproj b/WpfAppTests/WpfAppTests.csproj index 3076f95..ea03677 100644 --- a/WpfAppTests/WpfAppTests.csproj +++ b/WpfAppTests/WpfAppTests.csproj @@ -11,12 +11,12 @@ - + - +