Skip to content

Commit 2f0c7b5

Browse files
CalvinAllenCalvinAllen
authored
feat: modernize to SDK-style project with ARM64 support (#10)
* 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) * 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. * chore: add Generated folder to gitignore
1 parent 7f8b110 commit 2f0c7b5

7 files changed

Lines changed: 69 additions & 168 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Build
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
types: [opened, reopened]
7+
push:
8+
branches:
9+
- main
10+
11+
jobs:
12+
build:
13+
runs-on: windows-latest
14+
15+
steps:
16+
- uses: actions/checkout@v4
17+
18+
- name: 1. Generate Version
19+
id: version
20+
run: |
21+
$year = (Get-Date).Year
22+
$month = (Get-Date).Month
23+
$day = (Get-Date).Day
24+
$version = "$year.$month.$day.${{ github.run_number }}"
25+
echo "version=$version" >> $env:GITHUB_OUTPUT
26+
shell: pwsh
27+
28+
- name: 2. Build Project
29+
run: dotnet build src/CodingWithCalvin.SuperClean/CodingWithCalvin.SuperClean.csproj -c Release -p:SetVsixVersion=${{ steps.version.outputs.version }}
30+
31+
- name: 3. Create Information File
32+
uses: jsdaniell/create-json@v1.2.3
33+
with:
34+
name: 'src/CodingWithCalvin.SuperClean/bin/Release/CodingWithCalvin.SuperClean.info'
35+
json: '{"sha":"${{ github.sha }}", "version":"${{ steps.version.outputs.version }}"}'
36+
37+
- name: 4. Upload Artifact
38+
uses: actions/upload-artifact@v4
39+
with:
40+
path: |
41+
src/CodingWithCalvin.SuperClean/bin/Release/CodingWithCalvin.SuperClean.info
42+
src/CodingWithCalvin.SuperClean/bin/Release/CodingWithCalvin.SuperClean.vsix

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919

2020
- name: 1. Download artifact
2121
id: download-artifact
22-
uses: dawidd6/action-download-artifact@v2
22+
uses: dawidd6/action-download-artifact@v6
2323
with:
24-
workflow: release_build_and_deploy.yml
24+
workflow: build.yml
2525
workflow_conclusion: success
2626

2727
- name: 2. Parse Artifact Manifest

‎.github/workflows/release_build_and_deploy.yml‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,9 @@ orleans.codegen.cs
183183
# RIA/Silverlight projects
184184
Generated_Code/
185185

186+
# SDK-style project generated files
187+
Generated/
188+
186189
# Backup & report files from converting an old project file
187190
# to a newer Visual Studio version. Backup files are not needed,
188191
# because we have git ;-)

‎src/CodingWithCalvin.SuperClean/CodingWithCalvin.SuperClean.csproj‎

