dotdevelop · MakiWolf · Dec 25, 2023 · Dec 25, 2023 · Dec 25, 2023 · Dec 25, 2023
diff --git a/.github/workflows/monodevelop.yml b/.github/workflows/monodevelop.yml
@@ -45,7 +45,7 @@ jobs:
         # Synchronise Mono SSL certs
         cert-sync /etc/ssl/certs/ca-certificates.crt
         # Install extra packages required for dotdevelop build
-        sudo apt-get install -y sed git build-essential intltool nuget fsharp gtk-sharp2
+        sudo apt-get install -y sed git build-essential intltool nuget fsharp
         sudo apt-get install -y software-properties-common
         sudo apt-get update
     - name: Verify OS and tools versions

diff --git a/.gitmodules b/.gitmodules
@@ -1,10 +1,10 @@
 [submodule "main/external/debugger-libs"]
 	path = main/external/debugger-libs
-	url = https://github.com/dotdevelop/debugger-libs.git
+	url = https://github.com/easysimplified/debugger-libs.git
 	branch = master
 [submodule "main/external/guiunit"]
 	path = main/external/guiunit
-	url = https://github.com/dotdevelop/guiunit.git
+	url = https://github.com/easysimplified/guiunit.git
 [submodule "main/external/macdoc"]
 	path = main/external/macdoc
 	url = https://github.com/dotdevelop/macdoc
@@ -13,28 +13,23 @@
 	url = https://github.com/dotdevelop/mdtestharness.git
 [submodule "main/external/mono-addins"]
 	path = main/external/mono-addins
-	url = https://github.com/dotdevelop/mono-addins.git
-	branch = dotdevelop_gtksharp
+	url = https://github.com/easysimplified/mono-addins.git
 [submodule "main/external/mono-tools"]
 	path = main/external/mono-tools
 	url = https://github.com/dotdevelop/mono-tools.git
 [submodule "main/external/nrefactory"]
 	path = main/external/nrefactory
-	url = https://github.com/dotdevelop/NRefactory.git
+	url = https://github.com/easysimplified/NRefactory.git
 [submodule "main/external/sharpsvn-binary"]
 	path = main/external/sharpsvn-binary
 	url = https://github.com/dotdevelop/sharpsvn-binary.git
-[submodule "main/external/xwt"]
-	path = main/external/xwt
-	url = https://github.com/dotdevelop/xwt
-	branch = dotdevelop
 [submodule "main/external/Xamarin.PropertyEditing"]
 	path = main/external/Xamarin.PropertyEditing
 	url = https://github.com/dotdevelop/Xamarin.PropertyEditing
 	branch = master
 [submodule "main/external/vs-editor-api"]
 	path = main/external/vs-editor-api
-	url = https://github.com/dotdevelop/vs-editor-api.git
+	url = https://github.com/easysimplified/vs-editor-api.git
     branch = dotdevelop_oe_8.1.5
 [submodule "main/external/Monodevelop.Netcoredbg"]
 	path = main/external/Monodevelop.Netcoredbg
@@ -44,3 +39,6 @@
 	path = main/external/Samsung.Netcoredbg
 	url = https://github.com/dotdevelop/netcoredbg.git
 	branch = dotdevelop
+[submodule "main/external/xwt"]
+	path = main/external/xwt
+	url = https://github.com/easysimplified/xwt.git
diff --git a/main/Directory.Build.props b/main/Directory.Build.props
@@ -7,7 +7,7 @@
     <MdAddinsDirectory>$(MSBuildThisFileDirectory)..\..\md-addins\</MdAddinsDirectory>
     <!--<VSEditorCoreDirectory Condition="'$(VSEditorCoreDirectory)' == ''">$(MdAddinsDirectory)external\vs-editor-core\</VSEditorCoreDirectory>-->
     <VSEditorApiDirectory Condition="'$(VSEditorApiDirectory)' == ''">$(MSBuildThisFileDirectory)external\vs-editor-api\</VSEditorApiDirectory>
-    <ReferencesVSEditor Condition=" '$(OS)' == 'Windows_NT' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Windows.props</ReferencesVSEditor>
+    <ReferencesVSEditor Condition=" '$(OS)' == 'Windows_NT' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Gtk.props</ReferencesVSEditor>
     <ReferencesVSEditor Condition=" '$(OS)' == 'MAC' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Mac.props</ReferencesVSEditor>
     <ReferencesVSEditor Condition=" '$(OS)' == 'UNIX' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Gtk.props</ReferencesVSEditor>
     <ReferencesGtk>$(RootDirectory)\msbuild\ReferencesGtk.props</ReferencesGtk>

