From ed050cc6768c6ef9eb7d4677fd7e4e88703df344 Mon Sep 17 00:00:00 2001
From: "Calvin A. Allen" <calvin.allen@centricconsulting.com>
Date: Fri, 2 Jan 2026 18:26:19 -0500
Subject: [PATCH 1/3] feat: modernize to SDK-style project with ARM64 support

- Convert .csproj to SDK-style using CodingWithCalvin.VsixSdk/0.3.0
- Add ARM64 installation target alongside AMD64
- Update VS version range to [17.0,19.0)
- Standardize output path to bin/$(Configuration)/
- Replace msbuild workflow with dotnet build
- Rename build workflow from release_build_and_deploy.yml to build.yml
- Use CalVer versioning (YYYY.M.D.RunNumber)
---
 .github/workflows/build.yml                   |  42 ++++++
 .github/workflows/publish.yml                 |   4 +-
 .../workflows/release_build_and_deploy.yml    |  46 -------
 .../CodingWithCalvin.SuperClean.csproj        | 122 +++---------------
 .../source.extension.vsixmanifest             |   5 +-
 5 files changed, 66 insertions(+), 153 deletions(-)
 create mode 100644 .github/workflows/build.yml
 delete mode 100644 .github/workflows/release_build_and_deploy.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..e741a74
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,42 @@
+name: Build
+
+on:
+  workflow_dispatch:
+  pull_request:
+    types: [opened, reopened]
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: 1. Generate Version
+      id: version
+      run: |
+        $year = (Get-Date).Year
+        $month = (Get-Date).Month
+        $day = (Get-Date).Day
+        $version = "$year.$month.$day.${{ github.run_number }}"
+        echo "version=$version" >> $env:GITHUB_OUTPUT
+      shell: pwsh
+
+    - name: 2. Build Project
+      run: dotnet build src/CodingWithCalvin.SuperClean/CodingWithCalvin.SuperClean.csproj -c Release -p:SetVsixVersion=${{ steps.version.outputs.version }}
+
+    - name: 3. Create Information File
+      uses: jsdaniell/create-json@v1.2.3
+      with:
+        name: 'src/CodingWithCalvin.SuperClean/bin/Release/CodingWithCalvin.SuperClean.info'
+        json: '{"sha":"${{ github.sha }}", "version":"${{ steps.version.outputs.version }}"}'
+
+    - name: 4. Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        path: |
+          src/CodingWithCalvin.SuperClean/bin/Release/CodingWithCalvin.SuperClean.info
+          src/CodingWithCalvin.SuperClean/bin/Release/CodingWithCalvin.SuperClean.vsix
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3a3d04a..34a538e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -19,9 +19,9 @@ jobs:
 
       - name: 1. Download artifact
         id: download-artifact
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v6
         with:
-          workflow: release_build_and_deploy.yml
+          workflow: build.yml
           workflow_conclusion: success
 
       - name: 2. Parse Artifact Manifest
diff --git a/.github/workflows/release_build_and_deploy.yml b/.github/workflows/release_build_and_deploy.yml
deleted file mode 100644
index e739347..0000000
--- a/.github/workflows/release_build_and_deploy.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: 'Build and Deploy'
-  
-on:
-  workflow_dispatch:
-  pull_request:
-    types: [opened, reopened]
-  push:
-    branches: 
-      - main
-    tags-ignore:
-      - '[0-9]+.[0-9]+.[0-9]+.[0-9]+'
-  
-jobs:
-  Release-Build-and-Deploy: 
-    runs-on: windows-latest
-    
-    steps:
-    - uses: actions/checkout@v4
-    - uses: microsoft/setup-msbuild@v2
-    - uses: nuget/setup-nuget@v2
-
-    - name: 1. Versioning Release
-      id: step-version
-      uses: CodingWithCalvin/GHA-VSVsixVersioner@v1
-      with:
-        extension-manifest-file: 'src/CodingWithCalvin.SuperClean/source.extension.vsixmanifest'
-        extension-source-file: 'src/CodingWithCalvin.SuperClean/source.extension.cs'
-    
-    - name: 2. Restoring Packages
-      run: nuget restore ./src/CodingWithCalvin.SuperClean.slnx
-
-    - name: 3. Building Project
-      run: msbuild 'src/CodingWithCalvin.SuperClean/CodingWithCalvin.SuperClean.csproj' /p:configuration='Release' /p:platform='x64' /p:DeployExtension=False
-
-    - name: 4. Create Information File
-      uses: jsdaniell/create-json@v1.2.3
-      with:
-        name: 'src/CodingWithCalvin.SuperClean/bin/x64/Release/CodingWithCalvin.SuperClean.info'
-        json: '{"sha":"${{ github.sha }}", "version":"${{ steps.step-version.outputs.version }}"}'
-    
-    - name: 5. Publishing Build Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        path: |
-          src/CodingWithCalvin.SuperClean/bin/x64/Release/CodingWithCalvin.SuperClean.info
-          src/CodingWithCalvin.SuperClean/bin/x64/Release/CodingWithCalvin.SuperClean.vsix
diff --git a/src/CodingWithCalvin.SuperClean/CodingWithCalvin.SuperClean.csproj b/src/CodingWithCalvin.SuperClean/CodingWithCalvin.SuperClean.csproj
index ac430b9..322ec51 100644
--- a/src/CodingWithCalvin.SuperClean/CodingWithCalvin.SuperClean.csproj
+++ b/src/CodingWithCalvin.SuperClean/CodingWithCalvin.SuperClean.csproj
@@ -1,118 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="CodingWithCalvin.VsixSdk/0.3.0">
+
   <PropertyGroup>
