Skip to content

Commit 13f7753

Browse files
asbjornuasbjornu
authored
Merge branch 'main' into const_string
2 parents 3bc5638 + f88284c commit 13f7753

File tree

59 files changed

+1700
-280
lines changed

Some content is hidden

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

59 files changed

+1700
-280
lines changed

‎.github/workflows/ci.yml

Lines changed: 12 additions & 9 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
@@ -129,7 +132,7 @@ jobs:
129132
strategy:
130133
matrix:
131134
os: [windows-latest, ubuntu-latest, macos-latest]
132-
targetFramework: [net48, net5.0, net6.0, netcoreapp3.1]
135+
targetFramework: [net6.0, netcoreapp3.1]
133136
fail-fast: false
134137

135138
steps:
@@ -213,7 +216,7 @@ jobs:
213216
runs-on: ubuntu-latest
214217
strategy:
215218
matrix:
216-
targetFramework: [ '3.1', '5.0', '6.0' ]
219+
targetFramework: [ '3.1', '6.0' ]
217220
distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
218221
fail-fast: false
219222

@@ -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
-
@@ -277,7 +280,7 @@ jobs:
277280
runs-on: ubuntu-latest
278281
strategy:
279282
matrix:
280-
targetFramework: [ '3.1', '5.0', '6.0' ]
283+
targetFramework: [ '3.1', '6.0' ]
281284
distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
282285
fail-fast: false
283286

@@ -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/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
if_false: github-check
128128
-
129129
name: '[Remark Lint]'
130-
uses: reviewdog/action-remark-lint@v5.3
130+
uses: reviewdog/action-remark-lint@v5.4
131131
with:
132132
github_token: ${{ secrets.GITHUB_TOKEN }}
133133
reporter: ${{ steps.reporter.outputs.value }}

‎.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:

‎build/artifacts/Tasks/ArtifactsDotnetToolTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
55
[TaskName(nameof(ArtifactsDotnetToolTest))]
66
[TaskDescription("Tests the dotnet global tool in docker container")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
8-
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
8+
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
99
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1010
[IsDependentOn(typeof(ArtifactsPrepare))]
1111
public class ArtifactsDotnetToolTest : FrostingTask<BuildContext>

‎build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
55
[TaskName(nameof(ArtifactsMsBuildCoreTest))]
66
[TaskDescription("Tests the msbuild package in docker container")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
8-
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
8+
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
99
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1010
[IsDependentOn(typeof(ArtifactsPrepare))]
1111
public class ArtifactsMsBuildCoreTest : FrostingTask<BuildContext>
@@ -36,7 +36,6 @@ public override void Run(BuildContext context)
3636
targetFramework = targetFramework switch
3737
{
3838
Constants.Version31 => $"netcoreapp{targetFramework}",
39-
Constants.Version50 => $"net{targetFramework}",
4039
Constants.Version60 => $"net{targetFramework}",
4140
_ => targetFramework
4241
};

‎build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public override void Run(BuildContext context)
2323
var nugetSource = context.MakeAbsolute(Paths.Nuget).FullPath;
2424

2525
context.Information("\nTesting msbuild task with dotnet build (for .net core)\n");
26-
var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion50, Constants.NetVersion60 };
26+
var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion60 };
2727
foreach (var framework in frameworks)
2828
{
2929
var dotnetMsBuildSettings = new DotNetMSBuildSettings();
@@ -43,21 +43,5 @@ public override void Run(BuildContext context)
4343
var netcoreExe = Paths.Integration.Combine("core").Combine("build").Combine(framework).CombineWithFilePath("app.dll");
4444
context.ValidateOutput("dotnet", netcoreExe.FullPath, context.Version.GitVersion.FullSemVer);
4545
}
46-
47-
context.Information("\nTesting msbuild task with msbuild (for full framework)\n");
48-
49-
var msBuildSettings = new MSBuildSettings
50-
{
51-
Verbosity = Verbosity.Minimal,
52-
Restore = true
53-
};
54-
55-
msBuildSettings.WithProperty("GitVersionMsBuildVersion", version);
56-
msBuildSettings.WithProperty("RestoreSource", nugetSource);
57-
58-
context.MSBuild("./tests/integration/full", msBuildSettings);
59-
60-
var fullExe = Paths.Integration.Combine("full").Combine("build").CombineWithFilePath("app.exe");
61-
context.ValidateOutput(fullExe.FullPath, null, context.Version.GitVersion.FullSemVer);
6246
}
6347
}

‎build/artifacts/Tasks/ArtifactsNativeTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
55
[TaskName(nameof(ArtifactsNativeTest))]
66
[TaskDescription("Tests the native executables in docker container")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
8-
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
8+
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
99
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1010
[IsDependentOn(typeof(ArtifactsPrepare))]
1111
public class ArtifactsNativeTest : FrostingTask<BuildContext>

‎build/artifacts/Tasks/ArtifactsPrepare.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
55
[TaskName(nameof(ArtifactsPrepare))]
66
[TaskDescription("Pulls the docker images needed for testing the artifacts")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
8-
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
8+
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
99
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1010
public class ArtifactsPrepare : FrostingTask<BuildContext>
1111
{

0 commit comments

Comments
 (0)