Merge pull request #1 from microsoft/master

Merge master

Author: mcpiroman

.github/ISSUE_TEMPLATE/Bug_Report.md

@@ -26,14 +26,16 @@ This bug tracker is monitored by Windows Terminal development team and other tec
 **Important: When reporting BSODs or security issues, DO NOT attach memory dumps, logs, or traces to Github issues**.
 Instead, send dumps/traces to secure@microsoft.com, referencing this GitHub issue.
 
+If this is an application crash, please also provide a Feedback Hub submission link so we can find your diagnostic data on the backend. Use the category "Apps > Windows Terminal (Preview)" and choose "Share My Feedback" after submission to get the link.
+
 Please use this form and describe your issue, concisely but precisely, with as much detail as possible.
 
 -->
 
 # Environment
 
 ```none
-Windows build number: [run "ver" at a command prompt]
+Windows build number: [run `[Environment]::OSVersion` for powershell, or `ver` for cmd]
 Windows Terminal version (if applicable):
 
 Any other software?

OpenConsole.sln

@@ -12,6 +12,8 @@
 
 ## Installation
 
+_(Note: in order to run the Windows Terminal, you'll need to be running at least Windows build 18362 or higher.)_
+
 ### Microsoft Store
 
 Download the Microsoft Terminal free from the Microsoft Store and it'll be continuously updated. Or, feel free to side-load [releases](https://github.com/microsoft/terminal/releases) from GitHub, but note they won't auto-update.

README.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.2 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [many more](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets Microsoft's [definition](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)) of a security vulnerability, please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/en-us/msrc/pgp-key-msrc).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://microsoft.com/msrc/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

SECURITY.md

@@ -13,17 +13,20 @@ pr:
   branches:
     include:
       - master
+  paths:
+    exclude:
+      - doc/*
+      - samples/*
+      - tools/*
 
 #     0.0.yyMM.dd##
 #     0.0.1904.0900
 name: 0.0.$(Date:yyMM).$(Date:dd)$(Rev:rr)
 
 jobs:
-# This is disabled because the build agents were running out of disk space. 
-# We're pursuing that in the background, but the spice must flow in the meantime.
-#  - template: ./templates/build-console-audit-job.yml
-#    parameters:
-#      platform: x64
+  - template: ./templates/build-console-audit-job.yml
+    parameters:
+      platform: x64
 
   - template: ./templates/build-console-ci.yml
     parameters:

build/pipelines/ci.yml

@@ -74,6 +74,14 @@ Try {
     If ($null -eq $AppXbf) {
         Throw "Failed to find App.xbf (TerminalApp project) in resources.pri"
     }
+
+    If ($Manifest.Package.Identity.ProcessorArchitecture -Ne "arm64") {
+        ### ARM64 doesn't package cpprest_2_10.
+        If (($null -eq (Get-Item "$AppxPackageRootPath\cpprest_2_10.dll" -EA:Ignore)) -And
+            ($null -eq (Get-Item "$AppxPackageRootPath\cpprest_2_10d.dll" -EA:Ignore))) {
+            Throw "Failed to find cpprest_2_10.dll -- check the WAP packaging project"
+        }
+    }
 } Finally {
     Remove-Item -Recurse -Force $AppxPackageRootPath
 }

build/scripts/Test-WindowsTerminalPackage.ps1

@@ -14,6 +14,7 @@
     "/.vs/",
     "/build/",
     "/src/cascadia/",
+    "/src/winconpty/",
     "/.nuget/",
     "/.github/",
     "/samples/"

consolegit2gitfilters.json

@@ -8,9 +8,9 @@ Settings in the Windows Console Host can be a bit tricky to understand. This is
 |---------------------------|-----------------------|--------------------------------------|
 |`FontSize`                 |Coordinate (REG_DWORD) |Size of font in pixels                |
 |`FontFamily`               |REG_DWORD              |GDI Font family                       |
-|`ScreenBufferSize`         |Coordinate (REG_DWORD) |Size of the screen buffer in WxH characters |
+|`ScreenBufferSize`         |Coordinate (REG_DWORD) |Size of the screen buffer in WxH characters\*\* |
 |`CursorSize`               |REG_DWORD              |Cursor height as percentage of a single character |
-|`WindowSize`               |Coordinate (REG_DWORD) |Initial size of the window in WxH characters |
+|`WindowSize`               |Coordinate (REG_DWORD) |Initial size of the window in WxH characters\*\* |
 |`WindowPosition`           |Coordinate (REG_DWORD) |Initial position of the window in WxH pixels (if not set, use auto-positioning) |
 |`WindowAlpha`              |REG_DWORD              |Opacity of the window (valid range: 0x4D-0xFF) |
 |`ScreenColors`             |REG_DWORD              |Default foreground and background colors |
@@ -39,6 +39,10 @@ Settings in the Windows Console Host can be a bit tricky to understand. This is
 
 *: Only applies to the improved version of the Windows Console Host
 
+**: WxH stands for Width by Height, it's the fact that things like a Window size
+store the Width and Height values in the high and low word in the registry's
+double word values.
+
 ## The Settings Hierarchy
 
 Settings are persisted to a variety of locations depending on how they are modified and how the Windows Console Host was invoked: