Skip to content

Commit f88284c

Browse files
arturcicarturcic
committed
Merge remote-tracking branch 'origin/support/5.x' into main
2 parents 49c01ae + 0501616 commit f88284c

18 files changed

+1669
-9
lines changed

‎.github/workflows/ci.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ env:
3030

3131
ENABLED_DIAGNOSTICS: ${{ secrets.ENABLED_DIAGNOSTICS }}
3232

33+
permissions:
34+
contents: read
35+
3336
jobs:
3437
prepare:
3538
name: Prepare Build
@@ -251,10 +254,10 @@ jobs:
251254
path: ${{ github.workspace }}/artifacts/packages/native
252255
-
253256
name: Setup QEMU
254-
uses: docker/setup-qemu-action@v1
257+
uses: docker/setup-qemu-action@v2
255258
-
256259
name: Set up Docker Buildx
257-
uses: docker/setup-buildx-action@v1
260+
uses: docker/setup-buildx-action@v2
258261
with:
259262
install: true
260263
-
@@ -309,10 +312,10 @@ jobs:
309312
path: ${{ github.workspace }}/artifacts/packages/nuget
310313
-
311314
name: Setup QEMU
312-
uses: docker/setup-qemu-action@v1
315+
uses: docker/setup-qemu-action@v2
313316
-
314317
name: Set up Docker Buildx
315-
uses: docker/setup-buildx-action@v1
318+
uses: docker/setup-buildx-action@v2
316319
with:
317320
install: true
318321
-
@@ -323,7 +326,7 @@ jobs:
323326
-
324327
name: Login to DockerHub
325328
if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools'
326-
uses: docker/login-action@v1
329+
uses: docker/login-action@v2
327330
with:
328331
username: ${{ secrets.DOCKER_USERNAME }}
329332
password: ${{ secrets.DOCKER_PASSWORD }}
@@ -346,7 +349,7 @@ jobs:
346349
-
347350
name: Login to GitHub Container Registry
348351
if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools'
349-
uses: docker/login-action@v1
352+
uses: docker/login-action@v2
350353
with:
351354
registry: ghcr.io
352355
username: ${{ github.repository_owner }}

‎.github/workflows/codeql-analysis.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,15 @@ on:
2020
schedule:
2121
- cron: '0 12 * * *'
2222

23+
permissions:
24+
contents: read
25+
2326
jobs:
2427
analyze:
28+
permissions:
29+
actions: read # for github/codeql-action/init to get workflow details
30+
contents: read # for actions/checkout to fetch code
31+
security-events: write # for github/codeql-action/analyze to upload SARIF results
2532
name: Analyze
2633
runs-on: ubuntu-latest
2734

@@ -38,7 +45,7 @@ jobs:
3845
fetch-depth: 0
3946

4047
- name: Initialize CodeQL
41-
uses: github/codeql-action/init@v1
48+
uses: github/codeql-action/init@v2
4249
with:
4350
languages: ${{ matrix.language }}
4451

@@ -70,4 +77,4 @@ jobs:
7077
run: dotnet run/build.dll --target=Build
7178

7279
- name: Perform CodeQL Analysis
73-
uses: github/codeql-action/analyze@v1
80+
uses: github/codeql-action/analyze@v2

‎.github/workflows/format.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ on:
1919
- '**'
2020
- '!docs/**'
2121

22+
permissions:
23+
contents: read
24+
2225
jobs:
2326
format:
2427
runs-on: ubuntu-latest

‎.github/workflows/homebrew.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@ on:
44
workflow_dispatch:
55
repository_dispatch:
66
types: [release]
7+
permissions:
8+
contents: read
9+
710
jobs:
811
homebrew:
12+
permissions:
13+
contents: none
914
name: Bump Homebrew formula
1015
runs-on: macos-latest
1116
steps:

‎src/Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<PackageVersion_NUnit3TestAdapter>4.2.1</PackageVersion_NUnit3TestAdapter>
4747
<PackageVersion_NunitXmlTestLogger>3.0.117</PackageVersion_NunitXmlTestLogger>
4848
<PackageVersion_Shouldly>4.0.3</PackageVersion_Shouldly>
49+
<PackageVersion_MicrosoftPublicApiAnalyzers>3.3.3</PackageVersion_MicrosoftPublicApiAnalyzers>
4950
</PropertyGroup>
5051