-    <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <UseCodebase>true</UseCodebase>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>15.0</OldToolsVersion>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <Optimize>true</Optimize>
-    <DefineConstants>X64</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <PlatformTarget>x64</PlatformTarget>
-    <DebugType>full</DebugType>
-    <DefineConstants>TRACE;DEBUG;X64</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{123DBC9B-8955-4446-9A74-DD2B8068F7B0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net48</TargetFramework>
     <RootNamespace>CodingWithCalvin.SuperClean</RootNamespace>
     <AssemblyName>CodingWithCalvin.SuperClean</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <GeneratePkgDefFile>true</GeneratePkgDefFile>
-    <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-    <StartAction>Program</StartAction>
-    <StartProgram Condition="'$(DevEnvDir)' != ''">$(DevEnvDir)devenv.exe</StartProgram>
-    <StartArguments>/rootsuffix Exp</StartArguments>
-    <VsixType>v3</VsixType>
+    <LangVersion>latest</LangVersion>
+    <OutputPath>bin/$(Configuration)/</OutputPath>
   </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <DeployExtension>True</DeployExtension>
+  </PropertyGroup>
+
   <ItemGroup>
-    <Compile Include="Commands\SuperCleanCommand.cs" />
-    <Compile Include="VSCommandTable.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>VSCommandTable.vsct</DependentUpon>
-    </Compile>
-    <Compile Include="SuperCleanPackage.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="source.extension.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>source.extension.vsixmanifest</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\..\LICENSE">
-      <Link>resources\LICENSE</Link>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <None Include="source.extension.vsixmanifest">
-      <SubType>Designer</SubType>
-      <Generator>VsixManifestGenerator</Generator>
-      <LastGenOutput>source.extension.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System" />
-    <Reference Include="System.Design" />
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <VSCTCompile Include="VSCommandTable.vsct">
-      <Generator>VsctGenerator</Generator>
-      <LastGenOutput>VSCommandTable.cs</LastGenOutput>
-      <ResourceName>Menus.ctmenu</ResourceName>
-    </VSCTCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Community.VisualStudio.Toolkit.17">
-      <Version>17.0.492</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.SDK">
-      <Version>17.5.33428.388</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VSSDK.BuildTools">
-      <Version>17.5.4072</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Community.VisualStudio.Toolkit.17" Version="17.0.492" />
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.14.40265" />
   </ItemGroup>
+
   <ItemGroup>
-    <Content Include="..\..\resources\icon.png">
-      <Link>resources\icon.png</Link>
+    <Content Include="..\..\resources\icon.png" Link="resources\icon.png">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="..\..\resources\logo.png">
-      <Link>resources\logo.png</Link>
+    <Content Include="..\..\resources\logo.png" Link="resources\logo.png">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="..\LICENSE">
-      <Link>resources\LICENSE</Link>
+    <Content Include="..\..\LICENSE" Link="resources\LICENSE">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/src/CodingWithCalvin.SuperClean/source.extension.vsixmanifest b/src/CodingWithCalvin.SuperClean/source.extension.vsixmanifest
index cb5cd3c..8cea8be 100644
--- a/src/CodingWithCalvin.SuperClean/source.extension.vsixmanifest
+++ b/src/CodingWithCalvin.SuperClean/source.extension.vsixmanifest
@@ -10,9 +10,12 @@
         <Tags>bin,debug,folder,output</Tags>
     </Metadata>
     <Installation>
-        <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Community">
+        <InstallationTarget Version="[17.0,19.0)" Id="Microsoft.VisualStudio.Community">
             <ProductArchitecture>amd64</ProductArchitecture>
         </InstallationTarget>
+        <InstallationTarget Version="[17.0,19.0)" Id="Microsoft.VisualStudio.Community">
+            <ProductArchitecture>arm64</ProductArchitecture>
+        </InstallationTarget>
     </Installation>
     <Dependencies>
     </Dependencies>

From 38a2189ddf44c97aeacb0ec5b48b5ece7c1cb795 Mon Sep 17 00:00:00 2001
From: "Calvin A. Allen" <calvin.allen@centricconsulting.com>
Date: Fri, 2 Jan 2026 18:42:35 -0500
Subject: [PATCH 2/3] fix: remove duplicate AssemblyInfo.cs for SDK-style
 project

SDK-style projects auto-generate assembly attributes, causing duplicate
attribute errors when AssemblyInfo.cs also defines them.
---
 .../Properties/AssemblyInfo.cs                    | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 src/CodingWithCalvin.SuperClean/Properties/AssemblyInfo.cs

diff --git a/src/CodingWithCalvin.SuperClean/Properties/AssemblyInfo.cs b/src/CodingWithCalvin.SuperClean/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8b80ca6..0000000
--- a/src/CodingWithCalvin.SuperClean/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-using CodingWithCalvin.SuperClean;
-
-[assembly: AssemblyTitle(Vsix.Name)]
-[assembly: AssemblyDescription(Vsix.Description)]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany(Vsix.Author)]
-[assembly: AssemblyProduct(Vsix.Name)]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-[assembly: AssemblyVersion(Vsix.Version)]
-[assembly: AssemblyFileVersion(Vsix.Version)]

From 7612b123fda9ecc222562ab93ad8b218299cfae4 Mon Sep 17 00:00:00 2001
From: "Calvin A. Allen" <calvin.allen@centricconsulting.com>
Date: Fri, 2 Jan 2026 18:44:12 -0500
Subject: [PATCH 3/3] chore: add Generated folder to gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 566550e..1ef4d0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -183,6 +183,9 @@ orleans.codegen.cs
 # RIA/Silverlight projects
 Generated_Code/
 
+# SDK-style project generated files
+Generated/
+
 # Backup & report files from converting an old project file
 # to a newer Visual Studio version. Backup files are not needed,
 # because we have git ;-)