Merge branch 'main' into main

Author: franknarf8

.devcontainer/Dockerfile

@@ -0,0 +1,9 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.202.5/containers/dotnet/.devcontainer/base.Dockerfile
+
+# [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
+ARG VARIANT="6.0-bullseye-slim"
+FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>

.devcontainer/devcontainer.json

@@ -0,0 +1,42 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.202.5/containers/dotnet
+{
+	"name": "C# (.NET)",
+	"runArgs": ["--init"],
+	"build": {
+		"dockerfile": "Dockerfile",
+		"args": {
+			"VARIANT": "6.0",
+		}
+	},
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": {
+        "editor.fontFamily": "'Cascadia Code', Consolas, 'Courier New', monospace",
+        "editor.rulers": [90],
+        "cSpell.words": [
+            "commiting",
+            "gittools",
+            "gitversion"
+        ],
+    },
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"ms-dotnettools.csharp",
+        "EditorConfig.EditorConfig",
+        "streetsidesoftware.code-spell-checker"
+	],
+
+	"postCreateCommand": "dotnet restore src; dotnet build build",
+
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode",
+	"features": {
+		"docker-in-docker": "latest",
+		"git": "latest",
+		"github-cli": "latest",
+		"sshd": "latest",
+		"powershell": "latest"
+	}
+}

.github/workflows/ci.yml

@@ -72,9 +72,8 @@ jobs:
     -
       name: Checkout
       uses: actions/checkout@v2
-    -
-      name: Fetch all history for all tags and branches
-      run: git fetch --prune --unshallow
+      with:
+        fetch-depth: 0
     -
       name: Use cached cake frosting
       id: cache-cake
@@ -109,6 +108,14 @@ jobs:
     -
       name: 'Upload native packages'
       uses: actions/[email protected]
