diff options
| author | Kirill Osenkov <github@osenkov.com> | 2019-06-29 02:37:25 +0300 |
|---|---|---|
| committer | Kirill Osenkov <github@osenkov.com> | 2019-06-29 02:37:25 +0300 |
| commit | 811639798f2f8d00ac904ab68f1d045c9a370de0 (patch) | |
| tree | e5e5f81c90e141283ba82ee5e90c81e62b67661d | |
| parent | 7adbba276a09d9680d44fa00fe3db93f2dfb251e (diff) | |
Fix Windows build.
3 files changed, 8 insertions, 1 deletions
diff --git a/main/msbuild/ReferencesVSEditor.Windows.props b/main/msbuild/ReferencesVSEditor.Windows.props index 83ad81e9f3..430fe530e8 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="all" />
+ <PackageReference Include="Microsoft.CodeAnalysis.InteractiveHost" Version="$(NuGetVersionRoslyn)" ExcludeAssets="$(ReferencesVSEditorPrivateAssets)" />
</ItemGroup>
<!-- The consolidated package is authored in a way to avoid adding it to the C# compiler (ref\net46 is empty).
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs index 5618666b3a..a7cdd2f82c 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs @@ -390,7 +390,9 @@ namespace MonoDevelop.TextEditor EditorOptions.ClearOptionValue (DefaultOptions.IndentSizeOptionName); EditorOptions.ClearOptionValue (DefaultOptions.NewLineCharacterOptionName); EditorOptions.ClearOptionValue (DefaultOptions.TrimTrailingWhiteSpaceOptionName); +#if !WINDOWS EditorOptions.ClearOptionValue (DefaultTextViewOptions.VerticalRulersName); +#endif return; } @@ -404,9 +406,11 @@ namespace MonoDevelop.TextEditor EditorOptions.SetOptionValue (DefaultOptions.NewLineCharacterOptionName, currentPolicy.GetEolMarker ()); EditorOptions.SetOptionValue (DefaultOptions.TrimTrailingWhiteSpaceOptionName, currentPolicy.RemoveTrailingWhitespace); +#if !WINDOWS EditorOptions.SetOptionValue ( DefaultTextViewOptions.VerticalRulersName, PropertyService.Get<bool> ("ShowRuler") ? new [] { currentPolicy.FileWidth } : Array.Empty<int> ()); +#endif } private Task UpdateOptionsFromEditorConfigAsync (object sender, CodingConventionsChangedEventArgs args) @@ -445,8 +449,10 @@ namespace MonoDevelop.TextEditor setVerticalRulers = false; } +#if !WINDOWS if (setVerticalRulers) EditorOptions.SetOptionValue (DefaultTextViewOptions.VerticalRulersName, verticalRulers ?? Array.Empty<int> ()); +#endif return Task.FromResult (true); } diff --git a/main/src/core/MonoDevelop.Startup/app.config b/main/src/core/MonoDevelop.Startup/app.config index 6ce5993912..96b3144c48 100644 --- a/main/src/core/MonoDevelop.Startup/app.config +++ b/main/src/core/MonoDevelop.Startup/app.config @@ -64,6 +64,7 @@ <dependentAssembly><assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-1.4.3.0" newVersion="1.4.3.0" /></dependentAssembly> <dependentAssembly><assemblyIdentity name="System.Runtime.Remoting" culture="neutral" publicKeyToken="b77a5c561934e089" /><bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /></dependentAssembly> <dependentAssembly><assemblyIdentity name="System.ValueTuple" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" /><bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /></dependentAssembly> + <dependentAssembly><assemblyIdentity name="System.Web.Razor" culture="neutral" publicKeyToken="31bf3856ad364e35" /><bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" /></dependentAssembly> <dependentAssembly><assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" /></dependentAssembly> <dependentAssembly><assemblyIdentity name="System.Xml" culture="neutral" publicKeyToken="b77a5c561934e089" /><bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /></dependentAssembly> <dependentAssembly><assemblyIdentity name="System" culture="neutral" publicKeyToken="b77a5c561934e089" /><bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /></dependentAssembly> |