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

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 all commits
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
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
58 changes: 58 additions & 0 deletions .github/workflows/monodevelop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,61 @@ jobs:
run: |
./configure --profile=gnome
make

ubuntu2004msbuild:
runs-on: ubuntu-latest
container:
# This is (currently) the cached docker image SHA256:aba80b77...40417fe dated 17/06/2021
image: "ubuntu:20.04"
steps:
- name: Dependencies
run: |
# Install extra ubuntu packages
apt-get update
apt-get install -y sudo
sudo apt-get update
# Install dotnet-sdk packages
sudo apt-get install -y wget
wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
sudo dpkg -i packages-microsoft-prod.deb
sudo apt-get install -y apt-transport-https
sudo apt-get update
sudo apt-get install -y dotnet-sdk-6.0
# Install mono and msbuild
sudo apt-get install -y gnupg ca-certificates
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
# Reference mono and msbuild from stable repo for versions 6.12.0.122 (mono) and 16.6.0.15201 (msbuild)
# echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
# Reference mono and msbuild from preview repo for versions 6.12.0.147 (mono) and 16.10.1 (msbuild)
echo "deb https://download.mono-project.com/repo/ubuntu preview-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-preview.list
sudo apt-get update
# Install mono-complete and ca-certificates-mono
sudo apt-get install -y mono-complete ca-certificates-mono
# Synchronise Mono SSL certs
cert-sync /etc/ssl/certs/ca-certificates.crt
# Install extra packages required for dotdevelop build
sudo apt-get install -y sed git build-essential intltool nuget fsharp gtk-sharp2
sudo apt-get install -y software-properties-common
sudo apt-get update
- name: Verify OS and tools versions
run: |
uname -a
git --version
make --version
mono -V
msbuild -version
dotnet --info
git config --global --add safe.directory /__w/dotdevelop/dotdevelop

