Skip to content
This repository has been archived by the owner on May 2, 2024. It is now read-only.

Commit

Permalink
(maint) update cake
Browse files Browse the repository at this point in the history
also, fix a typo, switch MSBuildToolVersion and bump CI VM.
  • Loading branch information
nils-a committed Sep 6, 2023
1 parent a361f41 commit 1f2ac61
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "1.1.0",
"version": "3.1.0",
"commands": [
"dotnet-cake"
]
}
}
}
}
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ windows-2019 ]
os: [ windows-2022 ]

steps:
- name: Checkout the repository
- name: Checkout the repository
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Double clicking on a node in the tree will jump to the corresponding code implem

## Contributing

Cake.7zip follows the [Contributor Covenant][contrib-covenant] Code of Conduct.
Mediatr-vs follows the [Contributor Covenant][contrib-covenant] Code of Conduct.

We accept Pull Requests.

Expand Down
32 changes: 16 additions & 16 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@ Setup(ctx =>
{
Verbose($"Updating version of {vsix.FullPath}");
XmlPoke(
vsix,
"/x:PackageManifest/x:Metadata/x:Identity/@Version",
vsix,
"/x:PackageManifest/x:Metadata/x:Identity/@Version",
$"{gitVersion.MajorMinorPatch}.{gitVersion.PreReleaseNumber}", // TODO: differentiate between CI-builds and Releases
new XmlPokeSettings
new XmlPokeSettings
{
Namespaces = new Dictionary<string, string>
Namespaces = new Dictionary<string, string>
{
{ "x", "http://schemas.microsoft.com/developer/vsx-schema/2011" }
}
}
);
}
// TODO: source.extension.cs is generated from the vsixmanifest - if we modify the vsixmanifest, we should ensure

// TODO: source.extension.cs is generated from the vsixmanifest - if we modify the vsixmanifest, we should ensure
// that source.extension.cs is updated, too.

version = gitVersion.SemVer;
Information($"Building version {gitVersion.SemVer}.");
}
Expand All @@ -52,11 +52,11 @@ Setup(ctx =>
Information("Local build.");
var vsix = GetFiles("./src/**/*.vsixmanifest").First();
version = XmlPeek(
vsix,
"/x:PackageManifest/x:Metadata/x:Identity/@Version",
new XmlPeekSettings
vsix,
"/x:PackageManifest/x:Metadata/x:Identity/@Version",
new XmlPeekSettings
{
Namespaces = new Dictionary<string, string>
Namespaces = new Dictionary<string, string>
{
{ "x", "http://schemas.microsoft.com/developer/vsx-schema/2011" }
}
Expand Down Expand Up @@ -96,7 +96,7 @@ Task("Build")
MSBuild(solutionPath, settings =>
settings.SetPlatformTarget(PlatformTarget.MSIL)
.SetMSBuildPlatform(MSBuildPlatform.x86)
.UseToolVersion(MSBuildToolVersion.VS2019)
.UseToolVersion(MSBuildToolVersion.VS2022)
.SetVerbosity(Verbosity.Quiet)
.WithTarget("Build")
.SetConfiguration(configuration));
Expand Down Expand Up @@ -134,11 +134,11 @@ Task("PublishToOpenGallery")
System.Net.Http.HttpMethod.Post,
url)
{
Content = content
Content = content
};

var response = client.Send(request);
if(response.IsSuccessStatusCode)
if(response.IsSuccessStatusCode)
{
Information($"Uploaded {fileName}");
}
Expand All @@ -147,12 +147,12 @@ Task("PublishToOpenGallery")
Warning($"Error uploading vsix. Status:{response.StatusCode} - {response.ReasonPhrase}");
Verbose(response.Content.ReadAsStringAsync().GetAwaiter().GetResult());
}

}
});

Task("Default")
.IsDependentOn("Build")
.IsDependentOn("PublishToOpenGallery");

RunTarget(target);
RunTarget(target);

0 comments on commit 1f2ac61

Please sign in to comment.