diff --git a/main/Main.sln b/main/Main.sln
diff --git a/main/external/debugger-libs b/main/external/debugger-libs
diff --git a/...sharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.FSharpCompilerOptionsWidget.cs b/...sharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.FSharpCompilerOptionsWidget.cs
@@ -28,11 +28,11 @@ public partial class FSharpCompilerOptionsWidget
 
 		private global::Gtk.HBox hbox2;
 
-		private global::Gtk.ComboBox comboDebug;
+		private global::Gtk.ComboBoxText comboDebug;
 
 		private global::Gtk.HBox hbox6;
 
-		private global::Gtk.ComboBox comboPlatforms;
+		private global::Gtk.ComboBoxText comboPlatforms;
 
 		private global::Gtk.Label label1;
 
@@ -181,7 +181,7 @@ protected virtual void Build()
 			this.hbox2.Name = "hbox2";
 			this.hbox2.Spacing = 6;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.comboDebug = global::Gtk.ComboBox.NewText();
+			this.comboDebug = new global::Gtk.ComboBoxText();
 			this.comboDebug.AppendText(global::Mono.Unix.Catalog.GetString("Full"));
 			this.comboDebug.AppendText(global::Mono.Unix.Catalog.GetString("Symbols only"));
 			this.comboDebug.AppendText (global::Mono.Unix.Catalog.GetString("Portable"));
@@ -207,7 +207,7 @@ protected virtual void Build()
 			this.hbox6.Name = "hbox6";
 			this.hbox6.Spacing = 6;
 			// Container child hbox6.Gtk.Box+BoxChild
-			this.comboPlatforms = global::Gtk.ComboBox.NewText();
+			this.comboPlatforms = new global::Gtk.ComboBoxText();
 			this.comboPlatforms.AppendText(global::Mono.Unix.Catalog.GetString("Any CPU"));
 			this.comboPlatforms.AppendText(global::Mono.Unix.Catalog.GetString("x86"));
 			this.comboPlatforms.AppendText(global::Mono.Unix.Catalog.GetString("x64"));

diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.csproj b/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.csproj
@@ -19,11 +19,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="Mono.Posix" />
-    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+   <PackageReference Include="GtkSharp" Version="3.24.24.95" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="generated.cs" />

diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/generated.cs b/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/generated.cs
@@ -24,26 +24,26 @@ internal class BinContainer
 		public static BinContainer Attach(Gtk.Bin bin)
 		{
 			BinContainer bc = new BinContainer();
-			bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
+//			bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
 			bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
 			bin.Added += new Gtk.AddedHandler(bc.OnAdded);
 			return bc;
 		}
 
-		private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args)
-		{
-			if ((this.child != null))
-			{
-				args.Requisition = this.child.SizeRequest();
-			}
-		}
+//		private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args)
+//		{
+//			if ((this.child != null))
+//			{
+//				args.Requisition = this.child.SizeRequest();
+//			}
+//		}
 
 		private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args)
 		{
-			if ((this.child != null))
-			{
-				this.child.Allocation = args.Allocation;
-			}
+//			if ((this.child != null))
+//			{
+//				this.child.Allocation = args.Allocation;
+//			}
 		}
 
 		private void OnAdded(object sender, Gtk.AddedArgs args)

diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/TestHelpers.fs b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/TestHelpers.fs
@@ -24,6 +24,7 @@ module FixtureSetup =
             //Environment.SetEnvironmentVariable ("MONO_ADDINS_REGISTRY", "/tmp")
             //Environment.SetEnvironmentVariable ("XDG_CONFIG_HOME", "/tmp")
             MonoDevelop.FSharp.MDLanguageService.DisableVirtualFileSystem()
+            Xwt.Application.Initialize (Xwt.ToolkitType.Gtk3)
             Runtime.Initialize (true)
             do! IdeApp.Initialize ((new ConsoleProgressMonitor()))
             do! Runtime.GetService<TypeSystemService> ()

diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpOutlineTextEditorExtension.fs b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpOutlineTextEditorExtension.fs
@@ -76,14 +76,14 @@ type FSharpOutlineTextEditorExtension() as x =
                 let treeStore = new TreeStore(typedefof<obj>)
                 let padTreeView = new PadTreeView(treeStore, HeadersVisible = true)
 
