merge(): pull in recent changes from master

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = crlf
+indent_size = 4
+indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true

README.md

@@ -15,36 +15,28 @@ Download [the latest version of the online installer][D1].
 All other downloads are available [in the Releases section][D2]. Visual Studio Code Portable
 is packaged as an online installer and complete zip file.
 
- [D1]: https://github.com/garethflowers/vscode-portable/releases/tag/Latest
- [D2]: https://github.com/garethflowers/vscode-portable/releases/latest
+[D1]: https://github.com/garethflowers/vscode-portable/releases/tag/Latest
+[D2]: https://github.com/garethflowers/vscode-portable/releases/latest
 
 ## Features
-* Runs a full copy of the Visual Studio Code editor.
-* Completely portable - runs off a USB, cloud drive (DropBox, iCloud drive,
-  OneDrive, etc) or hard drive.
-* Does not require administrator privileges, works for any user.
-* No need for any external software - simply download extract and run!
-* Packaged in PortableApps.com format for easy integration.
+
+* Runs a full copy of the Visual Studio Code editor.
+* Completely portable - runs off a USB, cloud drive (DropBox, iCloud drive, OneDrive, etc) or hard drive.
+* Does not require administrator privileges, works for any user.
+* No need for any external software - simply download extract and run!
+* Packaged in PortableApps.com format for easy integration.
 
 ## System Requirements
-* Microsoft Windows 7 or later.
-* [PortableApps.com Platform][S1] (Optional)
 
- [S1]: https://portableapps.com/download
+* Microsoft Windows 7 or later.
+* [PortableApps.com Platform](https://portableapps.com/download) (Optional)
 
 ## Credits
-* Visual Studio Code Portable is a redistribution of the
- [Visual Studio Code][C1] editor, developed by [Microsoft][C2].
-* [PortableApps.com platform][S1] developed by the [PortableApps.com team][C3].
-
- [C1]: https://code.visualstudio.com
- [C2]: https://www.microsoft.com
- [C3]: https://portableapps.com
+* Visual Studio Code Portable is a redistribution of the [Visual Studio Code](https://code.visualstudio.com) editor, developed by [Microsoft](https://www.microsoft.com).
+* [PortableApps.com platform](https://portableapps.com/download) developed by the [PortableApps.com team](https://portableapps.com).
 
 ## License
 
-* Portable application code released under [the MIT license][L1].
-* The Visual Studio Code editor is released under [the MIT license][L2].
-
- [L1]: https://raw.githubusercontent.com/garethflowers/vscode-portable/master/LICENSE
- [L2]: https://raw.githubusercontent.com/Microsoft/vscode/master/LICENSE.txt
+* Visual Studio Code Portable released under [the GPL v2.0 license](https://raw.githubusercontent.com/garethflowers/vscode-portable/master/LICENSE).
+* PortableApps.com Launcher released under [the GPL v2.0 license](https://raw.githubusercontent.com/garethflowers/vscode-portable/master/VSCodePortable/Other/Source/LauncherLicense.txt).
+* The Visual Studio Code editor is released under [the MIT license](https://raw.githubusercontent.com/Microsoft/vscode/master/LICENSE.txt).

VSCodePortable/App/AppInfo/Launcher/VSCodePortable.ini

@@ -1,7 +1,7 @@
 [Launch]
 ProgramExecutable=VSCode\code.exe
 ProgramExecutable64=VSCode64\code.exe
-CommandLineArguments='--user-data-dir="%PAL:DataDir%\code" --extensionHomePath="%PAL:DataDir%\code\extensions"'
+CommandLineArguments='--user-data-dir="%PAL:DataDir%\code" --extensions-dir="%PAL:DataDir%\code\extensions"'
 DirectoryMoveOK=yes
 DisableSplashScreen=true
 SplashTime=0
@@ -13,5 +13,7 @@ VSCODE_HOME=%PAL:DataDir%\code
 
 [DirectoriesCleanupIfEmpty]
 1=%APPDATA%\Code
-2=%USERPROFILE%\.vscode\extensions
-3=%USERPROFILE%\.vscode
+2=%APPDATA%\Visual Studio Code\logs
+3=%APPDATA%\Visual Studio Code
+4=%USERPROFILE%\.vscode\extensions
+5=%USERPROFILE%\.vscode

VSCodePortable/App/DefaultData/code/User/settings.json

@@ -1,4 +1,4 @@
 {
- "git.ignoreMissingGitWarning": true,
- "update.channel": "none"
+ "git.ignoreMissingGitWarning": true,
+ "update.channel": "none"
 }