From 829c72e781d57f91bc36fd528fdaf345f99e8cec Mon Sep 17 00:00:00 2001
From: Arthur van de Vondervoort <arthur.vandevondervoort@vanroey.be>
Date: Sun, 21 Sep 2025 13:11:33 +0200
Subject: [PATCH] Refactor BC DevTools for TFMs

---
 .../actions/setup-bc-devtools/Marketplace.ps1 |  2 +-
 .github/actions/setup-bc-devtools/action.yml  |  4 +--
 .github/workflows/build-and-release.yml       |  9 +-----
 .github/workflows/pull-request.yml            |  9 +-----
 src/RoslynTestKit/RoslynTestKit.csproj        | 32 ++++++-------------
 5 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/.github/actions/setup-bc-devtools/Marketplace.ps1 b/.github/actions/setup-bc-devtools/Marketplace.ps1
index 5abdc74..a67ea0b 100644
--- a/.github/actions/setup-bc-devtools/Marketplace.ps1
+++ b/.github/actions/setup-bc-devtools/Marketplace.ps1
@@ -55,7 +55,7 @@ $payload = @{
             sortOrder  = 0
         }
     )
-    assetTypes = @()
+    assetTypes = @( "Microsoft.VisualStudio.Services.VSIXPackage")
     flags      = 131 # IncludeVersions, IncludeFiles, IncludeAssetUri, see https://github.com/microsoft/vscode/blob/12ae331012923024bedaf873ba4259a8c64db020/src/vs/platform/extensionManagement/common/extensionGalleryService.ts#L86
 }
 
diff --git a/.github/actions/setup-bc-devtools/action.yml b/.github/actions/setup-bc-devtools/action.yml
index 5f80b27..4dbbad3 100644
--- a/.github/actions/setup-bc-devtools/action.yml
+++ b/.github/actions/setup-bc-devtools/action.yml
@@ -19,7 +19,7 @@ runs:
       run: |
         # Retrieve source Uri from Marketplace
         $sourceUri = ${{github.action_path}}/Marketplace.ps1 -Version ${{ inputs.version-number }}
-        "source-uri=$sourceUri" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8
+        echo "source-uri=$sourceUri" >> $env:GITHUB_OUTPUT
 
     - name: Download BC DevTools asset
       id: download-bc-devtools-asset
@@ -30,7 +30,7 @@ runs:
       run: |
         # Download BC DevTools asset
         $downloadPath = ${{github.action_path}}/Download-BcDevToolsAsset.ps1 -AssetUri $env:ASSET_URI
-        "download-path=$downloadPath" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8
+        echo "download-path=$downloadPath" >> $env:GITHUB_OUTPUT
 
     - name: Extract BC DevTools asset
       shell: pwsh
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index eb99a02..aae84f5 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -44,17 +44,10 @@ jobs:
             **/packages.lock.json
             nuget.config
 
-      - name: Setup BC DevTools - netstandard2.1
+      - name: Setup BC DevTools
         uses: ./.github/actions/setup-bc-devtools
         with:
           version-number: '12.0.875970'
-          target-path: 'Microsoft.Dynamics.BusinessCentral.Development.Tools/netstandard2.1'
-
-      - name: Setup BC DevTools - net8.0
-        uses: ./.github/actions/setup-bc-devtools
-        with:
-          version-number: '16.0.1463980'
-          target-path: 'Microsoft.Dynamics.BusinessCentral.Development.Tools/net8.0'
 
       - name: Restore
         run: dotnet restore src/RoslynTestKit.sln
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 99e3df1..8e30468 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -42,17 +42,10 @@ jobs:
             **/packages.lock.json
             nuget.config
 
-      - name: Setup BC DevTools (netstandard2.1)
+      - name: Setup BC DevTools
         uses: ./.github/actions/setup-bc-devtools
         with:
           version-number: '12.0.875970'
-          target-path: 'Microsoft.Dynamics.BusinessCentral.Development.Tools/netstandard2.1'
-
-      - name: Setup BC DevTools (net8.0)
-        uses: ./.github/actions/setup-bc-devtools
-        with:
-          version-number: '16.0.1463980'
-          target-path: 'Microsoft.Dynamics.BusinessCentral.Development.Tools/net8.0'
 
       - name: Restore
         run: dotnet restore src/RoslynTestKit.sln
diff --git a/src/RoslynTestKit/RoslynTestKit.csproj b/src/RoslynTestKit/RoslynTestKit.csproj
index 46afce3..5606e1f 100644
--- a/src/RoslynTestKit/RoslynTestKit.csproj
+++ b/src/RoslynTestKit/RoslynTestKit.csproj
@@ -18,41 +18,29 @@
     <PackageReference Include="DiffPlex" Version="1.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-  </ItemGroup>
-
-  <!-- ms-dynamics-smb.al-12.0.875970 with FileVersion 12.0.13.24028 -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Include="ApprovalTests" Version="5.4.4"
-                      PrivateAssets="all"
-                      ExcludeAssets="build;buildTransitive;analyzers;contentFiles;native;runtime" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.1.0" />
     <Reference Include="Microsoft.Dynamics.Nav.CodeAnalysis">
         <SpecificVersion>False</SpecificVersion>
-        <HintPath>..\..\Microsoft.Dynamics.BusinessCentral.Development.Tools\netstandard2.1\Microsoft.Dynamics.Nav.CodeAnalysis.dll</HintPath>
+        <HintPath>..\..\Microsoft.Dynamics.BusinessCentral.Development.Tools\Microsoft.Dynamics.Nav.CodeAnalysis.dll</HintPath>
         <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.Dynamics.Nav.CodeAnalysis.Workspaces">
         <SpecificVersion>False</SpecificVersion>
-        <HintPath>..\..\Microsoft.Dynamics.BusinessCentral.Development.Tools\netstandard2.1\Microsoft.Dynamics.Nav.CodeAnalysis.Workspaces.dll</HintPath>
+        <HintPath>..\..\Microsoft.Dynamics.BusinessCentral.Development.Tools\Microsoft.Dynamics.Nav.CodeAnalysis.Workspaces.dll</HintPath>
         <Private>False</Private>
-    </Reference>  
+    </Reference>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+    <PackageReference Include="ApprovalTests" Version="5.4.4"
+                      PrivateAssets="all"
+                      ExcludeAssets="build;buildTransitive;analyzers;contentFiles;native;runtime" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.1.0" />
   </ItemGroup>
 
-  <!-- ms-dynamics-smb.al-16.0.1463980 with FileVersion 16.0.22.22232 -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="ApprovalTests" Version="5.8.0"
                       PrivateAssets="all"
                       ExcludeAssets="build;buildTransitive;analyzers;contentFiles;native;runtime" />
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
-    <Reference Include="Microsoft.Dynamics.Nav.CodeAnalysis">
-        <SpecificVersion>False</SpecificVersion>
-        <HintPath>..\..\Microsoft.Dynamics.BusinessCentral.Development.Tools\net8.0\Microsoft.Dynamics.Nav.CodeAnalysis.dll</HintPath>
-        <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Dynamics.Nav.CodeAnalysis.Workspaces">
-        <SpecificVersion>False</SpecificVersion>
-        <HintPath>..\..\Microsoft.Dynamics.BusinessCentral.Development.Tools\net8.0\Microsoft.Dynamics.Nav.CodeAnalysis.Workspaces.dll</HintPath>
-        <Private>False</Private>
-    </Reference>
   </ItemGroup>
 </Project>
\ No newline at end of file