-                let setCellIcon _column (cellRenderer : CellRenderer) (treeModel : TreeModel) (iter : TreeIter) =
+                let setCellIcon _column (cellRenderer : CellRenderer) (treeModel : ITreeModel) (iter : TreeIter) =
                     let pixRenderer = cellRenderer :?> CellRendererImage
                     treeModel.GetValue(iter, 0)
                     |> Option.tryCast<FSharpNavigationDeclarationItem[]>
                     |> Option.iter(fun item ->
                         pixRenderer.Image <- ImageService.GetIcon(ServiceUtils.getIcon item.[0], Gtk.IconSize.Menu))
 
-                let setCellText _column (cellRenderer : CellRenderer) (treeModel : TreeModel) (iter : TreeIter) =
+                let setCellText _column (cellRenderer : CellRenderer) (treeModel : ITreeModel) (iter : TreeIter) =
                     let renderer = cellRenderer :?> CellRendererText
                     treeModel.GetValue(iter, 0)
                     |> Option.tryCast<FSharpNavigationDeclarationItem[]>

diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpGtkProject.xpt.xml b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/Templates/FSharpGtkProject.xpt.xml
@@ -28,12 +28,11 @@
         <Reference type="Package" refto="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 				<Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
         <Reference type="Package" refto="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Package" SpecificVersion="false" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Package" SpecificVersion="false" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Package" SpecificVersion="false" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Package" SpecificVersion="false" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Package" SpecificVersion="false" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Package" SpecificVersion="false" refto="atk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" SpecificVersion="false" refto="gtk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" SpecificVersion="false" refto="gdk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" SpecificVersion="false" refto="glib-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" SpecificVersion="false" refto="pango-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" SpecificVersion="false" refto="atk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
 			</References>
 
       <Packages requireLicenseAcceptance="false">

diff --git a/main/external/guiunit b/main/external/guiunit
diff --git a/main/external/mono-addins b/main/external/mono-addins
diff --git a/main/external/nrefactory b/main/external/nrefactory
diff --git a/main/external/vs-editor-api b/main/external/vs-editor-api
diff --git a/main/external/xwt b/main/external/xwt
diff --git a/main/msbuild/MDBuildTasks.targets b/main/msbuild/MDBuildTasks.targets
@@ -175,7 +175,6 @@
 
 	=================================================================
 	-->
-
 	<Target Name="_NuGetPrivateAssetsWorkaround_FilterLocalCopyReferences" BeforeTargets="_CopyFilesMarkedCopyLocal">
 		<FilterLocalCopyReferences
 			ReferenceCopyLocalPaths="@(ReferenceCopyLocalPaths)"

diff --git a/main/msbuild/ReferencesGtk.props b/main/msbuild/ReferencesGtk.props
@@ -4,33 +4,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <ReferencesGtkCopyToOutput Condition="$(ReferencesGtkCopyToOutput) == ''">false</ReferencesGtkCopyToOutput>
-    <HaveGtkSharp>false</HaveGtkSharp>
+    <HaveGtkSharp>true</HaveGtkSharp>
     <DefineConstants Condition="$(HaveGtkSharp)">$(DefineConstants);GTK3;GTK_SHARP</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition="$(HaveGtkSharp)">
-    <PackageReference Include="GtkSharp" Version="3.22.25.98" />
-  </ItemGroup>
-  <ItemGroup Condition="!$(HaveGtkSharp)">
-    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Private>$(ReferencesGtkCopyToOutput)</Private>
-    </Reference>
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Private>$(ReferencesGtkCopyToOutput)</Private>
-    </Reference>
-    <Reference Include="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Private>$(ReferencesGtkCopyToOutput)</Private>
-    </Reference>
-    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Private>$(ReferencesGtkCopyToOutput)</Private>
-    </Reference>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Private>$(ReferencesGtkCopyToOutput)</Private>
-    </Reference>
-    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Private>$(ReferencesGtkCopyToOutput)</Private>
-    </Reference>
-    <Reference Include="Mono.Cairo" />
+    <PackageReference Include="GtkSharp" Version="3.24.24.95" />
+    <PackageReference Include="WebkitGtkSharp" Version="3.24.24.95" />
   </ItemGroup>
   <ItemGroup>
     <!--   this should not be here: -->

diff --git a/main/src/addins/AspNet/Commands/AddControllerDialog.cs b/main/src/addins/AspNet/Commands/AddControllerDialog.cs
@@ -41,7 +41,7 @@ class AddControllerDialog : Dialog
 		Button buttonCancel;
 		Button buttonOk;
 		Entry nameEntry;
