Skip to content

Commit b50715f

Browse files
gep13gep13
committed
Merge branch 'release/0.4.0'
* release/0.4.0: (build) Update path to manifest(s) (#128) Make URL's absolute (doc) Update description for supported VS Versions (#133) fixed build (maint) cleanup (#133) re-enabled file-icon (#133) re-enabled Cake snippets (#133) re-enabled CSharp snippets (#133) enabled Build -> Cake Build menu (#133) Upgrade to support Visual Studio 2022 (GH-123) Add publishing manifest file
2 parents d0176b3 + 51805b6 commit b50715f

File tree

82 files changed

+953
-388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+953
-388
lines changed

‎Cake.VisualStudio.sln‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26127.3
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31515.178
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{04D0CE67-A915-44BB-BC3C-8E7885CF9E97}"
77
ProjectSection(SolutionItems) = preProject
@@ -11,11 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{7067556F-B744-4F73-B509-C8CC9F559AB9}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.VisualStudio", "src\Cake.VisualStudio.csproj", "{94660BCF-169A-42E1-BD84-345449743069}"
15-
ProjectSection(ProjectDependencies) = postProject
16-
{FCE573DD-E74E-4AB1-9D17-56FC8869797F} = {FCE573DD-E74E-4AB1-9D17-56FC8869797F}
17-
EndProjectSection
18-
EndProject
1914
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinTemplate", "template\AddinTemplate\AddinTemplate.csproj", "{FCE573DD-E74E-4AB1-9D17-56FC8869797F}"
2015
EndProject
2116
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModuleTemplate", "template\ModuleTemplate\ModuleTemplate.csproj", "{85BCBED7-39BD-4670-85F7-EE36D0DA31C0}"
@@ -28,16 +23,23 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinTestBasicTemplate", "t
2823
EndProject
2924
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SolutionItemTemplate", "template\SolutionItemTemplate\SolutionItemTemplate.csproj", "{5D45E667-D12D-44F8-8A87-5503BF5DE274}"
3025
EndProject
26+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Cake.VisualStudio.Shared", "src\Cake.VisualStudio.Shared\Cake.VisualStudio.Shared.shproj", "{3D9AB2DB-3DD8-4E2B-8DBC-BF29EDAF1A1B}"
27+
EndProject
28+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.VisualStudio", "src\Cake.VisualStudio\Cake.VisualStudio.csproj", "{94660BCF-169A-42E1-BD84-345449743069}"
29+
EndProject
30+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.VisualStudio.2022", "src\Cake.VisualStudio.2022\Cake.VisualStudio.2022.csproj", "{F8EB885A-FCA3-410A-B895-9CE327D5D482}"
31+
EndProject
3132
Global
33+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
34+
src\Cake.VisualStudio.Shared\Cake.VisualStudio.Shared.projitems*{3d9ab2db-3dd8-4e2b-8dbc-bf29edaf1a1b}*SharedItemsImports = 13
35+
src\Cake.VisualStudio.Shared\Cake.VisualStudio.Shared.projitems*{94660bcf-169a-42e1-bd84-345449743069}*SharedItemsImports = 4
36+
src\Cake.VisualStudio.Shared\Cake.VisualStudio.Shared.projitems*{f8eb885a-fca3-410a-b895-9ce327d5d482}*SharedItemsImports = 4
37+
EndGlobalSection
3238
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3339
Debug|Any CPU = Debug|Any CPU
3440
Release|Any CPU = Release|Any CPU
3541
EndGlobalSection
3642
GlobalSection(ProjectConfigurationPlatforms) = postSolution
37-
{94660BCF-169A-42E1-BD84-345449743069}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{94660BCF-169A-42E1-BD84-345449743069}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{94660BCF-169A-42E1-BD84-345449743069}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{94660BCF-169A-42E1-BD84-345449743069}.Release|Any CPU.Build.0 = Release|Any CPU
4143
{FCE573DD-E74E-4AB1-9D17-56FC8869797F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4244
{FCE573DD-E74E-4AB1-9D17-56FC8869797F}.Debug|Any CPU.Build.0 = Debug|Any CPU
4345
{FCE573DD-E74E-4AB1-9D17-56FC8869797F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -62,6 +64,14 @@ Global
6264
{5D45E667-D12D-44F8-8A87-5503BF5DE274}.Debug|Any CPU.Build.0 = Debug|Any CPU
6365
{5D45E667-D12D-44F8-8A87-5503BF5DE274}.Release|Any CPU.ActiveCfg = Release|Any CPU
6466
{5D45E667-D12D-44F8-8A87-5503BF5DE274}.Release|Any CPU.Build.0 = Release|Any CPU
67+
{94660BCF-169A-42E1-BD84-345449743069}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68+
{94660BCF-169A-42E1-BD84-345449743069}.Debug|Any CPU.Build.0 = Debug|Any CPU
69+
{94660BCF-169A-42E1-BD84-345449743069}.Release|Any CPU.ActiveCfg = Release|Any CPU
70+
{94660BCF-169A-42E1-BD84-345449743069}.Release|Any CPU.Build.0 = Release|Any CPU
71+
{F8EB885A-FCA3-410A-B895-9CE327D5D482}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
72+
{F8EB885A-FCA3-410A-B895-9CE327D5D482}.Debug|Any CPU.Build.0 = Debug|Any CPU
73+
{F8EB885A-FCA3-410A-B895-9CE327D5D482}.Release|Any CPU.ActiveCfg = Release|Any CPU
74+
{F8EB885A-FCA3-410A-B895-9CE327D5D482}.Release|Any CPU.Build.0 = Release|Any CPU
6575
EndGlobalSection
6676
GlobalSection(SolutionProperties) = preSolution
6777
HideSolutionNode = FALSE

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Cake for Visual Studio
22

33
Adds support for the [Cake](https://cakebuild.net/)
4-
build tool in Visual Studio 2017 and 2019. Includes support for the Task Runner Explorer,
4+
build tool in Visual Studio 2017, 2019, and 2022. Includes support for the Task Runner Explorer,
55
new item and project templates and bootstrapping important Cake files
66

77
Originally based off Mads Kristensen's [Brunch Task Runner](https://github.com/madskristensen/BrunchTaskRunner) extension.
@@ -28,22 +28,22 @@ a `build.cake` file.
2828
Open Task Runner Explorer by right-clicking the Cake script and select **Task Runner Explorer** from
2929
the context menu:
3030

31-
![Open Task Runner Explorer](art/open-trx.png)
31+
![Open Task Runner Explorer](https://cdn.jsdelivr.net/gh/cake-build/cake-vs@340ef57f9bfadc30641c0a2572e46fd35375ee89/art/open-trx.png)
3232

3333
Individual tasks will be listed in the task list on the left.
3434

35-
![Task List](art/task-list.png)
35+
![Task List](https://cdn.jsdelivr.net/gh/cake-build/cake-vs@340ef57f9bfadc30641c0a2572e46fd35375ee89/art/task-list.png)
3636

3737
Each task can be executed by double-clicking the task.
3838

39-
![Console output](art/console.png)
39+
![Console output](https://cdn.jsdelivr.net/gh/cake-build/cake-vs@340ef57f9bfadc30641c0a2572e46fd35375ee89/art/console.png)
4040

4141
### Bindings
4242

4343
Task bindings make it possible to associate individual tasks
4444
with Visual Studio events such as _Project Open_ etc.
4545

46-
![Bindings](art/bindings.png)
46+
![Bindings](https://cdn.jsdelivr.net/gh/cake-build/cake-vs@340ef57f9bfadc30641c0a2572e46fd35375ee89/art/bindings.png)
4747

4848
These bindings are stored in your `cake.config` file.
4949

@@ -57,13 +57,13 @@ However, at this time, it will not automatically download Cake for you.
5757

5858
Choose Cake Build from the Build menu to quickly install the default bootstrapper scripts or Cake configuration files into your solution.
5959

60-
![Template installers](art/installers.png)
60+
![Template installers](https://cdn.jsdelivr.net/gh/cake-build/cake-vs@340ef57f9bfadc30641c0a2572e46fd35375ee89/art/installers.png)
6161

6262
## Templates
6363

6464
The extension includes an item template for build scripts and project templates for Cake modules, addins, and unit tests.
6565

66-
![Project Template](art/templates.png)
66+
![Project Template](https://cdn.jsdelivr.net/gh/cake-build/cake-vs@340ef57f9bfadc30641c0a2572e46fd35375ee89/art/templates.png)
6767

6868
## Contribute
6969

‎build.cake‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,12 @@ Task("Update-Manifest-Version")
108108
{
109109
BuildVersion.UpdateManifestVersion(
110110
context: Context,
111-
path: "./src/source.extension.vsixmanifest"
111+
path: "./src/Cake.VisualStudio/source.extension.vsixmanifest"
112+
);
113+
114+
BuildVersion.UpdateManifestVersion(
115+
context: Context,
116+
path: "./src/Cake.VisualStudio.2022/source.extension.vsixmanifest"
112117
);
113118
});
114119

@@ -171,17 +176,20 @@ Task("Post-Build")
171176
.IsDependentOn("Build")
172177
.Does(() =>
173178
{
174-
CopyFileToDirectory("./src/bin/" + configuration + "/Cake.VisualStudio.vsix", artifacts);
179+
CopyFile("./src/Cake.VisualStudio/bin/" + configuration + "/Cake.VisualStudio.vsix", artifacts + "/Cake.VisualStudio.2019.vsix");
180+
CopyFile("./src/Cake.VisualStudio.2022/bin/" + configuration + "/Cake.VisualStudio.vsix", artifacts + "/Cake.VisualStudio.2022.vsix");
175181
});
176182

177183
Task("Publish-GitHub-Release")
178184
.WithCriteria(() => parameters.ShouldPublish)
179185
.Does(() =>
180186
{
181187
var buildResultDir = Directory(artifacts);
182-
var packageFile = File("Cake.VisualStudio.vsix");
188+
var packageFile2019 = File("Cake.VisualStudio.2019.vsix");
189+
var packageFile2022 = File("Cake.VisualStudio.2022.vsix");
183190

184-
GitReleaseManagerAddAssets(parameters.GitHub.Token, "cake-build", "cake-vs", parameters.Version.Milestone, buildResultDir + packageFile);
191+
GitReleaseManagerAddAssets(parameters.GitHub.Token, "cake-build", "cake-vs", parameters.Version.Milestone, buildResultDir + packageFile2019);
192+
GitReleaseManagerAddAssets(parameters.GitHub.Token, "cake-build", "cake-vs", parameters.Version.Milestone, buildResultDir + packageFile2022);
185193
GitReleaseManagerClose(parameters.GitHub.Token, "cake-build", "cake-vs", parameters.Version.Milestone);
186194
})
187195
.OnError(exception =>
@@ -195,19 +203,21 @@ Task("Upload-Artifact")
195203
.WithCriteria(() => parameters.ShouldPublishToAppVeyor)
196204
.Does(() =>
197205
{
198-
AppVeyor.UploadArtifact(artifacts + "Cake.VisualStudio.vsix");
206+
AppVeyor.UploadArtifact(artifacts + "Cake.VisualStudio.2019.vsix");
207+
AppVeyor.UploadArtifact(artifacts + "Cake.VisualStudio.2022.vsix");
199208
});
200209

201210
Task("Publish-Extension")
202211
.IsDependentOn("Post-Build")
203212
.WithCriteria(() => parameters.ShouldPublishToMyGet)
204213
.Does(() =>
205214
{
206-
var vsixPath = artifacts + "Cake.VisualStudio.vsix";
207215
var client = MyGetClient.GetClient(parameters.MyGet.Url, parameters.MyGet.Key, s => Context.Verbose(s));
208-
Information("Uploading VSIX to {0}...", parameters.MyGet.Url);
209-
var response = client.UploadVsix(GetFile(artifacts + "Cake.VisualStudio.vsix"));
210-
Information("VSIX Upload {0}", response.IsSuccessStatusCode ? "succeeded." : "failed with reason '" + response.ReasonPhrase + "'.");
216+
Information("Uploading VSIXs to {0}...", parameters.MyGet.Url);
217+
var response = client.UploadVsix(GetFile(artifacts + "Cake.VisualStudio.2019.vsix"));
218+
Information("VSIX Upload (2019) {0}", response.IsSuccessStatusCode ? "succeeded." : "failed with reason '" + response.ReasonPhrase + "'.");
219+
response = client.UploadVsix(GetFile(artifacts + "Cake.VisualStudio.2022.vsix"));
220+
Information("VSIX Upload (2019) {0}", response.IsSuccessStatusCode ? "succeeded." : "failed with reason '" + response.ReasonPhrase + "'.");
211221
});
212222

213223
Task("Default")

‎extension-manifest.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"$schema": "http://json.schemastore.org/vsix-publish",
3+
"categories": [
4+
"build"
5+
],
6+
"identity": {
7+
"internalName": "CakeforVisualStudio",
8+
"tags": [
9+
"Build",
10+
"C#",
11+
"Cake"
12+
]
13+
},
14+
"overview": "./README.md",
15+
"priceCategory": "free",
16+
"publisher": "vs-publisher-1392591",
17+
"private": false,
18+
"qna": false,
19+
"repo": "https://github.com/cake-build/cake-vs"
20+
}

0 commit comments

Comments
 (0)