Skip to content

Commit 0977561

Browse files
asbjornuasbjornu
authored
Merge branch 'main' into refactor-next-version-calculator
2 parents 059375f + d056ec8 commit 0977561

File tree

64 files changed

+430
-218
lines changed

Some content is hidden

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

64 files changed

+430
-218
lines changed

‎.github/workflows/ci.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@ jobs:
5656
key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
5757
-
5858
name: Setup .NET SDK
59-
uses: actions/[email protected].2
59+
uses: actions/[email protected].3
6060
with:
6161
dotnet-version: '7.0.x'
62-
dotnet-quality: 'preview'
6362
-
6463
name: '[Prepare]'
6564
if: steps.cache-cake.outputs.cache-hit != 'true'
@@ -96,10 +95,9 @@ jobs:
9695
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
9796
-
9897
name: Setup .NET SDK
99-
uses: actions/[email protected].2
98+
uses: actions/[email protected].3
10099
with:
101100
dotnet-version: '7.0.x'
102-
dotnet-quality: 'preview'
103101
-
104102
name: '[Build]'
105103
shell: pwsh
@@ -160,10 +158,9 @@ jobs:
160158
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
161159
-
162160
name: Setup .NET SDK
163-
uses: actions/[email protected].2
161+
uses: actions/[email protected].3
164162
with:
165163
dotnet-version: '7.0.x'
166-
dotnet-quality: 'preview'
167164
-
168165
name: '[Unit Test]'
169166
shell: pwsh
@@ -213,10 +210,9 @@ jobs:
213210
path: ${{ github.workspace }}/artifacts/packages/nuget
214211
-
215212
name: Setup .NET SDK
216-
uses: actions/[email protected].2
213+
uses: actions/[email protected].3
217214
with:
218215
dotnet-version: '7.0.x'
219-
dotnet-quality: 'preview'
220216
-
221217
name: '[Test Artifacts]'
222218
shell: pwsh
@@ -274,10 +270,9 @@ jobs:
274270
install: true
275271
-
276272
name: Setup .NET SDK
277-
uses: actions/[email protected].2
273+
uses: actions/[email protected].3
278274
with:
279275
dotnet-version: '7.0.x'
280-
dotnet-quality: 'preview'
281276
-
282277
name: '[Test Artifacts (amd64)]'
283278
shell: pwsh
@@ -333,10 +328,9 @@ jobs:
333328
install: true
334329
-
335330
name: Setup .NET SDK
336-
uses: actions/[email protected].2
331+
uses: actions/[email protected].3
337332
with:
338333
dotnet-version: '7.0.x'
339-
dotnet-quality: 'preview'
340334
-
341335
name: Login to DockerHub
342336
if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools'
@@ -424,10 +418,9 @@ jobs:
424418
path: ${{ github.workspace }}/artifacts/packages/nuget
425419
-
426420
name: Setup .NET SDK
427-
uses: actions/[email protected].2
421+
uses: actions/[email protected].3
428422
with:
429423
dotnet-version: '7.0.x'
430-
dotnet-quality: 'preview'
431424
-
432425
name: '[Publish]'
433426
shell: pwsh
@@ -479,10 +472,9 @@ jobs:
479472
path: ${{ github.workspace }}/artifacts/packages/native
480473
-
481474
name: Setup .NET SDK
482-
uses: actions/[email protected].2
475+
uses: actions/[email protected].3
483476
with:
484477
dotnet-version: '7.0.x'
485-
dotnet-quality: 'preview'
486478
-
487479
name: '[Release]'
488480
shell: pwsh

‎.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,9 @@ jobs:
5959

6060
-
6161
name: Setup .NET SDK
62-
uses: actions/[email protected].2
62+
uses: actions/[email protected].3
6363
with:
6464
dotnet-version: '7.0.x'
65-
dotnet-quality: 'preview'
6665

6766
-
6867
name: '[Prepare]'