+      if: matrix.os == 'windows-latest'
+      with:
+        name: native-${{ runner.os }}
+        path: ${{ github.workspace }}/artifacts/packages/native/*.zip
+    -
+      name: 'Upload native packages'
+      uses: actions/[email protected]
+      if: matrix.os != 'windows-latest'
       with:
         name: native-${{ runner.os }}
         path: ${{ github.workspace }}/artifacts/packages/native/*.tar.gz
@@ -122,16 +129,15 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        targetFramework: [net5.0, net6.0, netcoreapp3.1]
+        targetFramework: [net48, net5.0, net6.0, netcoreapp3.1]
       fail-fast: false
 
     steps:
     -
       name: Checkout
       uses: actions/checkout@v2
-    -
-      name: Fetch all history for all tags and branches
-      run: git fetch --prune --unshallow
+      with:
+        fetch-depth: 0
     -
       name: Use cached cake frosting
       id: cache-cake
@@ -170,9 +176,8 @@ jobs:
     -
       name: Checkout
       uses: actions/checkout@v2
-    -
-      name: Fetch all history for all tags and branches
-      run: git fetch --prune --unshallow
+      with:
+        fetch-depth: 0
     -
       name: Use cached cake frosting
       id: cache-cake
@@ -218,9 +223,8 @@ jobs:
     -
       name: Checkout
       uses: actions/checkout@v2
-    -
-      name: Fetch all history for all tags and branches
-      run: git fetch --prune --unshallow
+      with:
+        fetch-depth: 0
     -
       name: Use cached cake frosting
       id: cache-cake
@@ -264,7 +268,7 @@ jobs:
     -
       name: '[Test Artifacts (amd64)]'
       shell: pwsh
-      run: dotnet run/artifacts.dll --target=ArtifactsTest --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --verbosity=diagnostic
+      run: dotnet run/artifacts.dll --target=ArtifactsTest --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
     -
       name: '[Test Artifacts (arm64)]'
       shell: pwsh
@@ -284,9 +288,8 @@ jobs:
     -
       name: Checkout
       uses: actions/checkout@v2
-    -
-      name: Fetch all history for all tags and branches
-      run: git fetch --prune --unshallow
+      with:
+        fetch-depth: 0
     -
       name: Use cached cake frosting
       id: cache-cake
@@ -384,9 +387,8 @@ jobs:
     -
       name: Checkout
       uses: actions/checkout@v2
-    -
-      name: Fetch all history for all tags and branches
-      run: git fetch --prune --unshallow
+      with:
+        fetch-depth: 0
     -
       name: Use cached cake frosting
       id: cache-cake
@@ -428,9 +430,8 @@ jobs:
     -
       name: Checkout
       uses: actions/checkout@v2
-    -
-      name: Fetch all history for all tags and branches
-      run: git fetch --prune --unshallow
+      with:
+        fetch-depth: 0
     -
       name: Use cached cake frosting
       id: cache-cake

.github/workflows/codeql-analysis.yml

@@ -30,11 +30,10 @@ jobs:
 
     steps:
     -
-      name: Checkout repository
-      uses: actions/[email protected]
-    -
-      name: Fetch all history for all tags and branches
-      run: git fetch --prune --unshallow
+      name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1

.github/workflows/docs.yml

@@ -37,6 +37,12 @@ jobs:
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
+    -
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Prepare]'
       if: steps.cache-cake.outputs.cache-hit != 'true'
@@ -66,6 +72,17 @@ jobs:
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
+    -
+      name: Install .NET SDK 2.1.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '2.1.x'
+    -
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Build Documentation]'
       shell: pwsh
@@ -79,7 +96,7 @@ jobs:
         arguments: --url-ignore /api/ --allow-hash-href --assume-extension --disable-external
     -
       name: '[Remark Lint]'
-      uses: reviewdog/action-remark-lint@v4
+      uses: reviewdog/action-remark-lint@v5
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         reporter: github-pr-check
@@ -111,6 +128,17 @@ jobs:
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
+    -
+      name: Install .NET SDK 2.1.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '2.1.x'
+    -
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Publish Documentation]'
       if: ${{ github.event_name == 'push' }}

.gitignore

@@ -127,3 +127,4 @@ config.wyam.hash
 config.wyam.packages.xml
 /tests/integration/core/build
 /tests/integration/full/build
+docs/output

.vscode/GitVersion.code-workspace

@@ -2,7 +2,3 @@ assembly-versioning-scheme: MajorMinorPatch
 branches:
   main:
     tag: beta
-ignore:
-  sha:
-    - 0e77e2e16a136a1cd0f0474fe5710f617d508d81
-    - af73f6a349456f146a8d0a413de1331eddf61bc2

GitVersion.yml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Package GZip" type="DotNetProject" factoryName=".NET Project" folderName="Package">
+  <configuration default="false" name="Package Archive" type="DotNetProject" factoryName=".NET Project" folderName="Package">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=PackageGZip" />
+    <option name="PROGRAM_PARAMETERS" value="--target=PackageArchive" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -17,4 +17,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
+</component>

build/.run/Package GZip.run.xml renamed to build/.run/Package Archive.run.xml

@@ -37,7 +37,7 @@ public override void Run(BuildContext context)
                 Verbosity = DotNetCoreVerbosity.Minimal,
                 Configuration = context.MsBuildConfiguration,
                 MSBuildSettings = dotnetCoreMsBuildSettings,
-                ArgumentCustomization = args => args.Append($"--source {nugetSource}")
+                Sources = new[] { nugetSource }
             });
 
             var netcoreExe = Paths.Integration.Combine("core").Combine("build").Combine(framework).CombineWithFilePath("app.dll");

build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs

@@ -4,7 +4,7 @@ namespace Build.Tasks;
 [TaskDescription("Creates the packages (nuget, chocolatey or tar.gz)")]
 [IsDependentOn(typeof(PackageChocolatey))]
 [IsDependentOn(typeof(PackageNuget))]
-[IsDependentOn(typeof(PackageGZip))]
+[IsDependentOn(typeof(PackageArchive))]
 public class Package : FrostingTask<BuildContext>
 {
 }

build/build/Tasks/Package.cs

@@ -0,0 +1,46 @@
+using Cake.Compression;
+using Common.Utilities;
+
+namespace Build.Tasks;
+
+[TaskName(nameof(PackageArchive))]
+[TaskDescription("Creates the tar.gz or zip packages")]
+[IsDependentOn(typeof(PackagePrepare))]
+public class PackageArchive : FrostingTask<BuildContext>
+{
+    public override void Run(BuildContext context)
+    {
+        context.EnsureDirectoryExists(Paths.Native);
+
+        var platform = context.Environment.Platform.Family;
+        var runtimes = context.NativeRuntimes[platform];
+
+        foreach (var runtime in runtimes)
+        {
+            var sourceDir = Paths.Native.Combine(platform.ToString().ToLower()).Combine(runtime);
+            var targetDir = Paths.Native;
+            context.EnsureDirectoryExists(targetDir);
+
+            var archive = GetArchiveOutputPath(context, runtime, platform, targetDir);
+            var filePaths = context.GetFiles($"{sourceDir}/**/*");
+            switch (platform)
+            {
+                case PlatformFamily.Windows:
+                    context.ZipCompress(sourceDir, archive, filePaths);
+                    break;
+                default:
+                    context.GZipCompress(sourceDir, archive, filePaths);
+                    break;
+            }
+
+            context.Information($"Created {archive}");
+        }
+        base.Run(context);
+    }
+    private static FilePath GetArchiveOutputPath(BuildContextBase context, string runtime, PlatformFamily platform, DirectoryPath targetDir)
+    {
+        var ext = platform == PlatformFamily.Windows ? "zip" : "tar.gz";
+        var fileName = $"gitversion-{runtime}-{context.Version?.SemVersion}.{ext}".ToLower();
+        return targetDir.CombineWithFilePath(fileName);
+    }
+}