feat: Windows support 🪟

.editorconfig

@@ -231,7 +231,7 @@ dotnet_diagnostic.SA1000.severity = suggestion # Need to configure formatting in
 # Parameter '*' should begin with lower-case letter
 dotnet_diagnostic.SA1313.severity = suggestion # Rider disagrees?
 
-[**/*.{Tests,E2ETests,ArchTests}*/**.cs]
+[**/*.{Tests,E2ETests.*,ArchTests}*/**.cs]
 dotnet_diagnostic.CA1852.severity = warning
 dotnet_diagnostic.CA1816.severity = warning
 dotnet_diagnostic.CA2007.severity = none

.github/workflows/ci.yaml

@@ -20,8 +20,8 @@ on:
           - 'diagnostic'
 
 jobs:
-  test:
-    name: Test
+  test-linux:
+    name: 🐧 Test
     runs-on: ubuntu-latest
     timeout-minutes: 5
     env:
@@ -41,15 +41,46 @@ jobs:
           --target Test
           --commit ${{ github.sha }}
           --msbuildverbosity ${{ github.event.inputs.verbosity }}
+          --platform linux_x64
 
       - name: Display test results
         continue-on-error: true
         if: always()
         run: dotnet trx --verbosity normal
 
-      # TODO fix publish warnings and re-enable check
       - name: Check for warnings
         run: >
           dotnet run
           --project ./build/_build.csproj
           --target CheckBuildWarnings
+
+  test-windows:
+    name: 🪟 Test
+    runs-on: windows-latest
+    timeout-minutes: 10
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Set up runner
+        uses: ./.github/actions/setup-runner
+
+      - name: Run tests
+        run: |
+          dotnet run `
+          --project ./build/_build.csproj `
+          --target Test `
+          --commit ${{ github.sha }} `
+          --msbuildverbosity ${{ github.event.inputs.verbosity }} `
+          --platform win_x64
+
+      - name: Display test results
+        continue-on-error: true
+        if: always()
+        run: dotnet trx --verbosity normal
+
+      - name: Check for warnings
+        run: |
+          dotnet run `
+          --project ./build/_build.csproj `
+          --target CheckBuildWarnings

.nuke/build.schema.json

@@ -41,6 +41,9 @@
         "Restore",
         "Test",
         "TestE2E",
+        "TestE2E_Binary",
+        "TestE2E_Container",
+        "TestE2E_General",
         "TestLocal",
         "TestSelf",
         "TestUnit"
@@ -147,6 +150,45 @@
           "type": "string",
           "description": "MsBuildVerbosity - Console output verbosity - Default is 'normal'"
         },
+        "Platform": {
+          "type": "string",
+          "description": "Platform - A .NET RID but with underscores instead of dashes e.g. linux_x64 or win_x64",
+          "enum": [
+            "linux_arm",
+            "linux_arm64",
+            "linux_musl_x64",
+            "linux_x64",
+            "osx_10_10_x64",
+            "osx_10_11_x64",
+            "osx_10_12_x64",
+            "osx_10_13_x64",
+            "osx_10_14_x64",
+            "osx_10_15_x64",
+            "osx_11_0_arm64",
+            "osx_11_0_x64",
+            "osx_12_arm64",
+            "osx_12_x64",
+            "osx_x64",
+            "rhel_6_x64",
+            "rhel_x64",
+            "tizen",
+            "tizen_4_0_0",
+            "tizen_5_0_0",
+            "win_arm",
+            "win_arm64",
+            "win_x64",
+            "win_x86",
+            "win10_arm",
+            "win10_arm64",
+            "win10_x64",
+            "win10_x86",
+            "win7_x64",
+            "win7_x86",
+            "win81_arm",
+            "win81_x64",
+            "win81_x86"
+          ]
+        },
         "Solution": {
           "type": "string",
           "description": "Path to a solution file that is automatically loaded"

Drift.sln

@@ -38,7 +38,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "src\Common\Common
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Tests", "src\Common.Tests\Common.Tests.csproj", "{004FE90A-E749-4C17-B7B7-B529AA0F5F34}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli.E2ETests", "src\Cli.E2ETests\Cli.E2ETests.csproj", "{11F44BDE-0563-4C64-BE3C-9E7B69F89E12}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli.E2ETests.Binary", "src\Cli.E2ETests.Binary\Cli.E2ETests.Binary.csproj", "{B1A2C3D4-E5F6-7890-ABCD-EF1234567890}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli.E2ETests.Container", "src\Cli.E2ETests.Container\Cli.E2ETests.Container.csproj", "{C2B3D4E5-F6A7-8901-BCDE-F12345678901}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli.E2ETests.General", "src\Cli.E2ETests.General\Cli.E2ETests.General.csproj", "{D3C4E5F6-A7B8-9012-CDEF-123456789012}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli.Abstractions", "src\Cli.Abstractions\Cli.Abstractions.csproj", "{42ECC801-ADCB-43E4-86C0-E0E4B017D7B6}"
 EndProject
@@ -76,6 +80,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli.Settings.SchemaGenerato
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Schemas", "src\Common.Schemas\Common.Schemas.csproj", "{BAC0F9AF-CAE2-43FB-AF47-B9AC7B62544B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "E2E", "E2E", "{D1DBBF0F-1A0D-486C-A893-ACEB667F2A63}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -132,10 +138,18 @@ Global
 		{004FE90A-E749-4C17-B7B7-B529AA0F5F34}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8523E9E0-F412-41B7-B361-ADE639FFAF24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8523E9E0-F412-41B7-B361-ADE639FFAF24}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11F44BDE-0563-4C64-BE3C-9E7B69F89E12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11F44BDE-0563-4C64-BE3C-9E7B69F89E12}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11F44BDE-0563-4C64-BE3C-9E7B69F89E12}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11F44BDE-0563-4C64-BE3C-9E7B69F89E12}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1A2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1A2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1A2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1A2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C2B3D4E5-F6A7-8901-BCDE-F12345678901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2B3D4E5-F6A7-8901-BCDE-F12345678901}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2B3D4E5-F6A7-8901-BCDE-F12345678901}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2B3D4E5-F6A7-8901-BCDE-F12345678901}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3C4E5F6-A7B8-9012-CDEF-123456789012}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3C4E5F6-A7B8-9012-CDEF-123456789012}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3C4E5F6-A7B8-9012-CDEF-123456789012}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3C4E5F6-A7B8-9012-CDEF-123456789012}.Release|Any CPU.Build.0 = Release|Any CPU
 		{42ECC801-ADCB-43E4-86C0-E0E4B017D7B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{42ECC801-ADCB-43E4-86C0-E0E4B017D7B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{42ECC801-ADCB-43E4-86C0-E0E4B017D7B6}.Release|Any CPU.ActiveCfg = Release|Any CPU

README.md

@@ -20,7 +20,8 @@ state, Drift can detect issues like unknown devices or unexpected subnet access,
 
 You can install Drift by either:
 
-- Downloading the latest release from the [Releases page](https://github.com/hojmark/drift/releases?q=prerelease%3Afalse), or
+- Downloading the latest release from
+  the [Releases page](https://github.com/hojmark/drift/releases?q=prerelease%3Afalse), or
 - Running the installation script:
 
     ```bash