5152
<ItemGroup Condition=" '$(IsTestProject)' == 'true' ">

‎src/GitVersion.App/GitVersion.App.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25+
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(PackageVersion_MicrosoftPublicApiAnalyzers)">
26+
<PrivateAssets>all</PrivateAssets>
27+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28+
</PackageReference>
2529
<PackageReference Include="System.Text.Json" Version="$(PackageVersion_MicrosoftJson)" />
2630
<PackageReference Include="System.Text.Encodings.Web" Version="$(PackageVersion_MicrosoftJson)" />
2731
<PackageReference Include="Microsoft.Extensions.Hosting" Version="$(PackageVersion_MicrosoftExtensions)" />

‎src/GitVersion.App/PublicAPI.Shipped.txt

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
#nullable enable
2+
GitVersion.ArgumentParser
3+
GitVersion.ArgumentParser.ArgumentParser(GitVersion.IEnvironment! environment, GitVersion.BuildAgents.ICurrentBuildAgent! buildAgent, GitVersion.Logging.IConsole! console, GitVersion.IGlobbingResolver! globbingResolver) -> void
4+
GitVersion.ArgumentParser.ParseArguments(string! commandLineArguments) -> GitVersion.Arguments!
5+
GitVersion.ArgumentParser.ParseArguments(string![]! commandLineArguments) -> GitVersion.Arguments!
6+
GitVersion.Arguments
7+
GitVersion.Arguments.Arguments() -> void
8+
GitVersion.Arguments.Authentication -> GitVersion.AuthenticationInfo!
9+
GitVersion.Arguments.ClonePath -> string?
10+
GitVersion.Arguments.CommitId -> string?
11+
GitVersion.Arguments.ConfigFile -> string?
12+
GitVersion.Arguments.Diag -> bool
13+
GitVersion.Arguments.EnsureAssemblyInfo -> bool
14+
GitVersion.Arguments.Init -> bool
15+
GitVersion.Arguments.IsHelp -> bool
16+
GitVersion.Arguments.IsVersion -> bool
17+
GitVersion.Arguments.LogFilePath -> string?
18+
GitVersion.Arguments.NoCache -> bool
19+
GitVersion.Arguments.NoFetch -> bool
20+
GitVersion.Arguments.NoNormalize -> bool
21+
GitVersion.Arguments.Output -> System.Collections.Generic.ISet<GitVersion.Model.OutputType>!
22+
GitVersion.Arguments.OutputFile -> string?
23+
GitVersion.Arguments.OverrideConfig -> GitVersion.Model.Configuration.Config?
24+
GitVersion.Arguments.ShowConfig -> bool
25+
GitVersion.Arguments.ShowVariable -> string?
26+
GitVersion.Arguments.TargetBranch -> string?
27+
GitVersion.Arguments.TargetPath -> string?
28+
GitVersion.Arguments.TargetUrl -> string?
29+
GitVersion.Arguments.ToOptions() -> GitVersion.GitVersionOptions!
30+
GitVersion.Arguments.UpdateAssemblyInfo -> bool
31+
GitVersion.Arguments.UpdateAssemblyInfoFileName -> System.Collections.Generic.ISet<string!>!
32+
GitVersion.Arguments.UpdateProjectFiles -> bool
33+
GitVersion.Arguments.UpdateWixVersionFile -> bool
34+
GitVersion.Arguments.Verbosity -> GitVersion.Logging.Verbosity
35+
GitVersion.GitVersionAppModule
36+
GitVersion.GitVersionAppModule.GitVersionAppModule() -> void
37+
GitVersion.GitVersionAppModule.RegisterTypes(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void
38+
GitVersion.GitVersionExecutor
39+
GitVersion.GitVersionExecutor.Execute(GitVersion.GitVersionOptions! gitVersionOptions) -> int
40+
GitVersion.GitVersionExecutor.GitVersionExecutor(GitVersion.Logging.ILog! log, GitVersion.Logging.IConsole! console, GitVersion.Configuration.IConfigFileLocator! configFileLocator, GitVersion.Configuration.IConfigProvider! configProvider, GitVersion.IGitVersionCalculateTool! gitVersionCalculateTool, GitVersion.IGitVersionOutputTool! gitVersionOutputTool, GitVersion.IVersionWriter! versionWriter, GitVersion.IHelpWriter! helpWriter, GitVersion.IGitRepositoryInfo! repositoryInfo) -> void
41+
GitVersion.GlobbingResolver
42+
GitVersion.GlobbingResolver.GlobbingResolver() -> void
43+
GitVersion.GlobbingResolver.Resolve(string! workingDirectory, string! pattern) -> System.Collections.Generic.IEnumerable<string!>!
44+
GitVersion.HelpWriter
45+
GitVersion.HelpWriter.HelpWriter(GitVersion.IVersionWriter! versionWriter, GitVersion.Logging.IConsole! console) -> void
46+
GitVersion.HelpWriter.Write() -> void
47+
GitVersion.HelpWriter.WriteTo(System.Action<string!>! writeAction) -> void
48+
GitVersion.IArgumentParser
49+
GitVersion.IArgumentParser.ParseArguments(string! commandLineArguments) -> GitVersion.Arguments!
50+
GitVersion.IArgumentParser.ParseArguments(string![]! commandLineArguments) -> GitVersion.Arguments!
51+
GitVersion.IGitVersionExecutor
52+
GitVersion.IGitVersionExecutor.Execute(GitVersion.GitVersionOptions! gitVersionOptions) -> int
53+
GitVersion.IGlobbingResolver
54+
GitVersion.IGlobbingResolver.Resolve(string! workingDirectory, string! pattern) -> System.Collections.Generic.IEnumerable<string!>!
55+
GitVersion.IHelpWriter
56+
GitVersion.IHelpWriter.Write() -> void
57+
GitVersion.IHelpWriter.WriteTo(System.Action<string!>! writeAction) -> void
58+
GitVersion.IVersionWriter
59+
GitVersion.IVersionWriter.Write(System.Reflection.Assembly! assembly) -> void
60+
GitVersion.IVersionWriter.WriteTo(System.Reflection.Assembly! assembly, System.Action<string?>! writeAction) -> void
61+
GitVersion.QuotedStringHelpers
62+
GitVersion.VersionWriter
63+
GitVersion.VersionWriter.VersionWriter(GitVersion.Logging.IConsole! console) -> void
64+
GitVersion.VersionWriter.Write(System.Reflection.Assembly! assembly) -> void
65+
GitVersion.VersionWriter.WriteTo(System.Reflection.Assembly! assembly, System.Action<string?>! writeAction) -> void
66+
static GitVersion.QuotedStringHelpers.SplitUnquoted(string? input, char splitChar) -> string![]!
67+
static GitVersion.QuotedStringHelpers.UnquoteText(string! input) -> string!
68+
virtual GitVersion.GlobbingResolver.GetDirectoryInfoWrapper(string! workingDirectory) -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase!

‎src/GitVersion.App/PublicAPI.Unshipped.txt

Whitespace-only changes.

‎src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="FluentDateTime" Version="2.0.0" />
14+
<PackageReference Include="FluentDateTime" Version="2.1.0" />
1515
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2Sharp_NativeBinaries)" />
1616
<PackageReference Include="Microsoft.Extensions.Options" Version="$(PackageVersion_MicrosoftExtensions)" />
1717
<PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />

‎src/GitVersion.Core/GitVersion.Core.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" PrivateAssets="All" />
2020
<PackageReference Include="System.Text.Json" Version="$(PackageVersion_MicrosoftJson)" />
2121
<PackageReference Include="System.Text.Encodings.Web" Version="$(PackageVersion_MicrosoftJson)" />
22+
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(PackageVersion_MicrosoftPublicApiAnalyzers)">
23+
<PrivateAssets>all</PrivateAssets>
24+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25+
</PackageReference>
2226
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(PackageVersion_MicrosoftExtensions)" />
2327
<PackageReference Include="Microsoft.Extensions.Options" Version="$(PackageVersion_MicrosoftExtensions)" />
2428
<PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />

0 commit comments

Comments
 (0)