Publish to folder

.editorconfig

@@ -25,6 +25,11 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 
+# F# files
+[*.{fs, fsx, fsi}]
+indent_style = space
+indent_size = 4
+
 # Dotnet code style settings:
 [*.{cs,vb}]
 
@@ -58,19 +63,19 @@ csharp_space_after_keywords_in_control_flow_statements = true
 
 # Newline settings
 csharp_new_line_before_open_brace = types,methods
-csharp_new_line_before_else = true
-csharp_new_line_before_catch = true
-csharp_new_line_before_finally = true
+csharp_new_line_before_else = false
+csharp_new_line_before_catch = false
+csharp_new_line_before_finally = false
 csharp_new_line_before_members_in_object_initializers = true
 csharp_new_line_before_members_in_anonymous_types = true
 
 # Switch indentation
 csharp_indent_switch_labels = false
 
 # Prefer "var" everywhere it's apparent
-csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_for_built_in_types = true:none
 csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = false:suggestion
+csharp_style_var_elsewhere = true:none
 
 # Prefer method-like constructs to have a block body
 csharp_style_expression_bodied_methods = false:none

.gitignore

@@ -21,9 +21,9 @@ obj/
 /main/tests/config
 /main/tests/UnitTests/test-results
 /main/build/MacOSX/monostub
+/main/build/MacOSX/monostub-nogui
 /main/build/MacOSx/monostub-test
-/main/contrib/bin/
-/main/contrib/*/*/bin/
+/main/build/MacOSX/libsystemnative.dylib
 /local-libs
 /main/build/tests
 /main/monodevelop_version
@@ -38,6 +38,8 @@ obj/
 /main/packages
 /main/.nuget/
 pull-package.exe
+/main/tests/StressTest/TestProject/bin
+/main/tests/MonoDevelop.Core.Tests.Addin/bin/
 
 #VS writes these sometimes even when it doesn't change anything
 /main/_UpgradeReport_Files
@@ -63,14 +65,21 @@ autom4te.cache/
 tarballs/
 test-results/
 Thumbs.db
+.vs
 
 #Mac bundle stuff
 *.dmg
 *.app
 /main/build/MacOSX/render.exe
