Skip to content

Commit eb34f31

Browse files
authored
Merge branch 'main' into feature/paths-filter
2 parents 99ff8b4 + bc53a41 commit eb34f31

File tree

20 files changed

+85
-45
lines changed

20 files changed

+85
-45
lines changed

.github/workflows/_artifacts_linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
dotnet_versions:
1414
required: true
1515
type: string
16+
1617
env:
1718
DOTNET_INSTALL_DIR: "./.dotnet"
1819
DOTNET_ROLL_FORWARD: "Major"

.github/workflows/_docker.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
dotnet_versions:
1414
required: true
1515
type: string
16+
1617
env:
1718
DOTNET_INSTALL_DIR: "./.dotnet"
1819
DOTNET_ROLL_FORWARD: "Major"

.github/workflows/_docker_manifests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
dotnet_versions:
88
required: true
99
type: string
10+
1011
env:
1112
DOTNET_INSTALL_DIR: "./.dotnet"
1213
DOTNET_ROLL_FORWARD: "Major"

.github/workflows/_prepare.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ on:
77
dotnet_versions:
88
description: 'List of .NET versions'
99
value: ${{ jobs.set_matrix.outputs.dotnet_versions }}
10+
11+
env:
12+
DOTNET_INSTALL_DIR: "./.dotnet"
13+
DOTNET_ROLL_FORWARD: "Major"
14+
1015
jobs:
1116
prepare:
1217
name: ${{ matrix.os }}

build/build/Tasks/Package/PackageNuget.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ private static void PackageWithCli(BuildContext context)
2525
// GitVersion.MsBuild, global tool & core
2626
context.DotNetPack("./src/GitVersion.Core", settings);
2727

28-
settings.ArgumentCustomization = arg => arg.Append("/p:PackAsTool=true");
28+
settings.ArgumentCustomization = arg => arg.Append("-p:PackAsTool=true").Append("-p:BuildInParallel=false");
2929
context.DotNetPack("./src/GitVersion.App", settings);
3030

31-
settings.ArgumentCustomization = arg => arg.Append("/p:IsPackaging=true");
31+
settings.ArgumentCustomization = arg => arg.Append("-p:IsPackaging=true");
3232
context.DotNetPack("./src/GitVersion.MsBuild", settings);
3333
}
3434
}

docs/input/docs/usage/cli/arguments.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ GitVersion [path]
4141
E.g. /output json /format {SemVer} - will output `1.2.3+beta.4`
4242
/output json /format {Major}.{Minor} - will output `1.2`
4343
/l Path to logfile.
44-
/config Path to config file (defaults to GitVersion.yml or GitVersion.yaml)
44+
/config Path to config file (defaults to GitVersion.yml, GitVersion.yaml, .GitVersion.yml or .GitVersion.yaml)
4545
/showconfig Outputs the effective GitVersion config (defaults + custom
46-
from GitVersion.yml or GitVersion.yaml) in yaml format
46+
from GitVersion.yml, GitVersion.yaml, .GitVersion.yml or .GitVersion.yaml) in yaml format
4747
/overrideconfig Overrides GitVersion config values inline (semicolon-
4848
separated key value pairs e.g. /overrideconfig
4949
tag-prefix=Foo)
@@ -97,7 +97,7 @@ GitVersion [path]
9797
9898
## Override config
9999
100-
`/overrideconfig [key=value]` will override appropriate `key` from 'GitVersion.yml' or 'GitVersion.yaml'.
100+
`/overrideconfig [key=value]` will override appropriate `key` from 'GitVersion.yml', 'GitVersion.yaml', '.GitVersion.yml' or '.GitVersion.yaml'.
101101
102102
To specify multiple options add multiple `/overrideconfig [key=value]` entries:
103103
`/overrideconfig key1=value1 /overrideconfig key2=value2`.
@@ -129,7 +129,7 @@ Following options are supported:
129129
130130
Read more about [Configuration](/docs/reference/configuration).
131131
132-
Using `override-config` on the command line will not change the contents of the config file `GitVersion.yml` or `GitVersion.yaml`.
132+
Using `override-config` on the command line will not change the contents of the config file `GitVersion.yml`, `GitVersion.yaml`, `.GitVersion.yml` or `.GitVersion.yaml`.
133133
134134
### Example: How to override configuration option 'tag-prefix' to use prefix 'custom'
135135

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"src"
66
],
77
"sdk": {
8-
"version": "9.0.102"
8+
"version": "9.0.200"
99
}
1010
}

