Skip to content

Commit 4a5185c

Browse files
committed
- support for net 8
- use native array clone method
1 parent 4216a01 commit 4a5185c

File tree

4 files changed

+15
-18
lines changed

4 files changed

+15
-18
lines changed

Src/Xceed.Wpf.DataGrid/DotNetProjects.Wpf.DataGrid.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
4-
<TargetFrameworks>netcoreapp3.0;net4;net6.0-windows</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.0;net4;net6.0-windows;net8.0-windows</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<SignAssembly>true</SignAssembly>
77
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
@@ -32,4 +32,7 @@
3232
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
3333
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
3434
</ItemGroup>
35+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
36+
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
37+
</ItemGroup>
3538
</Project>

Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net6.0-windows</TargetFramework>
5-
<UseWPF>true</UseWPF>
6-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
7-
<SignAssembly>true</SignAssembly>
8-
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
9-
<ApplicationIcon />
10-
<StartupObject />
4+
<TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
5+
<UseWPF>true</UseWPF>
6+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
7+
<SignAssembly>true</SignAssembly>
8+
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
9+
<ApplicationIcon />
10+
<StartupObject />
1111
</PropertyGroup>
1212
<ItemGroup>
1313
<None Remove="Samples\Zoombox\Resources\ZoomboxProperties.xml" />
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525
<ItemGroup>
2626
<Reference Include="System.ComponentModel.DataAnnotations" />
27-
<Reference Include="System.Data" />
27+
<Reference Include="System.Data" />
2828
<Reference Include="System.Data.Entity" />
2929
</ItemGroup>
3030
<ItemGroup>

Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -199,15 +199,9 @@ private object Clone( object source )
199199
object result = null;
200200
var sourceType = source.GetType();
201201

202-
if( source is Array )
202+
if( source is Array array)
203203
{
204-
using( var stream = new MemoryStream() )
205-
{
206-
var formatter = new BinaryFormatter();
207-
formatter.Serialize( stream, source );
208-
stream.Seek( 0, SeekOrigin.Begin );
209-
result = ( Array )formatter.Deserialize( stream );
210-
}
204+
result = array.Clone();
211205
}
212206
// For IDictionary, we need to create EditableKeyValuePair to edit the Key-Value.
213207
else if( ( this.ItemsSource is IDictionary )

Src/Xceed.Wpf.Toolkit/DotNetProjects.Wpf.Extended.Toolkit.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
4-
<TargetFrameworks>netcoreapp3.0;net4;net6.0-windows</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.0;net4;net6.0-windows;net8.0-windows</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<SignAssembly>true</SignAssembly>
77
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>

0 commit comments

Comments
 (0)