‎.github/workflows/docs.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,11 @@ jobs:
5858
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
5959
-
6060
name: Get npm cache directory
61+
shell: bash
6162
id: cache-node-dir
62-
run: echo "::set-output name=dir::$(npm config get cache)"
63+
run: |
64+
cacheDir=$(npm config get cache)
65+
echo "dir=$cacheDir" >> $GITHUB_OUTPUT
6366
-
6467
name: Cache Node Modules
6568
id: cache-node
@@ -70,10 +73,9 @@ jobs:
7073
restore-keys: node-${{ runner.os }}
7174
-
7275
name: Setup .NET SDK
73-
uses: actions/[email protected].2
76+
uses: actions/[email protected].3
7477
with:
7578
dotnet-version: '7.0.x'
76-
dotnet-quality: 'preview'
7779
-
7880
name: '[Prepare]'
7981
if: steps.cache-cake.outputs.cache-hit != 'true'
@@ -105,10 +107,9 @@ jobs:
105107
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
106108
-
107109
name: Setup .NET SDK
108-
uses: actions/[email protected].2
110+
uses: actions/[email protected].3
109111
with:
110112
dotnet-version: '7.0.x'
111-
dotnet-quality: 'preview'
112113
-
113114
name: '[Build Documentation]'
114115
shell: pwsh
@@ -118,15 +119,13 @@ jobs:
118119
uses: chabad360/htmlproofer@master
119120
with:
120121
directory: ./artifacts/docs/preview
121-
arguments: --url-ignore /api/ --allow-hash-href --assume-extension --disable-external
122+
arguments: --ignore-urls /api/,/docs/ --allow-hash-href --assume-extension --disable-external
122123
-
123-
name: Reviewdog Reporter
124-
uses: haya14busa/action-cond@v1
124+
name: '[Reviewdog Reporter]'
125125
id: reporter
126-
with:
127-
cond: ${{ github.event_name == 'pull_request' }}
128-
if_true: github-pr-review
129-
if_false: github-check
126+
run: |
127+
value=$([ ${{ github.event_name == 'pull_request' }} ] && echo "github-pr-review" || echo "github-check")
128+
echo "value=$value" >> $GITHUB_OUTPUT
130129
-
131130
name: '[Remark Lint]'
132131
uses: reviewdog/[email protected]
@@ -163,10 +162,9 @@ jobs:
163162
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
164163
-
165164
name: Setup .NET SDK
166-
uses: actions/[email protected].2
165+
uses: actions/[email protected].3
167166
with:
168167
dotnet-version: '7.0.x'
169-
dotnet-quality: 'preview'
170168
-
171169
name: '[Publish Documentation]'
172170
if: ${{ github.event_name == 'push' }}

‎.github/workflows/format.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ jobs:
3030
- uses: actions/checkout@v3
3131
-
3232
name: Setup .NET SDK
33-
uses: actions/[email protected].2
33+
uses: actions/[email protected].3
3434
with:
3535
dotnet-version: '7.0.x'
36-
dotnet-quality: 'preview'
3736
-
3837
name: Run Format Build solution
3938
run: dotnet format ./build/ --verify-no-changes

‎.remarkrc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ plugins:
2525
- remark-lint-no-blockquote-without-marker
2626
- remark-lint-no-consecutive-blank-lines
2727
- remark-lint-no-duplicate-definitions
28-
- remark-lint-no-duplicate-headings
28+
- remark-lint-no-duplicate-headings: ["warn"]
2929
- remark-lint-no-emphasis-as-heading
3030
- remark-lint-no-empty-url
3131
- remark-lint-no-file-name-articles
3232
- remark-lint-no-file-name-consecutive-dashes
33-
- remark-lint-no-file-name-irregular-characters
33+
- remark-lint-no-file-name-irregular-characters: ["warn"]
3434
- remark-lint-no-file-name-mixed-case
3535
- remark-lint-no-file-name-outer-dashes
3636
- remark-lint-no-heading-content-indent

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ works out the [Semantic Version][semver] of the commit being built.
1414
| **GitVersion.Portable** | [![Chocolatey][choco-badge]][choco] |
1515
| **GitVersion.Tool** | [![NuGet][gvgt-badge]][gvgt] |
1616
| **GitVersion.CommandLine** | [![NuGet][gvcl-badge]][gvcl] |
17-
| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt] | Known as [GitVersionTask] before v5.6.0 |
17+
| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt] | Known as [GitVersionTask][gitversiontask] before v5.6.0 |
1818
| **Homebrew** | [![homebrew][brew-badge]][brew] |
1919
| **Azure Pipeline Task** | [![Azure Pipeline Task][az-pipeline-task-badge]][az-pipeline-task] |
2020
| **Github Action** | [![Github Action][gh-actions-badge]][gh-actions] |

