Skip to content

Commit ff9edcb

Browse files
CalvinAllenCalvinAllen
committed
Standardization
1 parent 22c3f9e commit ff9edcb

File tree

6 files changed

+50
-29
lines changed

6 files changed

+50
-29
lines changed

‎.github/workflows/publish.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ name: Publish to VS Marketplace
22

33
on:
44
workflow_dispatch:
5-
push:
6-
tags:
7-
- 'v[0-9]+.[0-9]+.[0-9]+.[0-9]+'
85

96
jobs:
107
publish:
118
runs-on: windows-latest
129
steps:
1310
- name: Checkout
14-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1512

1613
- name: 1. Download artifact
1714
id: download-artifact
@@ -20,19 +17,26 @@ jobs:
2017
github_token: ${{secrets.GH_SECRET}}
2118
workflow: release_build_and_deploy.yml
2219
workflow_conclusion: success
23-
24-
- name: 2. Publish Release to Marketplace
20+
21+
- name: 2. Parse Artifact Manifest
22+
id: artifact_manifest
23+
uses: ActionsTools/read-json-action@main
24+
with:
25+
file_path: ./artifact/CodingWithCalvin.SuperClean.Vsix.info
26+
27+
- name: 3. Publish Release to Marketplace
2528
uses: CodingWithCalvin/GHA-VSMarketplacePublisher@v1
2629
with:
2730
marketplace-pat: ${{ secrets.VS_PAT }}
2831
publish-manifest-path: ./src/extension.manifest.json
2932
vsix-path: ./artifact/CodingWithCalvin.SuperClean.Vsix.vsix
3033

31-
- name: 3. Create Release
34+
- name: 4. Create Tag & Release
3235
uses: ncipollo/[email protected]
3336
with:
3437
artifacts: ./artifact/CodingWithCalvin.SuperClean.Vsix.vsix
3538
generateReleaseNotes: true
3639
makeLatest: true
3740
token: ${{secrets.GH_SECRET}}
38-
41+
commit: ${{ steps.artifact_manifest.outputs.sha }}
42+
tag: "v${{steps.artifact_manifest.outputs.version }}"

‎.github/workflows/release_build_and_deploy.yml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,32 @@ jobs:
1515
runs-on: windows-latest
1616

1717
steps:
18-
- uses: actions/checkout@v3
19-
- uses: microsoft/[email protected]
20-
18+
- uses: actions/checkout@v4
19+
- uses: microsoft/setup-msbuild@v2
20+
- uses: nuget/setup-nuget@v2
21+
2122
- name: 1. Versioning Release
23+
id: step-version
2224
uses: CodingWithCalvin/GHA-VSVsixVersioner@v1
2325
with:
24-
extension-manifest-file: './src/CodingWithCalvin.SuperClean.Vsix/source.extension.vsixmanifest'
25-
extension-source-file: './src/CodingWithCalvin.SuperClean.Vsix/source.extension.cs'
26-
27-
- name: 2. Bootstrapping NuGet Installer
28-
uses: nuget/[email protected]
26+
extension-manifest-file: 'src/CodingWithCalvin.SuperClean.Vsix/source.extension.vsixmanifest'
27+
extension-source-file: 'src/CodingWithCalvin.SuperClean.Vsix/VsixConstants.cs'
2928

30-
- name: 3. Restoring Packages
29+
- name: 2. Restoring Packages
3130
run: nuget restore ./src/CodingWithCalvin.SuperClean.sln
32-
33-
- name: 4. Building Project
34-
run: msbuild './src/CodingWithCalvin.SuperClean.Vsix/CodingWithCalvin.SuperClean.Vsix.csproj' /p:configuration='Release' /p:platform='x64'
3531

