Skip to content

Commit b99563d

Browse files
franknarf8franknarf8
authored
Merge branch 'main' into main
2 parents 86d67b8 + 5604ae9 commit b99563d

File tree

24 files changed

+263
-237
lines changed

24 files changed

+263
-237
lines changed

‎.devcontainer/Dockerfile

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.202.5/containers/dotnet/.devcontainer/base.Dockerfile
2+
3+
# [Choice] .NET version: 6.0, 5.0, 3.1, 6.0-bullseye, 5.0-bullseye, 3.1-bullseye, 6.0-focal, 5.0-focal, 3.1-focal
4+
ARG VARIANT="6.0-bullseye-slim"
5+
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
6+
7+
# [Optional] Uncomment this section to install additional OS packages.
8+
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
9+
# && apt-get -y install --no-install-recommends <your-package-list-here>

‎.devcontainer/devcontainer.json

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2+
// https://github.com/microsoft/vscode-dev-containers/tree/v0.202.5/containers/dotnet
3+
{
4+
"name": "C# (.NET)",
5+
"runArgs": ["--init"],
6+
"build": {
7+
"dockerfile": "Dockerfile",
8+
"args": {
9+
"VARIANT": "6.0",
10+
}
11+
},
12+
13+
// Set *default* container specific settings.json values on container create.
14+
"settings": {
15+
"editor.fontFamily": "'Cascadia Code', Consolas, 'Courier New', monospace",
16+
"editor.rulers": [90],
17+
"cSpell.words": [
18+
"commiting",
19+
"gittools",
20+
"gitversion"
21+
],
22+
},
23+
24+
// Add the IDs of extensions you want installed when the container is created.
25+
"extensions": [
26+
"ms-dotnettools.csharp",
27+
"EditorConfig.EditorConfig",
28+
"streetsidesoftware.code-spell-checker"
29+
],
30+
31+
"postCreateCommand": "dotnet restore src; dotnet build build",
32+
33+
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
34+
"remoteUser": "vscode",
35+
"features": {
36+
"docker-in-docker": "latest",
37+
"git": "latest",
38+
"github-cli": "latest",
39+
"sshd": "latest",
40+
"powershell": "latest"
41+
}
42+
}

‎.github/workflows/ci.yml