‎SECURITY.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ You should receive a response within 24 hours. If for some reason you do not, pl
1717

1818
Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
1919

20-
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
21-
* Full paths of source file(s) related to the manifestation of the issue
22-
* The location of the affected source code (tag/branch/commit or direct URL)
23-
* Any special configuration required to reproduce the issue
24-
* Step-by-step instructions to reproduce the issue
25-
* Proof-of-concept or exploit code (if possible)
26-
* Impact of the issue, including how an attacker might exploit the issue
20+
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
21+
* Full paths of source file(s) related to the manifestation of the issue
22+
* The location of the affected source code (tag/branch/commit or direct URL)
23+
* Any special configuration required to reproduce the issue
24+
* Step-by-step instructions to reproduce the issue
25+
* Proof-of-concept or exploit code (if possible)
26+
* Impact of the issue, including how an attacker might exploit the issue
2727

2828
This information will help us triage your report more quickly.
2929

‎build/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<Using Include="Common.Utilities.Constants" Alias="Constants"/>
3939
</ItemGroup>
4040
<ItemGroup>
41-
<PackageReference Include="Cake.Common" />
4241
<PackageReference Include="Cake.Compression" />
4342
<PackageReference Include="Cake.Frosting" />
4443
<PackageReference Include="Cake.Incubator" />

‎build/Directory.Packages.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="Cake.Common" Version="2.3.0" />
76
<PackageVersion Include="Cake.Compression" Version="0.3.0" />
87
<PackageVersion Include="Cake.Codecov" Version="1.0.1" />
98
<PackageVersion Include="Cake.Coverlet" Version="2.5.4" />
10-
<PackageVersion Include="Cake.Frosting" Version="2.3.0" />
9+
<PackageVersion Include="Cake.Frosting" Version="3.0.0" />
1110
<PackageVersion Include="Cake.Incubator" Version="7.0.0" />
1211
<PackageVersion Include="Cake.DotNetLocalTools.Module" Version="1.0.2" />
1312
<PackageVersion Include="Cake.Docker" Version="1.1.2" />

‎build/artifacts/BuildLifetime.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ namespace Artifacts;
44

