-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev/migrie/f/identifyWindows' into dev/migrie/f/rename-…
…windows # Conflicts: # src/cascadia/TerminalApp/Resources/en-US/Resources.resw # src/cascadia/TerminalApp/TerminalPage.cpp # src/cascadia/TerminalApp/TerminalPage.h # src/cascadia/WindowsTerminal/AppHost.cpp
- Loading branch information
Showing
134 changed files
with
2,992 additions
and
2,919 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| { | ||
| // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations. | ||
| // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp | ||
|
|
||
| // List of extensions which should be recommended for users of this workspace. | ||
| "recommendations": [ | ||
| "ms-vscode.cpptools" | ||
| ], | ||
| // List of extensions recommended by VS Code that should not be recommended for users of this workspace. | ||
| "unwantedRecommendations": [ | ||
|
|
||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| { | ||
| // Use IntelliSense to learn about possible attributes. | ||
| // Hover to view descriptions of existing attributes. | ||
| // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| "name": "Debug OpenConsole by Launching (x64, debug)", | ||
| "type": "cppvsdbg", | ||
| "request": "launch", | ||
| "program": "${workspaceFolder}\\bin\\x64\\debug\\openconsole.exe", | ||
| "args": [], | ||
| "stopAtEntry": false, | ||
| "cwd": "${workspaceFolder}", | ||
| "environment": [], | ||
| }, | ||
| { | ||
| "name": "Debug Terminal by Attaching (You go build/register/launch it first.)", | ||
| "type": "cppvsdbg", | ||
| "request": "attach", | ||
| "processId": "${command:pickProcess}" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| { | ||
| "C_Cpp.default.browse.databaseFilename": "${workspaceFolder}\\.vscode\\.BROWSE.VC.DB", | ||
| "C_Cpp.default.browse.path": [ | ||
| "${workspaceFolder}" | ||
| ], | ||
| "C_Cpp.loggingLevel": "None", | ||
| "files.associations": { | ||
| "xstring": "cpp", | ||
| "*.idl": "cpp", | ||
| "array": "cpp", | ||
| "future": "cpp", | ||
| "istream": "cpp", | ||
| "memory": "cpp", | ||
| "tuple": "cpp", | ||
| "type_traits": "cpp", | ||
| "utility": "cpp", | ||
| "variant": "cpp", | ||
| "xlocmes": "cpp", | ||
| "xlocmon": "cpp", | ||
| "xlocnum": "cpp", | ||
| "xloctime": "cpp", | ||
| "multi_span": "cpp", | ||
| "pointers": "cpp", | ||
| "vector": "cpp" | ||
| }, | ||
| "files.exclude": { | ||
| "**/bin/**": true, | ||
| "**/obj/**": true, | ||
| "**/packages/**": true, | ||
| "**/generated files/**": true | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| { | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "type": "process", | ||
| "label": "Build Terminal/Console", | ||
| "command": "powershell.exe", | ||
| "args": [ | ||
| "-Command", | ||
| "Import-Module ${workspaceFolder}\\tools\\OpenConsole.psm1;", | ||
| "Set-MsBuildDevEnvironment;", | ||
| "$project = switch(\"${input:buildProjectChoice}\"){OpenConsole{\"Conhost\\Host_EXE\"} Terminal{\"Terminal\\CascadiaPackage\"}};", | ||
| "$target = switch(\"${input:buildModeChoice}\"){Build{\"\"} Rebuild{\":Rebuild\"} Clean{\":Clean\"}};", | ||
| "$target = $project + $target;", | ||
| "msbuild", | ||
| "${workspaceFolder}\\OpenConsole.sln", | ||
| "/p:Configuration=${input:configChoice}", | ||
| "/p:Platform=${input:platformChoice}", | ||
| "/t:$target", | ||
| "/verbosity:minimal" | ||
| ], | ||
| "problemMatcher": ["$msCompile"], | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| }, | ||
| "runOptions": { | ||
| "reevaluateOnRerun": false, | ||
| "instanceLimit": 1, | ||
| "runOn": "default" | ||
| } | ||
| }, | ||
| { | ||
| "type": "process", | ||
| "label": "Register Windows Terminal x64 Debug", | ||
| "command": "powershell.exe", | ||
| "args": [ | ||
| "-Command", | ||
| "Import-Module ${workspaceFolder}\\tools\\OpenConsole.psm1;", | ||
| "Set-MsBuildDevEnvironment;", | ||
| "Set-Location -Path ${workspaceFolder}\\src\\cascadia\\CascadiaPackage\\AppPackages\\CascadiaPackage_0.0.1.0_x64_Debug_Test;", | ||
| "if ((Get-AppxPackage -Name 'WindowsTerminalDev*') -ne $null) { Remove-AppxPackage 'WindowsTerminalDev_0.0.1.0_x64__8wekyb3d8bbwe'};", | ||
| "New-Item ..\\loose -Type Directory -Force;", | ||
| "makeappx unpack /v /o /p .\\CascadiaPackage_0.0.1.0_x64_Debug.msix /d ..\\Loose\\;", | ||
| "Add-AppxPackage -Path ..\\loose\\AppxManifest.xml -Register -ForceUpdateFromAnyVersion -ForceApplicationShutdown" | ||
| ], | ||
| "problemMatcher": ["$msCompile"], | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| } | ||
| }, | ||
| { | ||
| "type": "process", | ||
| "label": "Run Windows Terminal Dev", | ||
| "command": "wtd.exe", | ||
| "args": [ | ||
| ], | ||
| "problemMatcher": ["$msCompile"], | ||
| } | ||
| ], | ||
| "inputs":[ | ||
| { | ||
| "id": "platformChoice", | ||
| "type": "pickString", | ||
| "description": "Processor architecture choice", | ||
| "options":[ | ||
| "x64", | ||
| "x86", | ||
| "arm64" | ||
| ], | ||
| "default": "x64" | ||
| }, | ||
| { | ||
| "id": "configChoice", | ||
| "type": "pickString", | ||
| "description": "Debug or release?", | ||
| "options":[ | ||
| "Debug", | ||
| "Release" | ||
| ], | ||
| "default": "Debug" | ||
| }, | ||
| { | ||
| "id": "buildModeChoice", | ||
| "type": "pickString", | ||
| "description": "Build, rebuild, or clean?", | ||
| "options":[ | ||
| "Build", | ||
| "Rebuild", | ||
| "Clean" | ||
| ], | ||
| "default": "Build" | ||
| }, | ||
| { | ||
| "id": "buildProjectChoice", | ||
| "type": "pickString", | ||
| "description": "OpenConsole or Terminal?", | ||
| "options":[ | ||
| "OpenConsole", | ||
| "Terminal" | ||
| ], | ||
| "default": "Terminal" | ||
| } | ||
|
|
||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
This comment was marked as outdated.
Sorry, something went wrong.