diff --git a/.gitmodules b/.gitmodules
index e0d4812f099..f202a94ffa9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -42,5 +42,5 @@
branch = dotdevelop
[submodule "main/external/Samsung.Netcoredbg"]
path = main/external/Samsung.Netcoredbg
- url = https://github.com/dotdevelop/netcoredbg.git
- branch = dotdevelop
+ url = https://github.com/MakiWolf/netcoredbg
+ branch = master
diff --git a/main/Directory.Build.props b/main/Directory.Build.props
index f501d998f17..42f43c978de 100644
--- a/main/Directory.Build.props
+++ b/main/Directory.Build.props
@@ -18,7 +18,7 @@
16.11.0
0.1.0.2
13.0.3
- 5.8.0
+ 5.8.1
2.7.1
3.16.3
17.2.60629.1
diff --git a/main/NEWS b/main/NEWS
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/main/external/Samsung.Netcoredbg b/main/external/Samsung.Netcoredbg
index 39c63e79eb9..aafa6f3b84c 160000
--- a/main/external/Samsung.Netcoredbg
+++ b/main/external/Samsung.Netcoredbg
@@ -1 +1 @@
-Subproject commit 39c63e79eb98e6fb0b63ebbf58e9fb80e2d7ba2d
+Subproject commit aafa6f3b84c2e844d832db40478c50d174340a4e
diff --git a/main/external/guiunit b/main/external/guiunit
index 9affe481398..29faffa8220 160000
--- a/main/external/guiunit
+++ b/main/external/guiunit
@@ -1 +1 @@
-Subproject commit 9affe4813987b009022ab7b10e55f81f4a37344c
+Subproject commit 29faffa82201c61a6b51f9b647825c8fbd9ef8de
diff --git a/main/external/mono-tools b/main/external/mono-tools
index d858f5f27fa..8e265af7cd6 160000
--- a/main/external/mono-tools
+++ b/main/external/mono-tools
@@ -1 +1 @@
-Subproject commit d858f5f27fa8b10d734ccce7ffba631b995093e5
+Subproject commit 8e265af7cd665457281f4f9e375be32ac1b8ec99
diff --git a/main/external/nrefactory b/main/external/nrefactory
index 60ac8e99c51..074fabe9ba5 160000
--- a/main/external/nrefactory
+++ b/main/external/nrefactory
@@ -1 +1 @@
-Subproject commit 60ac8e99c51e43a58a4dc124b9680fb73c2f974b
+Subproject commit 074fabe9ba5dee3e02421538f596151344528f6a
diff --git a/main/external/nuget-binary/Lucene.Net.dll b/main/external/nuget-binary/Lucene.Net.dll
deleted file mode 100755
index 5cbb2bd46dc..00000000000
Binary files a/main/external/nuget-binary/Lucene.Net.dll and /dev/null differ
diff --git a/main/external/nuget-binary/Microsoft.Web.XmlTransform.dll b/main/external/nuget-binary/Microsoft.Web.XmlTransform.dll
deleted file mode 100755
index 98c9d56ff43..00000000000
Binary files a/main/external/nuget-binary/Microsoft.Web.XmlTransform.dll and /dev/null differ
diff --git a/main/external/nuget-binary/NuGet.Commands.dll b/main/external/nuget-binary/NuGet.Commands.dll
deleted file mode 100644
index 31e766b4d7e..00000000000
Binary files a/main/external/nuget-binary/NuGet.Commands.dll and /dev/null differ
diff --git a/main/external/nuget-binary/NuGet.Common.dll b/main/external/nuget-binary/NuGet.Common.dll
deleted file mode 100644
index cec6277e09e..00000000000
Binary files a/main/external/nuget-binary/NuGet.Common.dll and /dev/null differ
diff --git a/main/external/nuget-binary/NuGet.Configuration.dll b/main/external/nuget-binary/NuGet.Configuration.dll
deleted file mode 100644
index cb29db8ed14..00000000000
Binary files a/main/external/nuget-binary/NuGet.Configuration.dll and /dev/null differ
diff --git a/main/external/nuget-binary/NuGet.DependencyResolver.Core.dll b/main/external/nuget-binary/NuGet.DependencyResolver.Core.dll
deleted file mode 100644
index 90be4aeef43..00000000000
Binary files a/main/external/nuget-binary/NuGet.DependencyResolver.Core.dll and /dev/null differ
diff --git a/main/external/nuget-binary/NuGet.Frameworks.dll b/main/external/nuget-binary/NuGet.Frameworks.dll
deleted file mode 100644
index 009e420ad60..00000000000
Binary files a/main/external/nuget-binary/NuGet.Frameworks.dll and /dev/null differ
diff --git a/main/external/nuget-binary/NuGet.Indexing.dll b/main/external/nuget-binary/NuGet.Indexing.dll
deleted file mode 100644
index 55f5e1bfa94..00000000000
Binary files a/main/external/nuget-binary/NuGet.Indexing.dll and /dev/null differ
diff --git a/main/external/nuget-binary/NuGet.LibraryModel.dll b/main/external/nuget-binary/NuGet.LibraryModel.dll
deleted file mode 100644
index a70b8bf5f1a..00000000000
Binary files a/main/external/nuget-binary/NuGet.LibraryModel.dll and /dev/null differ
diff --git a/main/external/nuget-binary/NuGet.PackageManagement.dll b/main/external/nuget-binary/NuGet.PackageManagement.dll
deleted file mode 100644
index 9d33be12f15..00000000000
Binary files a/main/external/nuget-binary/NuGet.PackageManagement.dll and /dev/null differ
diff --git a/main/external/nuget-binary/NuGet.Packaging.Core.dll b/main/external/nuget-binary/NuGet.Packaging.Core.dll
deleted file mode 100644
index 58a73c2c2e3..00000000000
Binary files a/main/external/nuget-binary/NuGet.Packaging.Core.dll and /dev/null differ
diff --git a/main/external/nuget-binary/NuGet.Packaging.dll b/main/external/nuget-binary/NuGet.Packaging.dll
deleted file mode 100644
index 7067e2e513c..00000000000
Binary files a/main/external/nuget-binary/NuGet.Packaging.dll and /dev/null differ
diff --git a/main/external/nuget-binary/NuGet.ProjectModel.dll b/main/external/nuget-binary/NuGet.ProjectModel.dll
deleted file mode 100644
index 1be0af44d0b..00000000000
Binary files a/main/external/nuget-binary/NuGet.ProjectModel.dll and /dev/null differ
diff --git a/main/external/nuget-binary/NuGet.Protocol.dll b/main/external/nuget-binary/NuGet.Protocol.dll
deleted file mode 100644
index ea2d1f39f55..00000000000
Binary files a/main/external/nuget-binary/NuGet.Protocol.dll and /dev/null differ
diff --git a/main/external/nuget-binary/NuGet.Resolver.dll b/main/external/nuget-binary/NuGet.Resolver.dll
deleted file mode 100644
index 46d10782ecc..00000000000
Binary files a/main/external/nuget-binary/NuGet.Resolver.dll and /dev/null differ
diff --git a/main/external/nuget-binary/NuGet.Versioning.dll b/main/external/nuget-binary/NuGet.Versioning.dll
deleted file mode 100644
index 9ed020685fb..00000000000
Binary files a/main/external/nuget-binary/NuGet.Versioning.dll and /dev/null differ
diff --git a/main/external/nuget-binary/nuget.exe b/main/external/nuget-binary/nuget.exe
index 0e535e736e8..52e426db15b 100644
Binary files a/main/external/nuget-binary/nuget.exe and b/main/external/nuget-binary/nuget.exe differ
diff --git a/main/msbuild/ReferencesVSEditor.Windows.props b/main/msbuild/ReferencesVSEditor.Windows.props
index f556230002d..fd4895e0de7 100644
--- a/main/msbuild/ReferencesVSEditor.Windows.props
+++ b/main/msbuild/ReferencesVSEditor.Windows.props
@@ -15,7 +15,7 @@
-
+
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs
index bf0d3cbef83..3fd8c234baf 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs
@@ -47,7 +47,7 @@
using Roslyn.Utilities;
using Microsoft.CodeAnalysis.Options;
using MonoDevelop.CSharp.OptionProvider;
-using Microsoft.VisualStudio.CodingConventions;
+//using Microsoft.VisualStudio.CodingConventions;
using System.Linq;
using System.Collections.Immutable;
using System.Runtime.CompilerServices;
@@ -143,7 +143,7 @@ protected override ITextSource FormatImplementation (PolicyContainer policyParen
var textPolicy = policyParent.Get (chain);
var optionSet = policy.CreateOptions (textPolicy);
- if (input is IReadonlyTextDocument doc) {
+ /* if (input is IReadonlyTextDocument doc) {
try {
var conventions = EditorConfigService.GetEditorConfigContext (doc.FileName).WaitAndGetResult ();
if (conventions != null)
@@ -151,12 +151,12 @@ protected override ITextSource FormatImplementation (PolicyContainer policyParen
} catch (Exception e) {
LoggingService.LogError ("Error while loading coding conventions.", e);
}
- }
+ } */
return new StringTextSource (FormatText (optionSet, input.Text, startOffset, startOffset + length));
}
- sealed class DocumentOptions : IDocumentOptions
+ /* sealed class DocumentOptions : IDocumentOptions
{
readonly OptionSet optionSet;
readonly ICodingConventionsSnapshot codingConventionsSnapshot;
@@ -164,13 +164,13 @@ sealed class DocumentOptions : IDocumentOptions
new ConditionalWeakTable, IReadOnlyDictionary> ();
- public DocumentOptions (OptionSet optionSet, ICodingConventionsSnapshot codingConventionsSnapshot)
+ public DocumentOptions (OptionSet optionSet, ICodingConventionsSnapshot codingConventionsSnapshot)
{
this.optionSet = optionSet;
this.codingConventionsSnapshot = codingConventionsSnapshot;
}
- public bool TryGetDocumentOption (OptionKey option, out object value)
+ public bool TryGetDocumentOption (OptionKey option, out object value)
{
if (codingConventionsSnapshot != null) {
var editorConfigPersistence = option.Option.StorageLocations.OfType ().SingleOrDefault ();
@@ -198,8 +198,8 @@ public bool TryGetDocumentOption (OptionKey option, out object value)
var result = optionSet.GetOption (option);
value = result;
return true;
- }
- }
+ }
+ } */
sealed class FormattingDocumentOptionSet : OptionSet
{
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/CSharpDocumentOptionsProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/CSharpDocumentOptionsProvider.cs
index b48aca4ce4c..63477e3126c 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/CSharpDocumentOptionsProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/CSharpDocumentOptionsProvider.cs
@@ -23,7 +23,7 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
+/* using System;
using System.ComponentModel.Composition;
using System.Threading;
using System.Threading.Tasks;
@@ -54,12 +54,12 @@ async Task IDocumentOptionsProvider.GetOptionsForDocumentAsync
var path = GetPath (document);
ICodingConventionContext conventions = null;
- try {
- if (path != null)
- conventions = await EditorConfigService.GetEditorConfigContext (path, cancellationToken);
- } catch (Exception e) {
- LoggingService.LogError("Error while loading coding conventions.", e);
- }
+ try {
+ if (path != null)
+ //conventions = await EditorConfigService.GetEditorConfigContext (path, cancellationToken);
+ } catch (Exception e) {
+ LoggingService.LogError("Error while loading coding conventions.", e);
+ }
return new DocumentOptions (project?.Policies, conventions?.CurrentConventions);
}
@@ -155,3 +155,4 @@ public bool TryGetDocumentOption (OptionKey option, out object value)
}
}
}
+ */
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/OptionProviderFactory.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/OptionProviderFactory.cs
index b10358ea09b..2a01af55155 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/OptionProviderFactory.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/OptionProviderFactory.cs
@@ -23,7 +23,7 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
+/* using System;
using System.ComponentModel.Composition;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Options;
@@ -39,3 +39,4 @@ public IDocumentOptionsProvider TryCreate (Workspace workspace)
}
}
}
+ */
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml b/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml
index 6df895b7001..f640df74dbe 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml
+++ b/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml
@@ -84,6 +84,351 @@
would cause the Razor template to be last in the New Project dialog if both 1.1 and 2.x templates
are available. -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
GetTags (Type type)
{
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateWizard.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateWizard.cs
index e12599a1cdb..4988bd9104a 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateWizard.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Templating/DotNetCoreProjectTemplateWizard.cs
@@ -33,6 +33,8 @@ namespace MonoDevelop.DotNetCore.Templating
{
class DotNetCoreProjectTemplateWizard : TemplateWizard
{
+ const string defaultParameterNetCore80 = "UseNetCore80";
+ const string defaultParameterNetCore70 = "UseNetCore70";
const string defaultParameterNetCore60 = "UseNetCore60";
const string defaultParameterNetCore50 = "UseNetCore50";
const string defaultParameterNetCore30 = "UseNetCore30";
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectSupportedTargetFrameworks.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectSupportedTargetFrameworks.cs
index 29896551502..42385b1c48f 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectSupportedTargetFrameworks.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectSupportedTargetFrameworks.cs
@@ -64,7 +64,7 @@ public IEnumerable GetFrameworks ()
"2.1", "2.0", "1.6", "1.5", "1.4", "1.3", "1.2", "1.1", "1.0"
};
static string [] supportedNetCoreAppVersions = {
- "6.0", "5.0", "3.1", "3.0", "2.2", "2.1", "2.0", "1.1", "1.0"
+ "8.0", "7.0", "6.0", "5.0", "3.1", "3.0", "2.2", "2.1", "2.0", "1.1", "1.0"
};
public IEnumerable GetKnownFrameworks ()
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreSdk.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreSdk.cs
index 2c65d6ed3b2..6fd3f80e5a6 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreSdk.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreSdk.cs
@@ -36,7 +36,7 @@ namespace MonoDevelop.DotNetCore
public static class DotNetCoreSdk
{
static readonly Version DotNetCoreVersion2_1 = new Version (2, 1, 0);
- internal static readonly DotNetCoreVersion DotNetCoreUnsupportedTargetFrameworkVersion = new DotNetCoreVersion (6, 1, 0);
+ internal static readonly DotNetCoreVersion DotNetCoreUnsupportedTargetFrameworkVersion = new DotNetCoreVersion (8, 1, 0);
static DotNetCoreSdk ()
{
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreVersion.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreVersion.cs
index d65de6eef6b..0ff94c9981c 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreVersion.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreVersion.cs
@@ -43,6 +43,9 @@ class DotNetCoreVersion : IEquatable, IComparable, IComparabl
internal static readonly DotNetCoreVersion MinimumSupportedSdkVersion50 = new DotNetCoreVersion (5, 0, 400);
internal static readonly DotNetCoreVersion MinimumSupportedSdkVersion60 = new DotNetCoreVersion (6, 0, 6);
+ internal static readonly DotNetCoreVersion MinimumSupportedSdkVersion70 = new DotNetCoreVersion (7, 0, 7);
+
+ internal static readonly DotNetCoreVersion MinimumSupportedSdkVersion80 = new DotNetCoreVersion (8, 0, 8);
internal DotNetCoreVersion (int major, int minor, int patch)
: this (new Version (major, minor, patch))
{
@@ -254,6 +257,13 @@ public static bool IsSdkSupported (DotNetCoreVersion version)
return version >= MinimumSupportedSdkVersion60;
}
+ if (version.Major == 7) {
+ return version >= MinimumSupportedSdkVersion70;
+ }
+
+ if (version.Major == 8) {
+ return version >= MinimumSupportedSdkVersion80;
+ }
return false;
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/MSBuildSdks.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/MSBuildSdks.cs
index ce5ef6901d9..943c0f3dfe0 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/MSBuildSdks.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/MSBuildSdks.cs
@@ -39,12 +39,12 @@ static MSBuildSdks ()
{
TargetRuntime runtime = IdeApp.Preferences.DefaultTargetRuntime;
string binPath = runtime.GetMSBuildBinPath ("15.0");
- if (binPath != null) {
- string sdksPath = Path.Combine(binPath, "Sdks");
-
- if (Directory.Exists(sdksPath)) {
- Installed = true;
- MSBuildSDKsPath = sdksPath;
+ if (binPath != null) {
+ string sdksPath = Path.Combine(binPath, "Sdks");
+
+ if (Directory.Exists(sdksPath)) {
+ Installed = true;
+ MSBuildSDKsPath = sdksPath;
}
}
}
diff --git a/main/src/addins/MonoDevelop.DotNetCore/Properties/MonoDevelop.DotNetCore.addin.xml b/main/src/addins/MonoDevelop.DotNetCore/Properties/MonoDevelop.DotNetCore.addin.xml
index feb072c6c8f..7ce2859ac7a 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/Properties/MonoDevelop.DotNetCore.addin.xml
+++ b/main/src/addins/MonoDevelop.DotNetCore/Properties/MonoDevelop.DotNetCore.addin.xml
@@ -340,6 +340,86 @@
category="netcore/app/general"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs
index 29c89bce8ff..fd7d3af5782 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs
@@ -32,7 +32,7 @@
using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods;
using Microsoft.VisualStudio.Text.Utilities;
-using Microsoft.VisualStudio.CodingConventions;
+//using Microsoft.VisualStudio.CodingConventions;
using Microsoft.VisualStudio.Threading;
using Microsoft.VisualStudio.Utilities;
@@ -49,7 +49,7 @@
using MonoDevelop.Ide.Gui.Documents;
using AutoSave = MonoDevelop.Ide.Editor.AutoSave;
-using EditorConfigService = MonoDevelop.Ide.Editor.EditorConfigService;
+//using EditorConfigService = MonoDevelop.Ide.Editor.EditorConfigService;
using DefaultSourceEditorOptions = MonoDevelop.Ide.Editor.DefaultSourceEditorOptions;
using MonoDevelop.Components;
using System.Threading;
@@ -86,7 +86,7 @@ abstract partial class TextViewContent :
static bool settingZoomLevel;
PolicyContainer policyContainer;
- ICodingConventionContext editorConfigContext;
+ //ICodingConventionContext editorConfigContext;
bool warnOverwrite;
IDisposable textBufferRegistration;
@@ -161,7 +161,7 @@ protected override async Task OnGetViewControlAsync (CancellationToken
EditorOperations = (EditorOperationsInterface)Imports.EditorOperationsProvider.GetEditorOperations (TextView);
EditorOptions = Imports.EditorOptionsFactoryService.GetOptions (TextView);
TextBufferOptions = Imports.EditorOptionsFactoryService.GetOptions (TextView.TextBuffer);
- UpdateTextEditorOptions (this, EventArgs.Empty);
+ //UpdateTextEditorOptions (this, EventArgs.Empty);
contentProviders = new List (Imports.EditorContentProviderService.GetContentProvidersForView (TextView));
TextView.Properties [typeof (DocumentController)] = this;
@@ -199,7 +199,7 @@ protected override async Task OnGetViewControlAsync (CancellationToken
// Content providers can provide additional content
NotifyContentChanged ();
- await Load (false);
+ ////await Load (false);
return control;
}
@@ -249,11 +249,11 @@ protected override void OnFileNameChanged ()
warnOverwrite = false;
- if (editorConfigContext != null) {
+ /* if (editorConfigContext != null) {
editorConfigContext.CodingConventionsChangedAsync -= UpdateOptionsFromEditorConfigAsync;
EditorConfigService.RemoveEditConfigContext (TextDocument.FilePath).Ignore ();
editorConfigContext = null;
- }
+ } */
if (FilePath != TextDocument.FilePath && !string.IsNullOrEmpty (TextDocument.FilePath))
AutoSave.RemoveAutoSaveFile (TextDocument.FilePath);
@@ -272,7 +272,7 @@ protected override void OnFileNameChanged ()
UpdateTextBufferRegistration ();
- UpdateTextEditorOptions (null, null);
+ //UpdateTextEditorOptions (null, null);
}
protected override void OnOwnerChanged ()
@@ -280,7 +280,7 @@ protected override void OnOwnerChanged ()
base.OnOwnerChanged ();
if (TextDocument != null) {
- UpdateTextEditorOptions (null, null);
+ //UpdateTextEditorOptions (null, null);
UpdateTextBufferRegistration ();
}
}
@@ -312,19 +312,19 @@ protected override void OnDispose ()
UnsubscribeFromEvents ();
- if (policyContainer != null)
+ /* if (policyContainer != null)
policyContainer.PolicyChanged -= PolicyChanged;
if (editorConfigContext != null) {
editorConfigContext.CodingConventionsChangedAsync -= UpdateOptionsFromEditorConfigAsync;
EditorConfigService.RemoveEditConfigContext (FilePath).Ignore ();
- }
+ } */
base.OnDispose ();
}
protected virtual void SubscribeToEvents ()
{
- sourceEditorOptions.Changed += UpdateTextEditorOptions;
+ //sourceEditorOptions.Changed += UpdateTextEditorOptions;
TextDocument.DirtyStateChanged += HandleTextDocumentDirtyStateChanged;
TextBuffer.Changed += HandleTextBufferChanged;
TextView.Options.OptionChanged += TextBufferOptionsChanged;
@@ -332,8 +332,8 @@ protected virtual void SubscribeToEvents ()
protected virtual void UnsubscribeFromEvents ()
{
- if (sourceEditorOptions != null)
- sourceEditorOptions.Changed -= UpdateTextEditorOptions;
+ // if (sourceEditorOptions != null)
+ // sourceEditorOptions.Changed -= UpdateTextEditorOptions;
if (TextDocument != null)
TextDocument.DirtyStateChanged -= HandleTextDocumentDirtyStateChanged;
@@ -362,7 +362,7 @@ void UpdateLineNumberMarginOption ()
sourceEditorOptions.ShowLineNumberMargin);
}
- void UpdateTextEditorOptions (object sender, EventArgs e)
+ /* void UpdateTextEditorOptions (object sender, EventArgs e)
{
UpdateTextEditorOptionsAsync ().Forget ();
}
@@ -393,7 +393,7 @@ async Task UpdateTextEditorOptionsAsync ()
editorConfigContext.CodingConventionsChangedAsync += UpdateOptionsFromEditorConfigAsync;
await UpdateOptionsFromEditorConfigAsync (null, null);
- }
+ } */
void ClearOptionValue(string optionName)
{
@@ -438,7 +438,7 @@ private void UpdateOptionsFromPolicy()
#endif
}
- private Task UpdateOptionsFromEditorConfigAsync (object sender, CodingConventionsChangedEventArgs args)
+/* private Task UpdateOptionsFromEditorConfigAsync (object sender, CodingConventionsChangedEventArgs args)
{
// Set base options first, then override with editorconfig values
UpdateOptionsFromPolicy ();
@@ -610,7 +610,7 @@ void UseOriginalFile ()
}
return Task.CompletedTask;
- }
+ } */
///
/// Replace document content with new content. This marks the document as dirty.
@@ -779,7 +779,7 @@ void ReloadFromDisk ()
if (IsDisposed || !File.Exists (FilePath))
return;
- Load (true);
+ ////Load (true);
ShowNotification = false;
} catch (Exception ex) {
MessageService.ShowError ("Could not reload the file.", ex);
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj
index 93a403d0a04..1c9966ca408 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj
@@ -37,7 +37,7 @@
-
+
@@ -64,8 +64,8 @@
-
-
+
+
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
index 4ed1e937e1a..9166529b21d 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
@@ -88,7 +88,7 @@
-
+
@@ -97,7 +97,7 @@
-
+
@@ -127,7 +127,7 @@
-
+
@@ -137,7 +137,7 @@
-
+
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml
index cacaf7a52cc..878a0fe7820 100644
--- a/main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml
+++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml
@@ -1,6 +1,6 @@
-
+
@@ -431,7 +431,7 @@
-
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs
index 53745babf69..6ea93638517 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs
@@ -28,7 +28,7 @@
using MonoDevelop.Ide.Gui.Content;
using MonoDevelop.Ide.Fonts;
using MonoDevelop.Ide.Editor.Extension;
-using Microsoft.VisualStudio.CodingConventions;
+//using Microsoft.VisualStudio.CodingConventions;
using System.Threading.Tasks;
using MonoDevelop.Ide.TypeSystem;
@@ -58,7 +58,7 @@ public sealed class DefaultSourceEditorOptions : ITextEditorOptions
static DefaultSourceEditorOptions instance;
static ITextEditorOptions plainEditor;
static bool inited;
- ICodingConventionContext context;
+ //ICodingConventionContext context;
public static DefaultSourceEditorOptions Instance {
get {
@@ -187,8 +187,8 @@ bool ITextEditorOptions.RemoveTrailingWhitespaces {
get {
return DefaultSourceEditorOptions.Instance.RemoveTrailingWhitespaces;
}
- }
-
+ }
+
[Obsolete ("Old editor")]
bool ITextEditorOptions.WrapLines {
get {
@@ -277,13 +277,13 @@ void HandlePolicyChanged (object sender, MonoDevelop.Projects.Policies.PolicyCha
});
IdeApp.Preferences.ColorScheme.Changed += OnColorSchemeChanged;
- IdeApp.Preferences.Editor.FollowCodingConventions.Changed += OnFollowCodingConventionsChanged;
+ //IdeApp.Preferences.Editor.FollowCodingConventions.Changed += OnFollowCodingConventionsChanged;
}
- void OnFollowCodingConventionsChanged (object sender, EventArgs e)
+ /* void OnFollowCodingConventionsChanged (object sender, EventArgs e)
{
UpdateContextOptions (null, null).Ignore ();
- }
+ } */
void UpdateFont ()
@@ -319,7 +319,7 @@ public DefaultSourceEditorOptions WithTextStyle (TextStylePolicy policy)
return result;
}
- internal void SetContext (ICodingConventionContext context)
+ /* internal void SetContext (ICodingConventionContext context)
{
if (this.context == context)
return;
@@ -342,8 +342,8 @@ private Task UpdateContextOptions (object sender, CodingConventionsChangedEventA
defaultEolMarkerFromContext = eolMarker;
tabsToSpacesFromContext = null;
- if (followCodingConventions && context.CurrentConventions.UniversalConventions.TryGetIndentStyle (out Microsoft.VisualStudio.CodingConventions.IndentStyle result))
- tabsToSpacesFromContext = result == Microsoft.VisualStudio.CodingConventions.IndentStyle.Spaces;
+ //if (followCodingConventions && context.CurrentConventions.UniversalConventions.TryGetIndentStyle (out Microsoft.VisualStudio.CodingConventions.IndentStyle result))
+ // tabsToSpacesFromContext = result == Microsoft.VisualStudio.CodingConventions.IndentStyle.Spaces;
indentationSizeFromContext = null;
if (followCodingConventions && context.CurrentConventions.UniversalConventions.TryGetIndentSize (out int indentSize))
@@ -369,7 +369,7 @@ private Task UpdateContextOptions (object sender, CodingConventionsChangedEventA
}
this.FireChange ();
return Task.CompletedTask;
- }
+ } */
#region new options
@@ -931,12 +931,13 @@ public bool SmartBackspace{
public void Dispose ()
{
- IdeServices.FontService.RemoveCallback (UpdateFont);
+ /* IdeServices.FontService.RemoveCallback (UpdateFont);
IdeApp.Preferences.ColorScheme.Changed -= OnColorSchemeChanged;
IdeApp.Preferences.Editor.FollowCodingConventions.Changed -= OnFollowCodingConventionsChanged;
if (context != null)
- context.CodingConventionsChangedAsync -= UpdateContextOptions;
- }
+ context.CodingConventionsChangedAsync -= UpdateContextOptions; */
+
+ }
void OnChanged (EventArgs args)
{
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/EditorConfigService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/EditorConfigService.cs
index cfbe6a55127..d904cc5a5c1 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/EditorConfigService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/EditorConfigService.cs
@@ -23,7 +23,7 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
+/* using System;
using System.Collections.Immutable;
using System.IO;
using System.Linq;
@@ -44,7 +44,7 @@ static class EditorConfigService
readonly static object contextCacheLock = new object ();
readonly static ICodingConventionsManager codingConventionsManager = CodingConventionsManagerFactory.CreateCodingConventionsManager (new ConventionsFileManager());
static ImmutableDictionary contextCache = ImmutableDictionary.Empty;
-
+ public static class GetEditorConfigContext (string fileName, CancellationToken token = default (CancellationToken))
public static async Task GetEditorConfigContext (string fileName, CancellationToken token = default (CancellationToken))
{
if (string.IsNullOrEmpty (fileName))
@@ -87,112 +87,113 @@ static class EditorConfigService
public static Task RemoveEditConfigContext (string fileName)
{
- return Task.Run (() => {
- ICodingConventionContext ctx;
- lock (contextCacheLock) {
- if (!contextCache.TryGetValue (fileName, out ctx))
- return;
- contextCache = contextCache.Remove (fileName);
- }
- if (ctx != null)
+ return Task.Run (() => {
+ ICodingConventionContext ctx;
+ lock (contextCacheLock) {
+ if (!contextCache.TryGetValue (fileName, out ctx))
+ return;
+ contextCache = contextCache.Remove (fileName);
+ }
+ if (ctx != null)
ctx.Dispose ();
});
}
- class ConventionsFileManager : IFileWatcher
- {
- HashSet watchedFiles = new HashSet ();
+ class ConventionsFileManager : IFileWatcher
+ {
+ HashSet watchedFiles = new HashSet ();
public event ConventionsFileChangedAsyncEventHandler ConventionFileChanged;
- public event ContextFileMovedAsyncEventHandler ContextFileMoved;
-
- public ConventionsFileManager ()
- {
- FileService.FileChanged += FileService_FileChanged;
- FileService.FileRemoved += FileService_FileRemoved;
- FileService.FileMoved += FileService_FileMoved;
- FileService.FileRenamed += FileService_FileMoved;
- }
-
- void FileService_FileMoved (object sender, FileCopyEventArgs e)
- {
- lock (watchedFiles) {
- foreach (var file in e) {
- if (watchedFiles.Remove (file.SourceFile)) {
- ContextFileMoved?.Invoke (this, new ContextFileMovedEventArgs (file.SourceFile, file.TargetFile));
- if (file.SourceFile == file.TargetFile) {
- StartWatching (file.TargetFile.FileName, file.TargetFile.ParentDirectory);
- }
- }
- }
- }
- }
-
- void FileService_FileChanged (object sender, FileEventArgs e)
- {
- lock (watchedFiles) {
- foreach (var file in e) {
- if (watchedFiles.Contains (file.FileName)) {
- ConventionFileChanged?.Invoke (this, new ConventionsFileChangeEventArgs (file.FileName.FileName, file.FileName.ParentDirectory, ChangeType.FileModified));
- }
- }
- }
- }
-
- void FileService_FileRemoved (object sender, FileEventArgs e)
- {
- lock (watchedFiles) {
- foreach (var file in e) {
- if (watchedFiles.Remove (file.FileName)) {
- ConventionFileChanged?.Invoke (this, new ConventionsFileChangeEventArgs (file.FileName.FileName, file.FileName.ParentDirectory, ChangeType.FileDeleted));
- WatchDirectories ();
- }
- }
- }
- }
-
- public void Dispose ()
- {
- FileService.FileMoved -= FileService_FileMoved;
- FileService.FileRenamed -= FileService_FileMoved;
- FileService.FileRemoved -= FileService_FileRemoved;
- FileService.FileChanged -= FileService_FileChanged;
- FileWatcherService.WatchDirectories (this, null).Ignore ();
- lock (watchedFiles) {
- watchedFiles = null;
- }
- }
-
- public void StartWatching (string fileName, string directoryPath)
- {
- lock (watchedFiles) {
- var key = directoryPath + Path.DirectorySeparatorChar.ToString () + fileName;
-
- if (!File.Exists (key))
- return;
-
- if (!watchedFiles.Add (key))
- return;
-
- WatchDirectories ();
- }
- }
-
- public void StopWatching (string fileName, string directoryPath)
- {
- lock (watchedFiles) {
- var key = directoryPath + Path.DirectorySeparatorChar.ToString () + fileName;
- if (watchedFiles.Remove (key)) {
- WatchDirectories ();
- }
- }
- }
-
- void WatchDirectories ()
- {
- var directories = watchedFiles.Count == 0 ? null : watchedFiles.Select (file => new FilePath (file).ParentDirectory);
- FileWatcherService.WatchDirectories (this, directories).Ignore ();
- }
- }
+ public event ContextFileMovedAsyncEventHandler ContextFileMoved;
+
+ public ConventionsFileManager ()
+ {
+ FileService.FileChanged += FileService_FileChanged;
+ FileService.FileRemoved += FileService_FileRemoved;
+ FileService.FileMoved += FileService_FileMoved;
+ FileService.FileRenamed += FileService_FileMoved;
+ }
+
+ void FileService_FileMoved (object sender, FileCopyEventArgs e)
+ {
+ lock (watchedFiles) {
+ foreach (var file in e) {
+ if (watchedFiles.Remove (file.SourceFile)) {
+ ContextFileMoved?.Invoke (this, new ContextFileMovedEventArgs (file.SourceFile, file.TargetFile));
+ if (file.SourceFile == file.TargetFile) {
+ StartWatching (file.TargetFile.FileName, file.TargetFile.ParentDirectory);
+ }
+ }
+ }
+ }
+ }
+
+ void FileService_FileChanged (object sender, FileEventArgs e)
+ {
+ lock (watchedFiles) {
+ foreach (var file in e) {
+ if (watchedFiles.Contains (file.FileName)) {
+ ConventionFileChanged?.Invoke (this, new ConventionsFileChangeEventArgs (file.FileName.FileName, file.FileName.ParentDirectory, ChangeType.FileModified));
+ }
+ }
+ }
+ }
+
+ void FileService_FileRemoved (object sender, FileEventArgs e)
+ {
+ lock (watchedFiles) {
+ foreach (var file in e) {
+ if (watchedFiles.Remove (file.FileName)) {
+ ConventionFileChanged?.Invoke (this, new ConventionsFileChangeEventArgs (file.FileName.FileName, file.FileName.ParentDirectory, ChangeType.FileDeleted));
+ WatchDirectories ();
+ }
+ }
+ }
+ }
+
+ public void Dispose ()
+ {
+ FileService.FileMoved -= FileService_FileMoved;
+ FileService.FileRenamed -= FileService_FileMoved;
+ FileService.FileRemoved -= FileService_FileRemoved;
+ FileService.FileChanged -= FileService_FileChanged;
+ FileWatcherService.WatchDirectories (this, null).Ignore ();
+ lock (watchedFiles) {
+ watchedFiles = null;
+ }
+ }
+
+ public void StartWatching (string fileName, string directoryPath)
+ {
+ lock (watchedFiles) {
+ var key = directoryPath + Path.DirectorySeparatorChar.ToString () + fileName;
+
+ if (!File.Exists (key))
+ return;
+
+ if (!watchedFiles.Add (key))
+ return;
+
+ WatchDirectories ();
+ }
+ }
+
+ public void StopWatching (string fileName, string directoryPath)
+ {
+ lock (watchedFiles) {
+
+ var key = directoryPath + Path.DirectorySeparatorChar.ToString () + fileName;
+ if (watchedFiles.Remove (key)) {
+ WatchDirectories ();
+ }
+ }
+ }
+
+ void WatchDirectories ()
+ {
+ var directories = watchedFiles.Count == 0 ? null : watchedFiles.Select (file => new FilePath (file).ParentDirectory);
+ FileWatcherService.WatchDirectories (this, directories).Ignore ();
+ }
+ }
}
-}
+} */
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs
index aeeb4f2e1a8..c96955a0475 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs
@@ -1071,18 +1071,18 @@ void TextEditor_ZoomLevelChanged (object sender, EventArgs e)
async void TextEditor_FileNameChanged (object sender, EventArgs e)
{
- fileTypeCondition.SetFileName (FileName);
+ //fileTypeCondition.SetFileName (FileName);
// This is a sync call to remove from the cache, then async to dispose the context after the load is awaited.
- EditorConfigService.RemoveEditConfigContext (FileName).Ignore ();
+ //EditorConfigService.RemoveEditConfigContext (FileName).Ignore ();
// There is no use to try and create a cached context if we won't use it.
- if (!(Options is DefaultSourceEditorOptions options))
- return;
+ //if (!(Options is DefaultSourceEditorOptions options))
+ // return;
- var context = await EditorConfigService.GetEditorConfigContext (FileName);
- if (context != null)
- options.SetContext (context);
+ //var context = await EditorConfigService.GetEditorConfigContext (FileName);
+ //if (context != null)
+ // options.SetContext (context);
}
void TextEditor_MimeTypeChanged (object sender, EventArgs e)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs
index b262e0c3cfd..472a9e8f3ca 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs
@@ -236,10 +236,10 @@ async Task UpdateStyleParent (WorkspaceObject owner, string mimeType, Cancellati
policyContainer.PolicyChanged += HandlePolicyChanged;
((DefaultSourceEditorOptions)textEditor.Options).UpdateStylePolicy (currentPolicy);
- var context = await EditorConfigService.GetEditorConfigContext (textEditor.FileName, token);
- if (context == null)
- return;
- ((DefaultSourceEditorOptions)textEditor.Options).SetContext (context);
+ //var context = await EditorConfigService.GetEditorConfigContext (textEditor.FileName, token);
+ //if (context == null)
+ // return;
+ // ((DefaultSourceEditorOptions)textEditor.Options).SetContext (context);
}
void HandlePolicyChanged (object sender, MonoDevelop.Projects.Policies.PolicyChangedEventArgs args)
@@ -325,8 +325,8 @@ internal protected override ProjectReloadCapability OnGetProjectReloadCapability
protected override IEnumerable