diff options
| author | Marius Ungureanu <therzok@gmail.com> | 2019-08-13 07:27:26 +0300 |
|---|---|---|
| committer | Matt Ward <ward.matt@gmail.com> | 2019-08-13 16:54:27 +0300 |
| commit | acc60494884accc4baf88cdb213245288efbdeaf (patch) | |
| tree | 316206cdb50490625b541f5c05358b3d95cdb576 | |
| parent | a7f8c78dfc2f97fb19c255d80e69b82b9b2e5d2a (diff) | |
[Windows] Some fixes to assembly references
| -rw-r--r-- | main/msbuild/ReferencesVSEditor.Windows.props | 4 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/main/msbuild/ReferencesVSEditor.Windows.props b/main/msbuild/ReferencesVSEditor.Windows.props index 430fe530e8..f556230002 100644 --- a/main/msbuild/ReferencesVSEditor.Windows.props +++ b/main/msbuild/ReferencesVSEditor.Windows.props @@ -15,7 +15,7 @@ <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="$(NuGetVersionRoslyn)" PrivateAssets="$(ReferencesVSEditorPrivateAssets)" ExcludeAssets="$(ReferencesVSEditorExcludeAssets)" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="$(NuGetVersionVSEditor)" PrivateAssets="$(ReferencesVSEditorPrivateAssets)" ExcludeAssets="$(ReferencesVSEditorExcludeAssets)" />
<PackageReference Include="Microsoft.VisualStudio.InteractiveWindow" Version="2.8.0" PrivateAssets="$(ReferencesVSEditorPrivateAssets)" ExcludeAssets="$(ReferencesVSEditorExcludeAssets)" />
- <PackageReference Include="Microsoft.CodeAnalysis.InteractiveHost" Version="$(NuGetVersionRoslyn)" ExcludeAssets="$(ReferencesVSEditorPrivateAssets)" />
+ <PackageReference Include="Microsoft.CodeAnalysis.InteractiveHost" Version="$(NuGetVersionRoslyn)" PrivateAssets="$(ReferencesVSEditorPrivateAssets)" ExcludeAssets="$(ReferencesVSEditorExcludeAssets)" />
</ItemGroup>
<!-- The consolidated package is authored in a way to avoid adding it to the C# compiler (ref\net46 is empty).
@@ -25,7 +25,7 @@ <Reference Include="$(NuGetPackageRoot)Microsoft.VisualStudio.Platform.VSEditor\$(NuGetVersionVSEditor)\lib\net472\Microsoft.VisualStudio.Platform.VSEditor.dll">
<Private>false</Private>
</Reference>
- <Reference Include="$(NuGetPackageRoot)Microsoft.CodeAnalysis.InteractiveHost\$(NuGetVersionRoslyn)\Microsoft.CodeAnalysis.InteractiveHost.dll">
+ <Reference Include="$(NuGetPackageRoot)Microsoft.CodeAnalysis.InteractiveHost\$(NuGetVersionRoslyn)\lib\net472\Microsoft.CodeAnalysis.InteractiveHost.dll">
<Private>$(ReferencesVSEditorCopyToOutput)</Private>
</Reference>
</ItemGroup>
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs index 35d13428c6..4bf701d73f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs @@ -521,12 +521,16 @@ namespace MonoDevelop.Ide.Gui [CommandUpdateHandler (EditCommands.EnableDisableFolding)] protected void UpdateEnableDisableFolding (CommandInfo info) { +#if WINDOWS + info.Enabled = info.Visible = false; +#else info.Text = IsFoldMarkerMarginEnabled ? GettextCatalog.GetString ("Disable _Folding") : GettextCatalog.GetString ("Enable _Folding"); info.Enabled = GetContent<IFoldable> () != null || GetContent<Microsoft.VisualStudio.Text.Editor.ITextView3> () != null; // As we need to support both the new and the legacy editor, we need to check if perhaps // we are running in the new one. The legacy editor already implements <see cref="ITextView"/> // so we can't simply look for that and we do not want to import anything related to Cocoa. +#endif } [CommandUpdateHandler (EditCommands.ToggleAllFoldings)] |