@@ -43,6 +44,23 @@ drift init
 drift scan -i
 ```
 
+### Windows x64
+
+#### Install
+
+Download the `.zip` archive from the [Releases page](https://github.com/hojmark/drift/releases?q=prerelease%3Afalse),
+extract `drift.exe`, and place it somewhere on your `PATH`.
+
+#### Run
+
+```powershell
+# Create a network spec using auto-discovery
+drift init
+
+# Scan and detect drift
+drift scan -i
+```
+
 ### Container
 
 #### Run
@@ -106,7 +124,8 @@ JSON Schemas are available to enable editor auto-completion and validation:
   }
   ```
 
-There’s no official documentation site yet — if you run into trouble, feel free to [open a discussion](https://github.com/hojmark/drift/discussions/categories/q-a).
+There’s no official documentation site yet — if you run into trouble, feel free
+to [open a discussion](https://github.com/hojmark/drift/discussions/categories/q-a).
 
 ### ▸ What can be automatically discovered?
 

build/NukeBuild.Binaries.cs

@@ -14,33 +14,33 @@
 // ReSharper disable UnusedMember.Local
 
 sealed partial class NukeBuild {
-  private static readonly string[] FilesToDistribute = ["drift", "drift.dbg"];
+  private static readonly string[] FilesToDistributeLinux = ["drift", "drift.dbg"];
+  private static readonly string[] FilesToDistributeWindows = ["drift.exe"];
 
   Target PublishBinaries => _ => _
     .DependsOn( Build, CleanArtifacts )
+    .Requires( () => Platform )
+    .Requires( () => SupportedRuntimes.Contains( Platform ) )
     .Executes( async () => {
         using var _ = new OperationTimer( nameof(PublishBinaries) );
 
-        // TODO https://nuke.build/docs/common/cli-tools/#combinatorial-modifications
-        foreach ( var runtime in SupportedRuntimes ) {
-          var publishDir = Paths.PublishDirectoryForRuntime( runtime );
-          var version = await Versioning.Value.GetVersionAsync();
+        var publishDir = Paths.PublishDirectoryForRuntime( Platform );
+        var version = await Versioning.Value.GetVersionAsync();
 
-          Log.Information( "Publishing {Runtime} build to {PublishDir}", runtime, publishDir );
-          DotNetPublish( s => s
-            .SetProject( Solution.Cli )
-            .SetConfiguration( Configuration )
-            .SetOutput( publishDir )
-            .SetSelfContained( true )
-            .SetVersionProperties( version )
-            // TODO if not specifying a RID, apparently only x64 gets built on x64 host
-            .SetRuntime( runtime )
-            .SetProcessAdditionalArguments( $"-bl:{BinaryPublishLogName}" )
-            .EnableNoLogo()
-            .EnableNoRestore()
-            .EnableNoBuild()
-          );
-        }
+        Log.Information( "Publishing {Runtime} build to {PublishDir}", Platform, publishDir );
+        Log.Debug( "Supported runtimes are {SupportedRuntimes}", string.Join( ", ", SupportedRuntimes ) );
+        DotNetPublish( s => s
+          .SetProject( Solution.Cli )
+          .SetConfiguration( Configuration )
+          .SetOutput( publishDir )
+          .SetSelfContained( true )
+          .SetVersionProperties( version )
+          .SetRuntime( Platform )
+          .SetProcessAdditionalArguments( $"-bl:{BinaryPublishLogName}" )
+          .EnableNoLogo()
+          .EnableNoRestore()
+          .EnableNoBuild()
+        );
       }
     );
 
@@ -50,15 +50,23 @@ sealed partial class NukeBuild {
         using var _ = new OperationTimer( nameof(PackBinaries) );
 
         var version = await Versioning.Value.GetVersionAsync();
+        var publishDir = Paths.PublishDirectoryForRuntime( Platform );
 
-        foreach ( var runtime in SupportedRuntimes ) {
-          var publishDir = Paths.PublishDirectoryForRuntime( runtime );
-          var artifactFile = Paths.ArtifactsDirectory / $"drift_{version.WithoutMetadata()}_{runtime}.tar.gz";
+        var isWindows = Platform == DotNetRuntimeIdentifier.win_x64;
+        var extension = isWindows ? "zip" : "tar.gz";
+        var filesToDistribute = isWindows ? FilesToDistributeWindows : FilesToDistributeLinux;
+        var artifactFile = Paths.ArtifactsDirectory / $"drift_{version.WithoutMetadata()}_{Platform}.{extension}";
 
-          Log.Information( "Creating {ArtifactFile}", artifactFile );
+        Log.Information( "Creating {ArtifactFile}", artifactFile );
+
+        if ( isWindows ) {
+          Log.Debug( "Including files matching: {Files}", string.Join( ", ", filesToDistribute ) );
+          publishDir.ZipTo( artifactFile, f => filesToDistribute.Contains( f.Name ), fileMode: FileMode.CreateNew );
+        }
+        else {
           var files = publishDir
             .GetFiles()
-            .Where( file => FilesToDistribute.Contains( file.Name ) )
+            .Where( file => filesToDistribute.Contains( file.Name ) )
             .ToList();
           Log.Debug( "Including files: {Files}", string.Join( ", ", files.Select( f => f.Name ) ) );
           publishDir.TarGZipTo( artifactFile, files, fileMode: FileMode.CreateNew );

build/NukeBuild.Container.cs

@@ -6,6 +6,7 @@
 using JetBrains.Annotations;
 using Nuke.Common;
 using Nuke.Common.Tools.Docker;
+using Nuke.Common.Tools.DotNet;
 using Serilog;
 using Versioning;
 
@@ -33,6 +34,7 @@ partial class NukeBuild {
 
   Target PublishContainer => _ => _
     .DependsOn( PublishBinaries, CleanArtifacts )
+    .OnlyWhenDynamic( () => Platform != DotNetRuntimeIdentifier.win_x64 )
     .Requires( () => Commit )
     .Executes( async () => {
         using var _ = new OperationTimer( nameof(PublishContainer) );