8000 Monowindowsmsbuild: Do not merge by MakiWolf · Pull Request #155 · dotdevelop/dotdevelop · GitHub
[go: up one dir, main page]
Skip to content

Monowindowsmsbuild: Do not merge #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 70 commits into
base: main
Choose a base branch
from
Open

Monowindowsmsbuild: Do not merge #155

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
44cffd2
Look in Mono for Windows install dir for monodoc.dll
May 1, 2018
047d83c
Remove duplicate monodoc.dll reference
May 1, 2018
eb09226
update
MakiWolf Jan 26, 2024
588bcaa
Update Directory.Build.props
MakiWolf Jan 26, 2024
8504ba7
Update .gitmodules
MakiWolf Jan 26, 2024
ce962c1
Update .gitmodules
MakiWolf Jan 26, 2024
ce6e331
Update Main.sln
MakiWolf Jan 26, 2024
a4643ee
update
MakiWolf Jan 26, 2024
93c2f90
update
MakiWolf Jan 26, 2024
db74c2e
update
MakiWolf Jan 26, 2024
86a1455
update
MakiWolf Jan 26, 2024
0434283
update
MakiWolf Jan 26, 2024
320e159
update
MakiWolf Jan 26, 2024
4154fa2
update
MakiWolf Jan 26, 2024
ba83ea4
update
MakiWolf Jan 27, 2024
94f5b6a
update
MakiWolf Jan 27, 2024
8651af7
update
MakiWolf Jan 27, 2024
6a16eb9
update
MakiWolf Jan 27, 2024
4b351af
update
MakiWolf Jan 27, 2024
a5f2dbe
Merge branch 'use-mono-for-monodoc-on-windows' of https://github.com/…
MakiWolf Jan 27, 2024
892acb1
update
MakiWolf Jan 27, 2024
2806eca
remove gtk3
MakiWolf Jan 27, 2024
7be19f6
update
MakiWolf Feb 3, 2024
b54a76f
update
MakiWolf Feb 3, 2024
513d744
update
MakiWolf Feb 4, 2024
5fc1c86
update
MakiWolf Feb 4, 2024
1c0e67f
Merge branch 'windows' of https://github.com/MakiWolf/dotdevelop into…
MakiWolf Feb 4, 2024
47af2eb
update
MakiWolf Feb 4, 2024
fb4afc6
Update .gitmodules
MakiWolf Feb 4, 2024
d38c522
update
MakiWolf Feb 4, 2024
4cc2286
Update .gitmodules
MakiWolf Feb 4, 2024
a36173f
update
MakiWolf Feb 4, 2024
aae3e64
update
MakiWolf Feb 4, 2024
08edfa9
update
MakiWolf Feb 4, 2024
83427b5
update
MakiWolf Feb 9, 2024
22990e4
update
MakiWolf Feb 9, 2024
add31ea
Update .gitmodules
MakiWolf Feb 10, 2024
6775c50
update
MakiWolf Feb 10, 2024
ae0c763
update
MakiWolf Feb 10, 2024
387f12a
revert
MakiWolf Feb 10, 2024
bdc6c3f
update
MakiWolf Feb 10, 2024
748c680
update
MakiWolf Feb 10, 2024
f1eb206
update
MakiWolf Feb 10, 2024
d8654ab
update
8000 MakiWolf Feb 13, 2024
9c02436
update
MakiWolf Feb 13, 2024
11653ec
remove
MakiWolf Feb 15, 2024
84ca531
update
MakiWolf Feb 16, 2024
091dbda
update
MakiWolf Feb 16, 2024
6d74fc2
update
MakiWolf Feb 16, 2024
8adbb42
update
MakiWolf Feb 16, 2024
dc70c9d
update
MakiWolf Feb 16, 2024
6ebcdf8
update
MakiWolf Feb 16, 2024
226236f
fix startup
MakiWolf Feb 16, 2024
cafba34
restore
MakiWolf Feb 20, 2024
50046c2
experiment
MakiWolf Feb 21, 2024
8ac89d3
remove gnomeplatform
MakiWolf Feb 21, 2024
f38306e
update
MakiWolf Mar 9, 2024
835de3c
restore
MakiWolf Mar 9, 2024
f34f4d1
restore
MakiWolf Mar 9, 2024
ad46d07
restore
MakiWolf Mar 9, 2024
297c3f7
update
MakiWolf Mar 11, 2024
207e400
update
MakiWolf Mar 11, 2024
2833e0e
update
MakiWolf Mar 16, 2024
93ea174
update
MakiWolf Mar 16, 2024
807803c
Update monodevelop.yml
MakiWolf Mar 16, 2024
620f2ed
Update monodevelop.yml
MakiWolf Mar 16, 2024
c1ecc06
Update monodevelop.yml
MakiWolf Mar 16, 2024
1a51d49
update
MakiWolf May 8, 2024
2496990
update
MakiWolf May 26, 2024
1f9e9ca
remove wpf part completly
MakiWolf Sep 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update
  • Loading branch information
