Skip to content

Commit 5a97f60

Browse files
committed
Standardization 2.0
1 parent a741e60 commit 5a97f60

16 files changed

+21
-49
lines changed

.gitattributes

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

.github/workflows/publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ jobs:
2222
id: artifact_manifest
2323
uses: ActionsTools/read-json-action@main
2424
with:
25-
file_path: ./artifact/CodingWithCalvin.SuperClean.Vsix.info
25+
file_path: ./artifact/CodingWithCalvin.SuperClean.info
2626

2727
- name: 3. Publish Release to Marketplace
2828
uses: CodingWithCalvin/GHA-VSMarketplacePublisher@v1
2929
with:
3030
marketplace-pat: ${{ secrets.VS_PAT }}
3131
publish-manifest-path: ./src/extension.manifest.json
32-
vsix-path: ./artifact/CodingWithCalvin.SuperClean.Vsix.vsix
32+
vsix-path: ./artifact/CodingWithCalvin.SuperClean.vsix
3333

3434
- name: 4. Create Tag & Release
3535
uses: ncipollo/[email protected]
3636
with:
37-
artifacts: ./artifact/CodingWithCalvin.SuperClean.Vsix.vsix
37+
artifacts: ./artifact/CodingWithCalvin.SuperClean.vsix
3838
generateReleaseNotes: true
3939
makeLatest: true
4040
token: ${{secrets.GH_SECRET}}

.github/workflows/release_build_and_deploy.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,24 @@ jobs:
2323
id: step-version
2424
uses: CodingWithCalvin/GHA-VSVsixVersioner@v1
2525
with:
26-
extension-manifest-file: 'src/CodingWithCalvin.SuperClean.Vsix/source.extension.vsixmanifest'
27-
extension-source-file: 'src/CodingWithCalvin.SuperClean.Vsix/source.extension.cs'
26+
extension-manifest-file: 'src/CodingWithCalvin.SuperClean/source.extension.vsixmanifest'
27+
extension-source-file: 'src/CodingWithCalvin.SuperClean/source.extension.cs'
2828

2929
- name: 2. Restoring Packages
3030
run: nuget restore ./src/CodingWithCalvin.SuperClean.sln
3131

3232
- name: 3. Building Project
33-
run: msbuild 'src/CodingWithCalvin.SuperClean.Vsix/CodingWithCalvin.SuperClean.Vsix.csproj' /p:configuration='Release' /p:platform='x64'
33+
run: msbuild 'src/CodingWithCalvin.SuperClean/CodingWithCalvin.SuperClean.csproj' /p:configuration='Release' /p:platform='x64'
3434

3535
- name: 4. Create Information File
3636
uses: jsdaniell/[email protected]
3737
with:
38-
name: 'src/CodingWithCalvin.SuperClean.Vsix/bin/x64/Release/CodingWithCalvin.SuperClean.Vsix.info'
38+
name: 'src/CodingWithCalvin.SuperClean/bin/x64/Release/CodingWithCalvin.SuperClean.info'
3939
json: '{"sha":"${{ github.sha }}", "version":"${{ steps.step-version.outputs.version }}"}'
4040

4141
- name: 5. Publishing Build Artifact
4242
uses: actions/upload-artifact@v4
4343
with:
4444
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
45+
src/CodingWithCalvin.SuperClean/bin/x64/Release/CodingWithCalvin.SuperClean.info
46+
src/CodingWithCalvin.SuperClean/bin/x64/Release/CodingWithCalvin.SuperClean.vsix
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/CodingWithCalvin.SuperClean.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.5.33516.290
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodingWithCalvin.SuperClean.Vsix", "CodingWithCalvin.SuperClean.Vsix\CodingWithCalvin.SuperClean.Vsix.csproj", "{123DBC9B-8955-4446-9A74-DD2B8068F7B0}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodingWithCalvin.SuperClean", "CodingWithCalvin.SuperClean\CodingWithCalvin.SuperClean.csproj", "{123DBC9B-8955-4446-9A74-DD2B8068F7B0}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AB676E02-02D0-4D2A-BE8B-A94AAC94D27C}"
99
ProjectSection(SolutionItems) = preProject
10-
extension.manifest.json = extension.manifest.json
10+
..\resources\extension.manifest.json = ..\resources\extension.manifest.json
1111
..\.github\workflows\publish.yml = ..\.github\workflows\publish.yml
1212
..\README.md = ..\README.md
1313
..\.github\workflows\release_build_and_deploy.yml = ..\.github\workflows\release_build_and_deploy.yml

src/CodingWithCalvin.SuperClean.sln.DotSettings

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

src/CodingWithCalvin.SuperClean.Vsix/CodingWithCalvin.SuperClean.Vsix.csproj renamed to src/CodingWithCalvin.SuperClean/CodingWithCalvin.SuperClean.csproj

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</ItemGroup>
6565
<ItemGroup>
6666
<Content Include="..\..\LICENSE">
67-
<Link>Resources\LICENSE</Link>
67+
<Link>resources\LICENSE</Link>
6868
<IncludeInVSIX>true</IncludeInVSIX>
6969
</Content>
7070
<None Include="source.extension.vsixmanifest">
@@ -100,24 +100,16 @@
100100
</PackageReference>
101101
</ItemGroup>
102102
<ItemGroup>
103-
<Content Include="..\resources\icon.png">
104-
<Link>Resources\icon.png</Link>
103+
<Content Include="..\..\resources\icon.png">
104+
<Link>resources\icon.png</Link>
105105
<IncludeInVSIX>true</IncludeInVSIX>
106106
</Content>
107-
<Content Include="..\resources\logo.png">
108-
<Link>Resources\logo.png</Link>
107+
<Content Include="..\..\resources\logo.png">
108+
<Link>resources\logo.png</Link>
109109
<IncludeInVSIX>true</IncludeInVSIX>
110110
</Content>
111-
<Content Include="Resources\icon.png">
112-
<Link>../resources/icon.png</Link>
113-
<IncludeInVSIX>true</IncludeInVSIX>
114-
</Content>
115-
<Content Include="Resources\logo.png">
116-
<Link>../resources/logo.png</Link>
117-
<IncludeInVSIX>true</IncludeInVSIX>
118-
</Content>
119-
<Content Include="Resources\LICENSE">
120-
<Link>../../LICENSE</Link>
111+
<Content Include="..\LICENSE">
112+
<Link>resources\LICENSE</Link>
121113
<IncludeInVSIX>true</IncludeInVSIX>
122114
</Content>
123115
</ItemGroup>

src/CodingWithCalvin.SuperClean.Vsix/VSCommandTable.vsct renamed to src/CodingWithCalvin.SuperClean/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.vsixmanifest renamed to src/CodingWithCalvin.SuperClean/source.extension.vsixmanifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +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>
9-
<Icon>Resources\logo.png</Icon>
8+
<License>resources\LICENSE</License>
9+
<Icon>resources\logo.png</Icon>
1010
<Tags>bin,debug,folder,output</Tags>
1111
</Metadata>
1212
<Installation>

0 commit comments

Comments
 (0)