Removing some unnecessary differences (#9495)

* work on removing some unncessary differences

* fix compile

* skip another test

build/.nativeignore

@@ -83,11 +83,6 @@ node-pty/deps/**
 !node-pty/build/Release/*.dll
 !node-pty/build/Release/*.node
 
-emmet/node_modules/**
-
-pty.js/build/**
-!pty.js/build/Release/**
-
 # START SQL Modules
 
 @angular/**/src/**

build/azure-pipelines/exploration-merge.yml

@@ -1,39 +0,0 @@
-trigger:
-  branches:
-    include: ['master']
-pr: none
-
-jobs:
-  - job: ExplorationMerge
-    pool:
-      vmImage: Ubuntu-16.04
-    steps:
-      - task: NodeTool@0
-        inputs:
-          versionSpec: "10.15.1"
-
-      - script: |
-          set -e
-
-          cat << EOF > ~/.netrc
-          machine mssqltools.visualstudio.com
-          login azuredatastudio
-          password $(DEVOPS_PASSWORD)
-          EOF
-
-          git config user.email "andresse@microsoft.com"
-          git config user.name "AzureDataStudio"
-
-          git remote add explore "$ADS_EXPLORE_REPO"
-          git fetch explore
-
-          git checkout -b merge-branch explore/master
-
-          git merge origin/master
-
-          git push explore HEAD:master
-
-        displayName: Sync & Merge Explore
-        env:
-          ADS_EXPLORE_REPO: $(ADS_EXPLORE_REPO)
-          DEVOPS_PASSWORD: $(DEVOPS_PASSWORD)

build/gulpfile.hygiene.js

@@ -67,7 +67,6 @@ const indentationFilter = [
 
 	// except multiple specific files
 	'!**/package.json',
-	'!**/package-lock.json', // {{SQL CARBON EDIT}}
 	'!**/yarn.lock',
 	'!**/yarn-error.log',
 
@@ -406,7 +405,7 @@ function createGitIndexVinyls(paths) {
 				return e(err);
 			}
 
-			cp.exec(`git show ":${relativePath}"`, { maxBuffer: 2000 * 1024, encoding: 'buffer' }, (err, out) => {
+			cp.exec(`git show :${relativePath}`, { maxBuffer: 2000 * 1024, encoding: 'buffer' }, (err, out) => {
 				if (err) {
 					return e(err);
 				}

build/lib/optimize.ts

@@ -32,12 +32,11 @@ function log(prefix: string, message: string): void {
 	fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
 }
 
-// {{SQL CARBON EDIT}}
 export function loaderConfig(emptyPaths?: string[]) {
 	const result: any = {
 		paths: {
 			'vs': 'out-build/vs',
-			'sql': 'out-build/sql',
+			'sql': 'out-build/sql', // {{SQL CARBON EDIT}}
 			'vscode': 'empty:'
 		},
 		nodeModules: emptyPaths || []