# Checkout, configure and build
- uses: actions/checkout@v3
with:
submodules: true
- name: Checkout configure and build
run: |
cd main
cd external/fsharpbinding
./build.sh
cd ..
cd ..
./build.sh
10 changes: 5 additions & 5 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[submodule "main/external/debugger-libs"]
path = main/external/debugger-libs
url = https://github.com/dotdevelop/debugger-libs.git
url = https://github.com/easysimplified/debugger-libs.git
branch = master
[submodule "main/external/guiunit"]
path = main/external/guiunit
url = https://github.com/dotdevelop/guiunit.git
url = https://github.com/easysimplified/guiunit.git
[submodule "main/external/macdoc"]
path = main/external/macdoc
url = https://github.com/dotdevelop/macdoc
Expand All @@ -20,21 +20,21 @@
url = https://github.com/dotdevelop/mono-tools.git
[submodule "main/external/nrefactory"]
path = main/external/nrefactory
url = https://github.com/dotdevelop/NRefactory.git
url = https://github.com/easysimplified/NRefactory.git
[submodule "main/external/sharpsvn-binary"]
path = main/external/sharpsvn-binary
url = https://github.com/dotdevelop/sharpsvn-binary.git
[submodule "main/external/xwt"]
path = main/external/xwt
url = https://github.com/dotdevelop/xwt
url = https://github.com/easysimplified/xwt
branch = dotdevelop
[submodule "main/external/Xamarin.PropertyEditing"]
path = main/external/Xamarin.PropertyEditing
url = https://github.com/dotdevelop/Xamarin.PropertyEditing
branch = master
[submodule "main/external/vs-editor-api"]
path = main/external/vs-editor-api
url = https://github.com/dotdevelop/vs-editor-api.git
url = https://github.com/easysimplified/vs-editor-api.git
branch = dotdevelop_oe_8.1.5
[submodule "main/external/Monodevelop.Netcoredbg"]
path = main/external/Monodevelop.Netcoredbg
Expand Down
2 changes: 1 addition & 1 deletion main/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<MdAddinsDirectory>$(MSBuildThisFileDirectory)..\..\md-addins\</MdAddinsDirectory>
<!--<VSEditorCoreDirectory Condition="'$(VSEditorCoreDirectory)' == ''">$(MdAddinsDirectory)external\vs-editor-core\</VSEditorCoreDirectory>-->
<VSEditorApiDirectory Condition="'$(VSEditorApiDirectory)' == ''">$(MSBuildThisFileDirectory)external\vs-editor-api\</VSEditorApiDirectory>
<ReferencesVSEditor Condition=" '$(OS)' == 'Windows_NT' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Windows.props</ReferencesVSEditor>
<ReferencesVSEditor Condition=" '$(OS)' == 'Windows_NT' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Gtk.props</ReferencesVSEditor>
<ReferencesVSEditor Condition=" '$(OS)' == 'MAC' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Mac.props</ReferencesVSEditor>
<ReferencesVSEditor Condition=" '$(OS)' == 'UNIX' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Gtk.props</ReferencesVSEditor>
<ReferencesGtk>$(RootDirectory)\msbuild\ReferencesGtk.props</ReferencesGtk>
Expand Down
15 changes: 1 addition & 14 deletions main/Main.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.AspNetCore.Test
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoDevelop.TextEditor", "MonoDevelop.TextEditor", "{C14B06AC-905A-47AB-BAD9-652E3499CFE0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoDevelop.TextEditor.Wpf", "src\addins\MonoDevelop.TextEditor\MonoDevelop.TextEditor.Wpf\MonoDevelop.TextEditor.Wpf.csproj", "{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vs-editor-api", "vs-editor-api", "{669BD438-1BDC-40C6-83CA-CEC133D036A0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoDevelop.TextEditor", "src\addins\MonoDevelop.TextEditor\MonoDevelop.TextEditor\MonoDevelop.TextEditor.csproj", "{3F5B5BDA-69D5-441A-8142-AA25C998A997}"
Expand Down Expand Up @@ -2139,16 +2137,6 @@ Global
{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
{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E}.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
Expand Down Expand Up @@ -3074,7 +3062,6 @@ Global
{82B9A5C5-5713-49B5-93D1-BE29B00FF35A} = {D0469BC0-3DF4-4CE9-A9E3-3268359BAC2E}
{44FFFDDA-156F-49F9-AE6A-BA640C198B33} = {1DEFDD53-2677-439D-906E-141ED2AEC19B}
{C14B06AC-905A-47AB-BAD9-652E3499CFE0} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}
{29D34EA6-D312-4690-9FE9-1EA1F2EBAC2E} = {C14B06AC-905A-47AB-BAD9-652E3499CFE0}
{3F5B5BDA-69D5-441A-8142-AA25C998A997} = {C14B06AC-905A-47AB-BAD9-652E3499CFE0}
{669BD438-1BDC-40C6-83CA-CEC133D036A0} = {C14B06AC-905A-47AB-BAD9-652E3499CFE0}
{5A92B792-BF17-4748-B29E-34C99B2E8722} = {669BD438-1BDC-40C6-83CA-CEC133D036A0}
Expand Down Expand Up @@ -3233,4 +3220,4 @@ Global
MakePkgConfig = False
MakeLibPC = True
EndGlobalSection
EndGlobal
EndGlobal
5 changes: 5 additions & 0 deletions main/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
nuget restore

msbuild external/fsharpbinding/.paket/paket.targets /t:RestorePackages /p:PaketReferences="external\fsharpbinding\MonoDevelop.FSharpBinding\paket.references"

msbuild Main.sln /bl:MonoDevelop.binlog /r /m /p:Configuration=DebugGnome /p:PLATFORM='Any CPU'
2 changes: 1 addition & 1 deletion main/external/debugger-libs
Open in desktop
Submodule debugger-libs updated 1 files
+6 −2 Mono.Debugger.Soft/Mono.Debugger.Soft.csproj
64 changes: 0 additions & 64 deletions main/external/fsharpbinding/MonoDevelop.FSharp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{165E4D
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.FSharp.Gui", "MonoDevelop.FSharp.Gui\MonoDevelop.FSharp.Gui.csproj", "{FD0D1033-9145-48E5-8ED8-E2365252878C}"
EndProject
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "MonoDevelop.FSharp.fastbuild", "MonoDevelop.FSharpBinding\MonoDevelop.FSharp.fastbuild.fsproj", "{4C10F8F9-3816-4647-BA6E-85F5DE39883A}"
EndProject
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "MonoDevelop.FSharp.Tests.fastbuild", "MonoDevelop.FSharp.Tests\MonoDevelop.FSharp.Tests.fastbuild.fsproj", "{A1A45375-7FB8-4F2A-850F-FBCC67739927}"
EndProject
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "MonoDevelop.FSharpInteractive.Service.fastbuild", "MonoDevelop.FSharpi.Service\MonoDevelop.FSharpInteractive.Service.fastbuild.fsproj", "{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}"
EndProject
Project("{f2a71f9b-5d33-465a-a702-920d772 1CF5 79786}") = "MonoDevelop.FSharp.Shared.fastbuild", "MonoDevelop.FSharp.Shared\MonoDevelop.FSharp.Shared.fastbuild.fsproj", "{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FAKE", "FAKE", "{0926DD37-C0FF-464E-96A9-42D5AAA48D1B}"
ProjectSection(SolutionItems) = preProject
build.fsx = build.fsx
Expand All @@ -32,34 +24,6 @@ Global
Standalone|Any CPU = Standalone|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Release|Any CPU.Build.0 = Release|Any CPU
{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU
{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Standalone|Any CPU.ActiveCfg = Debug|Any CPU
{4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Standalone|Any CPU.Build.0 = Debug|Any CPU
{A1A45375-7FB8-4F2A-850F-FBCC67739927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A1A45375-7FB8-4F2A-850F-FBCC67739927}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1A45375-7FB8-4F2A-850F-FBCC67739927}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1A45375-7FB8-4F2A-850F-FBCC67739927}.Release|Any CPU.Build.0 = Release|Any CPU
{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{A1A45375-7FB8-4F2A-850F-FBCC67739927}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{A1A45375-7FB8-4F2A-850F-FBCC67739927}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
{A1A45375-7FB8-4F2A-850F-FBCC67739927}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
{A1A45375-7FB8-4F2A-850F-FBCC67739927}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU
{A1A45375-7FB8-4F2A-850F-FBCC67739927}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
{A1A45375-7FB8-4F2A-850F-FBCC67739927}.Standalone|Any CPU.ActiveCfg = Debug|Any CPU
{A1A45375-7FB8-4F2A-850F-FBCC67739927}.Standalone|Any CPU.Build.0 = Debug|Any CPU
{FD0D1033-9145-48E5-8ED8-E2365252878C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD0D1033-9145-48E5-8ED8-E2365252878C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD0D1033-9145-48E5-8ED8-E2365252878C}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -74,34 +38,6 @@ Global
{FD0D1033-9145-48E5-8ED8-E2365252878C}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
{FD0D1033-9145-48E5-8ED8-E2365252878C}.Standalone|Any CPU.ActiveCfg = Debug|Any CPU
{FD0D1033-9145-48E5-8ED8-E2365252878C}.Standalone|Any CPU.Build.0 = Debug|Any CPU
{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.Release|Any CPU.Build.0 = Release|Any CPU
{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU
{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.Standalone|Any CPU.ActiveCfg = Debug|Any CPU
{20D6EC2C-B62E-49D1-B685-90D8967A5B5D}.Standalone|Any CPU.Build.0 = Debug|Any CPU
{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.Release|Any CPU.Build.0 = Release|Any CPU
{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU
{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU
{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.Standalone|Any CPU.ActiveCfg = Debug|Any CPU
{AF5FEAD5-B50E-4F07-A274-32F23D5C504D}.Standalone|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
EndGlobalSection
Expand Down
2 changes: 1 addition & 1 deletion main/external/guiunit
Open in desktop
Submodule guiunit updated 2 files
+5 −5 src/framework/GuiUnit_NET_4_5.csproj
+3 −0 src/framework/app.config
2 changes: 1 addition & 1 deletion main/external/nrefactory
Open in desktop
Submodule nrefactory updated 12 files
+6 −4 ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
+4 −0 ICSharpCode.NRefactory.CSharp/OutputVisitor/CodeDomConvertVisitor.cs
+31 −3 ICSharpCode.NRefactory.CSharp/Parser/mcs/assembly.cs
+1 −1 ICSharpCode.NRefactory.CSharp/Parser/mcs/class.cs
+2 −0 ICSharpCode.NRefactory.CSharp/Parser/mcs/driver.cs
+6 −0 ICSharpCode.NRefactory.CSharp/Parser/mcs/eval.cs
+11 −7 ICSharpCode.NRefactory.CSharp/Parser/mcs/method.cs
+11 −5 ICSharpCode.NRefactory.CSharp/Parser/mcs/reflection.cs
+1 −1 ICSharpCode.NRefactory.Cecil/CecilLoader.cs
+7 −7 ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
+7 −7 ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
+4 −1 ICSharpCode.NRefactory/TypeSystem/Implementation/UnresolvedSecurityDeclarationBlob.cs
2 changes: 1 addition & 1 deletion main/external/vs-editor-api
Open in desktop
Submodule vs-editor-api updated 18 files
+41 −0 SECURITY.md
+2 −0 VSEditorCore.sln
+1 −1 build/PackageVersions.targets
+1 −1 build/Project.props
+2 −2 nuget.config
+1 −1 samples/AsyncCompletion/HelloWorldCompletion/packages.config
+52 −0 src/Editor/Text/Def/TextLogic/Classification/ClassificationLayer.cs
+30 −0 src/Editor/Text/Def/TextLogic/Classification/IClassificationTypeRegistryService.cs
+22 −0 src/Editor/Text/Def/TextLogic/Classification/ILayeredClassificationType.cs
+114 −0 src/Editor/Text/Def/TextLogic/Find/ITextSearchNavigator3.cs
+1 −1 src/Editor/Text/Def/TextLogic/Find/ITextSearchNavigatorFactoryService.cs
+3 −3 src/Editor/Text/Impl/BraceCompletion/BraceCompletionAdornmentServiceMac.cs
+47 −0 src/Editor/Text/Impl/ClassificationType/ClassificationKey.cs
+14 −10 src/Editor/Text/Impl/ClassificationType/ClassificationTypeImpl.cs
+27 −18 src/Editor/Text/Impl/ClassificationType/ClassificationTypeRegistryService.cs
+26 −13 src/Editor/Text/Impl/TextSearch/TextSearchNavigator.cs
+1 −1 src/Editor/Text/Impl/TextSearch/TextSearchNavigatorFactoryService.cs
+1 −2 src/Editor/Text/Util/TextUICocoaUtil/TextUICocoaUtil.csproj
2 changes: 1 addition & 1 deletion main/external/xwt
Open in desktop
Submodule xwt updated 8 files
+1 −2 TestApps/GtkSharpTest/GtkSharpTest.csproj
+5 −5 Xwt.Gtk.Windows/Xwt.Gtk.Windows.csproj
+2 −1 Xwt.Gtk/Xwt.GtkBackend/Gtk3ViewPort.cs
+2 −1 Xwt.Gtk/Xwt.GtkBackend/GtkWebKitMini.cs
+183 −3 Xwt.Gtk/Xwt.GtkBackend/WebViewBackend.cs
+3 −0 Xwt.Gtk2/Xwt.Gtk2.csproj
+2 −0 Xwt.Gtk3/Xwt.Gtk3.csproj
+4 −1 Xwt.GtkSharp/Xwt.GtkSharp.csproj
1 change: 0 additions & 1 deletion main/msbuild/MDBuildTasks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@

=================================================================
-->

<Target Name="_NuGetPrivateAssetsWorkaround_FilterLocalCopyReferences" BeforeTargets="_CopyFilesMarkedCopyLocal">
<FilterLocalCopyReferences
ReferenceCopyLocalPaths="@(ReferenceCopyLocalPaths)"
Expand Down
4 changes: 2 additions & 2 deletions main/msbuild/ReferencesGtk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<PropertyGroup>
<ReferencesGtkCopyToOutput Condition="$(ReferencesGtkCopyToOutput) == ''">false</ReferencesGtkCopyToOutput>
<HaveGtkSharp>false</HaveGtkSharp>
<DefineConstants Condition="$(HaveGtkSharp)">$(DefineConstants);GTK3;GTK_SHARP</DefineConstants>
<DefineConstants Condition="$(HaveGtkSharp)">$(DefineConstants);GTK3;GTK_SHARP;MAC</DefineConstants>
</PropertyGroup>

<ItemGroup Condition="$(HaveGtkSharp)">
<PackageReference Include="GtkSharp" Version="3.22.25.98" />
<PackageReference Include="GtkSharp" Version="3.24.24.95" />
</ItemGroup>
<ItemGroup Condition="!$(HaveGtkSharp)">
<Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
Expand Down
7 changes: 7 additions & 0 deletions main/src/addins/GnomePlatform/GnomePlatform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using MonoDevelop.Core.Execution;
using MonoDevelop.Core;

Expand Down Expand Up @@ -81,11 +82,17 @@ public override void ShowUrl (string url)

public override string DefaultMonospaceFont {
get {
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) {

try {
return (string) (Gio.GetGSettingsString ("org.gnome.desktop.interface","monospace-font-name"));
} catch (Exception) {
return "Monospace 11";
}
}
else{
return "Monospace 11";
}
}
}

Expand Down
1 change: 1 addition & 0 deletions main/src/addins/GnomePlatform/GnomePlatform.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" ExcludeAssets="all" />
<ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"/>
<ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj"/>
<ProjectReference Include="..\..\..\external\xwt\Xwt\Xwt.csproj"/>
Expand Down
Loading
Loading
0