Skip to content

Commit 3702574

Browse files
committed
compile net 6
1 parent 493c936 commit 3702574

File tree

8 files changed

+12
-3026
lines changed

8 files changed

+12
-3026
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
4-
<TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.0;net4;net6.0-windows</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<SignAssembly>true</SignAssembly>
77
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
@@ -29,4 +29,7 @@
2929
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
3030
<PackageReference Include="System.Drawing.Common" Version="4.6.0" />
3131
</ItemGroup>
32+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
33+
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
34+
</ItemGroup>
3235
</Project>

Src/Xceed.Wpf.Toolkit.LiveExplorer/Service References/NorthwindDataService/Reference.cs

Lines changed: 0 additions & 2711 deletions
This file was deleted.

Src/Xceed.Wpf.Toolkit.LiveExplorer/Service References/NorthwindDataService/Reference.datasvcmap

Lines changed: 0 additions & 14 deletions
This file was deleted.

Src/Xceed.Wpf.Toolkit.LiveExplorer/Service References/NorthwindDataService/service.edmx

Lines changed: 0 additions & 287 deletions
This file was deleted.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFrameworks>net4</TargetFrameworks>
4+
<TargetFramework>net6.0-windows</TargetFramework>
55
<UseWPF>true</UseWPF>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<SignAssembly>true</SignAssembly>
@@ -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/DotNetProjects.Wpf.Extended.Toolkit.csproj

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

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 4.6.{build}
1+
version: 5.0.{build}
22

33
branches:
44
only:
@@ -22,7 +22,7 @@ assembly_info:
2222

2323
configuration: Release
2424

25-
image: Visual Studio 2019
25+
image: Visual Studio 2022
2626

2727
before_build:
2828
- nuget restore DotNetProjects.Wpf.Extended.Toolkit.sln

global.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)