Merge pull request #92 from Microsoft/master

Sync with Microsoft microsoft#506

.azure-pipelines/common/build.yml

@@ -0,0 +1,9 @@
+steps:
+- task: Npm@1
+  displayName: 'npm install'
+
+- task: Npm@1
+  displayName: 'Build'
+  inputs:
+    command: custom
+    customCommand: run build

.azure-pipelines/common/lint.yml

@@ -0,0 +1,10 @@
+steps:
+- task: Npm@1
+  displayName: 'Lint'
+  inputs:
+    command: custom
+    customCommand: run lint
+
+- task: ComponentGovernanceComponentDetection@0
+  displayName: 'Component Detection'
+  condition: ne(variables['System.PullRequest.IsFork'], 'True')

.azure-pipelines/common/publish-test-results.yml

@@ -0,0 +1,7 @@
+steps:
+- task: PublishTestResults@2
+  displayName: 'Publish Test Results'
+  inputs:
+    testResultsFiles: '*-results.xml'
+    testRunTitle: '$(Agent.OS)'
+  condition: succeededOrFailed()

.azure-pipelines/common/publish-vsix.yml

@@ -0,0 +1,19 @@
+steps:
+- task: Npm@1
+  displayName: 'Package'
+  inputs:
+    command: custom
+    customCommand: run package
+
+- task: CopyFiles@2
+  displayName: 'Copy vsix to staging directory'
+  inputs:
+    Contents: '**/*.vsix'
+    TargetFolder: '$(build.artifactstagingdirectory)'
+
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish artifacts: vsix'
+  inputs:
+    PathtoPublish: '$(build.artifactstagingdirectory)'
+    ArtifactName: vsix
+  condition: ne(variables['System.PullRequest.IsFork'], 'True')

.azure-pipelines/common/test.yml

@@ -0,0 +1,11 @@
+steps:
+- task: Gulp@0
+  displayName: 'Test'
+  inputs:
+    targets: 'test'
+  env:
+    SERVICE_PRINCIPAL_CLIENT_ID: $(SERVICE_PRINCIPAL_CLIENT_ID)
+    SERVICE_PRINCIPAL_SECRET: $(SERVICE_PRINCIPAL_SECRET)
+    SERVICE_PRINCIPAL_DOMAIN: $(SERVICE_PRINCIPAL_DOMAIN)
+
+- template: publish-test-results.yml

.azure-pipelines/linux/test-linux.yml

@@ -0,0 +1,18 @@
+steps:
+- script: |
+    sudo cp .azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
+    sudo chmod +x /etc/init.d/xvfb
+    sudo update-rc.d xvfb defaults
+    sudo service xvfb start
+  displayName: 'Start X Virtual Frame Buffer'
+
+- script: |
+    export DISPLAY=:10
+    gulp test
+  displayName: 'Test'
+  env:
+    SERVICE_PRINCIPAL_CLIENT_ID: $(SERVICE_PRINCIPAL_CLIENT_ID)
+    SERVICE_PRINCIPAL_SECRET: $(SERVICE_PRINCIPAL_SECRET)
+    SERVICE_PRINCIPAL_DOMAIN: $(SERVICE_PRINCIPAL_DOMAIN)
+
+- template: ../common/publish-test-results.yml

.azure-pipelines/linux/xvfb.init

@@ -0,0 +1,56 @@
+#!/bin/bash
+#
+# COPIED FROM https://github.com/Microsoft/vscode/blob/e29c517386fe6f3a40e2f0ff00effae4919406aa/build/tfs/linux/x64/xvfb.init
+#
+#
+# /etc/rc.d/init.d/xvfbd
+#
+# chkconfig: 345 95 28
+# description: Starts/Stops X Virtual Framebuffer server
+# processname: Xvfb
+#
+### BEGIN INIT INFO
+# Provides:          xvfb
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start xvfb at boot time
+# Description:       Enable xvfb provided by daemon.
+### END INIT INFO
+
+[ "${NETWORKING}" = "no" ] && exit 0
+
+PROG="/usr/bin/Xvfb"
+PROG_OPTIONS=":10 -ac"
+PROG_OUTPUT="/tmp/Xvfb.out"
+
+case "$1" in
+	start)
+		echo "Starting : X Virtual Frame Buffer "
+		$PROG $PROG_OPTIONS>>$PROG_OUTPUT 2>&1 &
+		disown -ar
+	;;
+	stop)
+		echo "Shutting down : X Virtual Frame Buffer"
+		killproc $PROG
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && /bin/rm -f /var/lock/subsys/Xvfb
+		/var/run/Xvfb.pid
+		echo
+	;;
+	restart|reload)
+		$0 stop
+		$0 start
+		RETVAL=$?
+	;;
+	status)
+		status Xvfb
+		RETVAL=$?
+	;;
+	*)
+		echo $"Usage: $0 (start|stop|restart|reload|status)"
+		exit 1
+esac
+
+exit $RETVAL

