Skip to content

Commit 85e4d86

Browse files
Roei-LeviRoei-Levi
authored
Merge branch 'main' into feature/paths-filter
2 parents 8f3fde6 + 2855256 commit 85e4d86

File tree

9 files changed

+53
-35
lines changed

9 files changed

+53
-35
lines changed

‎.github/dependabot.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ updates:
77
prefix: "(sdk)"
88
directory: "/"
99
schedule:
10-
interval: daily
10+
interval: cron
11+
cronjob: "0 12 * * *"
1112
- package-ecosystem: nuget
1213
labels:
1314
- "dependencies"
@@ -18,6 +19,9 @@ updates:
1819
patterns:
1920
- "Microsoft.*"
2021
- "System.*"
22+
Microsoft_CodeAnalysis:
23+
patterns:
24+
- "Microsoft.CodeAnalysis.*"
2125
analyzers:
2226
patterns:
2327
- "*Analyzers"
@@ -38,7 +42,8 @@ updates:
3842
- "/new-cli"
3943
- "/src"
4044
schedule:
41-
interval: daily
45+
interval: cron
46+
cronjob: "0 12 * * *"
4247
open-pull-requests-limit: 10
4348

4449
- package-ecosystem: github-actions
@@ -52,7 +57,8 @@ updates:
5257
- "actions/*"
5358
directory: "/"
5459
schedule:
55-
interval: daily
60+
interval: cron
61+
cronjob: "0 12 * * *"
5662

5763
- package-ecosystem: npm
5864
labels:
@@ -65,4 +71,5 @@ updates:
6571
- "remark*"
6672
directory: "/"
6773
schedule:
68-
interval: monthly
74+
interval: cron
75+
cronjob: "0 12 1,15 * *"

‎build/Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageVersion Include="Cake.Coverlet" Version="4.0.1" />
99
<PackageVersion Include="Cake.Frosting" Version="5.0.0" />
1010
<PackageVersion Include="Cake.Frosting.Git" Version="5.0.1" />
11-
<PackageVersion Include="Cake.Http" Version="4.0.0" />
11+
<PackageVersion Include="Cake.Http" Version="5.0.0" />
1212
<PackageVersion Include="Cake.Incubator" Version="8.0.0" />
1313
<PackageVersion Include="Cake.DotNetLocalTools.Module" Version="3.0.12" />
1414
<PackageVersion Include="Cake.Docker" Version="1.3.0" />

‎build/docker/Tasks/DockerHubReadmePublish.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public override async Task RunAsync(BuildContext context)
4646
var token = context.ParseJson(response).Value<string>("token");
4747
settings
4848
.SetContentType("application/json")
49-
.SetAuthorization("JWT", token)
49+
.SetAuthorization("JWT", token!)
5050
.SetJsonRequestBody(new { full_description = readme });
5151
});
5252
context.Information("README.md updated on DockerHub");

‎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.203"
8+
"version": "9.0.300"
99
}
1010
}

‎new-cli/Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
2121
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
2222
<PackageVersion Include="Serilog.Sinks.Map" Version="2.0.0" />
23-
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta5.25257.101" />
23+
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta5.25263.102" />
2424
<PackageVersion Include="System.IO.Abstractions" Version="22.0.14" />
2525
<PackageVersion Include="System.Text.Json" Version="9.0.4" />
2626
</ItemGroup>

‎package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Directory.Packages.props

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.13.0" />
1313
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
1414
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
15-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
16-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
15+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
16+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
1717
<PackageVersion Include="Microsoft.IO.Redist" Version="6.1.0" />
1818
<PackageVersion Include="Polly" Version="8.5.2" />
1919
<PackageVersion Include="Roslynator.Analyzers" Version="4.13.1" />
@@ -23,13 +23,13 @@
2323
<PackageVersion Include="JsonSchema.Net.Generation" Version="5.0.2" />
2424
<PackageVersion Include="JunitXml.TestLogger" Version="6.1.0" />
2525
<PackageVersion Include="MSBuild.ProjectCreation" Version="14.0.0" />
26-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.4" />
26+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.5" />
2727
<PackageVersion Include="Microsoft.Build" Version="17.12.6" />
28-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.13.9" />
29-
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.4" />
30-
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.4" />
31-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
32-
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.4" />
28+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.14.8" />
29+
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.5" />
30+
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.5" />
31+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
32+
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.5" />
3333
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
3434
<PackageVersion Include="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5" />
3535
<PackageVersion Include="NSubstitute" Version="5.3.0" />
@@ -38,11 +38,11 @@
3838
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
3939
<PackageVersion Include="Shouldly" Version="4.3.0" />
4040
<PackageVersion Include="System.Collections.Immutable" Version="9.0.2" />
41-
<PackageVersion Include="System.Drawing.Common" Version="9.0.4" />
41+
<PackageVersion Include="System.Drawing.Common" Version="9.0.5" />
4242
<PackageVersion Include="System.IO.Abstractions" Version="22.0.14" />
4343
<PackageVersion Include="System.Reflection.Metadata" Version="9.0.2" />
44-
<PackageVersion Include="System.Security.Cryptography.Xml" Version="9.0.4" />
45-
<PackageVersion Include="System.Text.Json" Version="9.0.4" />
44+
<PackageVersion Include="System.Security.Cryptography.Xml" Version="9.0.5" />
45+
<PackageVersion Include="System.Text.Json" Version="9.0.5" />
4646
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
4747
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
4848
</ItemGroup>

