diff options
| author | Aaron Bockover <abock@microsoft.com> | 2019-07-24 20:44:46 +0300 |
|---|---|---|
| committer | Aaron Bockover <abock@microsoft.com> | 2019-07-24 20:44:46 +0300 |
| commit | 22317686c5af2cc4303f0f3ba96634d272d136bb (patch) | |
| tree | e062b7f6ca0760f637fa1c128e0f7340d3369461 | |
| parent | 9559f1a0e581e743f6af13b5bc84c81783510ea7 (diff) | |
Sync with vs-editor-core@b82b1ffb
| -rw-r--r-- | Directory.Build.props | 1 | ||||
| -rw-r--r-- | build/Environment.props | 8 | ||||
| -rw-r--r-- | global.json | 4 | ||||
| -rw-r--r-- | src/Editor/Text/Def/TextUI/Commanding/CommandSelector.cs | 5 |
4 files changed, 15 insertions, 3 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index 7065fcf..d61b76d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -13,6 +13,7 @@ <RepoBinPath>$(RepoRootPath)bin\</RepoBinPath> <RepoObjPath>$(RepoRootPath)obj\</RepoObjPath> <RepoSrcPath>$(RepoRootPath)src\</RepoSrcPath> + <RepoSrcEditorPath>$(RepoSrcPath)Editor\</RepoSrcEditorPath> <RepoLocalNuGetFeedPath>$(RepoRootPath)build\nuget-feed\</RepoLocalNuGetFeedPath> <RepoSrcRelativeProjectDirectory Condition="$(MSBuildProjectDirectory.Length) >= $(RepoSrcPath.Length)">$(MSBuildProjectDirectory.Substring($(RepoSrcPath.Length)))\</RepoSrcRelativeProjectDirectory> diff --git a/build/Environment.props b/build/Environment.props index 8775bbc..826315d 100644 --- a/build/Environment.props +++ b/build/Environment.props @@ -10,7 +10,13 @@ <HaveMono Condition="'$(HaveMono)' == '' And '$(MonoInstallRootDirectory)' != '' And Exists('$(MonoInstallRootDirectory)VERSION')">true</HaveMono> <HaveMono Condition="'$(HaveMono)' == ''">false</HaveMono> - <HaveXamarinMac Condition="'$(HaveXamarinMac)' == '' And $(IsMac) And Exists('/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/Version')">true</HaveXamarinMac> + <!-- Mono msbuild workaround: MSBuildExtensionsPath seems to be '$(MonoInstallRootDirectory)lib/mono/xbuild' by default, which is incorrect... --> + <MSBuildExtensionsPath Condition="$(HaveMono)">$([MSBuild]::NormalizeDirectory('$(MonoInstallRootDirectory)..\..\External\xbuild'))</MSBuildExtensionsPath> + + <XamarinMacCommonProps>$(MSBuildExtensionsPath)Xamarin\Mac\Xamarin.Mac.Common.props</XamarinMacCommonProps> + <XamarinMacCommonTargets>$(MSBuildExtensionsPath)Xamarin\Mac\Xamarin.Mac.Common.targets</XamarinMacCommonTargets> + + <HaveXamarinMac Condition="'$(HaveXamarinMac)' == '' And $(IsMac) And Exists('$(XamarinMacCommonProps)') And Exists('$(XamarinMacCommonTargets)')">true</HaveXamarinMac> <HaveXamarinMac Condition="'$(HaveXamarinMac)' == ''">false</HaveXamarinMac> </PropertyGroup> diff --git a/global.json b/global.json index 9d9b739..7c894d9 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "msbuild-sdks": { "Microsoft.Build.Traversal": "1.0.45", - "Xamarin.MSBuild.Sdk": "0.22.0", - "Xamarin.Mac.Sdk": "0.22.0" + "Xamarin.MSBuild.Sdk": "0.26.0", + "Xamarin.Mac.Sdk": "0.26.0" } }
\ No newline at end of file diff --git a/src/Editor/Text/Def/TextUI/Commanding/CommandSelector.cs b/src/Editor/Text/Def/TextUI/Commanding/CommandSelector.cs index d6bfe08..343d261 100644 --- a/src/Editor/Text/Def/TextUI/Commanding/CommandSelector.cs +++ b/src/Editor/Text/Def/TextUI/Commanding/CommandSelector.cs @@ -285,6 +285,11 @@ namespace Microsoft.VisualStudio.Text.Editor.Commanding public const string ToggleOutliningDefinitions = "toggleOutliningDefinitions:"; + /// <summary>⇧⌥⇡</summary> + public const string ExpandSelection = "expandSelection:"; + + /// <summary>⇧⌥⇣</summary> + public const string ContractSelection = "contractSelection:"; #endregion } |