Skip to content

Commit 2809167

Browse files
jogibear9988jogibear9988
committed
work on net5.0 support, drop netcore3
1 parent 29d6692 commit 2809167

13 files changed

Lines changed: 243 additions & 249 deletions

File tree

‎MyDesigner/Demo.MyDesigner.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>WinExe</OutputType>
4-
<TargetFramework>net45</TargetFramework>
4+
<TargetFramework>net5.0-windows</TargetFramework>
55
<UseWPF>true</UseWPF>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<ApplicationIcon />

‎MyTestAssembly/Demo.MyTestAssembly.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-
<TargetFramework>net45</TargetFramework>
4+
<TargetFramework>net5.0-windows</TargetFramework>
55
<UseWPF>true</UseWPF>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
</PropertyGroup>

‎SimpleSample/Demo.SimpleSample.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>Exe</OutputType>
4-
<TargetFrameworks>netcoreapp3.0;net45</TargetFrameworks>
4+
<TargetFrameworks>net5.0-windows</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
</PropertyGroup>

‎WpfDesign.Design.ExpressionBlendInteractionAddon/WpfDesign.Designer.ExpressionBlendInteractionAddon.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>Library</OutputType>
4-
<TargetFramework>net45</TargetFramework>
4+
<TargetFrameworks>net45;net5.0-windows</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<AssemblyName>ICSharpCode.WpfDesign.Designer.ExpressionBlendInteractionAddon</AssemblyName>
@@ -11,7 +11,7 @@
1111
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.0.1" />
14+
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
1515
</ItemGroup>
1616
<ItemGroup>
1717
<ProjectReference Include="..\WpfDesign.Designer\Project\WpfDesign.Designer.csproj" />

‎WpfDesign.Designer/Project/WpfDesign.Designer.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
4-
<TargetFrameworks>netcoreapp3.0;net45</TargetFrameworks>
4+
<TargetFrameworks>net45;net5.0-windows</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<AssemblyName>ICSharpCode.WpfDesign.Designer</AssemblyName>
8-
<DocumentationFile>..\..\bin\netcoreapp3.0\ICSharpCode.WpfDesign.Designer.xml</DocumentationFile>
8+
<DocumentationFile>..\..\bin\net5.0-windows\ICSharpCode.WpfDesign.Designer.xml</DocumentationFile>
99
<OutputPath>..\..\bin\</OutputPath>
1010
</PropertyGroup>
1111
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">

‎WpfDesign.Designer/Tests/WpfDesign.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
44
<TargetFramework>net45</TargetFramework>
@@ -7,8 +7,8 @@
77
<AssemblyName>ICSharpCode.WpfDesign.Tests</AssemblyName>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="NUnit" Version="3.11.0" />
11-
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
10+
<PackageReference Include="NUnit" Version="3.13.1" />
11+
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
1212
<PackageReference Include="RhinoMocks" Version="3.6.1" />
1313
</ItemGroup>
1414
<ItemGroup>

‎WpfDesign.XamlDom/Project/WpfDesign.XamlDom.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
4-
<TargetFrameworks>netcoreapp3.0;net45</TargetFrameworks>
5-
<DocumentationFile>..\..\bin\netcoreapp3.0\ICSharpCode.WpfDesign.XamlDom.xml</DocumentationFile>
4+
<TargetFrameworks>net45;net5.0-windows</TargetFrameworks>
5+
<DocumentationFile>..\..\bin\net5.0-windows\ICSharpCode.WpfDesign.XamlDom.xml</DocumentationFile>
66
<OutputPath>..\..\bin\</OutputPath>
77
<UseWPF>true</UseWPF>
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎WpfDesign/Project/WpfDesign.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
4-
<TargetFrameworks>netcoreapp3.0;net45</TargetFrameworks>
5-
<DocumentationFile>..\..\bin\netcoreapp3.0\ICSharpCode.WpfDesign.xml</DocumentationFile>
4+
<TargetFrameworks>net45;net5.0-windows</TargetFrameworks>
5+
<DocumentationFile>..\..\bin\net5.0-windows\ICSharpCode.WpfDesign.xml</DocumentationFile>
66
<OutputPath>..\..\bin\</OutputPath>
77
<UseWPF>true</UseWPF>
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎XamlDesigner/AvalonDock/PanesTemplateSelector.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using System.Windows;
1+
using AvalonDock.Layout;
2+
using System.Windows;
23
using System.Windows.Controls;
3-
using Xceed.Wpf.AvalonDock.Layout;
44

55
namespace ICSharpCode.XamlDesigner.AvalonDock
66
{

‎XamlDesigner/Demo.XamlDesigner.csproj‎

Lines changed: 4 additions & 4 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-
<TargetFramework>net45</TargetFramework>
4+
<TargetFramework>net5.0-windows</TargetFramework>
55
<UseWPF>true</UseWPF>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<ApplicationIcon />
@@ -22,8 +22,8 @@
2222
</None>
2323
</ItemGroup>
2424
<ItemGroup>
25-
<PackageReference Include="AvalonEdit" Version="5.0.4" />
26-
<PackageReference Include="DotNetProjects.AvalonDock" Version="3.2.49" />
25+
<PackageReference Include="AvalonEdit" Version="6.1.1" />
26+
<PackageReference Include="Dirkster.AvalonDock" Version="4.50.3" />
2727
</ItemGroup>
2828
<ItemGroup>
2929
<ProjectReference Include="..\WpfDesign.Design.ExpressionBlendInteractionAddon\WpfDesign.Designer.ExpressionBlendInteractionAddon.csproj" />

0 commit comments

Comments
 (0)