From 917eaa1846f160963bfa62280a990cab264ffa87 Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Wed, 18 Dec 2019 12:41:16 -0300 Subject: [PATCH 1/2] Changing things to run VS4Mac using net5 --- main/Main.sln | 88 ++----------------- main/MonoDevelop.props | 3 +- .../MonoDevelop.FSharp.Gui.csproj | 7 +- .../MonoDevelop.FSharp.Shared.fsproj | 7 +- .../MonoDevelop.FSharp.Tests.fsproj | 29 +----- .../MonoDevelop.FSharp.fsproj | 65 +++++--------- ...noDevelop.FSharpInteractive.Service.fsproj | 19 ++-- main/msbuild/MDBuildTasks/MDBuildTasks.csproj | 3 +- main/msbuild/MonoDevelop.AfterCommon.props | 4 +- main/msbuild/ReferencesVSEditor.Mac.props | 2 +- main/po/StripMnemonics/StripMnemonics.csproj | 2 +- main/po/po.mdproj | 2 +- .../addins/AspNet/MonoDevelop.AspNet.csproj | 32 +------ .../Tests/MonoDevelop.AspNet.Tests.csproj | 4 +- .../AspNet/CSharpBinding.AspNet.csproj | 4 +- .../CSharpBinding/Autotools/Autotools.csproj | 21 +---- .../addins/CSharpBinding/CSharpBinding.csproj | 35 +------- .../ChangeLogAddIn/ChangeLogAddIn.csproj | 25 +----- .../MonoDevelop.Deployment.Linux.csproj | 17 +--- .../MonoDevelop.Deployment.csproj | 17 +--- .../addins/GnomePlatform/GnomePlatform.csproj | 15 +--- .../addins/ILAsmBinding/ILAsmBinding.csproj | 13 +-- .../src/addins/MacPlatform/MacPlatform.csproj | 21 +---- ...Develop.AspNetCore.DevCertInstaller.csproj | 4 +- .../MonoDevelop.AspNetCore.Tests.csproj | 4 +- .../MonoDevelop.AspNetCore.csproj | 4 +- .../MonoDevelop.AssemblyBrowser.csproj | 19 +--- .../MonoDevelop.Autotools.csproj | 17 +--- .../MonoDevelop.ConnectedServices.csproj | 4 +- .../MonoDevelop.Debugger.Gdb.csproj | 17 +--- .../MonoDevelop.Debugger.Soft.AspNet.csproj | 33 +------ .../MonoDevelop.Debugger.Soft.csproj | 21 +---- ...evelop.Debugger.VsCodeDebugProtocol.csproj | 4 +- .../MonoDevelop.Debugger.PerfTests.csproj | 4 +- .../MonoDevelop.Debugger.Tests.csproj | 4 +- .../MonoDevelop.Debugger.csproj | 22 +---- .../MonoDevelop.DesignerSupport.Tests.csproj | 4 +- .../MonoDevelop.DesignerSupport.csproj | 21 +---- .../MonoDevelop.DocFood.csproj | 4 +- .../MonoDevelop.DotNetCore.Tests.csproj | 4 +- .../MonoDevelop.DotNetCore.csproj | 4 +- .../MonoDevelop.Gettext.csproj | 21 +---- .../MonoDevelop.GtkCore.csproj | 29 +----- .../libstetic/libstetic.csproj | 7 +- .../libsteticui/libsteticui.csproj | 9 +- .../MonoDevelop.HexEditor.csproj | 23 +---- ...MonoDevelop.PackageManagement.Tests.csproj | 2 +- .../MonoDevelop.PackageManagement.csproj | 2 +- .../MonoDevelop.Packaging.Tests.csproj | 4 +- .../MonoDevelop.Packaging.csproj | 4 +- .../MonoDevelop.Refactoring.csproj | 25 +----- .../MonoDevelop.RegexToolkit.csproj | 15 +--- .../MonoDevelop.SourceEditor.csproj | 24 +---- .../MonoDevelop.TextEditor.Cocoa.addin.xml | 1 + .../MonoDevelop.TextEditor.Wpf.csproj | 4 +- ...noDevelop.UnitTesting.NUnit.Runners.csproj | 4 +- .../MonoDevelop.UnitTesting.NUnit.csproj | 17 +--- .../NUnit3Runner/NUnit3Runner.csproj | 4 +- .../NUnitRunner/NUnitRunner.csproj | 7 +- .../MonoDevelop.UnitTesting.Tests.csproj | 4 +- .../MonoDevelop.UnitTesting.csproj | 21 +---- .../MonoDevelop.WebReferences.csproj | 15 +--- .../MonoDeveloperExtensions.csproj | 13 +-- .../NUnit/NUnit.csproj | 17 +--- .../PerformanceDiagnosticsAddIn.csproj | 4 +- .../UIThreadMonitorDaemon.csproj | 4 +- .../MonoDevelop.TextTemplating.csproj | 17 +--- .../addins/VBNetBinding/VBNetBinding.csproj | 15 +--- ...onoDevelop.VersionControl.Git.Tests.csproj | 4 +- .../MonoDevelop.VersionControl.Git.csproj | 4 +- ...lop.VersionControl.Subversion.Tests.csproj | 4 +- ...elop.VersionControl.Subversion.Unix.csproj | 4 +- ...noDevelop.VersionControl.Subversion.csproj | 21 +---- .../MonoDevelop.VersionControl.csproj | 25 +----- ...rsionControl.Subversion.Win32.Tests.csproj | 4 +- .../VersionControl.Subversion.Win32.csproj | 2 +- .../WindowsAPICodePack/Core/Core.csproj | 2 +- .../WindowsAPICodePack/Shell/Shell.csproj | 2 +- .../WindowsPlatform/WindowsPlatform.csproj | 23 +---- main/src/addins/Xml/MonoDevelop.Xml.csproj | 23 +---- .../Xml/Tests/MonoDevelop.Xml.Tests.csproj | 19 +--- .../MonoDevelop.Core/MonoDevelop.Core.csproj | 49 +++++------ .../ExtensionModel/MonoDevelop.Ide.addin.xml | 6 +- .../MonoDevelop.Ide/MonoDevelop.Ide.csproj | 30 +------ .../MonoDevelop.MSBuildBuilder.csproj | 10 ++- .../MonoDevelop.MSBuildResolver.csproj | 12 +-- .../MonoDevelop.Startup.csproj | 16 +--- main/src/core/MonoDevelop.Startup/app.config | 4 +- .../MonoDevelop.TextEditor.Tests.csproj | 4 +- .../ExtensionTools/ExtensionTools.csproj | 4 +- main/src/tools/mdhost/mdhost.csproj | 11 +-- main/src/tools/mdmonitor/mdmonitor.csproj | 4 +- main/src/tools/mdtool/mdtool.csproj | 13 +-- .../Ide.Tests/MonoDevelop.Ide.Tests.csproj | 4 +- main/tests/IdeUnitTests/IdeUnitTests.csproj | 4 +- .../MacPlatform.Tests.csproj | 4 +- .../MonoDevelop.CSharpBinding.Tests.csproj | 4 +- .../MonoDevelop.Core.Tests.Addin.csproj | 4 +- .../MonoDevelop.Core.Tests.csproj | 4 +- .../MonoDevelop.Refactoring.Tests.csproj | 4 +- .../ResultParser/ResultParser.csproj | 2 +- main/tests/StressTest/StressTest.csproj | 2 +- .../StressTest/TestProject/TestProject.csproj | 2 +- main/tests/TestRunner/TestRunner.csproj | 4 +- main/tests/UnitTests/UnitTests.csproj | 13 +-- .../UserInterfaceTests.csproj | 4 +- .../WindowsPlatform.Tests.csproj | 4 +- .../MonoDevelop.Ide.PerfTests.csproj | 4 +- .../MonoDevelop.PerformanceTesting.csproj | 4 +- .../Net472/Net472.csproj | 2 +- .../ContactBook/ContactBook.csproj | 2 +- .../CustomWidgets/CustomWidgets.csproj | 2 +- .../DotNetFrameworkProject.csproj | 2 +- .../DotNetFrameworkProject.csproj | 2 +- .../library1/library1.csproj | 2 +- .../library2/library2.csproj | 2 +- .../FileFormatExclude/library.csproj | 2 +- .../FileWatcherTest/FileWatcherTest.csproj | 2 +- .../FileWatcherTest/FileWatcherTest2.csproj | 2 +- .../FileWatcherTest/FileWatcherTest3.csproj | 2 +- .../FileWatcherTest/Library/Library.csproj | 2 +- .../test-projects/FileWatcherTest/Root.csproj | 2 +- .../LibraryProject/LibraryProject.csproj | 2 +- .../LibraryProject/LibraryProject.csproj | 2 +- .../ImportCircularDependency.csproj | 2 +- .../ImportedOutputPathProperty.csproj | 2 +- .../ImportedPlatformOutputPathProperty.csproj | 2 +- .../NetFrameworkProject.csproj | 2 +- .../PackageReferenceProject.csproj | 2 +- .../ProjectInSolutionFolder.csproj | 2 +- .../PackageAssemblyReferenceCondition.csproj | 2 +- ...ageAssemblyReferenceCondition.csproj-saved | 2 +- .../ReferenceFullPath.csproj | 2 +- .../ReferenceFullPath.csproj-saved | 2 +- .../ReferencePathTest.csproj | 2 +- .../RestoreStylePackageReference.csproj | 2 +- .../Console1/Console1.csproj | 2 +- .../Console2/Console2.csproj | 2 +- .../Console3/Console3.csproj | 2 +- .../Console1/Console1.csproj | 2 +- .../Console2/Console2.csproj | 2 +- .../Library.csproj | 2 +- .../StrictNuGetDependency.csproj | 2 +- .../StrictNuGetDependency.csproj-saved | 2 +- .../WebProject/WebProject.csproj | 2 +- .../additional-files/library/library.csproj | 2 +- .../build-action-none.csproj | 2 +- .../build-session/build-session.csproj | 2 +- .../build-session/lib1/lib1.csproj | 2 +- .../build-session/lib1/lib2/lib2.csproj | 2 +- .../builder-manager-tests/Dep1/Dep1.csproj | 2 +- .../builder-manager-tests/Dep2/Dep2.csproj | 2 +- .../DepMain/DepMain.csproj | 2 +- .../SyncTask/SyncTask.csproj | 2 +- .../TaskTest/SyncBuildProject.csproj | 2 +- .../builder-manager-tests/App.csproj | 2 +- .../crasher/ConsoleProject.csproj | 2 +- .../CompletionDbTest/CompletionDbTest.csproj | 2 +- .../Library1/Library1.csproj | 2 +- .../Library2/Library2.csproj | 2 +- .../commonLib/commonLib.csproj | 2 +- .../conditional-project-reference.csproj | 2 +- .../windowsLib/windowsLib.csproj | 2 +- .../ConsoleProject/ConsoleProject.csproj | 4 +- .../ConsoleProject/ConsoleProject.csproj | 4 +- .../ConsoleProject/ConsoleProject.csproj | 2 +- .../ConsoleProject-imported-wildcard.csproj | 2 +- .../ConsoleProject.csproj | 2 +- .../ConsoleProject/ConsoleProject.csproj | 2 +- .../ConsoleProject-import.csproj | 2 +- .../ConsoleProject-import.csproj.saved1 | 2 +- ...nsoleProject-imported-none-wildcard.csproj | 2 +- ...oject-imported-none-wildcard.csproj.saved1 | 2 +- ...oleProject-imported-wildcard-remove.csproj | 2 +- ...t-imported-wildcard-separate-remove.csproj | 2 +- ...t-imported-wildcard-separate-update.csproj | 2 +- ...oleProject-imported-wildcard-update.csproj | 2 +- .../ConsoleProject-imported-wildcard.csproj | 2 +- .../ConsoleProject-with-excludes.csproj | 2 +- ...Project-with-forward-slash-excludes.csproj | 2 +- ...-with-forward-slash-wildcard-update.csproj | 2 +- .../ConsoleProject-with-link-wildcard.csproj | 2 +- ...leProject-with-link-wildcard.csproj.saved1 | 2 +- ...leProject-with-path-wildcard-update.csproj | 2 +- .../ConsoleProject-with-path-wildcard.csproj | 2 +- ...th-property-trailing-slash-excludes.csproj | 2 +- ...nsoleProject-with-question-wildcard.csproj | 2 +- .../ConsoleProject.csproj | 2 +- .../ConsoleProject.csproj.saved1 | 2 +- .../ConsoleProject.csproj.saved2 | 2 +- .../ConsoleProject.csproj.saved3 | 2 +- .../ConsoleProject.csproj.saved4 | 2 +- .../ConsoleProject.csproj.saved5 | 2 +- .../ConsoleProject.csproj.saved6 | 2 +- .../ConsoleProject.csproj.saved7 | 2 +- .../ConsoleProject-conf-renamed.csproj | 2 +- .../ConsoleProject-duplicate-reference.csproj | 2 +- ...eProject-refresh-item-changed-saved.csproj | 2 +- .../ConsoleProject-refresh-saved.csproj | 2 +- ...ConsoleProject-triplicate-reference.csproj | 2 +- .../ConsoleProject/ConsoleProject.csproj | 2 +- ...ConsoleProject.csproj.build-action-change1 | 2 +- ...ConsoleProject.csproj.build-action-change2 | 2 +- .../ConsoleProject.csproj.config-copied | 2 +- .../ConsoleProject.csproj.config-props-added | 2 +- .../ConsoleProject.csproj.config-renamed | 2 +- .../ConsoleProject.csproj.custom-item | 2 +- .../ConsoleProject.csproj.reference-added | 2 +- .../console-with-libs.csproj | 2 +- .../library1/library1.csproj | 2 +- .../library2/library2.csproj | 2 +- .../csappfslib/csappfslib.csproj | 2 +- .../csharp-console/csharp-console.csproj | 2 +- .../ConsoleProject.csproj | 2 +- .../ConsoleProject.csproj.saved2 | 2 +- .../ConsoleProject.csproj.saved3 | 2 +- .../ConsoleProject.csproj.saved4 | 2 +- .../dotnet-cli-tool/dotnet-cli-tool.csproj | 2 +- .../expand-facades/ExpandFacadesFalse.csproj | 2 +- .../expand-facades/ExpandFacadesTrue.csproj | 2 +- .../fast-build-test/FastBuildTest.csproj | 2 +- .../fast-build-test/FastLibrary.csproj | 2 +- .../ConsoleProject/ConsoleProject.csproj | 2 +- .../ConsoleProject/ConsoleProject.csproj | 2 +- .../TestProject.csproj | 2 +- .../TestProject2.csproj | 2 +- .../TestProject.csproj | 2 +- .../TestProject.csproj.saved1 | 2 +- .../InvalidReference.csproj | 2 +- .../ReferencingProject.csproj | 2 +- .../ConsoleProject/ConsoleProject.csproj | 2 +- .../ConsoleProject.csproj.saved | 2 +- .../LibProject/LibProject.csproj | 2 +- .../msbuild-current/msbuild-current.csproj | 2 +- .../glob-auto-include.csproj | 2 +- .../glob-file-link-test-saved1.csproj | 2 +- .../glob-file-link-test.csproj | 2 +- .../glob-file-link-test2.csproj | 2 +- .../glob-import-metadata-prop-saved1.csproj | 2 +- .../glob-import-metadata-prop.csproj | 2 +- .../glob-import-metadata-prop2-saved.csproj | 2 +- .../glob-import-metadata-prop2-saved2.csproj | 2 +- .../glob-import-metadata-prop2-saved3.csproj | 2 +- .../glob-import-metadata-prop2.csproj | 2 +- .../glob-import-remove-test-saved.csproj | 2 +- .../glob-import-test.csproj | 2 +- .../glob-import-test2.csproj | 2 +- .../glob-import-update1-test.csproj | 2 +- .../glob-remove-saved.csproj | 2 +- .../glob-remove-saved2.csproj | 2 +- .../glob-remove-saved3.csproj | 2 +- .../glob-remove-test.csproj | 2 +- .../glob-remove-test2.csproj | 2 +- .../glob-test-saved1.csproj | 2 +- .../glob-test-saved2.csproj | 2 +- .../glob-test-saved3.csproj | 2 +- .../glob-test-saved4.csproj | 2 +- .../glob-test-saved5.csproj | 2 +- .../msbuild-glob-tests/glob-test.csproj | 2 +- .../msbuild-glob-tests/glob-test2.csproj | 2 +- .../glob-update1-test-saved.csproj | 2 +- .../glob-update1-test-saved2.csproj | 2 +- .../glob-update1-test.csproj | 2 +- .../glob-update2-test-saved.csproj | 2 +- .../glob-update2-test-saved2.csproj | 2 +- .../glob-update2-test.csproj | 2 +- .../glob-update3-test-saved.csproj | 2 +- .../glob-update3-test-saved2.csproj | 2 +- .../glob-update3-test-saved3.csproj | 2 +- .../glob-update3-test.csproj | 2 +- .../glob-update4-test-saved.csproj | 2 +- .../glob-update4-test.csproj | 2 +- .../msbuild-project-test/extra.csproj | 2 +- .../msbuild-project-test/test-remove.csproj | 2 +- .../msbuild-project-test/test-user.csproj | 4 +- .../msbuild-project-test/test.csproj | 6 +- .../ConsoleProject.csproj | 2 +- .../ProjectUsingMultiSdk.csproj | 2 +- .../ProjectUsingSdk.csproj | 2 +- .../ProjectUsingSdk2.csproj | 2 +- .../ProjectUsingSdkImport.csproj | 4 +- .../(some files)/functions.props | 2 +- .../msbuild-tests/condition-parse.csproj | 2 +- .../conditioned-properties.csproj | 2 +- .../msbuild-tests/functions.csproj | 2 +- .../project-with-custom-target.csproj | 2 +- .../project-with-duplicated-conf-saved.csproj | 2 +- .../project-with-duplicated-conf.csproj | 2 +- .../project-with-user-data.csproj | 2 +- .../msbuild-tests/property-eval-order.csproj | 2 +- .../msbuild-tests/property-eval-order.targets | 2 +- .../msbuild-tests/transforms.csproj | 2 +- .../NetStandardTest/NetStandardTest.csproj | 2 +- .../package-reference/library/library.csproj | 2 +- .../ExampleFormsSolution.UITests.csproj | 2 +- .../ConsoleProject/ConsoleProject.csproj | 2 +- .../ConsoleProject.csproj | 2 +- .../Library/Library.csproj | 2 +- .../console-with-libs.csproj | 2 +- .../project-from-vs/library1/library1.csproj | 2 +- .../project-from-vs/library2/library2.csproj | 2 +- .../ConsoleProject/ConsoleProject.csproj | 2 +- .../ConsoleProject/ConsoleProject.csproj | 2 +- .../ConsoleProject/ConsoleProject.csproj.2 | 2 +- .../project-ref-with-spaces.csproj | 4 +- .../some - library/some - library.csproj | 2 +- .../consoleproject.csproj | 2 +- .../project-with-conditioned-file.csproj | 2 +- .../project-with-imported-files.csproj | 2 +- .../project.csproj | 2 +- .../ConsoleProject/ConsoleProject.csproj | 2 +- .../ConsoleProject/ConsoleProject.csproj | 2 +- .../item-definition-group.csproj | 4 +- ...ition-group.csproj.add-file-match-metadata | 4 +- ...finition-group.csproj.add-file-no-metadata | 4 +- ...multiple-item-definitions-same-item.csproj | 4 +- .../project.csproj | 2 +- .../missing-projection-file.csproj | 2 +- .../property-evaluation-test.csproj | 2 +- .../default-value-save-2.csproj | 2 +- .../default-value-save-2.csproj.saved | 2 +- .../default-value-save-2.csproj.saved2 | 2 +- .../default-value-save-3.csproj | 2 +- .../default-value-save-3.csproj.saved | 2 +- .../default-value-save.csproj | 2 +- .../default-value-save.csproj.saved | 2 +- .../default-value-with-import-save-2.csproj | 2 +- ...ault-value-with-import-save-2.csproj.saved | 2 +- ...ult-value-with-import-save-2.csproj.saved2 | 2 +- .../default-value-with-import-save.csproj | 2 +- ...efault-value-with-import-save.csproj.saved | 2 +- .../empty-property-save.csproj | 2 +- .../empty-property-save.csproj.saved | 2 +- .../property-save-test.csproj | 2 +- .../console-project/console-project.csproj | 2 +- .../console-project.csproj-saved | 2 +- .../library1/library1.csproj | 2 +- .../library2/library2.csproj | 2 +- .../ConsoleProject/ConsoleProject.csproj | 4 +- .../ResourcesTester/ResourcesTester.csproj | 2 +- .../ICSharpCode.NRefactory.Cecil.csproj | 2 +- .../default-value-existing-save.csproj | 2 +- .../env-vars-prop.csproj | 2 +- .../multiple-prop-definition.csproj | 2 +- .../ConsoleProject.configs-added.csproj | 2 +- .../ConsoleProject.configs-modified.csproj | 2 +- .../ConsoleProject.configs-user-added.csproj | 2 +- ...onsoleProject.configs-user-switched.csproj | 2 +- .../ConsoleProject/ConsoleProject.csproj | 2 +- .../ConsoleProject.default-console.csproj | 2 +- .../ConsoleProject.default-modified.csproj | 2 +- .../ConsoleProject.new-project-extra.csproj | 2 +- ...oleProject.new-project-with-default.csproj | 2 +- .../ConsoleProject.new-project.csproj | 2 +- .../sln-config-mapping/app.csproj | 2 +- .../sln-config-mapping/lib/lib.csproj | 2 +- .../sln-config-mapping/lib2/lib2.csproj | 2 +- .../test-symlinked-file.csproj | 2 +- .../test-build-configs/Lib1/Lib1.csproj | 2 +- .../test-build-configs/Lib2/Lib2.csproj | 2 +- .../test-build-configs/Lib3/Lib3.csproj | 2 +- .../test-build-configs/Lib4/Lib4.csproj | 2 +- .../TestConfigurationMerging.csproj | 2 +- .../TestConfigurationMergingSaved.csproj | 2 +- .../TestConfigurationMerging10.csproj | 4 +- .../TestConfigurationMerging11.csproj | 4 +- .../TestConfigurationMerging11.csproj.saved | 4 +- .../TestConfigurationMerging11.csproj.saved2 | 4 +- .../TestConfigurationMerging2.csproj | 2 +- .../TestConfigurationMerging3.csproj | 2 +- .../TestConfigurationMerging3.csproj.saved | 2 +- .../TestConfigurationMerging4.csproj | 2 +- .../TestConfigurationMerging4.csproj.saved | 2 +- .../TestConfigurationMerging5.csproj | 2 +- .../TestConfigurationMerging5.csproj.saved | 2 +- .../TestConfigurationMerging6.csproj | 2 +- .../TestConfigurationMerging6.csproj.saved | 2 +- .../TestConfigurationMerging7.csproj | 2 +- .../TestConfigurationMerging7.csproj.saved | 2 +- .../TestConfigurationMerging8.csproj | 4 +- .../TestConfigurationMerging9.csproj | 4 +- .../TestConfigurationMerging9.csproj.saved | 4 +- .../TestConfigurationMerging9.csproj.saved2 | 4 +- .../test-multi-configuration/project.csproj | 4 +- .../test-project-refresh.csproj | 2 +- .../test-resource-id/ConsoleProject.csproj | 4 +- .../test-whitespace-roundtrip/project.csproj | 2 +- .../project.csproj.saved | 2 +- .../console-with-libs.csproj | 2 +- .../transfer-tests/library1/library1.csproj | 2 +- .../transfer-tests/library2/library2.csproj | 2 +- .../unit-testing-xunit-dotnetfull.csproj | 2 +- .../console-with-libs.csproj | 2 +- .../library1/library1.csproj | 2 +- .../library2/library2.csproj | 2 +- .../library2/library2.csproj.saved | 2 +- .../library-project-net461.csproj | 2 +- .../library-project/library-project.csproj | 2 +- .../workspace-metadata-references.csproj | 2 +- .../workspace/Sol/Cons/Cons.csproj | 2 +- .../MonoDevelop.UserInterfaceTesting.csproj | 4 +- .../MonoLibraries/MonoLibraries.wixproj | 2 +- setup/WixSetup/WixSetup.wixproj | 2 +- 403 files changed, 628 insertions(+), 1314 deletions(-) diff --git a/main/Main.sln b/main/Main.sln index 8bb83915a1b..2b639085e0f 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -144,18 +144,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Tests" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Gdb", "src\addins\MonoDevelop.Debugger.Gdb\MonoDevelop.Debugger.Gdb.csproj", "{FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.Debugger.Win32", "MonoDevelop.Debugger.Win32", "{8F47F5EC-2F57-4030-B658-7B1002DA90C2}" - ProjectSection(SolutionItems) = preProject - external\debugger-libs\eula.rtf = external\debugger-libs\eula.rtf - external\debugger-libs\README.txt = external\debugger-libs\README.txt - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CorApi", "external\debugger-libs\CorApi\CorApi.csproj", "{9FBCC262-10DC-4E84-A5C4-17230BBF8862}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CorApi2", "external\debugger-libs\CorApi2\CorApi2.csproj", "{69136056-BFD3-4CEC-BB41-D9991C79593C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Win32", "src\addins\MonoDevelop.Debugger.Win32\MonoDevelop.Debugger.Win32\MonoDevelop.Debugger.Win32.csproj", "{7E4B15FB-E8C4-419A-A31C-9310FD9062BD}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.PackageManagement", "MonoDevelop.PackageManagement", "{98F4461F-84D0-4C57-A11F-47E871BD04A0}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.PackageManagement.Tests", "src\addins\MonoDevelop.PackageManagement\MonoDevelop.PackageManagement.Tests\MonoDevelop.PackageManagement.Tests.csproj", "{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}" @@ -290,8 +278,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIThreadMonitorDaemon", "sr EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.ConnectedServices", "src\addins\MonoDevelop.ConnectedServices\MonoDevelop.ConnectedServices.csproj", "{BF71E2BB-9838-4E0C-B0E7-80559E3909BB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugging.Win32", "external\debugger-libs\Mono.Debugging.Win32\Mono.Debugging.Win32.csproj", "{74704C00-5861-4F86-920C-865148A175C5}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.DotNetCore", "src\addins\MonoDevelop.DotNetCore\MonoDevelop.DotNetCore.csproj", "{6868153E-41EA-43A4-A81A-C1E7256373F7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.DotNetCore.Tests", "src\addins\MonoDevelop.DotNetCore\MonoDevelop.DotNetCore.Tests\MonoDevelop.DotNetCore.Tests.csproj", "{7D3073E9-F52D-4E14-B988-5316DC6FD0BF}" @@ -312,7 +298,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.AspNetCore", "s EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Core.Tests", "tests\MonoDevelop.Core.Tests\MonoDevelop.Core.Tests.csproj", "{FDA43CAA-1C2A-4593-8601-3E2EE06D9E03}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.UnitTesting.Tests", "src\addins\MonoDevelop.UnitTesting\MonoDevelop.UnitTesting.Tests\MonoDevelop.UnitTesting.Tests.csproj", "{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.DesignerSupport.Tests", "src\addins\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.Tests\MonoDevelop.DesignerSupport.Tests.csproj", "{CD31F051-9012-487B-B7E8-4CDDEA68B3AF}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Refactoring.Tests", "tests\MonoDevelop.Refactoring.Tests\MonoDevelop.Refactoring.Tests.csproj", "{BCC3A6AE-EC45-40AD-BA3E-59F6401D588C}" EndProject @@ -468,8 +454,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Def", "Def", "{F16C4445-227 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.DesignerSupport", "MonoDevelop.DesignerSupport", "{56499B8C-4935-4D00-9192-4F2033142975}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.DesignerSupport.Tests", "src\addins\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.Tests\MonoDevelop.DesignerSupport.Tests.csproj", "{49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\core\Mono.TextEditor.Shared\Mono.TextEditor.Shared.projitems*{f8f92aa4-a376-4679-a9d4-60e7b7fbf477}*SharedItemsImports = 4 @@ -484,6 +468,8 @@ Global ReleaseGnome|Any CPU = ReleaseGnome|Any CPU ReleaseMac|Any CPU = ReleaseMac|Any CPU ReleaseWin32|Any CPU = ReleaseWin32|Any CPU + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {7525BB88-6142-4A26-93B9-A30C6983390A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -1234,36 +1220,6 @@ Global {FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {FA15FC26-A7E7-4932-93B7-65FAE6D5DD33}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU - {9FBCC262-10DC-4E84-A5C4-17230BBF8862}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU - {9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU - {9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU - {9FBCC262-10DC-4E84-A5C4-17230BBF8862}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU - {9FBCC262-10DC-4E84-A5C4-17230BBF8862}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU - {9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU - {9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU - {9FBCC262-10DC-4E84-A5C4-17230BBF8862}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU - {69136056-BFD3-4CEC-BB41-D9991C79593C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU - {69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU - {69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU - {69136056-BFD3-4CEC-BB41-D9991C79593C}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU - {69136056-BFD3-4CEC-BB41-D9991C79593C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU - {69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU - {69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU - {69136056-BFD3-4CEC-BB41-D9991C79593C}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU - {7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU - {7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU - {7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU - {7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU - {7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU - {7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU - {7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU - {7E4B15FB-E8C4-419A-A31C-9310FD9062BD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Debug|Any CPU.Build.0 = Debug|Any CPU {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU @@ -1911,16 +1867,6 @@ Global {BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU {BF71E2BB-9838-4E0C-B0E7-80559E3909BB}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU - {74704C00-5861-4F86-920C-865148A175C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74704C00-5861-4F86-920C-865148A175C5}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU - {74704C00-5861-4F86-920C-865148A175C5}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU - {74704C00-5861-4F86-920C-865148A175C5}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU - {74704C00-5861-4F86-920C-865148A175C5}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU - {74704C00-5861-4F86-920C-865148A175C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74704C00-5861-4F86-920C-865148A175C5}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU - {74704C00-5861-4F86-920C-865148A175C5}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU - {74704C00-5861-4F86-920C-865148A175C5}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU - {74704C00-5861-4F86-920C-865148A175C5}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU {6868153E-41EA-43A4-A81A-C1E7256373F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6868153E-41EA-43A4-A81A-C1E7256373F7}.Debug|Any CPU.Build.0 = Debug|Any CPU {6868153E-41EA-43A4-A81A-C1E7256373F7}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU @@ -2165,6 +2111,10 @@ Global {44FFFDDA-156F-49F9-AE6A-BA640C198B33}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {44FFFDDA-156F-49F9-AE6A-BA640C198B33}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU {44FFFDDA-156F-49F9-AE6A-BA640C198B33}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU + {44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|x86.ActiveCfg = Debug|Any CPU + {44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Debug|x86.Build.0 = Debug|Any CPU + {44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Release|x86.ActiveCfg = Release|Any CPU + {44FFFDDA-156F-49F9-AE6A-BA640C198B33}.Release|x86.Build.0 = Release|Any CPU {29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2661,22 +2611,6 @@ Global {785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU {785F775C-9CA0-4411-86E6-B89D89F3E2ED}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.DebugMac|Any CPU.Build.0 = Debug|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.Release|Any CPU.Build.0 = Release|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2745,10 +2679,6 @@ Global {2357AABD-08C7-4808-A495-8FF2D3CDFDB0} = {776872D9-76FA-407B-BA69-08E25A24E5CE} {174E6044-DD3A-49AB-9A5C-2A1F341B7B4F} = {776872D9-76FA-407B-BA69-08E25A24E5CE} {FA15FC26-A7E7-4932-93B7-65FAE6D5DD33} = {776872D9-76FA-407B-BA69-08E25A24E5CE} - {8F47F5EC-2F57-4030-B658-7B1002DA90C2} = {D417E929-2B3A-46AC-BBE8-027ADB63A790} - {9FBCC262-10DC-4E84-A5C4-17230BBF8862} = {8F47F5EC-2F57-4030-B658-7B1002DA90C2} - {69136056-BFD3-4CEC-BB41-D9991C79593C} = {8F47F5EC-2F57-4030-B658-7B1002DA90C2} - {7E4B15FB-E8C4-419A-A31C-9310FD9062BD} = {8F47F5EC-2F57-4030-B658-7B1002DA90C2} {98F4461F-84D0-4C57-A11F-47E871BD04A0} = {D417E929-2B3A-46AC-BBE8-027ADB63A790} {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B} = {98F4461F-84D0-4C57-A11F-47E871BD04A0} {F218643D-2E74-4309-820E-206A54B7133F} = {98F4461F-84D0-4C57-A11F-47E871BD04A0} @@ -2804,7 +2734,6 @@ Global {DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD} = {19C4CC37-7050-4944-B11F-60F52121B24C} {3FDB97B5-916E-4817-8098-41659687A8FF} = {19C4CC37-7050-4944-B11F-60F52121B24C} {BF71E2BB-9838-4E0C-B0E7-80559E3909BB} = {D417E929-2B3A-46AC-BBE8-027ADB63A790} - {74704C00-5861-4F86-920C-865148A175C5} = {8F47F5EC-2F57-4030-B658-7B1002DA90C2} {6868153E-41EA-43A4-A81A-C1E7256373F7} = {A026D596-3C8D-4521-BB42-2C898FA3BE2D} {7D3073E9-F52D-4E14-B988-5316DC6FD0BF} = {A026D596-3C8D-4521-BB42-2C898FA3BE2D} {A026D596-3C8D-4521-BB42-2C898FA3BE2D} = {D417E929-2B3A-46AC-BBE8-027ADB63A790} @@ -2815,7 +2744,7 @@ Global {1DEFDD53-2677-439D-906E-141ED2AEC19B} = {D417E929-2B3A-46AC-BBE8-027ADB63A790} {B3E73DE7-8AFC-429A-9B68-5699B1E63A02} = {1DEFDD53-2677-439D-906E-141ED2AEC19B} {FDA43CAA-1C2A-4593-8601-3E2EE06D9E03} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9} - {CD31F051-9012-487B-B7E8-4CDDEA68B3AF} = {DE462010-393D-4655-A42C-2C78BB14D2FA} + {CD31F051-9012-487B-B7E8-4CDDEA68B3AF} = {56499B8C-4935-4D00-9192-4F2033142975} {BCC3A6AE-EC45-40AD-BA3E-59F6401D588C} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9} {CF789E43-7AAF-4690-BA32-ABD75DEEB087} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9} {A9D93F6C-EB26-44FF-8F2A-B3DB411FA410} = {1DEFDD53-2677-439D-906E-141ED2AEC19B} @@ -2891,7 +2820,6 @@ Global {8E19F797-D714-4C07-903F-97C76E247A03} = {5A92B792-BF17-4748-B29E-34C99B2E8722} {F16C4445-2277-4A08-9511-5BE611756CDA} = {8E19F797-D714-4C07-903F-97C76E247A03} {56499B8C-4935-4D00-9192-4F2033142975} = {D417E929-2B3A-46AC-BBE8-027ADB63A790} - {49D21A49-7F0B-4F1E-A6D4-3B1EBB7B39C5} = {56499B8C-4935-4D00-9192-4F2033142975} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {856CF524-E2A7-4DB0-B80F-8F1B080A2E25} diff --git a/main/MonoDevelop.props b/main/MonoDevelop.props index 4421e3fc150..4c7b3594b4f 100644 --- a/main/MonoDevelop.props +++ b/main/MonoDevelop.props @@ -1,5 +1,5 @@ - + $(MSBuildThisFileDirectory) $(MonoDevelopRootDir)\msbuild\MonoDevelop.BeforeCommon.targets @@ -9,6 +9,5 @@ PackageReference - diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.csproj b/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.csproj index 3db6e486892..d8fa8d58ec2 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.csproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.csproj @@ -1,15 +1,14 @@ - + Debug AnyCPU 8.0.30703 2.0 - {FD0D1033-9145-48E5-8ED8-E2365252878C} FSharpBinding.Gui MonoDevelop.FSharp.Gui - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) ..\..\..\build\AddIns\FSharpBinding True @@ -36,5 +35,5 @@ - + diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Shared/MonoDevelop.FSharp.Shared.fsproj b/main/external/fsharpbinding/MonoDevelop.FSharp.Shared/MonoDevelop.FSharp.Shared.fsproj index 3b00e278073..0bfbdc478c4 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharp.Shared/MonoDevelop.FSharp.Shared.fsproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Shared/MonoDevelop.FSharp.Shared.fsproj @@ -1,12 +1,10 @@ - + Debug AnyCPU - {AF5FEAD5-B50E-4F07-A274-32F23D5C504D} - .NETFramework - $(MDFrameworkVersion) + $(MDTargetFrameworkNet5) 4.4.3.0 @@ -33,7 +31,6 @@ - diff --git a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj index 11dcb89113e..b840ce21707 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj @@ -1,14 +1,12 @@ - + Debug AnyCPU - {A1A45375-7FB8-4F2A-850F-FBCC67739927} False - .NETFramework - $(MDFrameworkVersion) + $(MDTargetFrameworkNet5) 4.4.3.0 ..\..\..\build\bin\mdtool.exe run-md-tests @@ -71,7 +69,6 @@ True - @@ -131,56 +128,34 @@ - {1497D0A8-AFF1-4938-BC22-BE79B358BA5B} - UnitTests False - {100568FC-F4E8-439B-94AD-41D11724E45B} - MonoDevelop.Refactoring False - {F218643D-2E74-4309-820E-206A54B7133F} - MonoDevelop.PackageManagement False - {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B} - MonoDevelop.PackageManagement.Tests - {AF5FEAD5-B50E-4F07-A274-32F23D5C504D} - MonoDevelop.FSharp.Shared - {F8F92AA4-A376-4679-A9D4-60E7B7FBF477} - MonoDevelop.SourceEditor False - {A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC} - MonoDevelop.UnitTesting False - {4C10F8F9-3816-4647-BA6E-85F5DE39883A} - MonoDevelop.FSharp False - {27096E7F-C91C-4AC6-B289-6897A701DF21} - MonoDevelop.Ide False - {2357AABD-08C7-4808-A495-8FF2D3CDFDB0} - MonoDevelop.Debugger False - {7525BB88-6142-4A26-93B9-A30C6983390A} - MonoDevelop.Core False diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj index f15270b00b2..214c62cfb6a 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj @@ -1,17 +1,15 @@ - + Debug AnyCPU - {4C10F8F9-3816-4647-BA6E-85F5DE39883A} FSharp.MonoDevelop FSharpBinding False False - $(MDFrameworkVersion) - 4.4.3.0 + $(MDTargetFrameworkNet5) true --publicsign ..\..\..\msbuild\MonoDevelop-Public.snk @@ -25,13 +23,10 @@ - - - @@ -74,6 +69,8 @@ + + @@ -132,61 +129,41 @@ - - {2C24D515-4A2C-445C-8419-C09231913CFA} - MonoDevelop.DesignerSupport + + + + + + + + + + False - - {FD0D1033-9145-48E5-8ED8-E2365252878C} - MonoDevelop.FSharp.Gui - - - {AF5FEAD5-B50E-4F07-A274-32F23D5C504D} - MonoDevelop.FSharp.Shared - - - {2357AABD-08C7-4808-A495-8FF2D3CDFDB0} - MonoDevelop.Debugger + False - {7525BB88-6142-4A26-93B9-A30C6983390A} - MonoDevelop.Core False - - {27096E7F-C91C-4AC6-B289-6897A701DF21} - MonoDevelop.Ide + False - - {100568FC-F4E8-439B-94AD-41D11724E45B} - MonoDevelop.Refactoring + + + + + False - {F8F92AA4-A376-4679-A9D4-60E7B7FBF477} - MonoDevelop.SourceEditor False - {A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC} - MonoDevelop.UnitTesting False - - - - - - - - - - - diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpi.Service/MonoDevelop.FSharpInteractive.Service.fsproj b/main/external/fsharpbinding/MonoDevelop.FSharpi.Service/MonoDevelop.FSharpInteractive.Service.fsproj index c3710a5e90d..ee6f3349edb 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpi.Service/MonoDevelop.FSharpInteractive.Service.fsproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharpi.Service/MonoDevelop.FSharpInteractive.Service.fsproj @@ -1,14 +1,12 @@ - + Debug AnyCPU - {20D6EC2C-B62E-49D1-B685-90D8967A5B5D} Exe MonoDevelop.FSharpi.Service - .NETFramework - $(MDFrameworkVersion) + $(MDTargetFrameworkNet5) 4.4.3.0 ..\..\..\build\AddIns\FSharpBinding true @@ -28,15 +26,6 @@ - - - - {AF5FEAD5-B50E-4F07-A274-32F23D5C504D} - MonoDevelop.FSharp.Shared - false - - - @@ -48,9 +37,11 @@ FSharp.Core.sigdata PreserveNewest + + false + - diff --git a/main/msbuild/MDBuildTasks/MDBuildTasks.csproj b/main/msbuild/MDBuildTasks/MDBuildTasks.csproj index b736d7adc8d..41a54688989 100644 --- a/main/msbuild/MDBuildTasks/MDBuildTasks.csproj +++ b/main/msbuild/MDBuildTasks/MDBuildTasks.csproj @@ -1,6 +1,7 @@  - net472 + netstandard2.1 + netstandard2.1 bin diff --git a/main/msbuild/MonoDevelop.AfterCommon.props b/main/msbuild/MonoDevelop.AfterCommon.props index a9e3f3951cf..8ee5d9f0865 100644 --- a/main/msbuild/MonoDevelop.AfterCommon.props +++ b/main/msbuild/MonoDevelop.AfterCommon.props @@ -8,8 +8,8 @@ <_IsSdkStyleProject>false <_IsSdkStyleProject Condition="'$(Configurations)' != '' and '$(Platforms)' != ''">true - v4.7.2 - net472 + netstandard2.1 + netstandard2.1 diff --git a/main/po/StripMnemonics/StripMnemonics.csproj b/main/po/StripMnemonics/StripMnemonics.csproj index 4395d315584..c524f21f5da 100644 --- a/main/po/StripMnemonics/StripMnemonics.csproj +++ b/main/po/StripMnemonics/StripMnemonics.csproj @@ -37,5 +37,5 @@ - + \ No newline at end of file diff --git a/main/po/po.mdproj b/main/po/po.mdproj index db2cebff637..6069704217b 100644 --- a/main/po/po.mdproj +++ b/main/po/po.mdproj @@ -1,5 +1,5 @@ - + Debug diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj index b9cb30001af..00bb312e502 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj @@ -1,11 +1,10 @@ - + Debug AnyCPU - {1CF94D07-5480-4D10-A3CD-2EBD5E87B02E} - $(MDFrameworkVersion) + $(MDTargetFrameworkNet5) ..\..\..\build\AddIns\AspNet true true @@ -18,63 +17,39 @@ - {27096E7F-C91C-4AC6-B289-6897A701DF21} - MonoDevelop.Ide False - {7525BB88-6142-4A26-93B9-A30C6983390A} - MonoDevelop.Core False - {2C24D515-4A2C-445C-8419-C09231913CFA} - MonoDevelop.DesignerSupport False - {100568FC-F4E8-439B-94AD-41D11724E45B} - MonoDevelop.Refactoring False - {F8F92AA4-A376-4679-A9D4-60E7B7FBF477} - MonoDevelop.SourceEditor False - {2357AABD-08C7-4808-A495-8FF2D3CDFDB0} - MonoDevelop.Debugger False - {91DD5A2D-9FE3-4C3C-9253-876141874DAD} - Mono.Addins False - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2} - Mono.Debugging False - {92494904-35FA-4DC9-BDE9-3A3E87AC49D3} - Xwt False - {8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC} - MonoDevelop.TextTemplating False - {86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1} - MonoDevelop.Xml False - {3B2A5653-EC97-4001-BB9B-D90F1AF2C371} - ICSharpCode.NRefactory False @@ -90,7 +65,7 @@ - + @@ -255,5 +230,4 @@ - diff --git a/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj b/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj index caa9916dab1..99bd5498234 100644 --- a/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj +++ b/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj @@ -5,7 +5,7 @@ Debug AnyCPU {BEFADF93-EE92-4806-9C0B-937B25311C95} - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) ..\..\..\..\build\bin\mdtool.exe run-md-tests ..\..\..\..\build\tests @@ -94,5 +94,5 @@ False - + diff --git a/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj b/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj index ddeea9f7472..2d2c8e46714 100644 --- a/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj +++ b/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj @@ -7,7 +7,7 @@ {F426CBB2-77FC-4E14-9E28-E667C2D1299A} AspNet MonoDevelop.CSharpBinding.AspNet - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) ..\..\..\..\build\AddIns\CSharpBinding - + diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/MonoDevelop.UnitTesting.NUnit.Runners.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/MonoDevelop.UnitTesting.NUnit.Runners.csproj index 467bfd23e92..a96d1e6a4ff 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/MonoDevelop.UnitTesting.NUnit.Runners.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/MonoDevelop.UnitTesting.NUnit.Runners.csproj @@ -4,7 +4,7 @@ Debug AnyCPU {F4100131-BA38-4E16-B29D-9B404A22B7F8} - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) bin\$(Configuration) @@ -16,5 +16,5 @@ - + diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit.csproj index 143ff30a443..4399ec94005 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit.csproj @@ -1,11 +1,10 @@ - + Debug AnyCPU - {6224D87E-2AC1-4D9F-91ED-714F797297BF} Library - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) ..\..\..\build\AddIns\MonoDevelop.UnitTesting @@ -18,28 +17,18 @@ - {7525BB88-6142-4A26-93B9-A30C6983390A} - MonoDevelop.Core False - {27096E7F-C91C-4AC6-B289-6897A701DF21} - MonoDevelop.Ide False - {91DD5A2D-9FE3-4C3C-9253-876141874DAD} - Mono.Addins False - {A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC} - MonoDevelop.UnitTesting False - {F218643D-2E74-4309-820E-206A54B7133F} - MonoDevelop.PackageManagement False @@ -73,5 +62,5 @@ - + diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnit3Runner.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnit3Runner.csproj index 45e051fb254..020a69bc001 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnit3Runner.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnit3Runner.csproj @@ -6,7 +6,7 @@ {D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A} Exe NUnitRunner - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) ..\..\..\..\build\AddIns\MonoDevelop.UnitTesting\NUnit3 @@ -35,5 +35,5 @@ - + diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj index 227b513900f..a35c57327ce 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj @@ -1,11 +1,10 @@ - + Debug AnyCPU - {0AF16AF1-0876-413E-9803-08BD33C19E00} Exe - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) ..\..\..\..\build\AddIns\MonoDevelop.UnitTesting\NUnit2 @@ -37,5 +36,5 @@ RemoteTestResult.cs - + diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj index 98c49765520..a5b1432d601 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj @@ -4,7 +4,7 @@ Debug AnyCPU {CD31F051-9012-487B-B7E8-4CDDEA68B3AF} - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) ..\..\..\..\build\bin\mdtool.exe run-md-tests ..\..\..\..\build\tests @@ -60,5 +60,5 @@ False - + \ No newline at end of file diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj index 8d42275ca8c..e6635c14985 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj @@ -1,11 +1,10 @@ - + Debug AnyCPU - {A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC} - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) ..\..\..\build\AddIns\MonoDevelop.UnitTesting @@ -29,38 +28,24 @@ - {7525BB88-6142-4A26-93B9-A30C6983390A} - MonoDevelop.Core False - {27096E7F-C91C-4AC6-B289-6897A701DF21} - MonoDevelop.Ide False - {91DD5A2D-9FE3-4C3C-9253-876141874DAD} - Mono.Addins False - {92494904-35FA-4DC9-BDE9-3A3E87AC49D3} - Xwt False - {3B2A5653-EC97-4001-BB9B-D90F1AF2C371} - ICSharpCode.NRefactory False - {6868153E-41EA-43A4-A81A-C1E7256373F7} - MonoDevelop.DotNetCore False - {F218643D-2E74-4309-820E-206A54B7133F} - MonoDevelop.PackageManagement False @@ -180,5 +165,5 @@ - + diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj index 074e7fb1681..0f7dd5866ae 100644 --- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj +++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj @@ -1,11 +1,10 @@ - + Debug AnyCPU - {2A00A871-C641-4116-ADFD-29B7799952B4} - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) ..\..\..\build\AddIns\MonoDevelop.WebReferences @@ -22,23 +21,15 @@ - {7525BB88-6142-4A26-93B9-A30C6983390A} - MonoDevelop.Core False - {27096E7F-C91C-4AC6-B289-6897A701DF21} - MonoDevelop.Ide False - {91DD5A2D-9FE3-4C3C-9253-876141874DAD} - Mono.Addins False - {92494904-35FA-4DC9-BDE9-3A3E87AC49D3} - Xwt False @@ -108,5 +99,5 @@ - + diff --git a/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj b/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj index 174cc152e20..e412647ee2e 100644 --- a/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj +++ b/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj @@ -1,29 +1,22 @@ - + Debug AnyCPU - {9A415695-CF80-4845-AA80-0DA26CF1E256} - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) ..\..\..\build\AddIns\MonoDeveloperExtensions\ - {7525BB88-6142-4A26-93B9-A30C6983390A} - MonoDevelop.Core False - {27096E7F-C91C-4AC6-B289-6897A701DF21} - MonoDevelop.Ide False - {91DD5A2D-9FE3-4C3C-9253-876141874DAD} - Mono.Addins False @@ -44,5 +37,5 @@ - + diff --git a/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj b/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj index 6226ced5205..9566f24bee8 100644 --- a/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj +++ b/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj @@ -1,10 +1,9 @@ - + Debug AnyCPU - {376889B5-6504-46A1-9D18-A9E4B4A50F49} - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) MonoDeveloperExtensions_nunit ..\..\..\..\build\AddIns\MonoDeveloperExtensions\ @@ -12,28 +11,18 @@ - {9A415695-CF80-4845-AA80-0DA26CF1E256} - MonoDeveloperExtensions False - {7525BB88-6142-4A26-93B9-A30C6983390A} - MonoDevelop.Core False - {91DD5A2D-9FE3-4C3C-9253-876141874DAD} - Mono.Addins False - {A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC} - MonoDevelop.UnitTesting False - {6224D87E-2AC1-4D9F-91ED-714F797297BF} - MonoDevelop.UnitTesting.NUnit False @@ -47,5 +36,5 @@ - + diff --git a/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/PerformanceDiagnosticsAddIn.csproj b/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/PerformanceDiagnosticsAddIn.csproj index 59b6af744fc..8c6d920ffae 100644 --- a/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/PerformanceDiagnosticsAddIn.csproj +++ b/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/PerformanceDiagnosticsAddIn.csproj @@ -5,7 +5,7 @@ Debug AnyCPU {DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD} - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) ..\..\..\..\build\AddIns\PerformanceDiagnostics @@ -57,7 +57,7 @@ true - + diff --git a/main/src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/UIThreadMonitorDaemon.csproj b/main/src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/UIThreadMonitorDaemon.csproj index 669ec3bf9ca..77b4c5b2996 100644 --- a/main/src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/UIThreadMonitorDaemon.csproj +++ b/main/src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/UIThreadMonitorDaemon.csproj @@ -6,7 +6,7 @@ AnyCPU {3FDB97B5-916E-4817-8098-41659687A8FF} Exe - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) bin\$(Configuration) @@ -18,5 +18,5 @@ - + diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj index f4d393e9131..9fcb8b5618d 100644 --- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj +++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj @@ -1,11 +1,10 @@ - + Debug AnyCPU - {8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC} - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) ..\..\..\..\build\AddIns\MonoDevelop.TextTemplating - + @@ -132,21 +136,21 @@ - + - + - - + - + @@ -155,12 +159,12 @@ - - - - + + + + - + @@ -763,19 +767,9 @@ - + - - - {91DD5A2D-9FE3-4C3C-9253-876141874DAD} - Mono.Addins - - - {A85C9721-C054-4BD8-A1F3-0227615F0A36} - Mono.Addins.Setup - - PreserveNewest @@ -787,7 +781,11 @@ - + + + + + @@ -800,4 +798,5 @@ + 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..44ac7921800 100644 --- a/main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml +++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml @@ -2,10 +2,10 @@ - + - + @@ -433,7 +433,7 @@ - + diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj index ea344d65b90..c86aebf010f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj @@ -1,14 +1,15 @@ - + Debug AnyCPU - {27096E7F-C91C-4AC6-B289-6897A701DF21} - $(MDFrameworkVersion) ..\..\..\build\bin true + $(MDTargetFrameworkNet5) + false + false LINUX @@ -84,51 +85,29 @@ - {7525BB88-6142-4A26-93B9-A30C6983390A} - MonoDevelop.Core False - {3B2A5653-EC97-4001-BB9B-D90F1AF2C371} - ICSharpCode.NRefactory - {53DCA265-3C3C-42F9-B647-F72BA678122B} - ICSharpCode.NRefactory.CSharp - {92494904-35FA-4DC9-BDE9-3A3E87AC49D3} - Xwt - {C3887A93-B2BD-4097-8E2F-3A063EFF32FD} - Xwt.Gtk - {91DD5A2D-9FE3-4C3C-9253-876141874DAD} - Mono.Addins False - {A85C9721-C054-4BD8-A1F3-0227615F0A36} - Mono.Addins.Setup False - {FEC19BDA-4904-4005-8C09-68E82E8BEF6A} - Mono.Addins.Gui - {90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2} - Mono.Debugging - {2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006} - ICSharpCode.NRefactory.Cecil - {B7C1673E-5124-4BE5-8D21-EC8B12F85B6B} - Xwt.XamMac @@ -4456,7 +4435,6 @@ - diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj index 798cc32593b..c32ccd0d8f1 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj @@ -1,14 +1,16 @@ - + Debug AnyCPU - {7F5B649A-3572-4713-83FD-C28A6AA70445} Exe MonoDevelop.Projects.MSBuild - $(MDFrameworkVersion) + $(MDTargetFrameworkNet5) + $(MDTargetFrameworkNet5) ..\..\..\build\bin MonoDevelop.Projects.MSBuild.MainClass + false + false x64 @@ -82,5 +84,5 @@ MonoDevelop.Core.Execution\RemoteProcessServer.cs - + diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildResolver/MonoDevelop.MSBuildResolver.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildResolver/MonoDevelop.MSBuildResolver.csproj index fc84e7ef59f..77f894c203e 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildResolver/MonoDevelop.MSBuildResolver.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildResolver/MonoDevelop.MSBuildResolver.csproj @@ -1,12 +1,12 @@ - + Debug AnyCPU - {BD432AE0-B262-4F63-A695-7B86D11B644F} - - v4.6.1 - v4.7.2 + $(MDTargetFrameworkNet5) + $(MDTargetFrameworkNet5) + false + false $(MSBuildToolsPath)\ - + diff --git a/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj b/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj index 6ea94c30077..dc6b9105f93 100644 --- a/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj +++ b/main/src/core/MonoDevelop.TextEditor.Tests/MonoDevelop.TextEditor.Tests.csproj @@ -8,7 +8,7 @@ {9E4BA410-8338-42EC-AF9C-422C35ECED81} ..\..\..\build\bin\mdtool.exe run-md-tests - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) ..\..\..\build\tests true @@ -84,5 +84,5 @@ UnitTests - + \ No newline at end of file diff --git a/main/src/tools/ExtensionTools/ExtensionTools.csproj b/main/src/tools/ExtensionTools/ExtensionTools.csproj index 429c99657e3..15f394ad4de 100644 --- a/main/src/tools/ExtensionTools/ExtensionTools.csproj +++ b/main/src/tools/ExtensionTools/ExtensionTools.csproj @@ -5,7 +5,7 @@ Debug AnyCPU {E33F7901-AA45-4C25-9868-DBB6CC8DC40C} - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) ..\..\..\build\bin MonoDevelop.ExtensionTools @@ -52,5 +52,5 @@ - + \ No newline at end of file diff --git a/main/src/tools/mdhost/mdhost.csproj b/main/src/tools/mdhost/mdhost.csproj index 8612b5e28fd..0d258af6b12 100644 --- a/main/src/tools/mdhost/mdhost.csproj +++ b/main/src/tools/mdhost/mdhost.csproj @@ -1,27 +1,22 @@ - + Debug x86 - {BFE8691A-D323-4622-9021-7B8B27F81599} Exe mdhost mdhost ..\..\..\build\bin\ - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) - {7525BB88-6142-4A26-93B9-A30C6983390A} - MonoDevelop.Core False - {91DD5A2D-9FE3-4C3C-9253-876141874DAD} - Mono.Addins False @@ -38,5 +33,5 @@ app.config - + diff --git a/main/src/tools/mdmonitor/mdmonitor.csproj b/main/src/tools/mdmonitor/mdmonitor.csproj index 39b22433594..c317152debb 100644 --- a/main/src/tools/mdmonitor/mdmonitor.csproj +++ b/main/src/tools/mdmonitor/mdmonitor.csproj @@ -7,7 +7,7 @@ {D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925} WinExe Mono.Instrumentation.Monitor - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) True ..\..\..\build\bin x86 @@ -78,5 +78,5 @@ - + diff --git a/main/src/tools/mdtool/mdtool.csproj b/main/src/tools/mdtool/mdtool.csproj index 69d8d48902a..ddefa14ea40 100644 --- a/main/src/tools/mdtool/mdtool.csproj +++ b/main/src/tools/mdtool/mdtool.csproj @@ -1,12 +1,11 @@ - + Debug x86 - {8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6} Exe ..\..\..\build\bin - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) @@ -15,18 +14,12 @@ - {7525BB88-6142-4A26-93B9-A30C6983390A} - MonoDevelop.Core False - {91DD5A2D-9FE3-4C3C-9253-876141874DAD} - Mono.Addins False - {A85C9721-C054-4BD8-A1F3-0227615F0A36} - Mono.Addins.Setup False @@ -40,5 +33,5 @@ src\GtkWorkarounds.cs - + diff --git a/main/tests/Ide.Tests/MonoDevelop.Ide.Tests.csproj b/main/tests/Ide.Tests/MonoDevelop.Ide.Tests.csproj index 438d915dea9..b894e9ecf1c 100644 --- a/main/tests/Ide.Tests/MonoDevelop.Ide.Tests.csproj +++ b/main/tests/Ide.Tests/MonoDevelop.Ide.Tests.csproj @@ -9,7 +9,7 @@ Ide.Tests ..\..\build\bin\mdtool.exe run-md-tests - $(MDFrameworkVersion) +$(MDTargetFrameworkNet5) ..\..\build\tests true - + diff --git a/main/tests/test-projects/msbuild-search-paths/ConsoleProject.csproj b/main/tests/test-projects/msbuild-search-paths/ConsoleProject.csproj index 16536b63a71..7cf77d7bad5 100755 --- a/main/tests/test-projects/msbuild-search-paths/ConsoleProject.csproj +++ b/main/tests/test-projects/msbuild-search-paths/ConsoleProject.csproj @@ -37,6 +37,6 @@ - + diff --git a/main/tests/test-projects/msbuild-search-paths/ProjectUsingMultiSdk.csproj b/main/tests/test-projects/msbuild-search-paths/ProjectUsingMultiSdk.csproj index 34218f40832..915322d4ad0 100755 --- a/main/tests/test-projects/msbuild-search-paths/ProjectUsingMultiSdk.csproj +++ b/main/tests/test-projects/msbuild-search-paths/ProjectUsingMultiSdk.csproj @@ -37,5 +37,5 @@ - + diff --git a/main/tests/test-projects/msbuild-search-paths/ProjectUsingSdk.csproj b/main/tests/test-projects/msbuild-search-paths/ProjectUsingSdk.csproj index 8d8985e7d45..e7ec222754d 100755 --- a/main/tests/test-projects/msbuild-search-paths/ProjectUsingSdk.csproj +++ b/main/tests/test-projects/msbuild-search-paths/ProjectUsingSdk.csproj @@ -37,5 +37,5 @@ - + diff --git a/main/tests/test-projects/msbuild-search-paths/ProjectUsingSdk2.csproj b/main/tests/test-projects/msbuild-search-paths/ProjectUsingSdk2.csproj index 5caeff9ddc3..a9e4338bdc0 100755 --- a/main/tests/test-projects/msbuild-search-paths/ProjectUsingSdk2.csproj +++ b/main/tests/test-projects/msbuild-search-paths/ProjectUsingSdk2.csproj @@ -37,5 +37,5 @@ - + diff --git a/main/tests/test-projects/msbuild-search-paths/ProjectUsingSdkImport.csproj b/main/tests/test-projects/msbuild-search-paths/ProjectUsingSdkImport.csproj index 0decbaba7c1..1506dce3d59 100755 --- a/main/tests/test-projects/msbuild-search-paths/ProjectUsingSdkImport.csproj +++ b/main/tests/test-projects/msbuild-search-paths/ProjectUsingSdkImport.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU @@ -37,7 +37,7 @@ - + diff --git a/main/tests/test-projects/msbuild-tests/(some files)/functions.props b/main/tests/test-projects/msbuild-tests/(some files)/functions.props index 060c6f17875..6b90acda529 100755 --- a/main/tests/test-projects/msbuild-tests/(some files)/functions.props +++ b/main/tests/test-projects/msbuild-tests/(some files)/functions.props @@ -1,5 +1,5 @@ - + $([System.IO.Path]::GetFullPath(`$([System.IO.Path]::Combine(`$(MSBuildThisFileDirectory)`, `foo`))`)) diff --git a/main/tests/test-projects/msbuild-tests/condition-parse.csproj b/main/tests/test-projects/msbuild-tests/condition-parse.csproj index ddbef04f379..3a0e8b73b0f 100755 --- a/main/tests/test-projects/msbuild-tests/condition-parse.csproj +++ b/main/tests/test-projects/msbuild-tests/condition-parse.csproj @@ -1,5 +1,5 @@ - + I hope so Foo diff --git a/main/tests/test-projects/msbuild-tests/conditioned-properties.csproj b/main/tests/test-projects/msbuild-tests/conditioned-properties.csproj index 297516959c1..1a95a50d0c1 100755 --- a/main/tests/test-projects/msbuild-tests/conditioned-properties.csproj +++ b/main/tests/test-projects/msbuild-tests/conditioned-properties.csproj @@ -1,5 +1,5 @@ - + One diff --git a/main/tests/test-projects/msbuild-tests/functions.csproj b/main/tests/test-projects/msbuild-tests/functions.csproj index 217f8551536..b8f0c05ff3d 100755 --- a/main/tests/test-projects/msbuild-tests/functions.csproj +++ b/main/tests/test-projects/msbuild-tests/functions.csproj @@ -1,5 +1,5 @@ - + diff --git a/main/tests/test-projects/msbuild-tests/project-with-custom-target.csproj b/main/tests/test-projects/msbuild-tests/project-with-custom-target.csproj index 0c7601c09f6..5ff43ea8af8 100755 --- a/main/tests/test-projects/msbuild-tests/project-with-custom-target.csproj +++ b/main/tests/test-projects/msbuild-tests/project-with-custom-target.csproj @@ -47,5 +47,5 @@ - + diff --git a/main/tests/test-projects/msbuild-tests/project-with-duplicated-conf-saved.csproj b/main/tests/test-projects/msbuild-tests/project-with-duplicated-conf-saved.csproj index 6f1d226a2a6..071a5c24a96 100755 --- a/main/tests/test-projects/msbuild-tests/project-with-duplicated-conf-saved.csproj +++ b/main/tests/test-projects/msbuild-tests/project-with-duplicated-conf-saved.csproj @@ -40,5 +40,5 @@ - + diff --git a/main/tests/test-projects/msbuild-tests/project-with-duplicated-conf.csproj b/main/tests/test-projects/msbuild-tests/project-with-duplicated-conf.csproj index 3a08656a4ea..63a8da28471 100755 --- a/main/tests/test-projects/msbuild-tests/project-with-duplicated-conf.csproj +++ b/main/tests/test-projects/msbuild-tests/project-with-duplicated-conf.csproj @@ -39,5 +39,5 @@ - + diff --git a/main/tests/test-projects/msbuild-tests/project-with-user-data.csproj b/main/tests/test-projects/msbuild-tests/project-with-user-data.csproj index aa6612995a6..585ef966340 100644 --- a/main/tests/test-projects/msbuild-tests/project-with-user-data.csproj +++ b/main/tests/test-projects/msbuild-tests/project-with-user-data.csproj @@ -38,7 +38,7 @@ - + diff --git a/main/tests/test-projects/msbuild-tests/property-eval-order.csproj b/main/tests/test-projects/msbuild-tests/property-eval-order.csproj index 1a03e64b2a3..2cf3290c992 100755 --- a/main/tests/test-projects/msbuild-tests/property-eval-order.csproj +++ b/main/tests/test-projects/msbuild-tests/property-eval-order.csproj @@ -1,5 +1,5 @@ - + One diff --git a/main/tests/test-projects/msbuild-tests/property-eval-order.targets b/main/tests/test-projects/msbuild-tests/property-eval-order.targets index fb505a156c2..4402f715c9b 100755 --- a/main/tests/test-projects/msbuild-tests/property-eval-order.targets +++ b/main/tests/test-projects/msbuild-tests/property-eval-order.targets @@ -1,5 +1,5 @@ - + Two diff --git a/main/tests/test-projects/msbuild-tests/transforms.csproj b/main/tests/test-projects/msbuild-tests/transforms.csproj index 1b5f7857cd3..9fef7886206 100755 --- a/main/tests/test-projects/msbuild-tests/transforms.csproj +++ b/main/tests/test-projects/msbuild-tests/transforms.csproj @@ -1,5 +1,5 @@ - + foo t0 diff --git a/main/tests/test-projects/netstandard-project/NetStandardTest/NetStandardTest.csproj b/main/tests/test-projects/netstandard-project/NetStandardTest/NetStandardTest.csproj index 0db765e36d5..390c2ff7147 100644 --- a/main/tests/test-projects/netstandard-project/NetStandardTest/NetStandardTest.csproj +++ b/main/tests/test-projects/netstandard-project/NetStandardTest/NetStandardTest.csproj @@ -41,5 +41,5 @@ Lib - + \ No newline at end of file diff --git a/main/tests/test-projects/package-reference/library/library.csproj b/main/tests/test-projects/package-reference/library/library.csproj index 24a78212d54..10c1621bf48 100644 --- a/main/tests/test-projects/package-reference/library/library.csproj +++ b/main/tests/test-projects/package-reference/library/library.csproj @@ -32,5 +32,5 @@ - + \ No newline at end of file diff --git a/main/tests/test-projects/performance/ExampleFormsSolution/ExampleFormsSolution.UITests/ExampleFormsSolution.UITests.csproj b/main/tests/test-projects/performance/ExampleFormsSolution/ExampleFormsSolution.UITests/ExampleFormsSolution.UITests.csproj index 2d26db3e879..64cb97f811a 100644 --- a/main/tests/test-projects/performance/ExampleFormsSolution/ExampleFormsSolution.UITests/ExampleFormsSolution.UITests.csproj +++ b/main/tests/test-projects/performance/ExampleFormsSolution/ExampleFormsSolution.UITests/ExampleFormsSolution.UITests.csproj @@ -53,5 +53,5 @@ - + \ No newline at end of file diff --git a/main/tests/test-projects/portable-library/ConsoleProject/ConsoleProject.csproj b/main/tests/test-projects/portable-library/ConsoleProject/ConsoleProject.csproj index 91e2cf1dac5..7ada0a469b3 100644 --- a/main/tests/test-projects/portable-library/ConsoleProject/ConsoleProject.csproj +++ b/main/tests/test-projects/portable-library/ConsoleProject/ConsoleProject.csproj @@ -34,7 +34,7 @@ - + {E54D2645-07DB-4D2C-9507-1AF788E81383} diff --git a/main/tests/test-projects/project-capability-tests/ConsoleProject.csproj b/main/tests/test-projects/project-capability-tests/ConsoleProject.csproj index c9fc9913242..2d719860322 100755 --- a/main/tests/test-projects/project-capability-tests/ConsoleProject.csproj +++ b/main/tests/test-projects/project-capability-tests/ConsoleProject.csproj @@ -39,5 +39,5 @@ - + diff --git a/main/tests/test-projects/project-capability-tests/Library/Library.csproj b/main/tests/test-projects/project-capability-tests/Library/Library.csproj index dfe0f1b6c31..f85852d17dd 100644 --- a/main/tests/test-projects/project-capability-tests/Library/Library.csproj +++ b/main/tests/test-projects/project-capability-tests/Library/Library.csproj @@ -31,5 +31,5 @@ - + \ No newline at end of file diff --git a/main/tests/test-projects/project-from-vs/console-with-libs/console-with-libs.csproj b/main/tests/test-projects/project-from-vs/console-with-libs/console-with-libs.csproj index c71afd4d044..38cf14ee4ac 100644 --- a/main/tests/test-projects/project-from-vs/console-with-libs/console-with-libs.csproj +++ b/main/tests/test-projects/project-from-vs/console-with-libs/console-with-libs.csproj @@ -49,5 +49,5 @@ library2 - + diff --git a/main/tests/test-projects/project-from-vs/library1/library1.csproj b/main/tests/test-projects/project-from-vs/library1/library1.csproj index fecd7d92b64..a4527ccf2da 100644 --- a/main/tests/test-projects/project-from-vs/library1/library1.csproj +++ b/main/tests/test-projects/project-from-vs/library1/library1.csproj @@ -35,5 +35,5 @@ - + \ No newline at end of file diff --git a/main/tests/test-projects/project-from-vs/library2/library2.csproj b/main/tests/test-projects/project-from-vs/library2/library2.csproj index 9cee207b9ea..53d239403a8 100644 --- a/main/tests/test-projects/project-from-vs/library2/library2.csproj +++ b/main/tests/test-projects/project-from-vs/library2/library2.csproj @@ -35,5 +35,5 @@ - + \ No newline at end of file diff --git a/main/tests/test-projects/project-includes-props/ConsoleProject/ConsoleProject.csproj b/main/tests/test-projects/project-includes-props/ConsoleProject/ConsoleProject.csproj index d5b5edfa6a2..e7dbedef182 100755 --- a/main/tests/test-projects/project-includes-props/ConsoleProject/ConsoleProject.csproj +++ b/main/tests/test-projects/project-includes-props/ConsoleProject/ConsoleProject.csproj @@ -22,5 +22,5 @@ - + diff --git a/main/tests/test-projects/project-multi-include-item/ConsoleProject/ConsoleProject.csproj b/main/tests/test-projects/project-multi-include-item/ConsoleProject/ConsoleProject.csproj index c4a65727762..9fa7a4dc51c 100755 --- a/main/tests/test-projects/project-multi-include-item/ConsoleProject/ConsoleProject.csproj +++ b/main/tests/test-projects/project-multi-include-item/ConsoleProject/ConsoleProject.csproj @@ -38,7 +38,7 @@ False - + - + \ No newline at end of file diff --git a/main/tests/test-projects/ref-source-target/console-project/console-project.csproj b/main/tests/test-projects/ref-source-target/console-project/console-project.csproj index 9d6edf148de..aef44d71f69 100644 --- a/main/tests/test-projects/ref-source-target/console-project/console-project.csproj +++ b/main/tests/test-projects/ref-source-target/console-project/console-project.csproj @@ -35,5 +35,5 @@ library1 - + diff --git a/main/tests/test-projects/ref-source-target/console-project/console-project.csproj-saved b/main/tests/test-projects/ref-source-target/console-project/console-project.csproj-saved index 8a84d871296..dabf292069f 100644 --- a/main/tests/test-projects/ref-source-target/console-project/console-project.csproj-saved +++ b/main/tests/test-projects/ref-source-target/console-project/console-project.csproj-saved @@ -39,5 +39,5 @@ library2 - + diff --git a/main/tests/test-projects/ref-source-target/library1/library1.csproj b/main/tests/test-projects/ref-source-target/library1/library1.csproj index a9d1dc77ebf..c8020f2cd6b 100644 --- a/main/tests/test-projects/ref-source-target/library1/library1.csproj +++ b/main/tests/test-projects/ref-source-target/library1/library1.csproj @@ -31,5 +31,5 @@ - + \ No newline at end of file diff --git a/main/tests/test-projects/ref-source-target/library2/library2.csproj b/main/tests/test-projects/ref-source-target/library2/library2.csproj index 3bdc47490a8..ef1f9f6fe61 100644 --- a/main/tests/test-projects/ref-source-target/library2/library2.csproj +++ b/main/tests/test-projects/ref-source-target/library2/library2.csproj @@ -31,5 +31,5 @@ - + \ No newline at end of file diff --git a/main/tests/test-projects/reference-refresh/ConsoleProject/ConsoleProject.csproj b/main/tests/test-projects/reference-refresh/ConsoleProject/ConsoleProject.csproj index 63753f3408e..f69b4e44418 100644 --- a/main/tests/test-projects/reference-refresh/ConsoleProject/ConsoleProject.csproj +++ b/main/tests/test-projects/reference-refresh/ConsoleProject/ConsoleProject.csproj @@ -1,5 +1,5 @@ - + Debug AnyCPU @@ -42,7 +42,7 @@ - + - $(MDTargetFramework) + diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/MonoDevelop.UnitTesting.NUnit.Runners.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/MonoDevelop.UnitTesting.NUnit.Runners.csproj index a96d1e6a4ff..2acd603f21e 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/MonoDevelop.UnitTesting.NUnit.Runners.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/MonoDevelop.UnitTesting.NUnit.Runners.csproj @@ -5,6 +5,8 @@ AnyCPU {F4100131-BA38-4E16-B29D-9B404A22B7F8} $(MDTargetFrameworkNet5) + false + false bin\$(Configuration) diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj index a5b1432d601..c8dcc5bcbf8 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj @@ -5,6 +5,8 @@ AnyCPU {CD31F051-9012-487B-B7E8-4CDDEA68B3AF} $(MDTargetFrameworkNet5) + false + false ..\..\..\..\build\bin\mdtool.exe run-md-tests ..\..\..\..\build\tests diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj index cedcab99ff8..b6b297cead9 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj @@ -1,9 +1,9 @@ - true - + Exe + @@ -18,7 +18,7 @@ fullbuildinfo mono ..\..\..\build\bin\ - $(MDTargetFrameworkNet5) + netcoreapp3.0 false false false @@ -51,9 +51,23 @@ - - - + + ..\..\..\teste2\bin\Debug\netcoreapp3.0 + TRACE;DEBUG;NETSTANDARD;NETSTANDARD2_1 + ..\..\..\build\bin\MonoDevelop.Core.xml + false + true + + + ..\..\..\teste2\bin\Debug\netcoreapp3.0 + false + true + + + ..\..\..\teste2\bin\Debug\netcoreapp3.0 + false + true + @@ -64,14 +78,6 @@ - - False - $(MSBuildToolsPath)\Microsoft.Build.dll - - - False - $(MSBuildToolsPath)\Microsoft.Build.Framework.dll - False $(MSBuildToolsPath)\Microsoft.Build.Utilities.Core.dll @@ -89,7 +95,9 @@ - + + + @@ -111,12 +119,76 @@ + + + + + + + + true + ..\..\..\..\..\..\..\..\Library\Frameworks\Mono.framework\Versions\6.4.0\lib\mono\4.0-api\System.Runtime.Remoting.dll + + + ..\..\..\..\..\..\..\..\Library\Frameworks\Mono.framework\Versions\6.4.0\lib\mono\gac\monodoc\1.0.0.0__0738eb9f132ed756\monodoc.dll + + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.dll + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.EditorFeatures.dll + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.Features.dll + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.dll + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.EditorFeatures.dll + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.EditorFeatures.Text.dll + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.Elfie.dll + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.Features.dll + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.FlowAnalysis.Utilities.dll + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.Scripting.dll + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.VisualBasic.dll + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.dll + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.VisualBasic.Features.dll + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + + + ..\..\..\build\bin\Microsoft.CodeAnalysis.Workspaces.dll + + + ..\..\..\..\..\..\mono_everyday\mono\mcs\class\lib\net_4_x-macos\monodoc.dll + - diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj index c86aebf010f..e3754bc9850 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj @@ -1,26 +1,57 @@ - - + + $(MSBuildThisFileDirectory) + $(MonoDevelopRootDir)\msbuild\MonoDevelop.BeforeCommon.targets + $(MonoDevelopRootDir)\msbuild\MonoDevelop.AfterCommon.targets + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + strict + PackageReference Debug AnyCPU ..\..\..\build\bin + true true - $(MDTargetFrameworkNet5) + netcoreapp3.0 false - false - + false + false + false + false + + + ..\..\..\teste2\bin\Debug\netcoreapp3.0 LINUX + false + ..\..\..\teste2\bin\Debug\netcoreapp3.0 LINUX + false + + + + ..\..\..\teste2\bin\Debug\netcoreapp3.0 + TRACE;DEBUGMAC;NETCOREAPP;NETCOREAPP3_0;MAC + true + false + + + + ..\..\..\teste2\bin\Debug\netcoreapp3.0 + TRACE;RELEASEMAC;NETCOREAPP;NETCOREAPP3_0;MAC + false + + + ..\..\..\teste2\bin\Debug\netcoreapp3.0 + false + + + ..\..\..\teste2\bin\Debug\netcoreapp3.0 + false - - - - @@ -50,11 +81,7 @@ when building with msbuild on Unix, $(MSBuildToolsPath) is like `$prefix/lib/mono/msbuild/*/bin` Prefer referencing msbuild 15.* assemblies over 14.1 . At runtime, we use correct one anyway --> - - $(MSBuildToolsPath)\Microsoft.Build.dll - False - - + $(MSBuildToolsPath)\Microsoft.Build.Framework.dll False @@ -65,7 +92,27 @@ + + + + + + + + + + + + true + ..\..\..\..\..\..\..\..\Library\Frameworks\Mono.framework\Versions\6.4.0\lib\mono\4.0-api\System.Runtime.Remoting.dll + + + ..\..\..\..\..\..\..\..\Library\Frameworks\Mono.framework\Versions\6.4.0\lib\mono\gac\monodoc\1.0.0.0__0738eb9f132ed756\monodoc.dll + + + ..\..\..\..\..\..\..\..\Library\Frameworks\Mono.framework\Versions\6.4.0\lib\mono\msbuild\15.0\bin\Microsoft.Build.dll + @@ -82,6 +129,21 @@ + + ..\..\..\external\mono-addins\Mono.Addins.Gui\bin\DebugMac\netstandard2.1\gdk-sharp.dll + + + ..\..\..\external\mono-addins\Mono.Addins.Gui\bin\DebugMac\netstandard2.1\glib-sharp.dll + + + ..\..\..\external\mono-addins\Mono.Addins.Gui\bin\DebugMac\netstandard2.1\gtk-sharp.dll + + + ..\..\..\external\mono-addins\Mono.Addins.Gui\bin\DebugMac\netstandard2.1\atk-sharp.dll + + + ..\..\..\external\mono-addins\Mono.Addins.Gui\bin\DebugMac\netstandard2.1\Mono.Cairo.dll + @@ -694,22 +756,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3034,7 +3096,7 @@ - + @@ -3084,6 +3146,9 @@ + + + @@ -4371,6 +4436,7 @@ + diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj index c32ccd0d8f1..10052dbffaa 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj @@ -14,10 +14,14 @@ x64 + ..\..\..\build\bin + false x64 + ..\..\..\build\bin + false diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildResolver/MonoDevelop.MSBuildResolver.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildResolver/MonoDevelop.MSBuildResolver.csproj index 77f894c203e..b2171ac90bf 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildResolver/MonoDevelop.MSBuildResolver.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildResolver/MonoDevelop.MSBuildResolver.csproj @@ -19,12 +19,22 @@ x64 + ..\..\..\..\build\bin\MSBuild + false + + + ..\..\..\..\build\bin\MSBuild + false - x64 + ..\..\..\..\build\bin\MSBuild + false + + + ..\..\..\..\build\bin\MSBuild + false - diff --git a/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj b/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj index 08c58017459..e49c9e02c22 100644 --- a/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj +++ b/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj @@ -1,14 +1,13 @@ - - + Debug x86 - WinExe + Exe MonoDevelop ..\..\..\theme-icons\Windows\monodevelop.ico -no-redirect ..\..\..\build\bin - $(MDTargetFrameworkNet5) + netcoreapp3.0 false false @@ -16,6 +15,8 @@ + false + false @@ -25,6 +26,7 @@ true + Exe app.manifest