+/main/build/MacOSX/*.o
+/main/external/fsharpbinding/.paket
+/main/external/fsharpbinding/paket-files
+/main/external/Xamarin.Mac.buildinfo
 /main/external/Xamarin.Mac.registrar.full.a
 /main/external/Xamarin.Mac.dll*
+/main/external/Xamarin.Mac.pdb
 /main/external/libxammac.dylib
+/main/external/libxammac-system.a
 
 # Autogenerated stuff
 /local-config/
@@ -94,11 +103,6 @@ Thumbs.db
 /main/build/MacOSX/Makefile
 /main/build/Makefile
 /main/external/Makefile
-/main/contrib/Makefile
-/main/contrib/Mono.Cecil/Makefile
-/main/contrib/ICSharpCode.NRefactory.CSharp/Makefile
-/main/contrib/GitSharp/Makefile
-/main/contrib/Mono.Debugger.Soft/Makefile
 /main/po/Makefile
 /main/src/Makefile
 /main/src/addins/AspNet/Makefile
@@ -180,15 +184,12 @@ Thumbs.db
 /main/tests/UnitTests/Makefile
 /main/tests/UserInterfaceTests/Makefile
 /main/theme-icons/Makefile
-/main/contrib/NGit/Makefile
-/main/contrib/NSch/Makefile
-/main/contrib/Sharpen/Makefile
-/main/contrib/ICSharpCode.Decompiler/Makefile
-/main/contrib/ICSharpCode.NRefactory/Makefile
 /main/src/addins/TextTemplating/Mono.TextTemplating.Tests/Makefile
 /main/tests/MacPlatform.Tests/Makefile
+/main/tests/MonoDevelop.Core.Tests.Addin/Makefile
 /main/tests/MonoDevelop.CSharpBinding.Tests/Makefile
 /main/tests/MonoDevelop.MacDev.Tests/Makefile
+/main/tests/MonoDevelop.Refactoring.Tests/Makefile
 /main/tests/UserInterfaceTests/Makefile
 /main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/Makefile
 /main/src/addins/MonoDevelop.PackageManagement/Makefile
@@ -198,6 +199,30 @@ Thumbs.db
 /main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/Makefile
 /main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/Makefile
 /main/src/addins/MonoDevelop.UnitTesting/Makefile
+/main/msbuild/Makefile
+/main/src/addins/MonoDevelop.AspNetCore/Makefile
+/main/src/addins/MonoDevelop.AzureFunctions/Makefile
+/main/src/addins/MonoDevelop.ConnectedServices/Makefile
+/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/Makefile
+/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/Makefile
+/main/src/addins/MonoDevelop.Debugger.Win32/Makefile
+/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/Makefile
+/main/src/addins/MonoDevelop.DotNetCore/Makefile
+/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/Makefile
+/main/src/addins/MonoDevelop.Packaging/Makefile
+/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/Makefile
+/main/src/addins/PerformanceDiagnostics/Makefile
+/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/Makefile
+/main/src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/Makefile
+/main/src/addins/VersionControl/Subversion.Win32.Tests/Makefile
+/main/src/addins/VersionControl/Subversion.Win32/Makefile
+/main/src/core/Mono.TextEditor.Platform/Makefile
+/main/src/core/Mono.TextEditor.Shared/Makefile
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/Makefile
+/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.MSBuild.Shared/Makefile
+/main/tests/MonoDevelop.Core.Tests/Makefile
+/main/tests/WindowsPlatform.Tests/Makefile
+/main/tests/IdeUnitTests/Makefile
 
 # extras configure junk
 /extras/MonoDevelop.Database/INSTALL

.gitmodules

@@ -26,9 +26,6 @@
 	path = main/external/xwt
 	url = git://github.com/mono/xwt
 	branch = master
-[submodule "main/external/monomac"]
-	path = main/external/monomac
-	url = git://github.com/mono/monomac.git
 [submodule "main/external/sharpsvn-binary"]
 	path = main/external/sharpsvn-binary
 	url = git://github.com/mono/sharpsvn-binary.git
@@ -46,8 +43,8 @@
 	branch = xs-5.10-v2
 [submodule "main/external/RefactoringEssentials"]
 	path = main/external/RefactoringEssentials
-	url = git://github.com/icsharpcode/RefactoringEssentials.git
-	branch = master
+	url = git://github.com/mono/RefactoringEssentials.git
+	branch = monodevelop2
 [submodule "main/external/macdoc"]
 	path = main/external/macdoc
 	url = git://github.com/xamarin/macdoc

CODEOWNERS

@@ -0,0 +1,37 @@
+# MonoDevelop Code Owners File
+#
+# GitHub uses this file to determine who to assign for reviews
+# on pull requests. Please keep this file alphabetically sorted.
+#
+# References:
+#
+# https://github.com/blog/2392-introducing-code-owners
+# https://help.github.com/articles/about-codeowners
+
+/main/src/core/MonoDevelop.Core @mono/monodevelop-core-owners
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AtkCocoaHelper @iainx
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands @slluis
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking @slluis @sevoku
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Theming @sevoku
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Components @slluis @sevoku
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.BuildOutputView @netonjm @rodrmoya
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion @slluis @mkrueger
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting @slluis @mkrueger
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates @mkrueger
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop @slluis
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension @mkrueger
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting @mkrueger
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.TextMate @mkrueger
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor @mkrueger
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution @slluis
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles @mkrueger @sevoku
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Execution @slluis
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components @slluis @sevoku
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content @slluis
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs @netonjm @rodrmoya
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui @slluis
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring @slluis
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem @mkrueger @DavidKarlas
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Updater @slluis
+/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide @slluis
+/main/src/core/MonoDevelop.Ide/branding @slluis

Makefile

@@ -3,8 +3,24 @@ include main/monodevelop_version
 EXTRA_DIST = configure code_of_conduct.md
 SPACE := 
 SPACE +=  
-AOT_DIRECTORIES:=$(subst $(SPACE),:,$(shell find main/build/* -type d))
-MONO_AOT:=MONO_PATH=$(AOT_DIRECTORIES):$(MONO_PATH) mono64 --aot --debug
+
+ifeq ($(origin APP), undefined)
+BIN_DIR=main/build
+else
+BIN_DIR="$(APP)/Contents/Resources/lib/monodevelop"
+endif
+
+AOT_DIRECTORIES:=$(subst $(SPACE),:,$(shell find $(BIN_DIR)/* -not -path "*azure-functions-cli*" -not -path "*.dSYM*" -not -path "*/ServiceHub/*" -not -path $(BIN_DIR)/tests* -type d))
+
+MONO_DIR=/Library/Frameworks/Mono.framework/Libraries/mono
+MSBUILD_PATH=$(MONO_DIR)/msbuild/15.0/bin
+
+# --assembly-loader=strict will not work for valuetuples here, even with binding redirects
+AOT_COMMAND=mono64 --aot=hybrid --debug --assembly-loader=strict
+MONO_AOT:=MONO_PATH="$(AOT_DIRECTORIES):$(MSBUILD_PATH):$(MONO_PATH)" $(AOT_COMMAND) --apply-bindings=$(BIN_DIR)/bin/MonoDevelop.exe.config
+
+MSBUILD_LIBRARIES=Microsoft.Build.dll Microsoft.Build.Framework.dll Microsoft.Build.Utilities.Core.dll
+MSBUILD_DLLS=$(patsubst %, $(MSBUILD_PATH)/%, $(MSBUILD_LIBRARIES))
 
 all: update_submodules all-recursive
 
@@ -35,8 +51,8 @@ CONFIG_MAKE=$(top_srcdir)/config.make
 	case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \
 	for dir in $(SUBDIRS); do \
 		case $$dir in \
-		.) PATH=$(PATH):/Library/Frameworks/Mono.framework/Versions/Current/bin $(MAKE) $*-local || { final_exit="exit 1"; $$dk; };;\
-		*) (cd $$dir && PATH=$(PATH):/Library/Frameworks/Mono.framework/Versions/Current/bin $(MAKE) $*) || { final_exit="exit 1"; $$dk; };;\
+		.) PATH="$(PATH):/Library/Frameworks/Mono.framework/Versions/Current/bin" $(MAKE) $*-local || { final_exit="exit 1"; $$dk; };;\
+		*) (cd $$dir && PATH="$(PATH):/Library/Frameworks/Mono.framework/Versions/Current/bin" $(MAKE) $*) || { final_exit="exit 1"; $$dk; };;\
 		esac \
 	done
 	$$final_exit
@@ -59,7 +75,10 @@ distclean: distclean-recursive
 remove-stale-tarballs:
 	rm -rf tarballs
 
-dist: update_submodules remove-stale-tarballs dist-recursive
+remove-stale-buildinfo:
+	rm -f main/src/core/MonoDevelop.Core/BuildVariables.cs
+
+dist: update_submodules remove-stale-tarballs remove-stale-buildinfo dist-recursive
 	mkdir -p tarballs
 	for t in $(SUBDIRS); do \
 		if test -e $$t/*.tar.gz; then \
@@ -87,23 +106,31 @@ dist: update_submodules remove-stale-tarballs dist-recursive
 	@echo Decompressing monodevelop-$(PACKAGE_VERSION).tar.bz2
 	@cd tarballs && tar xvjf monodevelop-$(PACKAGE_VERSION).tar.bz2
 	@cp version.config tarballs/monodevelop-$(PACKAGE_VERSION)
+	@cp NuGet.config tarballs/monodevelop-$(PACKAGE_VERSION)
 	@rm -f main/build/bin/buildinfo
 	@cd main && make buildinfo
 	@cp main/build/bin/buildinfo tarballs/monodevelop-$(PACKAGE_VERSION)/
 	@echo Generating merged tarball
-	@find tarballs/monodevelop-$(PACKAGE_VERSION)/ -type f -a \
-		\( -name \*.exe -o \
-		-name \*.dll -o \
-		-name \*.mdb \) \
-		-delete
 	@cd tarballs && tar -cjf monodevelop-$(PACKAGE_VERSION).tar.bz2 monodevelop-$(PACKAGE_VERSION)
 	@cd tarballs && rm -rf monodevelop-$(PACKAGE_VERSION)
 
+aot-all: aot aot-gac aot-msbuild-with-copy
+
+aot-msbuild-with-copy: aot-msbuild
+	@for i in $(MSBUILD_DLLS); do cp -r "$$i" "$$i.dylib" "$$i.dylib.dSYM" $(BIN_DIR)/bin; done
+
 aot:
-	@for i in main/build/bin/*.dll; do ($(MONO_AOT) $$i &> /dev/null && echo AOT successful: $$i) || (echo AOT failed: $$i); done
-	@for i in main/build/AddIns/*.dll; do ($(MONO_AOT) $$i &> /dev/null && echo AOT successful: $$i) || (echo AOT failed: $$i); done
-	@for i in main/build/AddIns/*/*.dll; do ($(MONO_AOT) $$i &> /dev/null && echo AOT successful: $$i) || (echo AOT failed: $$i); done
-	@for i in main/build/AddIns/*/*/*.dll; do ($(MONO_AOT) $$i &> /dev/null && echo AOT successful: $$i) || (echo AOT failed: $$i); done
+	@for i in $(BIN_DIR)/bin/*.dll; do ($(MONO_AOT) "$$i" &> /dev/null && echo AOT successful: $$i) || (echo AOT failed: $$i); done
+	@for i in $(BIN_DIR)/AddIns/*.dll; do ($(MONO_AOT) "$$i" &> /dev/null && echo AOT successful: $$i) || (echo AOT failed: $$i); done
+	@for i in $(BIN_DIR)/AddIns/*/*.dll; do ($(MONO_AOT) "$$i" &> /dev/null && echo AOT successful: $$i) || (echo AOT failed: $$i); done
+	@for i in $(BIN_DIR)/AddIns/*/*/*.dll; do ($(MONO_AOT) "$$i" &> /dev/null && echo AOT successful: $$i) || (echo AOT failed: $$i); done
+
+aot-gac:
+	@for i in $(MONO_DIR)/4.5/*.dll; do (sudo $(AOT_COMMAND) "$$i" &> /dev/null && echo AOT successful: $$i) || (echo AOT failed: $$i); done
+	@for i in $(MONO_DIR)/gac/*/*/*.dll; do (sudo $(AOT_COMMAND) "$$i" &> /dev/null && echo AOT successful: $$i) || (echo AOT failed: $$i); done
+
+aot-msbuild:
+	@for i in $(MSBUILD_DLLS); do (sudo $(AOT_COMMAND) "$$i" &> /dev/null && echo AOT successful: $$i) || (echo AOT failed: $$i); done
 
 run:
 	cd main && $(MAKE) run
@@ -126,12 +153,19 @@ run-gdb-64:
 run-leaks:
 	cd main && $(MAKE) run-leaks
 
+run-no-accessibility:
+	cd main && $(MAKE) run-no-accessibility
 test:
 	cd main && $(MAKE) test assembly=$(assembly)
+
+deploy-tests:
+	cd main && $(MAKE) deploy-tests
 
 uitest:
 	cd main && $(MAKE) uitest assembly=$(assembly) tests=$(tests)
 
+performance-tests:
+	cd main && $(MAKE) performance-tests
 coverage:
 	cd main && $(MAKE) coverage
 

MonoDevelop.mdw

@@ -1,6 +1,5 @@
 <WorkspaceItem name="MonoDevelop" ctype="Workspace">
   <Items>
-    <Item>extras/extras.mdw</Item>
     <Item>main/Main.sln</Item>
   </Items>
 </WorkspaceItem>

NuGet.config

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<packageSources>
-		<add key="Nuget Official" value="https://www.nuget.org/api/v2/" />
 		<add key="Nuget Official" value="https://api.nuget.org/v3/index.json" />
 		<add key="Roslyn Nightlies" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
 		<add key="Roslyn VSForMac" value="https://dotnet.myget.org/F/roslyn-for-vs-for-mac/api/v3/index.json" />
 		<add key="VS Editor" value="https://vside.myget.org/F/vssdk/api/v3/index.json" />
 		<add key="VS Editor Impl" value="https://vside.myget.org/F/vs-impl/api/v3/index.json" />
-		<add key="VS Editor Legacy" value="https://www.myget.org/F/vs-editor" />
+		<add key="VS Editor Legacy" value="https://www.myget.org/F/vs-editor/api/v3/index.json" />
 		<add key="NuGetizer3000" value="https://ci.appveyor.com/nuget/nugetizer3000" />
 		<add key="VSTest" value="https://dotnet.myget.org/F/vstest/" />
 		<add key="Templating" value="https://dotnet.myget.org/F/templating/" />
 		<add key="Azure AppService" value="https://www.myget.org/F/azure-appservice/api/v3/index.json" />
+		<add key="MSBuild" value="https://dotnet.myget.org/F/msbuild/api/v3/index.json" />
 	</packageSources>
 </configuration>

README.md

@@ -1,5 +1,8 @@
 **MonoDevelop** is a full-featured integrated development environment (IDE) for mono using Gtk#.
 
+The MonoDevelop core is also the foundation for Visual Studio for Mac.  
+Feel free to file bugs against Visual Studio for Mac here as well.
+
 See http://www.monodevelop.com for more info.  
 
 [![Build Status](http://jenkins.mono-project.com/job/test-monodevelop-mainline/badge/icon)](http://jenkins.mono-project.com/job/test-monodevelop-mainline/)
@@ -20,7 +23,7 @@ Compiling
 ---------
 
 If you are building from Git, make sure that you initialize the submodules
-that are part of this repository by executing:
+that are part of this repository by executing:  
 `git submodule update --init --recursive`
 
 If you are running a parallel mono installation, make sure to run all the following steps
@@ -54,6 +57,13 @@ Running
 You can run MonoDevelop from the build directory by executing:
 `make run`
 
+Debugging
+---------
+
+You can debug MonoDevelop using Visual Studio (on Windows or macOS) with the
+`main/Main.sln` solution. Use the `DebugWin32` configuration on Windows and the
+`DebugMac` configuration on macOS.
+
 Installing *(Optional)*
 ----------
 
@@ -116,10 +126,6 @@ https://developer.gnome.org/hig/stable/
 
 http://freedesktop.org/Standards/
 
-**Integrating with GNOME** *(a little out of date)*
-
-http://developers.sun.com/solaris/articles/integrating_gnome.html
-
 **Bugzilla**
 
 http://bugzilla.mozilla.org/bugwritinghelp.html