From 6ff76b95234321e56a8befe95d6635890f665538 Mon Sep 17 00:00:00 2001 From: Simon Ensslen Date: Tue, 27 Aug 2024 09:30:41 +0200 Subject: [PATCH 1/5] Update WpfScreenHelper.DpiTestWpfApp.csproj to net8 --- .../WpfScreenHelper.DpiTestWpfApp.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/WpfScreenHelper.DpiTestWpfApp/WpfScreenHelper.DpiTestWpfApp.csproj b/test/WpfScreenHelper.DpiTestWpfApp/WpfScreenHelper.DpiTestWpfApp.csproj index 1869ea2..77edb0f 100644 --- a/test/WpfScreenHelper.DpiTestWpfApp/WpfScreenHelper.DpiTestWpfApp.csproj +++ b/test/WpfScreenHelper.DpiTestWpfApp/WpfScreenHelper.DpiTestWpfApp.csproj @@ -2,7 +2,7 @@ WinExe - net5.0-windows + net8.0-windows true app.manifest From 0b88265fe8757cbdee9a55bfdb73539a4490a64b Mon Sep 17 00:00:00 2001 From: Simon Ensslen Date: Tue, 27 Aug 2024 09:31:32 +0200 Subject: [PATCH 2/5] Update WpfScreenHelper.csproj to multitarget net6 and net8 --- src/WpfScreenHelper/WpfScreenHelper.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WpfScreenHelper/WpfScreenHelper.csproj b/src/WpfScreenHelper/WpfScreenHelper.csproj index 22f5046..dc1f99e 100644 --- a/src/WpfScreenHelper/WpfScreenHelper.csproj +++ b/src/WpfScreenHelper/WpfScreenHelper.csproj @@ -1,7 +1,7 @@ - net40;netcoreapp3.1 + net40;net6.0;net8.0 true true WpfScreenHelper From 8a1f2c792b7a6a9d1c1a227aff9a41d60ec48e03 Mon Sep 17 00:00:00 2001 From: Simon Ensslen Date: Tue, 27 Aug 2024 09:32:14 +0200 Subject: [PATCH 3/5] Update dotnet.yml --- .github/workflows/dotnet.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index e878e4f..4e756ed 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -14,9 +14,13 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: dotnet-version: 6.0.x + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 8.0.x - name: Restore dependencies run: dotnet restore - name: Build From fa06133afd40104484b9dc30164361ad02c91246 Mon Sep 17 00:00:00 2001 From: Simon Ensslen Date: Tue, 27 Aug 2024 12:45:28 +0200 Subject: [PATCH 4/5] Update WpfScreenHelper.csproj --- src/WpfScreenHelper/WpfScreenHelper.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WpfScreenHelper/WpfScreenHelper.csproj b/src/WpfScreenHelper/WpfScreenHelper.csproj index dc1f99e..c819f27 100644 --- a/src/WpfScreenHelper/WpfScreenHelper.csproj +++ b/src/WpfScreenHelper/WpfScreenHelper.csproj @@ -1,7 +1,7 @@ - net40;net6.0;net8.0 + net40;net6.0-windows;net8.0-windows true true WpfScreenHelper From 4565796eee9991cf616270c3e8c44ee34dd70414 Mon Sep 17 00:00:00 2001 From: Michael Denny Date: Tue, 27 Aug 2024 12:58:17 +0200 Subject: [PATCH 5/5] Update dotnet.yml --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 4e756ed..a492006 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -13,11 +13,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup .NET + - name: Setup .NET 6.0.x uses: actions/setup-dotnet@v4 with: dotnet-version: 6.0.x - - name: Setup .NET + - name: Setup .NET 8.0.x uses: actions/setup-dotnet@v4 with: dotnet-version: 8.0.x