new-cli/Directory.Packages.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
<!-- common packages -->
77
<PackageVersion Include="LibGit2Sharp" Version="0.30.0" />
88
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
9-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
9+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
1010
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
1111
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
1212
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
13-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
13+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" />
1414
<PackageVersion Include="Polly" Version="8.5.2" />
15-
<PackageVersion Include="Roslynator.Analyzers" Version="4.13.0" />
16-
<PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.13.0" />
15+
<PackageVersion Include="Roslynator.Analyzers" Version="4.13.1" />
16+
<PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.13.1" />
1717
<!-- specific packages -->
1818
<PackageVersion Include="Scriban" Version="5.12.0" />
1919
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
2020
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
2121
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
2222
<PackageVersion Include="Serilog.Sinks.Map" Version="2.0.0" />
2323
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.25072.1" />
24-
<PackageVersion Include="System.Text.Json" Version="9.0.1" />
24+
<PackageVersion Include="System.Text.Json" Version="9.0.2" />
2525
</ItemGroup>
2626
</Project>

new-cli/GitVersion.Common.Command/ICommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ namespace GitVersion;
22

33
public interface ICommand<in T>
44
{
5-
public Task<int> InvokeAsync(T settings, CancellationToken cancellationToken = default);
5+
Task<int> InvokeAsync(T settings, CancellationToken cancellationToken = default);
66
}
77

88
public interface ICommandImpl

src/Directory.Packages.props

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,39 @@
66
<!-- common packages -->
77
<PackageVersion Include="LibGit2Sharp" Version="0.30.0" />
88
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
9-
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" />
10-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
11-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.12.0" />
9+
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.13.0" />
10+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
11+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.13.0" />
1212
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
1313
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
14-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
15-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
14+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
15+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" />
1616
<PackageVersion Include="Microsoft.IO.Redist" Version="6.1.0" />
1717
<PackageVersion Include="Polly" Version="8.5.2" />
18-
<PackageVersion Include="Roslynator.Analyzers" Version="4.13.0" />
19-
<PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.13.0" />
18+
<PackageVersion Include="Roslynator.Analyzers" Version="4.13.1" />
19+
<PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.13.1" />
2020
<!-- specific packages -->
2121
<PackageVersion Include="Buildalyzer" Version="7.1.0" />
2222
<PackageVersion Include="JsonSchema.Net.Generation" Version="5.0.0" />
23-
<PackageVersion Include="JunitXml.TestLogger" Version="5.0.0" />
23+
<PackageVersion Include="JunitXml.TestLogger" Version="6.0.0" />
2424
<PackageVersion Include="MSBuild.ProjectCreation" Version="14.0.0" />
25-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.1" />
25+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.2" />
2626
<PackageVersion Include="Microsoft.Build" Version="17.12.6" />
27-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
28-
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.1" />
29-
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.1" />
30-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
31-
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.1" />
32-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
27+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.13.9" />
28+
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.2" />
29+
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.2" />
30+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
31+
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.2" />
32+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
3333
<PackageVersion Include="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5" />
3434
<PackageVersion Include="NSubstitute" Version="5.3.0" />
3535
<PackageVersion Include="NUnit" Version="4.3.2" />
3636
<PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
37-
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
37+
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
3838
<PackageVersion Include="Shouldly" Version="4.3.0" />
39-
<PackageVersion Include="System.Drawing.Common" Version="9.0.1" />
40-
<PackageVersion Include="System.Security.Cryptography.Xml" Version="9.0.1" />
41-
<PackageVersion Include="System.Text.Json" Version="9.0.1" />
39+
<PackageVersion Include="System.Drawing.Common" Version="9.0.2" />
40+
<PackageVersion Include="System.Security.Cryptography.Xml" Version="9.0.2" />
41+
<PackageVersion Include="System.Text.Json" Version="9.0.2" />
4242
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
4343
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
4444
</ItemGroup>

0 commit comments

Comments
 (0)