Lines changed: 18 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,32 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="CodingWithCalvin.VsixSdk/0.3.0">
2+
33
<PropertyGroup>
4-
<MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
5-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6-
<UseCodebase>true</UseCodebase>
7-
<FileUpgradeFlags>
8-
</FileUpgradeFlags>
9-
<UpgradeBackupLocation>
10-
</UpgradeBackupLocation>
11-
<OldToolsVersion>15.0</OldToolsVersion>
12-
<TargetFrameworkProfile />
13-
</PropertyGroup>
14-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
15-
<PlatformTarget>x64</PlatformTarget>
16-
<OutputPath>bin\x64\Release\</OutputPath>
17-
<Optimize>true</Optimize>
18-
<DefineConstants>X64</DefineConstants>
19-
</PropertyGroup>
20-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
21-
<DebugSymbols>true</DebugSymbols>
22-
<OutputPath>bin\x64\Debug\</OutputPath>
23-
<PlatformTarget>x64</PlatformTarget>
24-
<DebugType>full</DebugType>
25-
<DefineConstants>TRACE;DEBUG;X64</DefineConstants>
26-
</PropertyGroup>
27-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
28-
<PropertyGroup>
29-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
30-
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
31-
<SchemaVersion>2.0</SchemaVersion>
32-
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
33-
<ProjectGuid>{123DBC9B-8955-4446-9A74-DD2B8068F7B0}</ProjectGuid>
34-
<OutputType>Library</OutputType>
35-
<AppDesignerFolder>Properties</AppDesignerFolder>
4+
<TargetFramework>net48</TargetFramework>
365
<RootNamespace>CodingWithCalvin.SuperClean</RootNamespace>
376
<AssemblyName>CodingWithCalvin.SuperClean</AssemblyName>
38-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
39-
<GeneratePkgDefFile>true</GeneratePkgDefFile>
40-
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
41-
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
42-
<IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
43-
<CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
44-
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
45-
<StartAction>Program</StartAction>
46-
<StartProgram Condition="'$(DevEnvDir)' != ''">$(DevEnvDir)devenv.exe</StartProgram>
47-
<StartArguments>/rootsuffix Exp</StartArguments>
48-
<VsixType>v3</VsixType>
7+
<LangVersion>latest</LangVersion>
8+
<OutputPath>bin/$(Configuration)/</OutputPath>
499
</PropertyGroup>
10+
11+
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
12+
<DeployExtension>True</DeployExtension>
13+
</PropertyGroup>
14+
5015
<ItemGroup>
51-
<Compile Include="Commands\SuperCleanCommand.cs" />
52-
<Compile Include="VSCommandTable.cs">
53-
<AutoGen>True</AutoGen>
54-
<DesignTime>True</DesignTime>
55-
<DependentUpon>VSCommandTable.vsct</DependentUpon>
56-
</Compile>
57-
<Compile Include="SuperCleanPackage.cs" />
58-
<Compile Include="Properties\AssemblyInfo.cs" />
59-
<Compile Include="source.extension.cs">
60-
<AutoGen>True</AutoGen>
61-
<DesignTime>True</DesignTime>
62-
<DependentUpon>source.extension.vsixmanifest</DependentUpon>
63-
</Compile>
64-
</ItemGroup>
65-
<ItemGroup>
66-
<Content Include="..\..\LICENSE">
67-
<Link>resources\LICENSE</Link>
68-
<IncludeInVSIX>true</IncludeInVSIX>
69-
</Content>
70-
<None Include="source.extension.vsixmanifest">
71-
<SubType>Designer</SubType>
72-
<Generator>VsixManifestGenerator</Generator>
73-
<LastGenOutput>source.extension.cs</LastGenOutput>
74-
</None>
75-
</ItemGroup>
76-
<ItemGroup>
77-
<Reference Include="Microsoft.CSharp" />
78-
<Reference Include="System" />
79-
<Reference Include="System.Design" />
80-
<Reference Include="System.Windows.Forms" />
81-
</ItemGroup>
82-
<ItemGroup />
83-
<ItemGroup>
84-
<VSCTCompile Include="VSCommandTable.vsct">
85-
<Generator>VsctGenerator</Generator>
86-
<LastGenOutput>VSCommandTable.cs</LastGenOutput>
87-
<ResourceName>Menus.ctmenu</ResourceName>
88-
</VSCTCompile>
89-
</ItemGroup>
90-
<ItemGroup>
91-
<PackageReference Include="Community.VisualStudio.Toolkit.17">
92-
<Version>17.0.492</Version>
93-
</PackageReference>
94-
<PackageReference Include="Microsoft.VisualStudio.SDK">
95-
<Version>17.5.33428.388</Version>
96-
</PackageReference>
97-
<PackageReference Include="Microsoft.VSSDK.BuildTools">
98-
<Version>17.5.4072</Version>
99-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
100-
</PackageReference>
16+
<PackageReference Include="Community.VisualStudio.Toolkit.17" Version="17.0.492" />
17+
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.14.40265" />
10118
</ItemGroup>
19+
10220
<ItemGroup>
103-
<Content Include="..\..\resources\icon.png">
104-
<Link>resources\icon.png</Link>
21+
<Content Include="..\..\resources\icon.png" Link="resources\icon.png">
10522
<IncludeInVSIX>true</IncludeInVSIX>
10623
</Content>
107-
<Content Include="..\..\resources\logo.png">
108-
<Link>resources\logo.png</Link>
24+
<Content Include="..\..\resources\logo.png" Link="resources\logo.png">
10925
<IncludeInVSIX>true</IncludeInVSIX>
11026
</Content>
111-
<Content Include="..\LICENSE">
112-
<Link>resources\LICENSE</Link>
27+
<Content Include="..\..\LICENSE" Link="resources\LICENSE">
11328
<IncludeInVSIX>true</IncludeInVSIX>
11429
</Content>
11530
</ItemGroup>
116-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
117-
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
118-
</Project>
31+
32+
</Project>

‎src/CodingWithCalvin.SuperClean/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/CodingWithCalvin.SuperClean/source.extension.vsixmanifest‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010
<Tags>bin,debug,folder,output</Tags>
1111
</Metadata>
1212
<Installation>
13-
<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Community">
13+
<InstallationTarget Version="[17.0,19.0)" Id="Microsoft.VisualStudio.Community">
1414
<ProductArchitecture>amd64</ProductArchitecture>
1515
</InstallationTarget>
16+
<InstallationTarget Version="[17.0,19.0)" Id="Microsoft.VisualStudio.Community">
17+
<ProductArchitecture>arm64</ProductArchitecture>
18+
</InstallationTarget>
1619
</Installation>
1720
<Dependencies>
1821
</Dependencies>

0 commit comments

Comments
 (0)