From c831596e0258aceca2ea4647d2fa2420860f6217 Mon Sep 17 00:00:00 2001
From: Matt Irvine <mji7wb@virginia.edu>
Date: Mon, 25 Feb 2019 11:06:31 -0800
Subject: [PATCH] Fix Windows issues with menu, packaging, and test script
 (#4144)

---
 build/win32/code.iss                      | 1 -
 scripts/test.bat                          | 2 +-
 src/vs/platform/windows/common/windows.ts | 4 +++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/win32/code.iss b/build/win32/code.iss
index 0cb185870b..de979c66d5 100644
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -78,7 +78,6 @@ Name: "runcode"; Description: "{cm:RunAfter,{#NameShort}}"; GroupDescription: "{
 
 [Files]
 Source: "*"; Excludes: "\CodeSignSummary*.md,\tools,\tools\*,\resources\app\product.json"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "tools\*"; DestDir: "{app}\tools"; Flags: ignoreversion
 Source: "{#ProductJsonPath}"; DestDir: "{code:GetDestDir}\resources\app"; Flags: ignoreversion
 
 [Icons]
diff --git a/scripts/test.bat b/scripts/test.bat
index 05f9632554..829b88abb5 100644
--- a/scripts/test.bat
+++ b/scripts/test.bat
@@ -29,7 +29,7 @@ if not "%BUILD_BUILDID%" == "" (
 
 rem Otherwise
 if "%BUILD_BUILDID%" == "" (
-	%CODE% .\test\electron\index.js --reporter mocha-junit-reporter %*
+	%CODE% .\test\electron\index.js %*
 )
 popd
 
diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts
index 7436325efd..f587589c0b 100644
--- a/src/vs/platform/windows/common/windows.ts
+++ b/src/vs/platform/windows/common/windows.ts
@@ -275,7 +275,9 @@ export function getTitleBarStyle(configurationService: IConfigurationService, en
 		}
 	}
 
-	return 'custom'; // default to custom on all OS
+	// {{SQL CARBON EDIT}} - Always use native toolbar
+	return 'native';
+	// return 'custom'; // default to custom on all OS
 }
 
 export const enum OpenContext {