32+
- name: 3. Building Project
33+
run: msbuild 'src/CodingWithCalvin.SuperClean.Vsix/CodingWithCalvin.SuperClean.Vsix.csproj' /p:configuration='Release' /p:platform='x64'
34+
35+
- name: 4. Create Information File
36+
uses: jsdaniell/[email protected]
37+
with:
38+
name: 'src/CodingWithCalvin.SuperClean.Vsix/bin/x64/Release/CodingWithCalvin.SuperClean.Vsix.info'
39+
json: '{"sha":"${{ github.sha }}", "version":"${{ steps.step-version.outputs.version }}"}'
40+
3641
- name: 5. Publishing Build Artifact
37-
uses: actions/upload-artifact@v3
42+
uses: actions/upload-artifact@v4
3843
with:
39-
path: './src/CodingWithCalvin.SuperClean.Vsix/bin/x64/Release/CodingWithCalvin.SuperClean.Vsix.vsix'
44+
path: |
45+
src/CodingWithCalvin.SuperClean.Vsix/bin/x64/Release/CodingWithCalvin.SuperClean.Vsix.info
46+
src/CodingWithCalvin.SuperClean.Vsix/bin/x64/Release/CodingWithCalvin.SuperClean.Vsix.vsix

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
</Compile>
6464
</ItemGroup>
6565
<ItemGroup>
66+
<Content Include="..\..\LICENSE">
67+
<Link>Resources\LICENSE</Link>
68+
<IncludeInVSIX>true</IncludeInVSIX>
69+
</Content>
6670
<None Include="source.extension.vsixmanifest">
6771
<SubType>Designer</SubType>
6872
<Generator>VsixManifestGenerator</Generator>
@@ -96,19 +100,26 @@
96100
</PackageReference>
97101
</ItemGroup>
98102
<ItemGroup>
103+
<Content Include="..\resources\icon.png">
104+
<Link>Resources\icon.png</Link>
105+
<IncludeInVSIX>true</IncludeInVSIX>
106+
</Content>
107+
<Content Include="..\resources\logo.png">
108+
<Link>Resources\logo.png</Link>
109+
<IncludeInVSIX>true</IncludeInVSIX>
110+
</Content>
99111
<Content Include="Resources\icon.png">
100-
<Link>../resources/icon.png</Link>
112+
<Link>../resources/icon.png</Link>
101113
<IncludeInVSIX>true</IncludeInVSIX>
102114
</Content>
103115
<Content Include="Resources\logo.png">
104116
<Link>../resources/logo.png</Link>
105117
<IncludeInVSIX>true</IncludeInVSIX>
106118
</Content>
107-
<Content Include="Resources\LICENSE">
119+
<Content Include="Resources\LICENSE">
108120
<Link>../../LICENSE</Link>
109121
<IncludeInVSIX>true</IncludeInVSIX>
110122
</Content>
111-
112123
</ItemGroup>
113124
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
114125
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />

‎src/CodingWithCalvin.SuperClean.Vsix/VSCommandTable.vsct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</Buttons>
1616

1717
<Bitmaps>
18-
<Bitmap guid="IconGuid" usedList="BroomIcon" href="./Resources/icon.png" />
18+
<Bitmap guid="IconGuid" usedList="BroomIcon" href="../resources/icon.png" />
1919
</Bitmaps>
2020
</Commands>
2121

‎src/CodingWithCalvin.SuperClean.Vsix/source.extension.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ internal sealed partial class Vsix
99
{
1010
public const string Id = "VS-SuperClean";
1111
public const string Name = "Super Clean";
12-
public const string Description = @"Adds a 'Super Clean' option to the right click menu of the Solution and Project nodes of the Solution Explorer, to fully clear out the bin and obj folders for either all projects in the solution, or the specific project selected.";
12+
public const string Description = @"Adds a 'Super Clean' option to the right click menu of the Solution and Project nodes of the Solution Explorer, to clear out the bin and obj folders for all, or selected, projects in the solution.";
1313
public const string Language = "en-US";
1414
public const string Version = "1.1";
1515
public const string Author = "Coding With Calvin";

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
<DisplayName>Super Clean</DisplayName>
66
<Description xml:space="preserve">Adds a 'Super Clean' option to the right click menu of the Solution and Project nodes of the Solution Explorer, to clear out the bin and obj folders for all, or selected, projects in the solution.</Description>
77
<MoreInfo>https://github.com/codingwithcalvin/vs-superclean</MoreInfo>
8-
<License>Resources\LICENSE</License>
8+
<License>Resources\LICENSE</License>
99
<Icon>Resources\logo.png</Icon>
10-
<PreviewImage>Resources\logo.png</PreviewImage>
1110
<Tags>bin,debug,folder,output</Tags>
1211
</Metadata>
1312
<Installation>

0 commit comments

Comments
 (0)