+24-23
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,8 @@ jobs:
7272
-
7373
name: Checkout
7474
uses: actions/checkout@v2
75-
-
76-
name: Fetch all history for all tags and branches
77-
run: git fetch --prune --unshallow
75+
with:
76+
fetch-depth: 0
7877
-
7978
name: Use cached cake frosting
8079
id: cache-cake
@@ -109,6 +108,14 @@ jobs:
109108
-
110109
name: 'Upload native packages'
111110
uses: actions/[email protected]
111+
if: matrix.os == 'windows-latest'
112+
with:
113+
name: native-${{ runner.os }}
114+
path: ${{ github.workspace }}/artifacts/packages/native/*.zip
115+
-
116+
name: 'Upload native packages'
117+
uses: actions/[email protected]
118+
if: matrix.os != 'windows-latest'
112119
with:
113120
name: native-${{ runner.os }}
114121
path: ${{ github.workspace }}/artifacts/packages/native/*.tar.gz
@@ -122,16 +129,15 @@ jobs:
122129
strategy:
123130
matrix:
124131
os: [windows-latest, ubuntu-latest, macos-latest]
125-
targetFramework: [net5.0, net6.0, netcoreapp3.1]
132+
targetFramework: [net48, net5.0, net6.0, netcoreapp3.1]
126133
fail-fast: false
127134

128135
steps:
129136
-
130137
name: Checkout
131138
uses: actions/checkout@v2
132-
-
133-
name: Fetch all history for all tags and branches
134-
run: git fetch --prune --unshallow
139+
with:
140+
fetch-depth: 0
135141
-
136142
name: Use cached cake frosting
137143
id: cache-cake
@@ -170,9 +176,8 @@ jobs:
170176
-
171177
name: Checkout
172178
uses: actions/checkout@v2
173-
-
174-
name: Fetch all history for all tags and branches
175-
run: git fetch --prune --unshallow
179+
with:
180+
fetch-depth: 0
176181
-
177182
name: Use cached cake frosting
178183
id: cache-cake
@@ -218,9 +223,8 @@ jobs:
218223
-
219224
name: Checkout
220225
uses: actions/checkout@v2
221-
-
222-
name: Fetch all history for all tags and branches
223-
run: git fetch --prune --unshallow
226+
with:
227+
fetch-depth: 0
224228
-
225229
name: Use cached cake frosting
226230
id: cache-cake
@@ -264,7 +268,7 @@ jobs:
264268
-
265269
name: '[Test Artifacts (amd64)]'
266270
shell: pwsh
267-
run: dotnet run/artifacts.dll --target=ArtifactsTest --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --verbosity=diagnostic
271+
run: dotnet run/artifacts.dll --target=ArtifactsTest --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
268272
-
269273
name: '[Test Artifacts (arm64)]'
270274
shell: pwsh
@@ -284,9 +288,8 @@ jobs:
284288
-
285289
name: Checkout
286290
uses: actions/checkout@v2
287-
-
288-
name: Fetch all history for all tags and branches
289-
run: git fetch --prune --unshallow
291+
with:
292+
fetch-depth: 0
290293
-
291294
name: Use cached cake frosting
292295
id: cache-cake
@@ -384,9 +387,8 @@ jobs:
384387
-
385388
name: Checkout
386389
uses: actions/checkout@v2
387-
-
388-
name: Fetch all history for all tags and branches
389-
run: git fetch --prune --unshallow
390+
with:
391+
fetch-depth: 0
390392
-
391393
name: Use cached cake frosting
392394
id: cache-cake
@@ -428,9 +430,8 @@ jobs:
428430
-
429431
name: Checkout
430432
uses: actions/checkout@v2
431-
-
432-
name: Fetch all history for all tags and branches
433-
run: git fetch --prune --unshallow
433+
with:
434+
fetch-depth: 0
434435
-
435436
name: Use cached cake frosting
436437
id: cache-cake

‎.github/workflows/codeql-analysis.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,10 @@ jobs:
3030

3131
steps:
3232
-
33-
name: Checkout repository
34-
uses: actions/[email protected]
35-
-
36-
name: Fetch all history for all tags and branches
37-
run: git fetch --prune --unshallow
33+
name: Checkout
34+
uses: actions/checkout@v2
35+
with:
36+
fetch-depth: 0
3837

3938
- name: Initialize CodeQL
4039
uses: github/codeql-action/init@v1

‎.github/workflows/docs.yml

+29-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ jobs:
3737
with:
3838
path: tools
3939
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
40+
-
41+
name: Install .NET SDK 6.0.x
42+
uses: actions/setup-dotnet@v1
43+
with:
44+
dotnet-version: '6.0.x'
45+
include-prerelease: true
4046
-
4147
name: '[Prepare]'
4248
if: steps.cache-cake.outputs.cache-hit != 'true'
@@ -66,6 +72,17 @@ jobs:
6672
with:
6773
path: tools
6874
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
75+
-
76+
name: Install .NET SDK 2.1.x
77+
uses: actions/setup-dotnet@v1
78+
with:
79+
dotnet-version: '2.1.x'
80+
-
81+
name: Install .NET SDK 6.0.x
82+
uses: actions/setup-dotnet@v1
83+
with:
84+
dotnet-version: '6.0.x'
85+
include-prerelease: true
6986
-
7087
name: '[Build Documentation]'
7188
shell: pwsh
@@ -79,7 +96,7 @@ jobs:
7996
arguments: --url-ignore /api/ --allow-hash-href --assume-extension --disable-external
8097
-
8198
name: '[Remark Lint]'
82-
uses: reviewdog/action-remark-lint@v4
99+
uses: reviewdog/action-remark-lint@v5
83100
with:
84101
github_token: ${{ secrets.GITHUB_TOKEN }}
85102
reporter: github-pr-check
@@ -111,6 +128,17 @@ jobs:
111128
with:
112129
path: tools
113130
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
131+
-
132+
name: Install .NET SDK 2.1.x
133+
uses: actions/setup-dotnet@v1
134+
with:
135+
dotnet-version: '2.1.x'
136+
-
137+
name: Install .NET SDK 6.0.x
138+
uses: actions/setup-dotnet@v1
139+
with:
140+
dotnet-version: '6.0.x'
141+
include-prerelease: true
114142
-
115143
name: '[Publish Documentation]'
116144
if: ${{ github.event_name == 'push' }}

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,4 @@ config.wyam.hash
127127
config.wyam.packages.xml
128128
/tests/integration/core/build
129129
/tests/integration/full/build
130+
docs/output

‎.vscode/GitVersion.code-workspace

-25
This file was deleted.

‎GitVersion.yml

-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,3 @@ assembly-versioning-scheme: MajorMinorPatch
22
branches:
33
main:
44
tag: beta
5-
ignore:
6-
sha:
7-
- 0e77e2e16a136a1cd0f0474fe5710f617d508d81
8-
- af73f6a349456f146a8d0a413de1331eddf61bc2

‎build/.run/Package GZip.run.xml ‎build/.run/Package Archive.run.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Package GZip" type="DotNetProject" factoryName=".NET Project" folderName="Package">
2+
<configuration default="false" name="Package Archive" type="DotNetProject" factoryName=".NET Project" folderName="Package">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=PackageGZip" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=PackageArchive" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -17,4 +17,4 @@
1717
<option name="Build" />
1818
</method>
1919
</configuration>
20-
</component>
20+
</component>

‎build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public override void Run(BuildContext context)
3737
Verbosity = DotNetCoreVerbosity.Minimal,
3838
Configuration = context.MsBuildConfiguration,
3939
MSBuildSettings = dotnetCoreMsBuildSettings,
40-
ArgumentCustomization = args => args.Append($"--source {nugetSource}")
40+
Sources = new[] { nugetSource }
4141
});
4242

4343
var netcoreExe = Paths.Integration.Combine("core").Combine("build").Combine(framework).CombineWithFilePath("app.dll");

‎build/build/Tasks/Package.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace Build.Tasks;
44
[TaskDescription("Creates the packages (nuget, chocolatey or tar.gz)")]
55
[IsDependentOn(typeof(PackageChocolatey))]
66
[IsDependentOn(typeof(PackageNuget))]
7-
[IsDependentOn(typeof(PackageGZip))]
7+
[IsDependentOn(typeof(PackageArchive))]
88
public class Package : FrostingTask<BuildContext>
99
{
1010
}

‎build/build/Tasks/Package/PackageArchive.cs

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
using Cake.Compression;
2+
using Common.Utilities;
3+
4+
namespace Build.Tasks;
5+
6+
[TaskName(nameof(PackageArchive))]
7+
[TaskDescription("Creates the tar.gz or zip packages")]
8+
[IsDependentOn(typeof(PackagePrepare))]
9+
public class PackageArchive : FrostingTask<BuildContext>
10+
{
11+
public override void Run(BuildContext context)
12+
{
13+
context.EnsureDirectoryExists(Paths.Native);
14+
15+
var platform = context.Environment.Platform.Family;
16+
var runtimes = context.NativeRuntimes[platform];
17+
18+
foreach (var runtime in runtimes)
19+
{
20+
var sourceDir = Paths.Native.Combine(platform.ToString().ToLower()).Combine(runtime);
21+
var targetDir = Paths.Native;
22+
context.EnsureDirectoryExists(targetDir);
23+
24+
var archive = GetArchiveOutputPath(context, runtime, platform, targetDir);
25+
var filePaths = context.GetFiles($"{sourceDir}/**/*");
26+
switch (platform)
27+
{
28+
case PlatformFamily.Windows:
29+
context.ZipCompress(sourceDir, archive, filePaths);
30+
break;
31+
default:
32+
context.GZipCompress(sourceDir, archive, filePaths);
33+
break;
34+
}
35+
36+
context.Information($"Created {archive}");
37+
}
38+
base.Run(context);
39+
}
40+
private static FilePath GetArchiveOutputPath(BuildContextBase context, string runtime, PlatformFamily platform, DirectoryPath targetDir)
41+
{
42+
var ext = platform == PlatformFamily.Windows ? "zip" : "tar.gz";
43+
var fileName = $"gitversion-{runtime}-{context.Version?.SemVersion}.{ext}".ToLower();
44+
return targetDir.CombineWithFilePath(fileName);
45+
}
46+
}

‎build/build/Tasks/Package/PackageGZip.cs

-33
This file was deleted.

0 commit comments

Comments
 (0)