55
public class BuildLifetime : BuildLifetimeBase<BuildContext>
66
{
7-
public override void Setup(BuildContext context)
7+
public override void Setup(BuildContext context, ISetupContext info)
88
{
9-
base.Setup(context);
9+
base.Setup(context, info);
1010

1111
context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", string.Empty) == "linux";
1212

‎build/build/BuildLifetime.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ namespace Build;
55

66
public class BuildLifetime : BuildLifetimeBase<BuildContext>
77
{
8-
public override void Setup(BuildContext context)
8+
public override void Setup(BuildContext context, ISetupContext info)
99
{
10-
base.Setup(context);
10+
base.Setup(context, info);
1111

1212
context.MsBuildConfiguration = context.Argument(Arguments.Configuration, "Release");
1313
context.EnabledUnitTests = context.IsEnabled(EnvVars.EnabledUnitTests);

‎build/build/Tasks/Test/UnitTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Cake.Coverlet;
44
using Cake.Incubator.LoggingExtensions;
55
using Common.Utilities;
6+
using CoverletSettings = Common.Addins.Cake.Coverlet.CoverletSettings;
67

78
namespace Build.Tasks;
89

‎build/chores/BuildLifetime.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace Chores;
44

55
public class BuildLifetime : FrostingLifetime<BuildContext>
66
{
7-
public override void Setup(BuildContext context)
7+
public override void Setup(BuildContext context, ISetupContext info)
88
{
99
context.StartGroup("Build Setup");
1010
context.EndGroup();

‎build/common/Addins/Cake.Coverlet/ArgumentsProcessor.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ namespace Common.Addins.Cake.Coverlet;
44

55
internal static class ArgumentsProcessor
66
{
7-
public static ProcessArgumentBuilder ProcessMSBuildArguments(
7+
public static ProcessArgumentBuilder ProcessMsBuildArguments(
88
CoverletSettings settings,
99
ICakeEnvironment cakeEnvironment,
1010
ProcessArgumentBuilder builder,
1111
FilePath project)
1212
{
13-
builder.AppendMSBuildProperty(nameof(CoverletSettings.CollectCoverage), settings.CollectCoverage.ToString());
13+
builder.AppendMsBuildProperty(nameof(CoverletSettings.CollectCoverage), settings.CollectCoverage.ToString());
1414
builder.AppendPropertyList(nameof(CoverletSettings.CoverletOutputFormat), SplitFlagEnum(settings.CoverletOutputFormat));
1515

1616
if (settings.Threshold.HasValue)
@@ -20,7 +20,7 @@ public static ProcessArgumentBuilder ProcessMSBuildArguments(
2020
throw new Exception("Threshold Percentage cannot be set as greater than 100%");
2121
}
2222

23-
builder.AppendMSBuildProperty(nameof(CoverletSettings.Threshold), settings.Threshold.ToString()!);
23+
builder.AppendMsBuildProperty(nameof(CoverletSettings.Threshold), settings.Threshold.ToString()!);
2424

2525
if (settings.ThresholdType != ThresholdType.NotSet)
2626
{
@@ -33,7 +33,7 @@ public static ProcessArgumentBuilder ProcessMSBuildArguments(
3333
var directoryPath = settings.CoverletOutputDirectory
3434
.MakeAbsolute(cakeEnvironment).FullPath;
3535

36-
builder.AppendMSBuildPropertyQuoted("CoverletOutput", directoryPath);
36+
builder.AppendMsBuildPropertyQuoted("CoverletOutput", directoryPath);
3737
}
3838
else if (!string.IsNullOrEmpty(settings.CoverletOutputName))
3939
{
@@ -42,7 +42,7 @@ public static ProcessArgumentBuilder ProcessMSBuildArguments(
4242

4343
var filepath = FilePath.FromString(settings.OutputTransformer(settings.CoverletOutputName, directoryPath));
4444

45-
builder.AppendMSBuildPropertyQuoted("CoverletOutput", filepath.MakeAbsolute(cakeEnvironment).FullPath);
45+
builder.AppendMsBuildPropertyQuoted("CoverletOutput", filepath.MakeAbsolute(cakeEnvironment).FullPath);
4646
}
4747

4848
if (settings.ExcludeByFile.Count > 0)
@@ -69,12 +69,12 @@ public static ProcessArgumentBuilder ProcessMSBuildArguments(
6969

7070
if (settings.MergeWithFile != null && settings.MergeWithFile.GetExtension() == ".json")
7171
{
72-
builder.AppendMSBuildPropertyQuoted("MergeWith", settings.MergeWithFile.MakeAbsolute(cakeEnvironment).FullPath);
72+
builder.AppendMsBuildPropertyQuoted("MergeWith", settings.MergeWithFile.MakeAbsolute(cakeEnvironment).FullPath);
7373
}
7474

7575
if (settings.IncludeTestAssembly.HasValue)
7676
{
77-
builder.AppendMSBuildProperty(nameof(CoverletSettings.IncludeTestAssembly), settings.IncludeTestAssembly.Value ? bool.TrueString : bool.FalseString);
77+
builder.AppendMsBuildProperty(nameof(CoverletSettings.IncludeTestAssembly), settings.IncludeTestAssembly.Value ? bool.TrueString : bool.FalseString);
7878
}
7979

8080
return builder;

‎build/common/Addins/Cake.Coverlet/BuilderExtension.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ namespace Common.Addins.Cake.Coverlet;
22

33
internal static class BuilderExtension
44
{
5-
internal static ProcessArgumentBuilder AppendMSBuildProperty(this ProcessArgumentBuilder builder, string propertyName, string value)
5+
internal static ProcessArgumentBuilder AppendMsBuildProperty(this ProcessArgumentBuilder builder, string propertyName, string value)
66
{
77
builder.AppendSwitch($"/property:{propertyName}", "=", value);
88
return builder;
99
}
1010

11-
internal static ProcessArgumentBuilder AppendMSBuildPropertyQuoted(this ProcessArgumentBuilder builder, string propertyName, string value)
11+
internal static ProcessArgumentBuilder AppendMsBuildPropertyQuoted(this ProcessArgumentBuilder builder, string propertyName, string value)
1212
{
1313
builder.AppendSwitchQuoted($"/property:{propertyName}", "=", value);
1414
return builder;

0 commit comments

Comments
 (0)