From 65e2779a1b3bddea38f12657ff3d9c31769259ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= <nefarius@dhmx.at>
Date: Sat, 25 Aug 2018 22:30:28 +0200
Subject: [PATCH] Fixed build script

---
 .nuke                           |  2 +-
 build/.build.csproj.dotsettings | 23 -------------
 build/Build.cs                  | 58 +++------------------------------
 3 files changed, 5 insertions(+), 78 deletions(-)
 delete mode 100644 build/.build.csproj.dotsettings

diff --git a/.nuke b/.nuke
index 4d60562..a9c2c79 100644
--- a/.nuke
+++ b/.nuke
@@ -1 +1 @@
-ViGEmBus.sln
\ No newline at end of file
+ViGEmClient.sln
\ No newline at end of file
diff --git a/build/.build.csproj.dotsettings b/build/.build.csproj.dotsettings
deleted file mode 100644
index ea35790..0000000
--- a/build/.build.csproj.dotsettings
+++ /dev/null
@@ -1,23 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/ImplicitNullability/EnableFields/@EntryValue">False</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Implicit</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_PRIVATE_MODIFIER/@EntryValue">Implicit</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/ThisQualifier/INSTANCE_MEMBERS_QUALIFY_MEMBERS/@EntryValue">0</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_USER_LINEBREAKS/@EntryValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_INVOCATION_LPAR/@EntryValue">False</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARGUMENTS_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/build/Build.cs b/build/Build.cs
index e3801fd..6dd1cf9 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Linq;
 using Nuke.Common;
 using Nuke.Common.Git;
@@ -17,11 +16,13 @@ class Build : NukeBuild
     [Solution] readonly Solution Solution;
     [GitRepository] readonly GitRepository GitRepository;
 
+    AbsolutePath SourceDirectory => RootDirectory / "src";
     AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts";
 
     Target Clean => _ => _
         .Executes(() =>
         {
+            DeleteDirectories(GlobDirectories(SourceDirectory, "**/bin", "**/obj"));
             EnsureCleanDirectory(ArtifactsDirectory);
         });
 
@@ -31,13 +32,7 @@ class Build : NukeBuild
         {
             MSBuild(s => s
                 .SetTargetPath(SolutionFile)
-                .SetTargets("Restore")
-                .SetTargetPlatform(MSBuildTargetPlatform.x64));
-
-            MSBuild(s => s
-                .SetTargetPath(SolutionFile)
-                .SetTargets("Restore")
-                .SetTargetPlatform(MSBuildTargetPlatform.x86));
+                .SetTargets("Restore"));
         });
 
     Target Compile => _ => _
@@ -49,52 +44,7 @@ class Build : NukeBuild
                 .SetTargets("Rebuild")
                 .SetConfiguration(Configuration)
                 .SetMaxCpuCount(Environment.ProcessorCount)
-                .SetNodeReuse(IsLocalBuild)
-                .SetTargetPlatform(MSBuildTargetPlatform.x64));
-
-            MSBuild(s => s
-                .SetTargetPath(SolutionFile)
-                .SetTargets("Rebuild")
-                .SetConfiguration(Configuration)
-                .SetMaxCpuCount(Environment.ProcessorCount)
-                .SetNodeReuse(IsLocalBuild)
-                .SetTargetPlatform(MSBuildTargetPlatform.x86));
-
-            #region Ugly hack, fix me!
-            EnsureExistingDirectory(Path.Combine(ArtifactsDirectory, @"x64"));
-            EnsureExistingDirectory(Path.Combine(ArtifactsDirectory, @"x86"));
-
-            File.Copy(
-                Path.Combine(WorkingDirectory, @"bin\x64\ViGEmBus.inf"),
-                Path.Combine(ArtifactsDirectory, @"ViGEmBus.inf")
-            );
-
-            File.Copy(
-                Path.Combine(WorkingDirectory, @"bin\x64\ViGEmBus.pdb"),
-                Path.Combine(ArtifactsDirectory, @"x64\ViGEmBus.pdb")
-            );
-            File.Copy(
-                Path.Combine(WorkingDirectory, @"bin\x64\ViGEmBus\ViGEmBus.sys"),
-                Path.Combine(ArtifactsDirectory, @"x64\ViGEmBus.sys")
-            );
-            File.Copy(
-                Path.Combine(WorkingDirectory, @"bin\x64\ViGEmBus\WdfCoinstaller01009.dll"),
-                Path.Combine(ArtifactsDirectory, @"x64\WdfCoinstaller01009.dll")
-            );
-
-            File.Copy(
-                Path.Combine(WorkingDirectory, @"bin\x86\ViGEmBus.pdb"),
-                Path.Combine(ArtifactsDirectory, @"x86\ViGEmBus.pdb")
-            );
-            File.Copy(
-                Path.Combine(WorkingDirectory, @"bin\x86\ViGEmBus\ViGEmBus.sys"),
-                Path.Combine(ArtifactsDirectory, @"x86\ViGEmBus.sys")
-            );
-            File.Copy(
-                Path.Combine(WorkingDirectory, @"bin\x86\ViGEmBus\WdfCoinstaller01009.dll"),
-                Path.Combine(ArtifactsDirectory, @"x86\WdfCoinstaller01009.dll")
-            );
-            #endregion
+                .SetNodeReuse(IsLocalBuild));
         });
 
     private Target Pack => _ => _