-		ComboBox templateCombo;
+		ComboBoxText templateCombo;
 
 		public string ControllerName {
 			get	{
@@ -101,7 +101,7 @@ void Build ()
 			AddActionWidget (buttonOk, ResponseType.Ok);
 
 			nameEntry = new Entry ();
-			templateCombo = ComboBox.NewText ();
+			templateCombo = new Gtk.ComboBoxText ();
 
 			var nameLabel = new Label {
 				TextWithMnemonic = GettextCatalog.GetString ("_Name:"),
@@ -123,7 +123,7 @@ void Build ()
 			table.Attach (nameEntry, 1, 2, 0, 1, AttachOptions.Fill | AttachOptions.Expand, 0, 0, 0);
 			table.Attach (templateLabel, 0, 1, 1, 2, AttachOptions.Fill, 0, 0, 0);
 			table.Attach (templateCombo, 1, 2, 1, 2, AttachOptions.Fill | AttachOptions.Expand, 0, 0, 0);
-			VBox.PackStart (table);
+			//VBox.PackStart (table);
 
 			Child.ShowAll ();
 		}
+5 −5		src/framework/GuiUnit_NET_4_5.csproj
+3 −0		src/framework/app.config
+313 −2		Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj
+1 −1		Mono.Addins.GuiGtk3/interfaces/AddinInfoView.ui.xml
+4 −4		Mono.Addins.GuiGtk3/interfaces/AddinManagerDialog.ui.xml
+2 −2		Test/GuiTester/GuiTester.csproj
+6 −4		ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
+4 −0		ICSharpCode.NRefactory.CSharp/OutputVisitor/CodeDomConvertVisitor.cs
+31 −3		ICSharpCode.NRefactory.CSharp/Parser/mcs/assembly.cs
+1 −1		ICSharpCode.NRefactory.CSharp/Parser/mcs/class.cs
+2 −0		ICSharpCode.NRefactory.CSharp/Parser/mcs/driver.cs
+6 −0		ICSharpCode.NRefactory.CSharp/Parser/mcs/eval.cs
+11 −7		ICSharpCode.NRefactory.CSharp/Parser/mcs/method.cs
+11 −5		ICSharpCode.NRefactory.CSharp/Parser/mcs/reflection.cs
+1 −1		ICSharpCode.NRefactory.Cecil/CecilLoader.cs
+7 −7		ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
+7 −7		ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
+4 −1		ICSharpCode.NRefactory/TypeSystem/Implementation/UnresolvedSecurityDeclarationBlob.cs
+41 −0		SECURITY.md
+2 −0		VSEditorCore.sln
+1 −1		build/PackageVersions.targets
+1 −1		build/Project.props
+2 −2		nuget.config
+1 −1		samples/AsyncCompletion/HelloWorldCompletion/packages.config
+52 −0		src/Editor/Text/Def/TextLogic/Classification/ClassificationLayer.cs
+30 −0		src/Editor/Text/Def/TextLogic/Classification/IClassificationTypeRegistryService.cs
+22 −0		src/Editor/Text/Def/TextLogic/Classification/ILayeredClassificationType.cs
+114 −0		src/Editor/Text/Def/TextLogic/Find/ITextSearchNavigator3.cs
+1 −1		src/Editor/Text/Def/TextLogic/Find/ITextSearchNavigatorFactoryService.cs
+3 −3		src/Editor/Text/Impl/BraceCompletion/BraceCompletionAdornmentServiceMac.cs
+47 −0		src/Editor/Text/Impl/ClassificationType/ClassificationKey.cs
+14 −10		src/Editor/Text/Impl/ClassificationType/ClassificationTypeImpl.cs
+27 −18		src/Editor/Text/Impl/ClassificationType/ClassificationTypeRegistryService.cs
+26 −13		src/Editor/Text/Impl/TextSearch/TextSearchNavigator.cs
+1 −1		src/Editor/Text/Impl/TextSearch/TextSearchNavigatorFactoryService.cs
+1 −2		src/Editor/Text/Util/TextUICocoaUtil/TextUICocoaUtil.csproj
+1 −2		TestApps/GtkSharpTest/GtkSharpTest.csproj
+4 −7		Xwt.Gtk.Windows/Xwt.Gtk.Windows.csproj
+2 −1		Xwt.Gtk/Xwt.GtkBackend/Gtk3ViewPort.cs
+2 −1		Xwt.Gtk/Xwt.GtkBackend/GtkWebKitMini.cs
+183 −3		Xwt.Gtk/Xwt.GtkBackend/WebViewBackend.cs
+3 −0		Xwt.Gtk2/Xwt.Gtk2.csproj
+2 −0		Xwt.Gtk3/Xwt.Gtk3.csproj
+4 −1		Xwt.GtkSharp/Xwt.GtkSharp.csproj