‎src/GitVersion.App.Tests/HelpWriterTests.cs

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,33 @@ public void AllArgsAreInHelp()
1919
{
2020
var lookup = new Dictionary<string, string>
2121
{
22+
{ nameof(Arguments.IsHelp), "/?" },
23+
{ nameof(Arguments.IsVersion), "/version" },
24+
2225
{ nameof(Arguments.TargetUrl), "/url" },
2326
{ nameof(Arguments.TargetBranch), "/b" },
27+
{ nameof(Arguments.ClonePath), "/dynamicRepoLocation" },
28+
{ nameof(Arguments.CommitId), "/c" },
29+
2430
{ nameof(Arguments.LogFilePath) , "/l" },
31+
{ nameof(Arguments.Verbosity), "/verbosity" },
32+
{ nameof(Arguments.Output) , "/output" },
2533
{ nameof(Arguments.OutputFile) , "/outputfile" },
26-
{ nameof(Arguments.ClonePath), "/dynamicRepoLocation" },
27-
{ nameof(Arguments.IsHelp), "/?" },
28-
{ nameof(Arguments.IsVersion), "/version" },
34+
{ nameof(Arguments.ShowVariable), "/showvariable" },
35+
{ nameof(Arguments.Format), "/format" },
36+
2937
{ nameof(Arguments.UpdateWixVersionFile), "/updatewixversionfile" },
38+
{ nameof(Arguments.UpdateProjectFiles), "/updateprojectfiles" },
39+
{ nameof(Arguments.UpdateAssemblyInfo), "/updateassemblyinfo" },
40+
{ nameof(Arguments.EnsureAssemblyInfo), "/ensureassemblyinfo" },
41+
3042
{ nameof(Arguments.ConfigurationFile), "/config" },
31-
{ nameof(Arguments.Verbosity), "/verbosity" },
32-
{ nameof(Arguments.CommitId), "/c" },
3343
{ nameof(Arguments.ShowConfiguration), "/showconfig" },
3444
{ nameof(Arguments.OverrideConfiguration), "/overrideconfig" },
35-
{ nameof(Arguments.ShowVariable), "/showvariable" },
36-
{ nameof(Arguments.Format), "/format" }
45+
46+
{ nameof(Arguments.NoCache), "/nocache" },
47+
{ nameof(Arguments.NoFetch), "/nofetch" },
48+
{ nameof(Arguments.NoNormalize), "/nonormalize" },
3749
};
3850
var helpText = string.Empty;
3951

@@ -42,7 +54,7 @@ public void AllArgsAreInHelp()
4254
var ignored = new[]
4355
{
4456
nameof(Arguments.Authentication),
45-
nameof(Arguments.UpdateAssemblyInfoFileName)
57+
nameof(Arguments.UpdateAssemblyInfoFileName),
4658
};
4759
typeof(Arguments).GetFields()
4860
.Select(p => p.Name)

‎src/GitVersion.App/Arguments.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ internal class Arguments
1313

1414
public string? TargetPath;
1515

16-
public bool UpdateWixVersionFile;
17-
1816
public string? TargetUrl;
1917
public string? TargetBranch;
2018
public string? CommitId;
@@ -35,6 +33,7 @@ internal class Arguments
3533
public ISet<OutputType> Output = new HashSet<OutputType>();
3634
public Verbosity Verbosity = Verbosity.Normal;
3735

36+
public bool UpdateWixVersionFile;
3837
public bool UpdateProjectFiles;
3938
public bool UpdateAssemblyInfo;
4039
public bool EnsureAssemblyInfo;

0 commit comments

Comments
 (0)