@MakiWolf
MakiWolf committed Feb 4, 2024
commit a36173f8675ec49fae18fe2d4d7f360e537d98f7
107 changes: 36 additions & 71 deletions main/Main.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk.Mac", "external\xwt
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk.Windows", "external\xwt\Xwt.Gtk.Windows\Xwt.Gtk.Windows.csproj", "{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.XamMac", "external\xwt\Xwt.XamMac\Xwt.XamMac.csproj", "{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xwt.XamMac", "external\xwt\Xwt.XamMac\Xwt.XamMac.csproj", "{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mono.Addins", "Mono.Addins", "{B8897B76-1A12-4DFA-8B60-7944CC4C9654}"
EndProject
Expand Down Expand Up @@ -478,14 +478,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextUIGtkUtil", "external\v
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoDevelop.Debugger.DotNetCore", "external\Monodevelop.Netcoredbg\MonoDevelop.Debugger.DotNetCore\MonoDevelop.Debugger.DotNetCore.csproj", "{F71A259D-C08F-48D9-93B7-EE51497EB390}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xwt.Gtk2", "external\xwt\Xwt.Gtk2\Xwt.Gtk2.csproj", "{FED3E127-B64A-4E57-8D2A-C8817C5D593A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xwt.GtkSharp", "external\xwt\Xwt.GtkSharp\Xwt.GtkSharp.csproj", "{8F0B736F-8353-4A6C-B471-192D826BDD81}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Addins.GuiGtk3", "external\mono-addins\Mono.Addins.GuiGtk3\Mono.Addins.GuiGtk3.csproj", "{410A7DC9-E7DA-43E6-B592-93E2A344B660}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoDevelop.GtkExtensions", "src\core\MonoDevelop.GtkExtensions\MonoDevelop.GtkExtensions.csproj", "{288994D1-C7E1-4740-99AB-A52B572EBA8A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk", "external\xwt\Xwt.Gtk\Xwt.Gtk.csproj", "{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -5533,70 +5531,6 @@ Global
{F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
{F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
{F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseWin32|x86.Build.0 = Release|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Debug|x86.ActiveCfg = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Debug|x86.Build.0 = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugGnome|x86.Build.0 = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugMac|x86.Build.0 = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.DebugWin32|x86.Build.0 = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Release|Any CPU.Build.0 = Release|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Release|x86.ActiveCfg = Release|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Release|x86.Build.0 = Release|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseGnome|Any CPU.ActiveCfg = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseGnome|Any CPU.Build.0 = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseGnome|x86.Build.0 = Release|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseMac|x86.Build.0 = Release|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
{FED3E127-B64A-4E57-8D2A-C8817C5D593A}.ReleaseWin32|x86.Build.0 = Release|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|x86.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|x86.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugGnome|x86.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugMac|x86.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.DebugWin32|x86.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|Any CPU.Build.0 = Release|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|x86.ActiveCfg = Release|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.Release|x86.Build.0 = Release|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseGnome|Any CPU.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseGnome|Any CPU.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseGnome|x86.Build.0 = Release|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseMac|x86.Build.0 = Release|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
{8F0B736F-8353-4A6C-B471-192D826BDD81}.ReleaseWin32|x86.Build.0 = Release|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Debug|Any CPU.Build.0 = Debug|Any CPU
{410A7DC9-E7DA-43E6-B592-93E2A344B660}.Debug|x86.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -5661,6 +5595,38 @@ Global
{288994D1-C7E1-4740-99AB-A52B572EBA8A}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
{288994D1-C7E1-4740-99AB-A52B572EBA8A}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
{288994D1-C7E1-4740-99AB-A52B572EBA8A}.ReleaseWin32|x86.Build.0 = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Debug|x86.ActiveCfg = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Debug|x86.Build.0 = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugGnome|x86.ActiveCfg = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugGnome|x86.Build.0 = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugMac|x86.ActiveCfg = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugMac|x86.Build.0 = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.DebugWin32|x86.Build.0 = Debug|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Release|Any CPU.Build.0 = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Release|x86.ActiveCfg = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Release|x86.Build.0 = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseGnome|x86.ActiveCfg = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseGnome|x86.Build.0 = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseMac|x86.Build.0 = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseWin32|x86.ActiveCfg = Release|Any CPU
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseWin32|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -5880,10 +5846,9 @@ Global
{2C24D515-4A2C-445C-8419-C09231913CFA} = {56499B8C-4935-4D00-9192-4F2033142975}
{209B27AE-712E-4B87-8846-BB149874D44E} = {745BF6CA-BC7C-4863-B1B4-C423A828820A}
{F71A259D-C08F-48D9-93B7-EE51497EB390} = {A026D596-3C8D-4521-BB42-2C898FA3BE2D}
{FED3E127-B64A-4E57-8D2A-C8817C5D593A} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
{8F0B736F-8353-4A6C-B471-192D826BDD81} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
{410A7DC9-E7DA-43E6-B592-93E2A344B660} = {B8897B76-1A12-4DFA-8B60-7944CC4C9654}
{288994D1-C7E1-4740-99AB-A52B572EBA8A} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}
{C3887A93-B2BD-4097-8E2F-3A063EFF32FD} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {856CF524-E2A7-4DB0-B80F-8F1B080A2E25}
Expand Down
4 changes: 2 additions & 2 deletions main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="!$(HaveGtkSharp)">
<ProjectReference Include="..\..\..\external\xwt\Xwt.Gtk2\Xwt.Gtk2.csproj">
<ProjectReference Include="..\..\..\external\xwt\Xwt.Gtk\Xwt.Gtk.csproj">
<Project>{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}</Project>
<Name>Xwt.Gtk2</Name>
<Name>Xwt.Gtk</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//
//
// GtkWorkarounds.cs
//
// Authors: Jeffrey Stedfast <jeff@xamarin.com>
Expand Down Expand Up @@ -959,7 +959,7 @@ static ForallDelegate CreateForallCallback (IntPtr gtype)
static extern void gtksharp_container_override_forall (IntPtr gtype, ForallDelegate cb);
#endif

public static string MarkupLinks (string text) => Xwt.GtkBackend.GtkWorkarounds.MarkupLinks (text);
//public static string MarkupLinks (string text) => Xwt.GtkBackend.GtkWorkarounds.MarkupLinks (text);

public static void SetLinkHandler (this Gtk.Label label, Action<string> urlHandler)
{
Expand Down
10 changes: 5 additions & 5 deletions main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
C693
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " />
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " />
<ItemGroup>
<Reference Include="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<Reference Include="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<HintPath Condition="'$(OS)' == 'Windows_NT'">$(MSBuildProgramFiles32)\Mono\lib\mono\monodoc\monodoc.dll</HintPath>
<Private Condition="'$(OS)' == 'Windows_NT'">True</Private>
</Reference>
Expand Down Expand Up @@ -95,6 +95,10 @@
<IncludeCopyLocal Include="Xwt.XamMac.dll" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\external\xwt\Xwt.Gtk\Xwt.Gtk.csproj">
<Project>{c3887a93-b2bd-4097-8e2f-3a063eff32fd}</Project>
<Name>Xwt.Gtk</Name>
</ProjectReference>
<ProjectReference Include="..\MonoDevelop.Core\MonoDevelop.Core.csproj">
<Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
<Name>MonoDevelop.Core</Name>
Expand Down Expand Up @@ -138,10 +142,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="!$(HaveGtkSharp)">
<ProjectReference Include="..\..\..\external\xwt\Xwt.Gtk2\Xwt.Gtk2.csproj">
<Project>{FED3E127-B64A-4E57-8D2A-C8817C5D593A}</Project>
<Name>Xwt.Gtk2</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins.Gui\Mono.Addins.Gui.csproj">
<Project>{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}</Project>
<Name>Mono.Addins.Gui</Name>
Expand Down
0