From 66c3779c5b4746acc5b5b0eced409165ef0091d8 Mon Sep 17 00:00:00 2001
From: Alberto Spelta <albertospelta@users.noreply.github.com>
Date: Tue, 12 Nov 2024 17:02:27 +0100
Subject: [PATCH 1/4] Update .NET SDK version in global.json to 8.0.400

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index e62d0a7..db864f2 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
     "sdk": {
-        "version": "8.0.100",
+        "version": "8.0.400",
         "allowPrerelease": false,
         "rollForward": "latestFeature"
     }
-}
\ No newline at end of file
+}

From 3eb0608f15d3afab4233e0e8cc5430081efbdb83 Mon Sep 17 00:00:00 2001
From: Alberto Spelta <albertospelta@users.noreply.github.com>
Date: Tue, 12 Nov 2024 17:23:13 +0100
Subject: [PATCH 2/4] Update target frameworks `net462` to `net472`, remove
 `netcoreapp3.1`

---
 .../Dax.Vpax.Obfuscator.TestApp.csproj              |  4 ++--
 src/Dax.Vpax.Obfuscator/Dax.Vpax.Obfuscator.csproj  | 13 ++++---------
 tests/Directory.Build.props                         |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/Dax.Vpax.Obfuscator.TestApp/Dax.Vpax.Obfuscator.TestApp.csproj b/src/Dax.Vpax.Obfuscator.TestApp/Dax.Vpax.Obfuscator.TestApp.csproj
index f49b11c..54bfb7e 100644
--- a/src/Dax.Vpax.Obfuscator.TestApp/Dax.Vpax.Obfuscator.TestApp.csproj
+++ b/src/Dax.Vpax.Obfuscator.TestApp/Dax.Vpax.Obfuscator.TestApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
 
@@ -10,4 +10,4 @@
     <ProjectReference Include="..\Dax.Vpax.Obfuscator\Dax.Vpax.Obfuscator.csproj" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Dax.Vpax.Obfuscator/Dax.Vpax.Obfuscator.csproj b/src/Dax.Vpax.Obfuscator/Dax.Vpax.Obfuscator.csproj
index 1b88dfa..5aac8b8 100644
--- a/src/Dax.Vpax.Obfuscator/Dax.Vpax.Obfuscator.csproj
+++ b/src/Dax.Vpax.Obfuscator/Dax.Vpax.Obfuscator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 
@@ -41,15 +41,10 @@
 
   <!-- Include DLL from project reference in NuGet package -->
   <ItemGroup>
-    <!-- net462 -->
-    <_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net462\Dax.Tokenizer.dll">
+    <!-- net472 -->
+    <_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net472\Dax.Tokenizer.dll">
       <BuildAction>None</BuildAction>
-      <PackagePath>lib\net462\</PackagePath>
-    </_PackageFiles>
-    <!-- netcoreapp3.1 -->
-    <_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_netcoreapp3.1\Dax.Tokenizer.dll">
-      <BuildAction>None</BuildAction>
-      <PackagePath>lib\netcoreapp3.1\</PackagePath>
+      <PackagePath>lib\net472\</PackagePath>
     </_PackageFiles>
     <!-- net6.0 -->
     <_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net6.0\Dax.Tokenizer.dll">
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index 6dbc271..e245c33 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>

From ef2f5ccd54ab47a9145b3bc2400d38028d46ed1c Mon Sep 17 00:00:00 2001
From: Alberto Spelta <albertospelta@users.noreply.github.com>
Date: Tue, 12 Nov 2024 17:31:47 +0100
Subject: [PATCH 3/4] Update ci.yml

---
 .github/workflows/ci.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 283e924..4c3484d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: CI
+name: ci
 on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
@@ -14,10 +14,9 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            3.1.x
             6.0.x
-            8.0.x
-      - name: dotnet restore
+          global-json-file: global.json
+      - name: restore
         run: dotnet restore Dax.Vpax.Obfuscator.CI.slnf
       - name: dotnet build
         run: dotnet build Dax.Vpax.Obfuscator.CI.slnf --configuration Release --no-restore

From 8c2d77024e537bbe2170a48b8fd99f4e879db8c9 Mon Sep 17 00:00:00 2001
From: Alberto Spelta <albertospelta@users.noreply.github.com>
Date: Tue, 12 Nov 2024 17:33:07 +0100
Subject: [PATCH 4/4] Unpin `xunit.runner.visualstudio` version, bump version
 2.8.2

---
 tests/Directory.Packages.props | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props
index 45cc73e..3a322e0 100644
--- a/tests/Directory.Packages.props
+++ b/tests/Directory.Packages.props
@@ -6,7 +6,6 @@
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="xunit" Version="2.9.2" />
-    <!-- pinned dependencies required to test out-of-support target frameworks -->
-    <PackageVersion Include="xunit.runner.visualstudio" Version="[2.4.5]" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
 </Project>