.azure-pipelines/main.yml

@@ -0,0 +1,27 @@
+jobs:
+- job: Windows
+  pool:
+    vmImage: VS2017-Win2016
+  steps:
+  - template: common/build.yml
+  - template: common/lint.yml
+  # https://github.com/Microsoft/vscode-docker/issues/606
+  # - template: common/test.yml
+
+- job: Linux
+  pool:
+    vmImage: ubuntu-16.04
+  steps:
+  - template: common/build.yml
+  - template: common/publish-vsix.yml # Only publish vsix from linux build since we use this to release and want to stay consistent
+  - template: common/lint.yml
+  - template: linux/test-linux.yml
+
+- job: macOS
+  pool:
+    vmImage: macOS 10.13
+  steps:
+  - template: common/build.yml
+  - template: common/lint.yml
+  # https://github.com/Microsoft/vscode-docker/issues/606
+  # - template: common/test.yml

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @Microsoft/vscodeazuretools

.gitignore

@@ -9,3 +9,4 @@ coverage/**
 .vscode-test
 testOutput
 .vs
+test-results.xml

.vscode/launch.json

@@ -8,15 +8,15 @@
 			"request": "launch",
 			"runtimeExecutable": "${execPath}",
 			"args": [
-				"--extensionDevelopmentPath=${workspaceRoot}"
+				"--extensionDevelopmentPath=${workspaceFolder}"
 			],
 			"env": {
 				"DEBUGTELEMETRY": "1"
 			},
 			"stopOnEntry": false,
 			"sourceMaps": true,
 			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
+				"${workspaceFolder}/out/**/*.js"
 			],
 			"preLaunchTask": "npm"
 		},
@@ -31,14 +31,14 @@
 				// "c:/Repos/vscode-docker/test/test.code-workspace",
 				// "--extensionDevelopmentPath=c:/Repos/vscode-docker",
 				// "--extensionTestsPath=c:/Repos/vscode-docker/out/test"
-				"${workspaceRoot}/test/test.code-workspace",
-				"--extensionDevelopmentPath=${workspaceRoot}",
-				"--extensionTestsPath=${workspaceRoot}/out/test"
+				"${workspaceFolder}/test/test.code-workspace",
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--extensionTestsPath=${workspaceFolder}/out/test"
 			],
 			"stopOnEntry": false,
 			"sourceMaps": true,
 			"outFiles": [
-				"${workspaceRoot}/out/test"
+				"${workspaceFolder}/out/test"
 			],
 			"preLaunchTask": "npm",
 			"env": {

.vscode/tasks.json

@@ -1,5 +1,5 @@
 // Available variables which can be used inside of strings.
-// ${workspaceRoot}: the root folder of the team
+// ${workspaceFolder}: the root folder of the team
 // ${file}: the current opened file
 // ${fileBasename}: the current opened file's basename
 // ${fileDirname}: the current opened file's dirname
@@ -34,10 +34,7 @@
 		{
 			"type": "npm",
 			"script": "lint",
-			"problemMatcher": {
-				"base": "$tslint5",
-				"fileLocation": "absolute"
-			}
+			"problemMatcher": "$tslint5"
 		}
 	]
 }

.vscodeignore

@@ -6,3 +6,6 @@ typings/**
 tsconfig.json
 test/**
 testOutput/**
+.github/**
+test-results.xml
+.azure-pipelines/**

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.x.x - Unreleased
+
+### Added
+* Adds preview support for debugging .NET Core web applications running in Linux Docker containers.
+
+## 0.3.1 - 25 September 2018
+
+### Fixed
+
+* Error while generating Dockerfile for 'other' [#504](https://github.com/Microsoft/vscode-docker/issues/504)
+
 ## 0.3.0 - 21 September 2018
 
 ### Added