Update TFM settings for projects.

mmanela · Jan 8, 2025 · cdc1260 · cdc1260
1 parent 55745d6
commit cdc1260
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 12 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -13,17 +13,22 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    
-    - name: Setup .NET
+
+    - name: Setup .NET 8
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 8.0.x
-
+
+    - name: Setup .NET 9
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 9.0.x
+
     - name: Restore dependencies
       run: dotnet restore
-    
+
     - name: Build
       run: dotnet build --no-restore
-    
+
     - name: Test
       run: dotnet test --no-build --verbosity normal
diff --git a/DiffPlex.WindowsForms.Demo/DiffPlex.WindowsForms.Demo.csproj b/DiffPlex.WindowsForms.Demo/DiffPlex.WindowsForms.Demo.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net6.0-windows;net46</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows;net48;net46</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <ApplicationIcon>..\DiffPlex.ico</ApplicationIcon>

diff --git a/DiffPlex.WindowsForms.Demo/Program.cs b/DiffPlex.WindowsForms.Demo/Program.cs
@@ -14,7 +14,7 @@ static class Program
         [STAThread]
         static void Main()
         {
-#if !NET46
+#if NET6_0_OR_GREATER
             Application.SetHighDpiMode(HighDpiMode.SystemAware);
 #endif
             Application.EnableVisualStyles();

diff --git a/DiffPlex.Wpf.Demo/DiffPlex.Wpf.Demo.csproj b/DiffPlex.Wpf.Demo/DiffPlex.Wpf.Demo.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net9.0-windows;net48</TargetFrameworks>
+    <TargetFrameworks>net9.0-windows;net8.0-windows;net48;net46</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <StartupObject>DiffPlex.Wpf.Demo.App</StartupObject>

diff --git a/DiffPlex.Wpf/Controls/DiffViewer.xaml.cs b/DiffPlex.Wpf/Controls/DiffViewer.xaml.cs
@@ -20,7 +20,6 @@
 
 using DiffPlex.DiffBuilder;
 using DiffPlex.DiffBuilder.Model;
-using DiffPlex.WindowsForms.Controls;
 
 namespace DiffPlex.Wpf.Controls;
 

diff --git a/DiffPlex.Wpf/DiffPlex.Wpf.csproj b/DiffPlex.Wpf/DiffPlex.Wpf.csproj
@@ -41,4 +41,8 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' != 'net8.0-windows' AND '$(TargetFramework)' != 'net6.0-windows' AND '$(TargetFramework)' != 'net46' AND '$(TargetFramework)' != 'net48'" >
+    <Compile Remove="Forms\*.cs" />
+    <EmbeddedResource Remove="Forms\*.resx" />
+  </ItemGroup>
 </Project>
diff --git a/DiffPlex.Wpf/Icon.png b/DiffPlex.Wpf/Icon.png
diff --git a/DiffPlex.sln b/DiffPlex.sln
@@ -18,11 +18,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		azure-pipelines.yml = azure-pipelines.yml
+		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
+		global.json = global.json
 		License.txt = License.txt
 		NuGet.props = NuGet.props
 		README.md = README.md
 		images\website.png = images\website.png
-		global.json = global.json
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiffPlex.Wpf", "DiffPlex.Wpf\DiffPlex.Wpf.csproj", "{CB18D73D-7E84-4B28-B44D-93CB34794A6A}"

diff --git a/README.md b/README.md
@@ -260,7 +260,7 @@ public IObservableVector<ICommandBarElement> SecondaryCommands { get; }
 [![NuGet](https://img.shields.io/nuget/v/DiffPlex.Wpf.svg)](https://www.nuget.org/packages/DiffPlex.Wpf/)
 
 DiffPlex WPF control library `DiffPlex.Wpf` is used to render textual diffs in your WPF application.
-It targets `.NET 6`, `.NET Framework 4.8` and `.NET Framework 4.6`.
+It targets `.NET 9`, `.NET 8`, `.NET 6`, `.NET Framework 4.8` and `.NET Framework 4.6`.
 
 ```csharp
 using DiffPlex.Wpf.Controls;
@@ -385,7 +385,7 @@ public event EventHandler<ViewModeChangedEventArgs> ViewModeChanged;
 Windows Forms control of diff viewer is a WPF element host control.
 It is also included in `DiffPlex.Wpf` assembly.
 You can import it to use in your Windows Forms application.
-It targets `.NET 6`, `.NET Framework 4.8` and `.NET Framework 4.6`.
+It targets `.NET 8`, `.NET 6`, `.NET Framework 4.8` and `.NET Framework 4.6`.
 
 ```csharp
 using DiffPlex.WindowsForms.Controls;

diff --git a/images/wpf_side_light.jpg b/images/wpf_side_light.jpg