Skip to content
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

35 items added by concurrentobservabledictionaryaddrange cannot be removed #36

Merged
merged 4 commits into from
Dec 20, 2024
Merged

35 items added by concurrentobservabledictionaryaddrange cannot be removed #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e9aefe
#35 Added unit tests to expose the issue
stewienj Dec 19, 2024
c8cf693
Implemented a fix for issue #35
stewienj Dec 19, 2024
ba680e5
Modernised the code base a bit before doing a new release
stewienj Dec 19, 2024
e5c878b
Centralised nuget package management, and updated all the packages
stewienj Dec 19, 2024
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
12 changes: 12 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Project>
<!--
If you want to debug this look at https://docs.microsoft.com/en-us/dotnet/core/project-sdk/overview
or dotnet msbuild -preprocess:output.xml <project file name>

Here's a list of all the properties https://docs.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props
-->
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net48;net8.0</TargetFrameworks>
<WinTargetFramework>net8.0-windows</WinTargetFramework>
</PropertyGroup>
</Project>
15 changes: 15 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Project>
<PropertyGroup Condition="'$(UsingMicrosoftNETSdk)'=='true'">
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="FluentAssertions" Version="7.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
<PackageVersion Include="MSTest.TestAdapter" Version="3.6.4" />
<PackageVersion Include="MSTest.TestFramework" Version="3.6.4" />
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ExamplesAndTests/BigCsvFileViewer/Auxiliary/PeHeaderReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ public DateTime TimeStamp
// Add in the number of seconds since 1970/1/1
returnValue = returnValue.AddSeconds(fileHeader.TimeDateStamp);
// Adjust to local timezone
returnValue += TimeZone.CurrentTimeZone.GetUtcOffset(returnValue);
returnValue = TimeZoneInfo.ConvertTimeFromUtc(returnValue, TimeZoneInfo.Local);

return returnValue;
}
Expand Down
21 changes: 2 additions & 19 deletions ExamplesAndTests/BigCsvFileViewer/BigCsvFileViewer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<UseWpf>true</UseWpf>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BigCsvFileViewer</RootNamespace>
<AssemblyName>BigCsvFileViewer</AssemblyName>
<TargetFramework>net46</TargetFramework>
<Copyright>Creative Commons</Copyright>
<Company>Swordfish Computing Pty Ltd</Company>
<Version>1.0.0</Version>
<TargetFrameworks>$(WinTargetFramework)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>BigCsvFileViewer.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Swordfish.NET.CollectionsV3\Swordfish.NET.CollectionsV3.csproj" />
</ItemGroup>
Expand Down
30 changes: 15 additions & 15 deletions ...plesAndTests/DGGroupSortFilterExampleConcurrent/DGGroupSortFilterExampleConcurrent.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net461</TargetFramework>
<UseWPF>true</UseWPF>
<LangVersion>preview</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
</ItemGroup>

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<UseWPF>true</UseWPF>
<LangVersion>preview</LangVersion>
<TargetFrameworks>$(WinTargetFramework)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Swordfish.NET.CollectionsV3\Swordfish.NET.CollectionsV3.csproj" />
</ItemGroup>

</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions ExamplesAndTests/DGGroupSortFilterExampleNormal/DGGroupSortFilterExampleNormal.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net461</TargetFramework>
<UseWPF>true</UseWPF>
<TargetFrameworks>$(WinTargetFramework)</TargetFrameworks>
</PropertyGroup>

</Project>
7 changes: 2 additions & 5 deletions ...lesAndTests/DataGridGroupSortFilterUltimateExample/Auxilary/GroupSortAndFilterBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,15 @@ private void DataGrid_UserClickedOnHeaderSorting(object sender, DataGridSortingE

var toRemove = SortDescriptions.Where(sd => sd.PropertyName == sortMemberPath).FirstOrDefault();

if (toRemove == SortDescriptions.FirstOrDefault() && toRemove != null)
if (toRemove == SortDescriptions.FirstOrDefault())
{
direction =
toRemove.Direction == ListSortDirection.Ascending ?
ListSortDirection.Descending :
ListSortDirection.Ascending;
}

if (toRemove != null)
{
SortDescriptions.Remove(toRemove);
}
SortDescriptions.Remove(toRemove);

var sortDescription = new SortDescription(sortMemberPath, direction);
SortDescriptions.Insert(0, sortDescription);
Expand Down
42 changes: 21 additions & 21 deletions ...ests/DataGridGroupSortFilterUltimateExample/DataGridGroupSortFilterUltimateExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net461</TargetFramework>
<UseWPF>true</UseWPF>
<ApplicationIcon>Resources\Thumbs_Up.ico</ApplicationIcon>
<LangVersion>preview</LangVersion>
</PropertyGroup>

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<UseWPF>true</UseWPF>
<ApplicationIcon>Resources\Thumbs_Up.ico</ApplicationIcon>
<LangVersion>preview</LangVersion>
<TargetFrameworks>$(WinTargetFramework)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Page Remove="Resources\GroupStyles.xaml" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
</ItemGroup>

</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Swordfish.NET.CollectionsV3\Swordfish.NET.CollectionsV3.csproj" />
</ItemGroup>

<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Swordfish.NET.CollectionsV3\Swordfish.NET.CollectionsV3.csproj" />
</ItemGroup>

<ItemGroup>
<Resource Include="Resources\GroupStyles.xaml">
<Generator>MSBuild:Compile</Generator>
</Resource>
</ItemGroup>

</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions ExamplesAndTests/EditableDataGridTest/EditableDataGridTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net461</TargetFramework>
<UseWPF>true</UseWPF>
<TargetFrameworks>$(WinTargetFramework)</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ExamplesAndTests/RetainedSelectionTest/RetainedSelectionTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net461</TargetFramework>
<UseWPF>true</UseWPF>
<LangVersion>preview</LangVersion>
<TargetFrameworks>$(WinTargetFramework)</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
19 changes: 2 additions & 17 deletions ExamplesAndTests/Swordfish.NET.Test/Swordfish.NET.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<UseWpf>true</UseWpf>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Swordfish.NET.Test</RootNamespace>
<AssemblyName>Swordfish.NET.Test</AssemblyName>
<TargetFramework>net46</TargetFramework>
<Copyright>Creative Commons</Copyright>
<Company>Swordfish Computing Pty Ltd</Company>
<Product>Swordfish.NET.Test</Product>
<Title>Swordfish.NET.Test</Title>
<Version>1.0.0</Version>
<TargetFrameworks>net48</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Swordfish.NET.Collections\Swordfish.NET.Collections.csproj" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions ExamplesAndTests/Swordfish.NET.TestV3/Swordfish.NET.TestV3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<UseWpf>true</UseWpf>
<TargetFrameworks>netcoreapp3.1;net451;net46</TargetFrameworks>
<Copyright>Creative Commons</Copyright>
<Company>Swordfish Computing Pty Ltd</Company>
<Product>Swordfish.NET.TestV3</Product>
<Title>Swordfish.NET.TestV3</Title>
<Version>1.0.0</Version>
<TargetFrameworks>$(WinTargetFramework)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="System.ValueTuple" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Swordfish.NET.CollectionsV3\Swordfish.NET.CollectionsV3.csproj" />
Expand Down
Loading
Loading