Skip to content

Commit 535f99b

Browse files
ThomasPiskolThomasPiskol
committed
merge support/5.x
2 parents d4aa1db + 25866da commit 535f99b

File tree

212 files changed

+1472
-1288
lines changed

Some content is hidden

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

212 files changed

+1472
-1288
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ on:
66
- main
77
- 'fix/*'
88
- 'feature/*'
9-
- 'release/*'
9+
- 'support/*'
1010
paths:
1111
- '**'
1212
- '!docs/**'
1313

1414
pull_request:
1515
branches:
1616
- main
17-
- 'release/*'
17+
- 'support/*'
1818
paths:
1919
- '**'
2020
- '!docs/**'

‎.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ on:
44
push:
55
branches:
66
- main
7-
- 'release/*'
7+
- 'support/*'
88
paths:
99
- '**'
1010
- '!docs/**'
1111

1212
pull_request:
1313
branches:
1414
- main
15-
- 'release/*'
15+
- 'support/*'
1616
paths:
1717
- '**'
1818
- '!docs/**'

‎.github/workflows/docs.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Verify & Publish Docs
33
on:
44
workflow_dispatch:
55
push:
6+
branches:
7+
# - main
8+
- 'support/*'
69
paths:
710
- docs/**
811
- package*.json
@@ -11,6 +14,9 @@ on:
1114
- mkdocs.yml
1215
- .github/workflows/docs.yml
1316
pull_request:
17+
branches:
18+
# - main
19+
- 'support/*'
1420
paths:
1521
- docs/**
1622
- package*.json

‎.github/workflows/format.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ on:
66
- main
77
- 'fix/*'
88
- 'feature/*'
9-
- 'release/*'
9+
- 'support/*'
1010
paths:
1111
- '**'
1212
- '!docs/**'
1313

1414
pull_request:
1515
branches:
1616
- main
17-
- 'release/*'
17+
- 'support/*'
1818
paths:
1919
- '**'
2020
- '!docs/**'

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
## files generated by popular Visual Studio add-ons.
77

88
# User-specific files
9+
.vs
910
*.suo
1011
*.user
1112
*.userprefs

‎GitVersion.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ assembly-versioning-scheme: MajorMinorPatch
22
branches:
33
main:
44
tag: beta
5+
support:
6+
tag: beta

‎build/artifacts/Startup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ public void Configure(IServiceCollection services)
1313

1414
services.UseWorkingDirectory(Extensions.GetRootDirectory());
1515

16-
services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.8.2"));
16+
services.UseDotnetTool(Tools.GitVersion, Tools.Versions[Tools.GitVersion]);
1717
}
1818
}

‎build/build/Startup.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public void Configure(IServiceCollection services)
1313

1414
services.UseWorkingDirectory(Extensions.GetRootDirectory());
1515

16-
services.UseTool(new Uri("nuget:?package=NuGet.CommandLine&version=6.0.0"));
17-
services.UseTool(new Uri("dotnet:?package=Codecov.Tool&version=1.13.0"));
18-
services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.8.2"));
16+
services.UseNugetTool(Tools.NugetCmd, Tools.Versions[Tools.NugetCmd]);
17+
services.UseDotnetTool(Tools.Codecov, Tools.Versions[Tools.Codecov]);
18+
services.UseDotnetTool(Tools.GitVersion, Tools.Versions[Tools.GitVersion]);
1919
}
2020
}

‎build/build/Tasks/Test/PublishCoverage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public override bool ShouldRun(BuildContext context)
1212
{
1313
var shouldRun = true;
1414
shouldRun &= context.ShouldRun(context.IsOnWindows, $"{nameof(PublishCoverage)} works only on Windows agents.");
15-
shouldRun &= context.ShouldRun(context.IsOnMainOrReleaseBranchOriginalRepo, $"{nameof(PublishCoverage)} works only for on main or release branch original repository.");
15+
shouldRun &= context.ShouldRun(context.IsOnMainOrSupportBranchOriginalRepo, $"{nameof(PublishCoverage)} works only for on main or release branch original repository.");
1616

1717
return shouldRun;
1818
}

‎build/common/Utilities/BuildContextBase.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ protected BuildContextBase(ICakeContext context) : base(context)
88
public BuildVersion? Version { get; set; }
99

1010
public bool IsOriginalRepo { get; set; }
11+
public string BranchName { get; set; } = string.Empty;
1112
public bool IsMainBranch { get; set; }
12-
public bool IsReleaseBranch { get; set; }
13+
public bool IsSupportBranch { get; set; }
1314
public bool IsPullRequest { get; set; }
1415
public bool IsTagged { get; set; }
1516
public bool IsLocalBuild { get; set; }
@@ -18,7 +19,7 @@ protected BuildContextBase(ICakeContext context) : base(context)
1819
public bool IsOnWindows { get; set; }
1920
public bool IsOnLinux { get; set; }
2021
public bool IsOnMacOS { get; set; }
21-
public bool IsOnMainOrReleaseBranchOriginalRepo => !IsLocalBuild && IsOriginalRepo && (IsMainBranch || IsReleaseBranch) && !IsPullRequest;
22-
public bool IsStableRelease => IsOnMainOrReleaseBranchOriginalRepo && IsTagged;
23-
public bool IsPreRelease => IsOnMainOrReleaseBranchOriginalRepo && !IsTagged;
22+
public bool IsOnMainOrSupportBranchOriginalRepo => !IsLocalBuild && IsOriginalRepo && (IsMainBranch || IsSupportBranch) && !IsPullRequest;
23+
public bool IsStableRelease => IsOnMainOrSupportBranchOriginalRepo && IsTagged;
24+
public bool IsPreRelease => IsOnMainOrSupportBranchOriginalRepo && !IsTagged;
2425
}

0 commit comments

Comments
 (0)