diff --git a/.github/workflows/monodevelop.yml b/.github/workflows/monodevelop.yml new file mode 100644 index 00000000000..6ee4aab56cc --- /dev/null +++ b/.github/workflows/monodevelop.yml @@ -0,0 +1,68 @@ +name: CI + +on: + push: + branches: + - '*' + paths-ignore: + - '**.md' + pull_request: + branches: + - '*' + + workflow_dispatch: + +jobs: + ubuntu2004: + 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: | + ./configure --profile=gnome + make diff --git a/.gitignore b/.gitignore index 59249529679..f0fff1fdac4 100644 --- a/.gitignore +++ b/.gitignore @@ -279,3 +279,15 @@ main/po/StripMnemonics.exe *.binlog *.ProjectImports.zip main/tests/StressTest/bin + +#rider +main/.idea/ +.idea/ + +.localcache + +#dotnet Version +global.json + +#crash logs +*mono_crash.*.json diff --git a/.gitmodules b/.gitmodules index f2ac87c4a4f..e0d4812f099 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,54 +1,46 @@ [submodule "main/external/debugger-libs"] path = main/external/debugger-libs - url = git://github.com/mono/debugger-libs.git + url = https://github.com/dotdevelop/debugger-libs.git branch = master [submodule "main/external/guiunit"] path = main/external/guiunit - url = git://github.com/mono/guiunit.git -[submodule "main/external/libgit-binary"] - path = main/external/libgit-binary - url = git://github.com/mono/libgit-binary.git - branch = vs-8.0-v0.26.8 -[submodule "main/external/libgit2"] - path = main/external/libgit2 - url = git://github.com/mono/libgit2.git - branch = vs-8.0-v0.26.8 -[submodule "main/external/libgit2sharp"] - path = main/external/libgit2sharp - url = git://github.com/mono/libgit2sharp.git - branch = vs-8.0-v0.26 + url = https://github.com/dotdevelop/guiunit.git [submodule "main/external/macdoc"] path = main/external/macdoc - url = git://github.com/xamarin/macdoc + url = https://github.com/dotdevelop/macdoc [submodule "main/external/mdtestharness"] path = main/external/mdtestharness - url = git://github.com/mono/mdtestharness.git + url = https://github.com/dotdevelop/mdtestharness.git [submodule "main/external/mono-addins"] path = main/external/mono-addins - url = git://github.com/mono/mono-addins.git - branch = master + url = https://github.com/dotdevelop/mono-addins.git + branch = dotdevelop_gtksharp [submodule "main/external/mono-tools"] path = main/external/mono-tools - url = git://github.com/mono/mono-tools.git + url = https://github.com/dotdevelop/mono-tools.git [submodule "main/external/nrefactory"] path = main/external/nrefactory - url = git://github.com/xamarin/NRefactory.git -[submodule "main/external/nuget-binary"] - path = main/external/nuget-binary - url = git://github.com/mono/nuget-binary.git - branch = master + url = https://github.com/dotdevelop/NRefactory.git [submodule "main/external/sharpsvn-binary"] path = main/external/sharpsvn-binary - url = git://github.com/mono/sharpsvn-binary.git + url = https://github.com/dotdevelop/sharpsvn-binary.git [submodule "main/external/xwt"] path = main/external/xwt - url = git://github.com/mono/xwt - branch = master + url = https://github.com/dotdevelop/xwt + branch = dotdevelop [submodule "main/external/Xamarin.PropertyEditing"] path = main/external/Xamarin.PropertyEditing - url = https://github.com/xamarin/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/microsoft/vs-editor-api.git - branch = master + url = https://github.com/dotdevelop/vs-editor-api.git + branch = dotdevelop_oe_8.1.5 +[submodule "main/external/Monodevelop.Netcoredbg"] + path = main/external/Monodevelop.Netcoredbg + url = https://github.com/dotdevelop/monodevelop.netcoredbg.git + branch = dotdevelop +[submodule "main/external/Samsung.Netcoredbg"] + path = main/external/Samsung.Netcoredbg + url = https://github.com/dotdevelop/netcoredbg.git + branch = dotdevelop diff --git a/.nugetfallback/libgit2sharp/0.27.0-preview-g1da3cfaa68/.nupkg.metadata b/.nugetfallback/libgit2sharp/0.27.0-preview-g1da3cfaa68/.nupkg.metadata new file mode 100644 index 00000000000..20344507a73 --- /dev/null +++ b/.nugetfallback/libgit2sharp/0.27.0-preview-g1da3cfaa68/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "JBVp+Mxc3fpXhybVZzGo4KDbV6hf/fq0+3DVgQ+UODSeOKfZrY8rDcpfBy51eWKJjGvdYaNyKyM4Xrz5ty8+Bw==" +} \ No newline at end of file diff --git a/.nugetfallback/libgit2sharp/0.27.0-preview-g1da3cfaa68/libgit2sharp.0.27.0-preview-g1da3cfaa68.nupkg b/.nugetfallback/libgit2sharp/0.27.0-preview-g1da3cfaa68/libgit2sharp.0.27.0-preview-g1da3cfaa68.nupkg new file mode 100644 index 00000000000..c2da9bb2edb Binary files /dev/null and b/.nugetfallback/libgit2sharp/0.27.0-preview-g1da3cfaa68/libgit2sharp.0.27.0-preview-g1da3cfaa68.nupkg differ diff --git a/.nugetfallback/libgit2sharp/0.27.0-preview-g1da3cfaa68/libgit2sharp.0.27.0-preview-g1da3cfaa68.nupkg.sha512 b/.nugetfallback/libgit2sharp/0.27.0-preview-g1da3cfaa68/libgit2sharp.0.27.0-preview-g1da3cfaa68.nupkg.sha512 new file mode 100644 index 00000000000..76b58f8b9a3 --- /dev/null +++ b/.nugetfallback/libgit2sharp/0.27.0-preview-g1da3cfaa68/libgit2sharp.0.27.0-preview-g1da3cfaa68.nupkg.sha512 @@ -0,0 +1 @@ +JBVp+Mxc3fpXhybVZzGo4KDbV6hf/fq0+3DVgQ+UODSeOKfZrY8rDcpfBy51eWKJjGvdYaNyKyM4Xrz5ty8+Bw== \ No newline at end of file diff --git a/.nugetfallback/libgit2sharp/0.27.0-preview-g1da3cfaa68/libgit2sharp.nuspec b/.nugetfallback/libgit2sharp/0.27.0-preview-g1da3cfaa68/libgit2sharp.nuspec new file mode 100755 index 00000000000..fa83d3a4bbe --- /dev/null +++ b/.nugetfallback/libgit2sharp/0.27.0-preview-g1da3cfaa68/libgit2sharp.nuspec @@ -0,0 +1,26 @@ + + + + LibGit2Sharp + 0.27.0-preview-g1da3cfaa68 + LibGit2Sharp contributors + false + App_Readme/LICENSE.md + https://aka.ms/deprecateLicenseUrl + square-logo.png + https://github.com/dotdevelop/libgit2sharp/ + LibGit2Sharp brings all the might and speed of libgit2, a native Git implementation, to the managed world of .Net and Mono. + https://github.com/libgit2/libgit2sharp/blob/1da3cfaa68/CHANGES.md#libgit2sharp-changes + Copyright © LibGit2Sharp contributors + libgit2 git + + + + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.common/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.common/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..831508af434 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.common/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "TmiReau8/5wXYRAbR80FxmMPpGltEBdmgrJgbt4mhDgyNl4pkCaKREyDY3DfMQvunZru4SjDJjaoLkt3cXPqzg==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.common.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.common.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..2a12147e63a Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.common.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.common.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.common.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..2121a2808fa --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.common.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +lqI6zenfnVUlWbyKYA1TZsT8Yp9yuUo3+P+rg9o0X54NwWOtUV9NyGAG8UOaRylbQJhlylGMf5WRtYeNlplzYA== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.common.nuspec b/.nugetfallback/microsoft.codeanalysis.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.common.nuspec new file mode 100755 index 00000000000..d129d94f5fc --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.common.nuspec @@ -0,0 +1,33 @@ + + + + Microsoft.CodeAnalysis.Common + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + A shared package used by the Microsoft .NET Compiler Platform ("Roslyn"). + Do not install this package manually, it will be added as a prerequisite by other packages that require it. + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.csharp.editorfeatures/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.csharp.editorfeatures/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..b27567f6f0f --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.csharp.editorfeatures/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "aivGMkIt1bf/EuiFbJZCvIkc+abQ0Hlytf7+mXV+egqMzW48k9gPkBmUEUoYSMEiG0xkOM6OPlmvTbRF5o5aXw==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.csharp.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.editorfeatures.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.csharp.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.editorfeatures.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..f8ab3ce4226 Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.csharp.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.editorfeatures.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.csharp.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.editorfeatures.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.csharp.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.editorfeatures.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..18838933da6 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.csharp.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.editorfeatures.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +IpcJizcADFHipSfRLJdMOOe05jn8boKum0llHHvKTsdX3B0KJPMeDiWVaUp9mrwO9Z4EwYGYYFFw8qMkWwyAvA== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.csharp.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.editorfeatures.nuspec b/.nugetfallback/microsoft.codeanalysis.csharp.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.editorfeatures.nuspec new file mode 100755 index 00000000000..bae2e60b992 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.csharp.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.editorfeatures.nuspec @@ -0,0 +1,47 @@ + + + + Microsoft.CodeAnalysis.CSharp.EditorFeatures + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + .NET Compiler Platform ("Roslyn") support for C# editor features inside the Visual Studio editor. + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.csharp.features/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.csharp.features/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..0871cd3616d --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.csharp.features/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "nU3JVeQlwdA7LOkrhfK27ySZRYNrO1ixAiJo2LwRmySC2TyJWGCWpXSL04FI9nbk1xc2A08bJE5BYX+Vv0FdEg==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.csharp.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.features.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.csharp.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.features.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..fe78f4e17d7 Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.csharp.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.features.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.csharp.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.features.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.csharp.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.features.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..d53031bc853 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.csharp.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.features.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +s8zcFoePqnH5XC4MNu7y+svfh27W4brq4xAK1REUVfyoItZ1SWKZpgdancZvde/LDzQeG89YotAfN1abIgb9Uw== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.csharp.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.features.nuspec b/.nugetfallback/microsoft.codeanalysis.csharp.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.features.nuspec new file mode 100755 index 00000000000..e9ee9f43170 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.csharp.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.features.nuspec @@ -0,0 +1,30 @@ + + + + Microsoft.CodeAnalysis.CSharp.Features + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + .NET Compiler Platform ("Roslyn") support for creating C# editing experiences. + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.csharp.workspaces/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.csharp.workspaces/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..8425b62bc82 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.csharp.workspaces/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "FpA47k7JHDN8JCeNPzkdRJUK3qzpelFhyQW9vGNARaVZN07zxXQ2FxEwIeFrYxmhNCFd6RjUED0jqxDNDiGvcA==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.csharp.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.workspaces.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.csharp.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.workspaces.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..2a8b7dba99a Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.csharp.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.workspaces.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.csharp.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.workspaces.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.csharp.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.workspaces.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..eb282f64c83 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.csharp.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.workspaces.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +Diu61yiXi6gPdbNxTBYI1ZHEFH+0Rn6dgevb4hzsJ9/dYBsJWYcsfPUjwC83Pfbn9k9CGLoIDKDOQErZJVlczg== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.csharp.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.workspaces.nuspec b/.nugetfallback/microsoft.codeanalysis.csharp.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.workspaces.nuspec new file mode 100755 index 00000000000..218e402e6e9 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.csharp.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.workspaces.nuspec @@ -0,0 +1,28 @@ + + + + Microsoft.CodeAnalysis.CSharp.Workspaces + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + .NET Compiler Platform ("Roslyn") support for analyzing C# projects and solutions. + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.csharp/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.csharp/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..b1c6894db61 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.csharp/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "tTVzmQwq68vnwgYVJyQ+3XWinUbesO0iVxi7dc8MWTtKLASCJ5egHqmZq5H/5V67cuOt9SSKHZtsyOUWsyMRHA==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.csharp/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.csharp/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..8cd5191cae6 Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.csharp/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.csharp/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.csharp/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..a43f50e1718 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.csharp/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +Lg5RCOPsXOO+D/WIAL65N06EVE3sT1BgPQ71Ktw6H8piOlp3RRjkhTGisniUUcYLbq5Jy1Y5CEBCNf/LzmJttQ== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.csharp/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.nuspec b/.nugetfallback/microsoft.codeanalysis.csharp/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.nuspec new file mode 100755 index 00000000000..7144f097ee2 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.csharp/3.4.0-beta4-19568-04/microsoft.codeanalysis.csharp.nuspec @@ -0,0 +1,26 @@ + + + + Microsoft.CodeAnalysis.CSharp + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + .NET Compiler Platform ("Roslyn") support for C#, Microsoft.CodeAnalysis.CSharp.dll. + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.editorfeatures.common/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.editorfeatures.common/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..b9858f627d5 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.editorfeatures.common/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "aTDG1xjhS0wjlDY1iovWr//jE/EZ/xmJn8JvqLo5Ru0mZk9M2H5A9LATjEShlmsltnMglcONr9MF8Tz1ueDI+A==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.editorfeatures.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.common.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.editorfeatures.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.common.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..8e32f285e26 Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.editorfeatures.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.common.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.editorfeatures.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.common.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.editorfeatures.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.common.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..776b3cacd1a --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.editorfeatures.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.common.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +NMo60QdAixL0g/M6SQ3DP3HgiYZDCxVgixU8luo+2erCIhkSfJos3j3jPmrMx39dk4lsp4ug87hsdNqf2DjZNA== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.editorfeatures.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.common.nuspec b/.nugetfallback/microsoft.codeanalysis.editorfeatures.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.common.nuspec new file mode 100755 index 00000000000..6f4307682cb --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.editorfeatures.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.common.nuspec @@ -0,0 +1,46 @@ + + + + Microsoft.CodeAnalysis.EditorFeatures.Common + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + .NET Compiler Platform ("Roslyn") support for editor features inside the Visual Studio editor. + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.editorfeatures.text/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.editorfeatures.text/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..afeb1ff647b --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.editorfeatures.text/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "xtQhwszqaWJ6mawZaroLYSyMpQLZ7OpBDjih1mHc59+DEmiJVMPo9Jwoh9UurDzyGvFwsO3N0Wd7plgAe2UX1A==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.editorfeatures.text/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.text.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.editorfeatures.text/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.text.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..be514719bfe Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.editorfeatures.text/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.text.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.editorfeatures.text/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.text.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.editorfeatures.text/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.text.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..2af934aea87 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.editorfeatures.text/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.text.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +5V8SnTUt4LatOEXKfP0mYRMW6wR+Up0+/lOxlvYyI3/09ueDdLBINRx/QUe1IZ92O7UHr7+sjg1oz/gCC9s+Og== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.editorfeatures.text/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.text.nuspec b/.nugetfallback/microsoft.codeanalysis.editorfeatures.text/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.text.nuspec new file mode 100755 index 00000000000..92ed6d6fcb9 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.editorfeatures.text/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.text.nuspec @@ -0,0 +1,32 @@ + + + + Microsoft.CodeAnalysis.EditorFeatures.Text + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + .NET Compiler Platform ("Roslyn") support for working with Visual Studio text buffers. + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.editorfeatures/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.editorfeatures/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..a2305c84488 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.editorfeatures/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "CTTACfIVPDN8GLQk1z6kkX7x6TOo0sOjI0Z4XLlnbgfh43C/6py58W7H3dNHs8dc+h8shNGboTUBCEyJ4m5bUw==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..a611c801156 Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..7bb2e6854a3 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +VCKf7dkDH9F6Rr3rWGs8jQwOlMeTMxU6j5dL1mURTHzP6zInPV365iqkobG1uRtbG6gWjIBKvfac8ZDPvTFU/g== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.nuspec b/.nugetfallback/microsoft.codeanalysis.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.nuspec new file mode 100755 index 00000000000..9b14bfc82b1 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.editorfeatures.nuspec @@ -0,0 +1,31 @@ + + + + Microsoft.CodeAnalysis.EditorFeatures + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + .NET Compiler Platform ("Roslyn") support for editor features inside the Visual Studio editor. + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.features/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.features/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..003918bcc6e --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.features/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "WgllFT67O9JDkilG6KR0TdQAGKw/at2+SatV3geRPDuIB+AGqPbOvNfhhx+5WdeZoY/5MmbzjVwv9U7k7spH+w==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.features.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.features.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..3e64aa272e1 Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.features.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.features.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.features.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..687da1a983f --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.features.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +U55Yz57mzchO7h3TVxBa51NpSS2iu+e3qTf8jTyl4DoCoynt8V7mISUsClfIqqh1sq+d0xH6vcKye2XMe4d2FA== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.features.nuspec b/.nugetfallback/microsoft.codeanalysis.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.features.nuspec new file mode 100755 index 00000000000..fbce9c4f3c9 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.features.nuspec @@ -0,0 +1,30 @@ + + + + Microsoft.CodeAnalysis.Features + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + .NET Compiler Platform ("Roslyn") support for creating editing experiences. + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.scripting.common/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.scripting.common/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..7ae3d6e10bb --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.scripting.common/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "JwtcwNsQx17WhnNnk7ui/uG/dysGLzHGHDAfNF3a2huM2FafQfzUagukJ2g5jQccBp8TrUFHrai+8VISwgTntA==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.scripting.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.scripting.common.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.scripting.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.scripting.common.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..ac69755e89a Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.scripting.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.scripting.common.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.scripting.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.scripting.common.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.scripting.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.scripting.common.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..014fd518f1f --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.scripting.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.scripting.common.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +8lHrpR31eJnxHjqsvsjN4EzTlmlWW21IBGP5cvHVxugQ4ElrVp3li8yCJpND7tM64rIzgAeH/pJnmZ8LVeB1OA== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.scripting.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.scripting.common.nuspec b/.nugetfallback/microsoft.codeanalysis.scripting.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.scripting.common.nuspec new file mode 100755 index 00000000000..e995b16e61d --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.scripting.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.scripting.common.nuspec @@ -0,0 +1,27 @@ + + + + Microsoft.CodeAnalysis.Scripting.Common + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + Microsoft .NET Compiler Platform ("Roslyn") shared scripting package. + Do not install this package manually, it will be added as a prerequisite by other packages that require it. + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic.editorfeatures/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.visualbasic.editorfeatures/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..2e93b4c46f4 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.visualbasic.editorfeatures/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "C3iU9ja4aCwBTRNa/EWt0+2ggpuMfi/iBe8IS2dK5J7x3OV3c5IB4c12Cejw++3mUak0UjK6pNFQzNnVKowxzA==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.editorfeatures.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.visualbasic.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.editorfeatures.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..4593947dc35 Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.visualbasic.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.editorfeatures.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.editorfeatures.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.visualbasic.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.editorfeatures.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..fa897cf391a --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.visualbasic.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.editorfeatures.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +G2qDUYYHrZAgoaNUwPgMu5x2irHXfOrObHaHNnneKyFWR4Jqe4l6lAAnQ0thHv595O8mizombvz8S5EJiUc4kQ== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.editorfeatures.nuspec b/.nugetfallback/microsoft.codeanalysis.visualbasic.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.editorfeatures.nuspec new file mode 100755 index 00000000000..bd0c256238f --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.visualbasic.editorfeatures/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.editorfeatures.nuspec @@ -0,0 +1,45 @@ + + + + Microsoft.CodeAnalysis.VisualBasic.EditorFeatures + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + .NET Compiler Platform ("Roslyn") support for VisualBasic editor features inside the Visual Studio editor. + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic.features/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.visualbasic.features/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..58652b0f32b --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.visualbasic.features/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "ZJ7teeeBNcO8mREkea6eY545+zrMHrP0JszX4XCcvogAh8n9JPnQ7sUYfAmTvVeSIiKasoWEqibAY3Kx9H89CA==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.features.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.visualbasic.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.features.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..c4e1b484e5b Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.visualbasic.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.features.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.features.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.visualbasic.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.features.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..5abc2688f89 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.visualbasic.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.features.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +U9F7XTGZ6oqEI1ezCspVJKGI92iP3nhY8RWqPCf3KSdW3zJLX4TumNAnP1FBkndT85a6ZA1o9bStHyieQQiJvg== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.features.nuspec b/.nugetfallback/microsoft.codeanalysis.visualbasic.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.features.nuspec new file mode 100755 index 00000000000..ddad7b48850 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.visualbasic.features/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.features.nuspec @@ -0,0 +1,30 @@ + + + + Microsoft.CodeAnalysis.VisualBasic.Features + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + .NET Compiler Platform ("Roslyn") support for creating Visual Basic editing experiences. + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic.workspaces/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.visualbasic.workspaces/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..437eea5189a --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.visualbasic.workspaces/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "6Z4zIJroA7yei1npQp2PnbchxiAFjLnuEyrUn4KTEgr104k2y21UGgTqCYWB5krq+wKxnNfdB7XjjpCnnAvPfQ==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.workspaces.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.visualbasic.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.workspaces.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..1adecd21426 Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.visualbasic.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.workspaces.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.workspaces.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.visualbasic.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.workspaces.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..5139cdacaf1 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.visualbasic.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.workspaces.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +wdMVnT9Waxrn2+0z+uRscpvjX61vEepeJSEHjkZWzpSOIzjOu2suPvub9aHBJfu6vLUgkEiM/NDzaY1GC4EhmQ== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.workspaces.nuspec b/.nugetfallback/microsoft.codeanalysis.visualbasic.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.workspaces.nuspec new file mode 100755 index 00000000000..eb6648f6014 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.visualbasic.workspaces/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.workspaces.nuspec @@ -0,0 +1,28 @@ + + + + Microsoft.CodeAnalysis.VisualBasic.Workspaces + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + .NET Compiler Platform ("Roslyn") support for analyzing Visual Basic projects and solutions. + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.visualbasic/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..77be29762d9 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.visualbasic/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "hRyKDYi4zWXRx0JeBbtq1dhtDGjB75mgHjIzna/cjx0ec+6X3t3AdPv9RxmqN3PvmhqeHL771//g2+Yyz3gzfQ==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.visualbasic/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..3873e12e0c9 Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.visualbasic/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.visualbasic/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..ce8bc73bf78 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.visualbasic/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +JAeZJNFvPgqcnA4sgZwvw1RREDz1WkcDLhdKYwSsBc8vspRdrGuOSHV6rRMBVAjg0fCqxbiQwIlMMwPMWjoaNg== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.visualbasic/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.nuspec b/.nugetfallback/microsoft.codeanalysis.visualbasic/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.nuspec new file mode 100755 index 00000000000..153d034ad2e --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.visualbasic/3.4.0-beta4-19568-04/microsoft.codeanalysis.visualbasic.nuspec @@ -0,0 +1,26 @@ + + + + Microsoft.CodeAnalysis.VisualBasic + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + .NET Compiler Platform ("Roslyn") support for Visual Basic, Microsoft.CodeAnalysis.VisualBasic.dll. + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.workspaces.common/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.workspaces.common/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..2a2daaa0c64 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.workspaces.common/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "EcegeKTAEjl++wXUMIyd2R4FIbpuxlC+kyrOurqFDZaXMgFKeuqu72UON/fBYafGWHNISuICFmegpTC30jEKXA==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.workspaces.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.common.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.workspaces.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.common.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..7bb7f03eb6d Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.workspaces.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.common.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.workspaces.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.common.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.workspaces.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.common.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..d98437bc01f --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.workspaces.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.common.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +Fzq65z6qcUo2WxcjwOC4G0qzPdPjqDgNf/jiks4uNuVPWLJZA3azl/dCFm208pjm4PhvJJaGonV/AcevrRoRTg== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.workspaces.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.common.nuspec b/.nugetfallback/microsoft.codeanalysis.workspaces.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.common.nuspec new file mode 100755 index 00000000000..7e01a6a88b2 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.workspaces.common/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.common.nuspec @@ -0,0 +1,28 @@ + + + + Microsoft.CodeAnalysis.Workspaces.Common + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + A shared package used by the .NET Compiler Platform ("Roslyn") including support for analyzing projects and solutions. + Do not install this package manually, it will be added as a prerequisite by other packages that require it. + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + + \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.workspaces.msbuild/3.4.0-beta4-19568-04/.nupkg.metadata b/.nugetfallback/microsoft.codeanalysis.workspaces.msbuild/3.4.0-beta4-19568-04/.nupkg.metadata new file mode 100644 index 00000000000..48e123aa437 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.workspaces.msbuild/3.4.0-beta4-19568-04/.nupkg.metadata @@ -0,0 +1,4 @@ +{ + "version": 1, + "contentHash": "LLOkCHYke1s9xJAh8b/qXIBvJVDHrtNmSj3iKgmCjSfYUUMTBJ1Tq2f/wPLcPkG8sU/PAqeaXovCJrMCHvyuWQ==" +} \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.workspaces.msbuild/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.msbuild.3.4.0-beta4-19568-04.nupkg b/.nugetfallback/microsoft.codeanalysis.workspaces.msbuild/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.msbuild.3.4.0-beta4-19568-04.nupkg new file mode 100644 index 00000000000..0c8465193e6 Binary files /dev/null and b/.nugetfallback/microsoft.codeanalysis.workspaces.msbuild/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.msbuild.3.4.0-beta4-19568-04.nupkg differ diff --git a/.nugetfallback/microsoft.codeanalysis.workspaces.msbuild/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.msbuild.3.4.0-beta4-19568-04.nupkg.sha512 b/.nugetfallback/microsoft.codeanalysis.workspaces.msbuild/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.msbuild.3.4.0-beta4-19568-04.nupkg.sha512 new file mode 100644 index 00000000000..a1c96e99a07 --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.workspaces.msbuild/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.msbuild.3.4.0-beta4-19568-04.nupkg.sha512 @@ -0,0 +1 @@ +Jd4WkKSc22OjcTp8QebxX1zdq8MHXccDrKib9cbtUjhYowSwcJsPQ1JsMax8FWRpkmKwAgHNJ4OsYZ91DPg15g== \ No newline at end of file diff --git a/.nugetfallback/microsoft.codeanalysis.workspaces.msbuild/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.msbuild.nuspec b/.nugetfallback/microsoft.codeanalysis.workspaces.msbuild/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.msbuild.nuspec new file mode 100755 index 00000000000..02238a6fc4c --- /dev/null +++ b/.nugetfallback/microsoft.codeanalysis.workspaces.msbuild/3.4.0-beta4-19568-04/microsoft.codeanalysis.workspaces.msbuild.nuspec @@ -0,0 +1,39 @@ + + + + Microsoft.CodeAnalysis.Workspaces.MSBuild + 3.4.0-beta4-19568-04 + Microsoft + Microsoft + true + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/dotnet/roslyn + .NET Compiler Platform ("Roslyn") support for analyzing MSBuild projects and solutions. This should be used with at least one + of the following packages to add the appropriate language support: + - Microsoft.CodeAnalysis.CSharp.Workspaces + - Microsoft.CodeAnalysis.VisualBasic.Workspaces + + More details at https://aka.ms/roslyn-packages + This package was built from the source at https://github.com/dotnet/roslyn/commit/82f2e2541478e239dc4b04f231e90dc2b3dcb422. + © Microsoft Corporation. All rights reserved. + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics + true + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Building.md b/Building.md new file mode 100644 index 00000000000..257f4cff08f --- /dev/null +++ b/Building.md @@ -0,0 +1,135 @@ +# Building DotDevelop + +To build DotDevelop from scratch you will need to following pre-requisites. + +Please note, Ubuntu 20.04 LTS is the perferred environment for buiding from source as Ubuntu 22.04 LTS doesn’t support .NET Core 3.1 or 2.0 since the distro only supports openSSL 3. + +## Build Environment Requirements + +The following steps are for Ubuntu, other distros may require different URLs. + +```bash +sudo apt update +sudo apt install wget +sudo apt install intltool fsharp gtk-sharp2 + +# DotNet +## Ubuntu 20.04 +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 +rm packages-microsoft-prod.deb + +## Ubuntu 22.04 +# wget https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb +# sudo dpkg -i packages-microsoft-prod.deb +# rm packages-microsoft-prod.deb + +sudo apt-get install -y apt-transport-https +sudo apt-get update && sudo apt-get install -y dotnet-sdk-3.1 +sudo apt-get update && sudo apt-get install -y dotnet-sdk-5.0 +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 + +# NetCoreDbg Requirements +sudo apt install curl +sudo apt install -y cmake clang +``` + +## Clone and Building + +Build DotDevelop + +```bash +git clone -b main https://github.com/dotdevelop/dotdevelop.git +cd dotdevelop/ + +./configure --profile=gnome +make +``` + +Build NetCoreDbg, starting from the root of the `dotdevelop` folder. + +```bash +# Build NetCoreDbg (starting from DotDevelop directory) +cd main/external/Samsung.Netcoredbg +bash build.sh +cd ../../.. +``` + +## Launching the IDE + +Launch DotDevelop, using one of the 2 options + +```bash +# Start detached from terminal window +(mono main/build/bin/MonoDevelop.exe &) + +# Start attached to terminal window +mono main/build/bin/MonoDevelop.exe +``` + +## Building using Dotdevelop +once you have a sucessfull build on Linux you can also start Dotdevelop for building Dotdevelop +```bash +git clone -b main https://github.com/dotdevelop/dotdevelop.git +git submodule update --init +cd main +nuget restore +``` + +open Main.sln from Dotdevelop +select Mondevelop.Startup and DebugGnome!! + +### Verify .NET Core Debugger is attached + +1. Launch, MonoDevelop +2. Edit > Preferences > Projects > .NET Core Debuggers +3. Click `...` and navigate to, `main/build/AddIns/Samsung.Netcoredbg/netcoredbg` +4. Click, OK and start debugging + + +### Running DotDevelop with .NET6.0+ installed + +With dotnet-sdk-6.0+ installed, the following error occurs:- + +"MSB4236 WorkloadAutoImportPropsLocator could not be found". + +This is described by [this issue](https://github.com/dotnet/sdk/issues/17461) with the following workaround:- + +Set the environment variable `MSBuildEnableWorkloadResolver=false` prior to starting monodevelop + +eg, in a terminal, before starting dotdevelop as above... + +```bash +export MSBuildEnableWorkloadResolver=false +mono ./main/build/bin/MonoDevelop.exe --no-redirect +``` +### CI mainfest +Take a look at [the CI manifest](https://github.com/dotdevelop/dotdevelop/blob/main/.github/workflows/monodevelop.yml) in case the latest steps differ from above. + +## References + +* [NetCoreDbg - Readme.md](https://github.com/dotdevelop/netcoredbg/tree/dotdevelop#readme) + * [Samsung NetCoreDbg](https://github.com/Samsung/netcoredbg) +* [Issue #19 - Samsung.NetCoreDbg External Package](https://github.com/dotdevelop/dotdevelop/issues/47) diff --git a/Makefile b/Makefile index acaba31f05e..e763f2e2c88 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ include main/monodevelop_version EXTRA_DIST = configure code_of_conduct.md -SPACE := -SPACE += +SPACE := +SPACE += ifeq ($(origin APP), undefined) BIN_DIR=main/build @@ -110,7 +110,7 @@ dist: update_submodules remove-stale-tarballs remove-stale-buildinfo dist-recurs echo Decompressing $$tb; \ tar xvjf external/$$tb; \ done - @rm -rf tarballs/external + @rm -rf tarballs/external @echo Decompressing monodevelop-$(PACKAGE_VERSION).tar.bz2 @cd tarballs && tar xvjf monodevelop-$(PACKAGE_VERSION).tar.bz2 @cp version.config tarballs/monodevelop-$(PACKAGE_VERSION) @@ -165,7 +165,7 @@ run-no-accessibility: cd main && $(MAKE) run-no-accessibility test: cd main && $(MAKE) test assembly=$(assembly) - + deploy-tests: cd main && $(MAKE) deploy-tests diff --git a/NuGet.config b/NuGet.config index 826e9f8c208..28f0a186b4d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,18 +1,15 @@ - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/NuGetExternalFeed.config b/NuGetExternalFeed.config new file mode 100644 index 00000000000..d3bce859b9c --- /dev/null +++ b/NuGetExternalFeed.config @@ -0,0 +1,6 @@ + + + + + + diff --git a/README.md b/README.md index 127f8e74444..e5ffde2bf64 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,30 @@ -**MonoDevelop** is a full-featured integrated development environment (IDE) for mono using Gtk#. +**PLEASE NOTE!** -The MonoDevelop core is also the foundation for Visual Studio for Mac. -Feel free to file bugs against Visual Studio for Mac here as well. +This is an effort to get MonoDevelop open sourced again. -See http://www.monodevelop.com for more info. +**DotDevelop** will hopefully be a full-featured integrated development environment (IDE) for .NET using GTK. -[![Build Status](http://jenkins.mono-project.com/job/test-monodevelop-mainline/badge/icon)](http://jenkins.mono-project.com/job/test-monodevelop-mainline/) +**Current Status** -[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mono/monodevelop?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +This fork is based on the last commit on 29 Jan 2020 (https://github.com/mono/monodevelop/commit/96b42aa0741af179a8e501f426b6ff5451c27264). + +It was refactored to compile / run again on Linux. Other platforms will follow. + +**Contributors** + +[Building from Source](Building.md) + + +Discussion, Bugs, Patches +------------------------- + +https://github.com/dotdevelop/dotdevelop/issues/new *(submit bugs and patches here)* +https://github.com/dotdevelop/community/issues/9 *(temporary link to the roadmap thread, should be replaced in the future with a proper roadmap) + +> Other Linux distributions/versions require different ways to acquire dependencies. Open [a new issue +](https://github.com/dotdevelop/dotdevelop/issues) and point out which Linux distribution/version you use, so others might help. + +# (outdated) ReadMe from MonoDevelop: Directory organization ---------------------- @@ -122,15 +139,3 @@ References **[Gnome Human Interface Guidelines (HIG)](https://developer.gnome.org/hig/stable/)** **[freedesktop.org standards](http://freedesktop.org/Standards/)** - -Discussion, Bugs, Patches -------------------------- - -monodevelop-list@lists.ximian.com *(questions and discussion)* - -monodevelop-patches-list@lists.ximian.com *(track commits to MonoDevelop)* - -monodevelop-bugs@lists.ximian.com *(track MonoDevelop bugzilla component)* - -https://github.com/mono/monodevelop/issues/new *(submit bugs and patches here)* - diff --git a/main/Directory.Build.props b/main/Directory.Build.props index dcf4897bf3c..f501d998f17 100644 --- a/main/Directory.Build.props +++ b/main/Directory.Build.props @@ -5,23 +5,24 @@ $(MSBuildThisFileDirectory) $(RootDirectory)packages $(MSBuildThisFileDirectory)..\..\md-addins\ - $(MdAddinsDirectory)external\vs-editor-core\ + $(MSBuildThisFileDirectory)external\vs-editor-api\ $(RootDirectory)\msbuild\ReferencesVSEditor.Windows.props - $(RootDirectory)\msbuild\ReferencesVSEditor.Mac.props + $(RootDirectory)\msbuild\ReferencesVSEditor.Mac.props + $(RootDirectory)\msbuild\ReferencesVSEditor.Gtk.props $(RootDirectory)\msbuild\ReferencesGtk.props - 1.0.0.9 - 0.10.1 + 3.0.0 + 0.10.4 0.1.2 - 3.0.0-rc1.19464.2 - 16.2.0 + 5.0.403 + 16.11.0 0.1.0.2 - 12.0.2 - 5.4.0 - 2.7.0 - 3.9.0 - 15.8.20719.1 - 15.8.112 - 16.1.28-g2ad4df7366 + 13.0.3 + 5.8.0 + 2.7.1 + 3.16.3 + 17.2.60629.1 + 17.7.26 + 16.4.280 diff --git a/main/Main.sln b/main/Main.sln index 3776c79dae3..e6d3b9db6f9 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26228.4 MinimumVisualStudioVersion = 10.0.40219.1 @@ -62,8 +62,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDeveloperExtensions", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnit", "src\addins\MonoDeveloperExtensions\NUnit\NUnit.csproj", "{376889B5-6504-46A1-9D18-A9E4B4A50F49}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.DesignerSupport", "src\addins\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj", "{2C24D515-4A2C-445C-8419-C09231913CFA}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Autotools", "src\addins\MonoDevelop.Autotools\MonoDevelop.Autotools.csproj", "{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.WebReferences", "src\addins\MonoDevelop.WebReferences\MonoDevelop.WebReferences.csproj", "{2A00A871-C641-4116-ADFD-29B7799952B4}" @@ -189,8 +187,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xwt", "Xwt", "{67A32B53-F71 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt", "external\xwt\Xwt\Xwt.csproj", "{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk", "external\xwt\Xwt.Gtk\Xwt.Gtk.csproj", "{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.WPF", "external\xwt\Xwt.WPF\Xwt.WPF.csproj", "{C93D746E-1586-4D4F-B411-BF5A966E6A08}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk.Mac", "external\xwt\Xwt.Gtk.Mac\Xwt.Gtk.Mac.csproj", "{E95833C9-90AA-4366-9262-0A1BED148249}" @@ -219,8 +215,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Ceci EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuiUnit_NET_4_5", "external\guiunit\src\framework\GuiUnit_NET_4_5.csproj", "{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibGit2Sharp", "external\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj", "{EE6ED99F-CB12-4683-B055-D28FC7357A34}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{5D3F7E65-E55B-45CA-A83B-D1E10040281E}" ProjectSection(SolutionItems) = preProject ..\.editorconfig = ..\.editorconfig @@ -312,7 +306,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 @@ -460,8 +454,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MDBuildTasks", "msbuild\MDB EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandardClassification", "external\vs-editor-api\src\Editor\Language\Def\StandardClassification\StandardClassification.csproj", "{9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUICocoa", "external\vs-editor-api\src\Editor\Text\Def\TextUICocoa\TextUICocoa.csproj", "{B85A8B6C-FAE2-4604-A0A8-B6F42F696FA9}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.PerfTests", "src\addins\MonoDevelop.Debugger\MonoDevelop.Debugger.PerfTests\MonoDevelop.Debugger.PerfTests.csproj", "{785F775C-9CA0-4411-86E6-B89D89F3E2ED}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Imaging", "Imaging", "{8E19F797-D714-4C07-903F-97C76E247A03}" @@ -470,7 +462,29 @@ 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}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUIGtk", "external\vs-editor-api\src\Editor\Text\Def\TextUIGtk\TextUIGtk.csproj", "{E5EA3C1D-431E-46FD-B879-492725B1CDBE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.Mac", "src\addins\MonoDevelop.Debugger.Mac\MonoDevelop.Debugger.Mac.csproj", "{573D31CF-B22B-4693-820D-BA143266F4D8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.DesignerSupport.Mac", "src\addins\MonoDevelop.DesignerSupport.Mac\MonoDevelop.DesignerSupport.Mac.csproj", "{364E4FEE-0F78-4AEC-A170-BB6AC93E8F9A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUICommon", "external\vs-editor-api\src\Editor\Text\Def\TextUICommon\TextUICommon.csproj", "{11239964-1C07-4A3D-B129-E4AFFFE8A840}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUICocoa", "external\vs-editor-api\src\Editor\Text\Def\TextUICocoa\TextUICocoa.csproj", "{9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.DesignerSupport", "src\addins\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj", "{2C24D515-4A2C-445C-8419-C09231913CFA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUIGtkUtil", "external\vs-editor-api\src\Editor\Text\Util\TextUIGtkUtil\TextUIGtkUtil.csproj", "{209B27AE-712E-4B87-8846-BB149874D44E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.Debugger.DotNetCore", "external\Monodevelop.Netcoredbg\MonoDevelop.Debugger.DotNetCore\MonoDevelop.Debugger.DotNetCore.csproj", "{F71A259D-C08F-48D9-93B7-EE51497EB390}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk2", "external\xwt\Xwt.Gtk2\Xwt.Gtk2.csproj", "{FED3E127-B64A-4E57-8D2A-C8817C5D593A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.GtkSharp", "external\xwt\Xwt.GtkSharp\Xwt.GtkSharp.csproj", "{8F0B736F-8353-4A6C-B471-192D826BDD81}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Addins.GuiGtk3", "external\mono-addins\Mono.Addins.GuiGtk3\Mono.Addins.GuiGtk3.csproj", "{410A7DC9-E7DA-43E6-B592-93E2A344B660}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.GtkExtensions", "src\core\MonoDevelop.GtkExtensions\MonoDevelop.GtkExtensions.csproj", "{0A8EB4EA-60B4-4708-BA45-68C5E730ED00}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution @@ -486,6 +500,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 @@ -605,11 +621,11 @@ Global {0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU {0413DB7D-8B35-423F-9752-D75C9225E7DE}.Release|Any CPU.ActiveCfg = Release|Any CPU {0413DB7D-8B35-423F-9752-D75C9225E7DE}.Release|Any CPU.Build.0 = Release|Any CPU - {0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU - {0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.Build.0 = ReleaseGnome|Any CPU {0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU {0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU {0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU + {0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU + {0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {E2CAB397-D00C-4D11-8F5F-E3A052092969}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E2CAB397-D00C-4D11-8F5F-E3A052092969}.Debug|Any CPU.Build.0 = Debug|Any CPU {E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU @@ -647,11 +663,11 @@ Global {F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU {F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Release|Any CPU.ActiveCfg = Release|Any CPU {F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Release|Any CPU.Build.0 = Release|Any CPU - {F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU - {F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.Build.0 = ReleaseGnome|Any CPU {F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU {F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU {F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU + {F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU + {F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {1038FBD8-750E-4081-BC65-D89FFED3C881}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -774,22 +790,6 @@ Global {376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {376889B5-6504-46A1-9D18-A9E4B4A50F49}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.Build.0 = Release|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU - {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU {CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Debug|Any CPU.Build.0 = Debug|Any CPU {CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU @@ -970,12 +970,12 @@ Global {9BC670A8-1851-40EC-9685-279F4C98433D}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU {9BC670A8-1851-40EC-9685-279F4C98433D}.Release|Any CPU.ActiveCfg = Release|Any CPU {9BC670A8-1851-40EC-9685-279F4C98433D}.Release|Any CPU.Build.0 = Release|Any CPU - {9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU - {9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.Build.0 = ReleaseGnome|Any CPU {9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU {9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseWin32|Any CPU.Build.0 = ReleaseWin32|Any CPU + {9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU + {9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {BA9020AD-A2D1-47C8-9A7C-756162C38296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BA9020AD-A2D1-47C8-9A7C-756162C38296}.Debug|Any CPU.Build.0 = Debug|Any CPU {BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU @@ -1360,22 +1360,6 @@ Global {92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU {92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.ReleaseWin32|Any CPU.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}.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}.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}.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}.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}.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}.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}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU - {C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU {C93D746E-1586-4D4F-B411-BF5A966E6A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {C93D746E-1586-4D4F-B411-BF5A966E6A08}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -1544,22 +1528,6 @@ Global {D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU {D12F0F7B-8DE3-43EC-BA49-41052D065A9B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.DebugMac|Any CPU.Build.0 = Debug|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Release|Any CPU.Build.0 = Release|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU - {EE6ED99F-CB12-4683-B055-D28FC7357A34}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU {BFE8691A-D323-4622-9021-7B8B27F81599}.Debug|Any CPU.ActiveCfg = Debug|x86 {BFE8691A-D323-4622-9021-7B8B27F81599}.Debug|Any CPU.Build.0 = Debug|x86 {BFE8691A-D323-4622-9021-7B8B27F81599}.DebugGnome|Any CPU.ActiveCfg = Debug|x86 @@ -2167,6 +2135,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 @@ -2207,6 +2179,8 @@ Global {2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {2471CB49-9952-43D4-A7AD-7C01BCEDC461}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {2471CB49-9952-43D4-A7AD-7C01BCEDC461}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {44A7579B-2E53-451E-8F6B-946AD04DED3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2217,6 +2191,8 @@ Global {44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {44A7579B-2E53-451E-8F6B-946AD04DED3F}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {44A7579B-2E53-451E-8F6B-946AD04DED3F}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {AB85D313-77D7-4F3D-B3F3-56864A1253DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2227,6 +2203,8 @@ Global {AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {AB85D313-77D7-4F3D-B3F3-56864A1253DC}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {AB85D313-77D7-4F3D-B3F3-56864A1253DC}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {C0943335-A94F-4DF4-91D0-2129D45C666C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2237,6 +2215,8 @@ Global {C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {C0943335-A94F-4DF4-91D0-2129D45C666C}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {C0943335-A94F-4DF4-91D0-2129D45C666C}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2247,6 +2227,8 @@ Global {E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {E20390B6-25C8-4DDC-B3E3-9E0560FC4336}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {D53A102A-8B6B-4838-BC65-FE36527E7018}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2257,6 +2239,8 @@ Global {D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {D53A102A-8B6B-4838-BC65-FE36527E7018}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {D53A102A-8B6B-4838-BC65-FE36527E7018}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {33DAC448-FBCB-4030-9939-01FA4B3EAE76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2267,6 +2251,8 @@ Global {33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {33DAC448-FBCB-4030-9939-01FA4B3EAE76}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {33DAC448-FBCB-4030-9939-01FA4B3EAE76}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2277,6 +2263,8 @@ Global {FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {FB46DD61-12E4-42D0-A99C-0A79C412FDD5}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2287,6 +2275,8 @@ Global {E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {E5AF4EB5-9E7F-40B6-8762-98FA45FACA06}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {6154E851-B914-47D5-9CC0-3E7433047574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6154E851-B914-47D5-9CC0-3E7433047574}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {6154E851-B914-47D5-9CC0-3E7433047574}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2297,6 +2287,8 @@ Global {6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {6154E851-B914-47D5-9CC0-3E7433047574}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {6154E851-B914-47D5-9CC0-3E7433047574}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {E0561832-1C54-41A8-A30A-97E8E81DBCA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2307,6 +2299,8 @@ Global {E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {E0561832-1C54-41A8-A30A-97E8E81DBCA7}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {E0561832-1C54-41A8-A30A-97E8E81DBCA7}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2317,6 +2311,8 @@ Global {CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {CB978906-1945-4BB6-AAA5-1FA2E60C22EF}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {9B8B470A-5455-45B5-A5D1-8619ED174257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2327,6 +2323,8 @@ Global {9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {9B8B470A-5455-45B5-A5D1-8619ED174257}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {9B8B470A-5455-45B5-A5D1-8619ED174257}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {726E446E-2E8D-4B48-A47B-923C6CEC4556}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2337,6 +2335,8 @@ Global {726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {726E446E-2E8D-4B48-A47B-923C6CEC4556}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {726E446E-2E8D-4B48-A47B-923C6CEC4556}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {F713D37D-70A4-49BB-ADAE-B7007C880E57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2347,6 +2347,8 @@ Global {F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {F713D37D-70A4-49BB-ADAE-B7007C880E57}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {F713D37D-70A4-49BB-ADAE-B7007C880E57}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2357,6 +2359,8 @@ Global {B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {B5C85F1D-38B8-4A57-A763-F390D58BD4D5}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {72987C64-502B-4BBB-B9C9-B09F54C7B552}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2367,6 +2371,8 @@ Global {72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {72987C64-502B-4BBB-B9C9-B09F54C7B552}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {72987C64-502B-4BBB-B9C9-B09F54C7B552}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {3C354DFC-8768-4023-9977-B9C3B9FF81ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2377,6 +2383,8 @@ Global {3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {3C354DFC-8768-4023-9977-B9C3B9FF81ED}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {3C354DFC-8768-4023-9977-B9C3B9FF81ED}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {29E74860-17B2-47D3-B3D4-7BC7E77900CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2387,6 +2395,8 @@ Global {29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {29E74860-17B2-47D3-B3D4-7BC7E77900CE}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {29E74860-17B2-47D3-B3D4-7BC7E77900CE}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {135FD888-1648-4721-A861-4F7503C44A3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {135FD888-1648-4721-A861-4F7503C44A3D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {135FD888-1648-4721-A861-4F7503C44A3D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2397,6 +2407,8 @@ Global {135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {135FD888-1648-4721-A861-4F7503C44A3D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {135FD888-1648-4721-A861-4F7503C44A3D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {547C3D7B-7DFF-4169-88A7-56245170FDB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2407,6 +2419,8 @@ Global {547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {547C3D7B-7DFF-4169-88A7-56245170FDB3}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {547C3D7B-7DFF-4169-88A7-56245170FDB3}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {1206D585-670F-4951-A6BF-493C79C950E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1206D585-670F-4951-A6BF-493C79C950E4}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {1206D585-670F-4951-A6BF-493C79C950E4}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2417,6 +2431,8 @@ Global {1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {1206D585-670F-4951-A6BF-493C79C950E4}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {1206D585-670F-4951-A6BF-493C79C950E4}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {69F195E1-A8C9-43B3-AE91-A8FC79393163}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2427,6 +2443,8 @@ Global {69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {69F195E1-A8C9-43B3-AE91-A8FC79393163}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {69F195E1-A8C9-43B3-AE91-A8FC79393163}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {B2B41590-92EF-4120-B9B8-E861F3903FDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2437,6 +2455,8 @@ Global {B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {B2B41590-92EF-4120-B9B8-E861F3903FDD}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {B2B41590-670F-4169-B3D4-7BC7E77900CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2457,6 +2477,8 @@ Global {3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {063241E2-CBDA-4A95-9B8E-914AD6D6D242}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2467,6 +2489,8 @@ Global {063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {063241E2-CBDA-4A95-9B8E-914AD6D6D242}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {063241E2-CBDA-4A95-9B8E-914AD6D6D242}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {C00336B8-0DC9-4F05-A030-C6BD2A018746}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2477,6 +2501,8 @@ Global {C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {C00336B8-0DC9-4F05-A030-C6BD2A018746}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {C00336B8-0DC9-4F05-A030-C6BD2A018746}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2487,6 +2513,8 @@ Global {1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {1CA8F6F3-8FCD-4AC1-84A7-5DB4248FEC07}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {C90CEE76-1A52-43EC-A28D-ABD25F95646B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2497,6 +2525,8 @@ Global {C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {C90CEE76-1A52-43EC-A28D-ABD25F95646B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {C90CEE76-1A52-43EC-A28D-ABD25F95646B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2507,6 +2537,8 @@ Global {9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {9B0C6B46-52CA-42F5-83E1-C259F54EE5F5}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2517,6 +2549,8 @@ Global {A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {A8F39368-ECD9-41A5-A562-CC7C82B3CC86}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2527,6 +2561,8 @@ Global {6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {6CFF32E7-9621-4F17-8D31-732F93F0C1A6}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {FDE5334A-70B5-41AE-9445-A0C77725A63D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2537,6 +2573,8 @@ Global {FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {FDE5334A-70B5-41AE-9445-A0C77725A63D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {FDE5334A-70B5-41AE-9445-A0C77725A63D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {8858E6B0-8398-46A9-9022-358D10E5E394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8858E6B0-8398-46A9-9022-358D10E5E394}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {8858E6B0-8398-46A9-9022-358D10E5E394}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2547,6 +2585,8 @@ Global {8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {8858E6B0-8398-46A9-9022-358D10E5E394}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {8858E6B0-8398-46A9-9022-358D10E5E394}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {8EC74798-FED7-4F3C-A01B-25013317A90B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2557,6 +2597,8 @@ Global {8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {8EC74798-FED7-4F3C-A01B-25013317A90B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {8EC74798-FED7-4F3C-A01B-25013317A90B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {52BF10FD-66DF-430F-8A30-E5E63A93AE91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2567,6 +2609,8 @@ Global {52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {52BF10FD-66DF-430F-8A30-E5E63A93AE91}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {52BF10FD-66DF-430F-8A30-E5E63A93AE91}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU {C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.Debug|Any CPU.Build.0 = Debug|Any CPU {C8BEA9D9-9608-4FC7-BE8D-DFEDCE41C39F}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU @@ -2609,6 +2653,8 @@ Global {A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU {A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU + {A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU + {A0B6FE73-D046-4E1C-BA9D-F20683889C5A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU {E8F4F0EB-C2B1-4116-8459-E076E0E0E485}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU {E8F4F0EB-C2B1-4116-8459-E076E0E0E485}.DebugMac|Any CPU.Build.0 = Debug|Any CPU {E8F4F0EB-C2B1-4116-8459-E076E0E0E485}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU @@ -2647,16 +2693,6 @@ Global {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Debug|x86.Build.0 = Debug|Any CPU {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Release|x86.ActiveCfg = Release|Any CPU {9730E995-DFFE-49F2-BEDB-4DE7F33C8E8D}.Release|x86.Build.0 = Release|Any CPU - {B85A8B6C-FAE2-4604-A0A8-B6F42F696FA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B85A8B6C-FAE2-4604-A0A8-B6F42F696FA9}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU - {B85A8B6C-FAE2-4604-A0A8-B6F42F696FA9}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU - {B85A8B6C-FAE2-4604-A0A8-B6F42F696FA9}.DebugMac|Any CPU.Build.0 = Debug|Any CPU - {B85A8B6C-FAE2-4604-A0A8-B6F42F696FA9}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU - {B85A8B6C-FAE2-4604-A0A8-B6F42F696FA9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B85A8B6C-FAE2-4604-A0A8-B6F42F696FA9}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU - {B85A8B6C-FAE2-4604-A0A8-B6F42F696FA9}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU - {B85A8B6C-FAE2-4604-A0A8-B6F42F696FA9}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU - {B85A8B6C-FAE2-4604-A0A8-B6F42F696FA9}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU {785F775C-9CA0-4411-86E6-B89D89F3E2ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {785F775C-9CA0-4411-86E6-B89D89F3E2ED}.Debug|Any CPU.Build.0 = Debug|Any CPU {785F775C-9CA0-4411-86E6-B89D89F3E2ED}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU @@ -2673,22 +2709,224 @@ 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 + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugMac|Any CPU.Build.0 = Debug|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Release|Any CPU.Build.0 = Release|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Debug|x86.ActiveCfg = Debug|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Debug|x86.Build.0 = Debug|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Release|x86.ActiveCfg = Release|Any CPU + {E5EA3C1D-431E-46FD-B879-492725B1CDBE}.Release|x86.Build.0 = Release|Any CPU + + {209B27AE-712E-4B87-8846-BB149874D44E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.Release|Any CPU.Build.0 = Release|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.Debug|x86.ActiveCfg = Debug|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.Debug|x86.Build.0 = Debug|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.Release|x86.ActiveCfg = Release|Any CPU + {209B27AE-712E-4B87-8846-BB149874D44E}.Release|x86.Build.0 = Release|Any CPU + + {573D31CF-B22B-4693-820D-BA143266F4D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.Release|Any CPU.Build.0 = Release|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.Debug|x86.ActiveCfg = Debug|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.Debug|x86.Build.0 = Debug|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.Release|x86.ActiveCfg = Release|Any CPU + {573D31CF-B22B-4693-820D-BA143266F4D8}.Release|x86.Build.0 = Release|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.Debug|Any CPU.Build.0 = Debug|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugMac|Any CPU.Build.0 = Debug|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.Release|Any CPU.ActiveCfg = Release|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.Release|Any CPU.Build.0 = Release|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.Debug|x86.ActiveCfg = Debug|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.Debug|x86.Build.0 = Debug|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.Release|x86.ActiveCfg = Release|Any CPU + {11239964-1C07-4A3D-B129-E4AFFFE8A840}.Release|x86.Build.0 = Release|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Release|Any CPU.Build.0 = Release|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.ReleaseGnome|Any CPU.ActiveCfg = Debug|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Debug|x86.ActiveCfg = Debug|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Debug|x86.Build.0 = Debug|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Release|x86.ActiveCfg = Release|Any CPU + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6}.Release|x86.Build.0 = Release|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.ActiveCfg = DebugMac|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.Build.0 = DebugMac|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.Build.0 = Release|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.ActiveCfg = DebugMac|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.Build.0 = DebugMac|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|x86.ActiveCfg = Debug|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|x86.Build.0 = Debug|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.Release|x86.ActiveCfg = Release|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.Release|x86.Build.0 = Release|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.Build.0 = DebugGnome|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU + {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugMac|Any CPU.Build.0 = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.Release|Any CPU.Build.0 = Release|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseGnome|Any CPU.ActiveCfg = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseGnome|Any CPU.Build.0 = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.Debug|x86.ActiveCfg = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.Debug|x86.Build.0 = Debug|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.Release|x86.ActiveCfg = Release|Any CPU + {F71A259D-C08F-48D9-93B7-EE51497EB390}.Release|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}.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}.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}.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}.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}.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}.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}.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}.Debug|x86.ActiveCfg = Debug|Any CPU + {FED3E127-B64A-4E57-8D2A-C8817C5D593A}.Debug|x86.Build.0 = Debug|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 + {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}.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}.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}.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}.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}.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}.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}.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}.Debug|x86.ActiveCfg = Debug|Any CPU + {8F0B736F-8353-4A6C-B471-192D826BDD81}.Debug|x86.Build.0 = Debug|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 + {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}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugMac|Any CPU.Build.0 = Debug|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.Release|Any CPU.ActiveCfg = Release|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.Release|Any CPU.Build.0 = Release|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseGnome|Any CPU.ActiveCfg = Debug|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseGnome|Any CPU.Build.0 = Debug|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.Debug|x86.ActiveCfg = Debug|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.Debug|x86.Build.0 = Debug|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.Release|x86.ActiveCfg = Release|Any CPU + {410A7DC9-E7DA-43E6-B592-93E2A344B660}.Release|x86.Build.0 = Release|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.DebugMac|Any CPU.Build.0 = Debug|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Release|Any CPU.Build.0 = Release|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.ReleaseWin32|Any CPU.ActiveCfg = Debug|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.ReleaseWin32|Any CPU.Build.0 = Debug|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Debug|x86.ActiveCfg = Debug|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Debug|x86.Build.0 = Debug|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Release|x86.ActiveCfg = Release|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.Release|x86.Build.0 = Release|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2719,7 +2957,6 @@ Global {7E9FADE6-CB4E-4366-8489-AEA1DD9F45F2} = {D417E929-2B3A-46AC-BBE8-027ADB63A790} {9A415695-CF80-4845-AA80-0DA26CF1E256} = {7E9FADE6-CB4E-4366-8489-AEA1DD9F45F2} {376889B5-6504-46A1-9D18-A9E4B4A50F49} = {7E9FADE6-CB4E-4366-8489-AEA1DD9F45F2} - {2C24D515-4A2C-445C-8419-C09231913CFA} = {56499B8C-4935-4D00-9192-4F2033142975} {CFC02FEC-BDF4-40B9-94D6-35E73F76A92E} = {D417E929-2B3A-46AC-BBE8-027ADB63A790} {2A00A871-C641-4116-ADFD-29B7799952B4} = {D417E929-2B3A-46AC-BBE8-027ADB63A790} {B480BF1B-1DCD-4288-9212-F5BEDF763797} = {D417E929-2B3A-46AC-BBE8-027ADB63A790} @@ -2772,7 +3009,6 @@ Global {372E8E3E-29D5-4B4D-88A2-4711CD628C4E} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C} {67A32B53-F719-4ECB-B5E1-FD0B04FEE258} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C} {92494904-35FA-4DC9-BDE9-3A3E87AC49D3} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258} - {C3887A93-B2BD-4097-8E2F-3A063EFF32FD} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258} {C93D746E-1586-4D4F-B411-BF5A966E6A08} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258} {E95833C9-90AA-4366-9262-0A1BED148249} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258} {252117CA-0ABB-4F36-BFC8-DE23A8089BB9} = {67A32B53-F719-4ECB-B5E1-FD0B04FEE258} @@ -2787,7 +3023,6 @@ Global {53DCA265-3C3C-42F9-B647-F72BA678122B} = {2D711139-8765-4929-BC7A-AA2DEE6F615D} {2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006} = {2D711139-8765-4929-BC7A-AA2DEE6F615D} {D12F0F7B-8DE3-43EC-BA49-41052D065A9B} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C} - {EE6ED99F-CB12-4683-B055-D28FC7357A34} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C} {BFE8691A-D323-4622-9021-7B8B27F81599} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E} {8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E} {D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E} @@ -2827,7 +3062,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} @@ -2853,7 +3088,6 @@ Global {C0943335-A94F-4DF4-91D0-2129D45C666C} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B} {E20390B6-25C8-4DDC-B3E3-9E0560FC4336} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B} {D53A102A-8B6B-4838-BC65-FE36527E7018} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B} - {B85A8B6C-FAE2-4604-A0A8-B6F42F696FA9} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B} {33DAC448-FBCB-4030-9939-01FA4B3EAE76} = {32539734-6484-4451-9EF3-61610CA25BBF} {FB46DD61-12E4-42D0-A99C-0A79C412FDD5} = {32539734-6484-4451-9EF3-61610CA25BBF} {E5AF4EB5-9E7F-40B6-8762-98FA45FACA06} = {32539734-6484-4451-9EF3-61610CA25BBF} @@ -2904,7 +3138,18 @@ 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} + {E5EA3C1D-431E-46FD-B879-492725B1CDBE} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B} + {573D31CF-B22B-4693-820D-BA143266F4D8} = {776872D9-76FA-407B-BA69-08E25A24E5CE} + {364E4FEE-0F78-4AEC-A170-BB6AC93E8F9A} = {56499B8C-4935-4D00-9192-4F2033142975} + {11239964-1C07-4A3D-B129-E4AFFFE8A840} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B} + {9DAA25E7-9C9D-4C34-A72A-E402D29BE6F6} = {AA56E3AE-8E61-4101-B01A-2646DC1B0D7B} + {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} + {0A8EB4EA-60B4-4708-BA45-68C5E730ED00} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {856CF524-E2A7-4DB0-B80F-8F1B080A2E25} diff --git a/main/Main.sln.DotSettings b/main/Main.sln.DotSettings index 904c88e3dee..5fdc0e6ddaa 100644 --- a/main/Main.sln.DotSettings +++ b/main/Main.sln.DotSettings @@ -11,4 +11,5 @@ True <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"><ExtraRule Prefix="" Suffix="" Style="AA_BB" /></Policy> <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> \ No newline at end of file + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + diff --git a/main/external/Monodevelop.Netcoredbg b/main/external/Monodevelop.Netcoredbg new file mode 160000 index 00000000000..0a52b6c4c6d --- /dev/null +++ b/main/external/Monodevelop.Netcoredbg @@ -0,0 +1 @@ +Subproject commit 0a52b6c4c6de32a66d6549d3c6abca8152bf310d diff --git a/main/external/Samsung.Netcoredbg b/main/external/Samsung.Netcoredbg new file mode 160000 index 00000000000..39c63e79eb9 --- /dev/null +++ b/main/external/Samsung.Netcoredbg @@ -0,0 +1 @@ +Subproject commit 39c63e79eb98e6fb0b63ebbf58e9fb80e2d7ba2d 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..c52adb4590c 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.csproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.csproj @@ -13,10 +13,6 @@ ..\..\..\build\AddIns\FSharpBinding True - - - - 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..71f960bb4e4 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharp.Tests/MonoDevelop.FSharp.Tests.fsproj @@ -21,6 +21,12 @@ run-md-tests $(MSBuildProjectDirectory)\..\..\..\build\tests\MonoDevelop.FSharp.Tests.dll false + + bin\Debug\ + + + bin\Release\ + @@ -58,10 +64,6 @@ ..\..\..\build\bin\Microsoft.CodeAnalysis.Workspaces.dll False - - ..\..\Xamarin.Mac.dll - False - False ..\..\..\build\AddIns\DisplayBindings\SourceEditor\MonoDevelop.SourceEditor.dll diff --git a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj index f15270b00b2..fdd8356ac05 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj @@ -30,8 +30,6 @@ - - @@ -74,6 +72,8 @@ + + @@ -132,22 +132,23 @@ - - {2C24D515-4A2C-445C-8419-C09231913CFA} - MonoDevelop.DesignerSupport + + + + + + + + + + + {100568FC-F4E8-439B-94AD-41D11724E45B} + MonoDevelop.Refactoring False - - {FD0D1033-9145-48E5-8ED8-E2365252878C} - MonoDevelop.FSharp.Gui - - - {AF5FEAD5-B50E-4F07-A274-32F23D5C504D} - MonoDevelop.FSharp.Shared - - - {2357AABD-08C7-4808-A495-8FF2D3CDFDB0} - MonoDevelop.Debugger + + {27096E7F-C91C-4AC6-B289-6897A701DF21} + MonoDevelop.Ide False @@ -155,14 +156,22 @@ MonoDevelop.Core False - - {27096E7F-C91C-4AC6-B289-6897A701DF21} - MonoDevelop.Ide + + {2357AABD-08C7-4808-A495-8FF2D3CDFDB0} + MonoDevelop.Debugger False - - {100568FC-F4E8-439B-94AD-41D11724E45B} - MonoDevelop.Refactoring + + {AF5FEAD5-B50E-4F07-A274-32F23D5C504D} + MonoDevelop.FSharp.Shared + + + {FD0D1033-9145-48E5-8ED8-E2365252878C} + MonoDevelop.FSharp.Gui + + + {364E4FEE-0F78-4AEC-A170-BB6AC93E8F9A} + MonoDevelop.DesignerSupport.Mac False @@ -176,17 +185,6 @@ 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..88f6f27243f 100644 --- a/main/external/fsharpbinding/MonoDevelop.FSharpi.Service/MonoDevelop.FSharpInteractive.Service.fsproj +++ b/main/external/fsharpbinding/MonoDevelop.FSharpi.Service/MonoDevelop.FSharpInteractive.Service.fsproj @@ -28,15 +28,6 @@ - - - - {AF5FEAD5-B50E-4F07-A274-32F23D5C504D} - MonoDevelop.FSharp.Shared - false - - - @@ -48,6 +39,11 @@ FSharp.Core.sigdata PreserveNewest + + {AF5FEAD5-B50E-4F07-A274-32F23D5C504D} + MonoDevelop.FSharp.Shared + false + diff --git a/main/external/fsharpbinding/paket.dependencies b/main/external/fsharpbinding/paket.dependencies index 0fa75c3a9f3..1b3e2d53ee5 100644 --- a/main/external/fsharpbinding/paket.dependencies +++ b/main/external/fsharpbinding/paket.dependencies @@ -1,6 +1,6 @@ version 5.201.1 framework: net472 -source https://nuget.org/api/v2/ +source https://api.nuget.org/v3/index.json nuget ExtCore framework: >= net40 nuget FSharp.Compiler.Service 31.0.0 diff --git a/main/external/fsharpbinding/paket.lock b/main/external/fsharpbinding/paket.lock index 817a6a8ded3..b099144eba0 100644 --- a/main/external/fsharpbinding/paket.lock +++ b/main/external/fsharpbinding/paket.lock @@ -1,6 +1,6 @@ RESTRICTION: == net472 NUGET - remote: https://www.nuget.org/api/v2 + remote: https://api.nuget.org/v3/index.json ExtCore (0.8.46) FAKE (5.8.4) Fantomas (3.0.0-beta-002) diff --git a/main/external/libgit-binary b/main/external/libgit-binary deleted file mode 160000 index 2871279e5d6..00000000000 --- a/main/external/libgit-binary +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2871279e5d6abe886a571583ae72131fae2ffa53 diff --git a/main/external/libgit2 b/main/external/libgit2 deleted file mode 160000 index 71efcb31582..00000000000 --- a/main/external/libgit2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 71efcb31582108be91adf61155927d8bd9bbcfc1 diff --git a/main/external/libgit2sharp b/main/external/libgit2sharp deleted file mode 160000 index 7c156e1beff..00000000000 --- a/main/external/libgit2sharp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7c156e1beff7d0c8811564b3d36fb85742392cbe diff --git a/main/external/mono-addins b/main/external/mono-addins index 78293401391..cddcc8052c5 160000 --- a/main/external/mono-addins +++ b/main/external/mono-addins @@ -1 +1 @@ -Subproject commit 78293401391922f6d06c4707a043e030b54e3732 +Subproject commit cddcc8052c57447c9422a85dabbbf2a872b4e415 diff --git a/main/external/nuget-binary b/main/external/nuget-binary deleted file mode 160000 index 7871fa26914..00000000000 --- a/main/external/nuget-binary +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7871fa26914593fdb2f2500df1196df7b8aecb1c diff --git a/main/external/nuget-binary/CODE-OF-CONDUCT.md b/main/external/nuget-binary/CODE-OF-CONDUCT.md new file mode 100644 index 00000000000..775f221c98e --- /dev/null +++ b/main/external/nuget-binary/CODE-OF-CONDUCT.md @@ -0,0 +1,6 @@ +# Code of Conduct + +This project has adopted the code of conduct defined by the Contributor Covenant +to clarify expected behavior in our community. + +For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct). diff --git a/main/external/nuget-binary/Lucene.Net.dll b/main/external/nuget-binary/Lucene.Net.dll new file mode 100755 index 00000000000..5cbb2bd46dc Binary files /dev/null and b/main/external/nuget-binary/Lucene.Net.dll differ diff --git a/main/external/nuget-binary/Microsoft.Web.XmlTransform.dll b/main/external/nuget-binary/Microsoft.Web.XmlTransform.dll new file mode 100755 index 00000000000..98c9d56ff43 Binary files /dev/null and b/main/external/nuget-binary/Microsoft.Web.XmlTransform.dll differ diff --git a/main/external/nuget-binary/NuGet-COPYRIGHT.txt b/main/external/nuget-binary/NuGet-COPYRIGHT.txt new file mode 100644 index 00000000000..0bdc1962b61 --- /dev/null +++ b/main/external/nuget-binary/NuGet-COPYRIGHT.txt @@ -0,0 +1,12 @@ +Copyright (c) .NET Foundation. All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); you may not use +these files except in compliance with the License. You may obtain a copy of the +License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. diff --git a/main/external/nuget-binary/NuGet-LICENSE.txt b/main/external/nuget-binary/NuGet-LICENSE.txt new file mode 100644 index 00000000000..dd0f078c6b9 --- /dev/null +++ b/main/external/nuget-binary/NuGet-LICENSE.txt @@ -0,0 +1,177 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS diff --git a/main/external/nuget-binary/NuGet.Commands.dll b/main/external/nuget-binary/NuGet.Commands.dll new file mode 100644 index 00000000000..31e766b4d7e Binary files /dev/null and b/main/external/nuget-binary/NuGet.Commands.dll differ diff --git a/main/external/nuget-binary/NuGet.Common.dll b/main/external/nuget-binary/NuGet.Common.dll new file mode 100644 index 00000000000..cec6277e09e Binary files /dev/null and b/main/external/nuget-binary/NuGet.Common.dll differ diff --git a/main/external/nuget-binary/NuGet.Configuration.dll b/main/external/nuget-binary/NuGet.Configuration.dll new file mode 100644 index 00000000000..cb29db8ed14 Binary files /dev/null and b/main/external/nuget-binary/NuGet.Configuration.dll differ diff --git a/main/external/nuget-binary/NuGet.DependencyResolver.Core.dll b/main/external/nuget-binary/NuGet.DependencyResolver.Core.dll new file mode 100644 index 00000000000..90be4aeef43 Binary files /dev/null and b/main/external/nuget-binary/NuGet.DependencyResolver.Core.dll differ diff --git a/main/external/nuget-binary/NuGet.Frameworks.dll b/main/external/nuget-binary/NuGet.Frameworks.dll new file mode 100644 index 00000000000..009e420ad60 Binary files /dev/null and b/main/external/nuget-binary/NuGet.Frameworks.dll differ diff --git a/main/external/nuget-binary/NuGet.Indexing.dll b/main/external/nuget-binary/NuGet.Indexing.dll new file mode 100644 index 00000000000..55f5e1bfa94 Binary files /dev/null and b/main/external/nuget-binary/NuGet.Indexing.dll differ diff --git a/main/external/nuget-binary/NuGet.LibraryModel.dll b/main/external/nuget-binary/NuGet.LibraryModel.dll new file mode 100644 index 00000000000..a70b8bf5f1a Binary files /dev/null and b/main/external/nuget-binary/NuGet.LibraryModel.dll differ diff --git a/main/external/nuget-binary/NuGet.PackageManagement.dll b/main/external/nuget-binary/NuGet.PackageManagement.dll new file mode 100644 index 00000000000..9d33be12f15 Binary files /dev/null and b/main/external/nuget-binary/NuGet.PackageManagement.dll differ diff --git a/main/external/nuget-binary/NuGet.Packaging.Core.dll b/main/external/nuget-binary/NuGet.Packaging.Core.dll new file mode 100644 index 00000000000..58a73c2c2e3 Binary files /dev/null and b/main/external/nuget-binary/NuGet.Packaging.Core.dll differ diff --git a/main/external/nuget-binary/NuGet.Packaging.dll b/main/external/nuget-binary/NuGet.Packaging.dll new file mode 100644 index 00000000000..7067e2e513c Binary files /dev/null and b/main/external/nuget-binary/NuGet.Packaging.dll differ diff --git a/main/external/nuget-binary/NuGet.ProjectModel.dll b/main/external/nuget-binary/NuGet.ProjectModel.dll new file mode 100644 index 00000000000..1be0af44d0b Binary files /dev/null and b/main/external/nuget-binary/NuGet.ProjectModel.dll differ diff --git a/main/external/nuget-binary/NuGet.Protocol.dll b/main/external/nuget-binary/NuGet.Protocol.dll new file mode 100644 index 00000000000..ea2d1f39f55 Binary files /dev/null and b/main/external/nuget-binary/NuGet.Protocol.dll differ diff --git a/main/external/nuget-binary/NuGet.Resolver.dll b/main/external/nuget-binary/NuGet.Resolver.dll new file mode 100644 index 00000000000..46d10782ecc Binary files /dev/null and b/main/external/nuget-binary/NuGet.Resolver.dll differ diff --git a/main/external/nuget-binary/NuGet.Versioning.dll b/main/external/nuget-binary/NuGet.Versioning.dll new file mode 100644 index 00000000000..9ed020685fb Binary files /dev/null and b/main/external/nuget-binary/NuGet.Versioning.dll differ diff --git a/main/external/nuget-binary/NuGetVersion-5.8.0.txt b/main/external/nuget-binary/NuGetVersion-5.8.0.txt new file mode 100644 index 00000000000..010b70ef500 --- /dev/null +++ b/main/external/nuget-binary/NuGetVersion-5.8.0.txt @@ -0,0 +1,2 @@ +These dlls have been downloaded fron NuGet Gallery and are all from release-5.8.x +Framework NET Framework 4.7.2 is currently selected for DotDevelop diff --git a/main/external/nuget-binary/README.md b/main/external/nuget-binary/README.md new file mode 100644 index 00000000000..5adc57dac1b --- /dev/null +++ b/main/external/nuget-binary/README.md @@ -0,0 +1,10 @@ + Temporary repo to hold nuget binaries for use with DotDevelop + +License: Apache License 2.0 (see NuGet-LICENSE.txt for details) + +This folder was initially an external repo as described above, and was forked into DotDevelop from the original MonoDevelop one at https://github.com/mono/nuget-binary. + +Since MonoDevelop was archived there have been no commits since 1-Dec-2018, and there seems to be no reason to continue keeping the contents as a submodule of DotDevelop. + +The advantage of changing it to a standard folder would then allow any changes to its contents - for example, updates to later releases of NuGet.Client (https://github.com/nuget/nuget.client) to be under the version control of the main DotDevelop repo. +It is being retained in the `main/external/nuget-binary` to minimise changes to the rest of the DotDevelop repo. diff --git a/main/external/nuget-binary/nuget.exe b/main/external/nuget-binary/nuget.exe new file mode 100644 index 00000000000..0e535e736e8 Binary files /dev/null and b/main/external/nuget-binary/nuget.exe differ diff --git a/main/external/vs-editor-api b/main/external/vs-editor-api index 5ce6368e5b7..71b2d6b03cc 160000 --- a/main/external/vs-editor-api +++ b/main/external/vs-editor-api @@ -1 +1 @@ -Subproject commit 5ce6368e5b71451d75a388db524e5e104e222122 +Subproject commit 71b2d6b03ccaf515f5ccfeea85999b65bd9b22b4 diff --git a/main/external/xwt b/main/external/xwt index 9a22465b52c..b191f50b079 160000 --- a/main/external/xwt +++ b/main/external/xwt @@ -1 +1 @@ -Subproject commit 9a22465b52c7dbaae321a514b046edebd6a0efb8 +Subproject commit b191f50b079c49df4426302fe84c53baeec6c721 diff --git a/main/msbuild/MDBuildTasks/MDBuildTasks.csproj b/main/msbuild/MDBuildTasks/MDBuildTasks.csproj index b736d7adc8d..8a93f9482be 100644 --- a/main/msbuild/MDBuildTasks/MDBuildTasks.csproj +++ b/main/msbuild/MDBuildTasks/MDBuildTasks.csproj @@ -4,7 +4,7 @@ bin - + diff --git a/main/msbuild/ReferencesGtk.props b/main/msbuild/ReferencesGtk.props index 00ade622658..480551d1975 100644 --- a/main/msbuild/ReferencesGtk.props +++ b/main/msbuild/ReferencesGtk.props @@ -1,10 +1,17 @@ - + + GTK_SHARP + false + false + $(DefineConstants);GTK3;GTK_SHARP - + + + + $(ReferencesGtkCopyToOutput) @@ -20,15 +27,17 @@ $(ReferencesGtkCopyToOutput) - + $(ReferencesGtkCopyToOutput) + + + + $(ReferencesGtkCopyToOutput) - - $(ReferencesGtkCopyToOutput) - + \ No newline at end of file diff --git a/main/msbuild/ReferencesVSEditor.Gtk.props b/main/msbuild/ReferencesVSEditor.Gtk.props new file mode 100644 index 00000000000..9fa95b8fcb4 --- /dev/null +++ b/main/msbuild/ReferencesVSEditor.Gtk.props @@ -0,0 +1,77 @@ + + + + false + runtime + none + none + runtime + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Release + Debug + $(VSEditorApiDirectory)bin\FPF\$(FPFConfiguration)\net472\ + + + + + + + + + + + + + diff --git a/main/src/addins/AspNet/Razor/EditorParserFixed/DisposableAction.cs b/main/src/addins/AspNet/Razor/EditorParserFixed/DisposableAction.cs index 231fc3bd430..48c6b1bf241 100644 --- a/main/src/addins/AspNet/Razor/EditorParserFixed/DisposableAction.cs +++ b/main/src/addins/AspNet/Razor/EditorParserFixed/DisposableAction.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Microsoft Public License (MS-PL) using System; @@ -13,7 +13,7 @@ public DisposableAction(Action action) { if (action == null) { - throw new ArgumentNullException("action"); + throw new ArgumentNullException(nameof(action)); } _action = action; } diff --git a/main/src/addins/AspNet/Razor/EditorParserFixed/RazorEditorParser.cs b/main/src/addins/AspNet/Razor/EditorParserFixed/RazorEditorParser.cs index bdc3002b958..1d8b82ec40e 100644 --- a/main/src/addins/AspNet/Razor/EditorParserFixed/RazorEditorParser.cs +++ b/main/src/addins/AspNet/Razor/EditorParserFixed/RazorEditorParser.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Microsoft Public License (MS-PL) using System.CodeDom; @@ -78,11 +78,11 @@ public RazorEditorParser(RazorEngineHost host, string sourceFileName) { if (host == null) { - throw new ArgumentNullException("host"); + throw new ArgumentNullException(nameof(host)); } if (String.IsNullOrEmpty(sourceFileName)) { - throw new ArgumentException(CommonResources.Argument_Cannot_Be_Null_Or_Empty, "sourceFileName"); + throw new ArgumentException(CommonResources.Argument_Cannot_Be_Null_Or_Empty, nameof(sourceFileName)); } Host = host; diff --git a/main/src/addins/AspNet/Razor/Generator/FileUtil.cs b/main/src/addins/AspNet/Razor/Generator/FileUtil.cs index cd90db11f78..14ad0d242bf 100644 --- a/main/src/addins/AspNet/Razor/Generator/FileUtil.cs +++ b/main/src/addins/AspNet/Razor/Generator/FileUtil.cs @@ -1,4 +1,4 @@ -// +// // FileUtil.cs // // Author: @@ -115,7 +115,7 @@ static bool IsSeparator (char ch) static string GetFullPath (string path) { if (path == null) - throw new ArgumentNullException ("path"); + throw new ArgumentNullException (nameof(path)); if (!isWindows || path.IndexOf ('*') == -1) return Path.GetFullPath (path); else { diff --git a/main/src/addins/AspNet/Razor/Generator/PreprocessedRazorHost.cs b/main/src/addins/AspNet/Razor/Generator/PreprocessedRazorHost.cs index d636cf94a40..258fd2fa6d5 100644 --- a/main/src/addins/AspNet/Razor/Generator/PreprocessedRazorHost.cs +++ b/main/src/addins/AspNet/Razor/Generator/PreprocessedRazorHost.cs @@ -25,7 +25,7 @@ class PreprocessedRazorHost : RazorEngineHost public PreprocessedRazorHost (string fullPath) : base (RazorCodeLanguage.GetLanguageByExtension (".cshtml")) { if (fullPath == null) - throw new ArgumentNullException ("fullPath"); + throw new ArgumentNullException (nameof(fullPath)); FullPath = fullPath; _codeDomProvider = new Microsoft.CSharp.CSharpCodeProvider (); diff --git a/main/src/addins/AspNet/WebForms/CSharp/CSharpProjector.cs b/main/src/addins/AspNet/WebForms/CSharp/CSharpProjector.cs index 3bf093be49d..dc56d6ec18f 100644 --- a/main/src/addins/AspNet/WebForms/CSharp/CSharpProjector.cs +++ b/main/src/addins/AspNet/WebForms/CSharp/CSharpProjector.cs @@ -1,4 +1,4 @@ -// +// // CSharpProjector.cs // // Author: @@ -39,9 +39,9 @@ public class CSharpProjector public Task CreateProjection (DocumentInfo info, IReadonlyTextDocument data, bool buildExpressions) { if (info == null) - throw new ArgumentNullException ("info"); + throw new ArgumentNullException (nameof(info)); if (data == null) - throw new ArgumentNullException ("data"); + throw new ArgumentNullException (nameof(data)); var document = new StringBuilder (); WriteUsings (info.Imports, document); diff --git a/main/src/addins/CSharpBinding/CSharpBinding.csproj b/main/src/addins/CSharpBinding/CSharpBinding.csproj index c4fcfe81388..9d445c25a9a 100644 --- a/main/src/addins/CSharpBinding/CSharpBinding.csproj +++ b/main/src/addins/CSharpBinding/CSharpBinding.csproj @@ -124,6 +124,7 @@ + @@ -232,6 +233,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -300,4 +321,4 @@ - \ No newline at end of file + diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs index 68c67dd1fa5..09af0d0a245 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs @@ -1,4 +1,4 @@ -// +// // CSharpFormattingPolicy.cs // // Author: @@ -116,7 +116,7 @@ static CSharpFormattingPolicy () public CSharpFormattingPolicy (OptionSet options) { if (options == null) - throw new ArgumentNullException ("options"); + throw new ArgumentNullException (nameof(options)); this.options = options; } diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/AbstractKeywordHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/AbstractKeywordHighlighter.cs new file mode 100644 index 00000000000..214638a3015 --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/AbstractKeywordHighlighter.cs @@ -0,0 +1,76 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using ICSharpCode.NRefactory6.CSharp; +using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; + +namespace Microsoft.CodeAnalysis.Editor.Implementation.Highlighting +{ + interface IHighlighter + { + IEnumerable GetHighlights ( + SyntaxNode root, int position, CancellationToken cancellationToken); + + } + internal abstract class AbstractKeywordHighlighter : IHighlighter + where TNode : SyntaxNode + { + public IEnumerable GetHighlights( + SyntaxNode root, int position, CancellationToken cancellationToken) + { + foreach (var token in GetTokens(root, position)) + { + for (var parent = token.Parent; parent != null; parent = parent.Parent) + { + if (parent is TNode) + { + var highlights = GetHighlights((TNode)parent, cancellationToken); + + // Only return them if any of them matched + if (highlights.Any(span => span.IntersectsWith(position))) + { + // Return the non-empty spans + return highlights.Where(s => !s.IsEmpty).Distinct(); + } + } + } + } + + return SpecializedCollections.EmptyEnumerable(); + } + + protected abstract IEnumerable GetHighlights(TNode node, CancellationToken cancellationToken); + + protected TextSpan EmptySpan(int position) + { + return new TextSpan(position, 0); + } + + internal static IEnumerable GetTokens( + SyntaxNode root, + int position) + { + foreach (var token in GetTokens (root, position, findInsideTrivia: true)) + yield return token; + + foreach (var token in GetTokens (root, position, findInsideTrivia: false)) + yield return token; + } + + private static IEnumerable GetTokens( + SyntaxNode root, + int position, + bool findInsideTrivia) + { + yield return root.FindToken(position - 0, findInsideTrivia); + + if (position > 0) + { + yield return root.FindToken(position - 1, findInsideTrivia); + } + } + } +} \ No newline at end of file diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs index a8c7f2c205b..44d9627e547 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs @@ -1,21 +1,21 @@ -// +// // HighlightUsagesExtension.cs -// +// // Author: // Mike Krüger -// +// // Copyright (c) 2010 Novell, Inc (http://www.novell.com) -// +// // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal // in the Software without restriction, including without limitation the rights // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell // copies of the Software, and to permit persons to whom the Software is // furnished to do so, subject to the following conditions: -// +// // The above copyright notice and this permission notice shall be included in // all copies or substantial portions of the Software. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -49,21 +49,45 @@ using MonoDevelop.Refactoring; using MonoDevelop.CSharp.Refactoring; using MonoDevelop.Ide.Editor.Highlighting; -using Microsoft.CodeAnalysis.DocumentHighlighting; -using Microsoft.VisualStudio.Platform; -using MonoDevelop.Ide.Composition; + +// oe REVERTED from oe-20180406-7.4.3.8-dd to fix editor highlighting. +// oe REVERTED from oe-20180406-7.4.3.8-dd to fix editor highlighting. +// oe REVERTED from oe-20180406-7.4.3.8-dd to fix editor highlighting. namespace MonoDevelop.CSharp.Highlighting { - class HighlightUsagesExtension : AbstractUsagesExtension> + class UsageData { - IDocumentHighlightsService highlightsService; + public RefactoringSymbolInfo SymbolInfo; + public Document Document; + public int Offset; + public ISymbol Symbol { + get { return SymbolInfo != null ? SymbolInfo.Symbol ?? SymbolInfo.DeclaredSymbol : null; } + } + } + + class HighlightUsagesExtension : AbstractUsagesExtension + { + static IHighlighter [] highlighters; + + static HighlightUsagesExtension () + { + try { + highlighters = typeof (HighlightUsagesExtension).Assembly + .GetTypes () + .Where (t => !t.IsAbstract && typeof (IHighlighter).IsAssignableFrom (t)) + .Select (Activator.CreateInstance) + .Cast () + .ToArray (); + } catch (Exception e) { + LoggingService.LogError ("Error while loading highlighters.", e); + highlighters = Array.Empty (); + } + } protected override void Initialize () { base.Initialize (); - highlightsService = DocumentContext.RoslynWorkspace.Services.GetLanguageServices (LanguageNames.CSharp).GetService (); - Editor.SetSelectionSurroundingProvider (new CSharpSelectionSurroundingProvider (Editor, DocumentContext)); fallbackHighlighting = Editor.SyntaxHighlighting; UpdateHighlighting (); @@ -85,9 +109,10 @@ void UpdateHighlighting () Editor.SyntaxHighlighting = fallbackHighlighting; return; } - var old = Editor.SyntaxHighlighting as TagBasedSyntaxHighlighting; - if (old == null) { - Editor.SyntaxHighlighting = CompositionManager.Instance.GetExportedValue ().CreateSyntaxHighlighting (Editor.TextView, "source.cs"); + var old = Editor.SyntaxHighlighting as RoslynClassificationHighlighting; + if (old == null || old.DocumentId != DocumentContext.AnalysisDocument.Id) { + Editor.SyntaxHighlighting = new RoslynClassificationHighlighting ((MonoDevelopWorkspace)DocumentContext.RoslynWorkspace, + DocumentContext.AnalysisDocument.Id, "source.cs"); } } @@ -98,40 +123,151 @@ public override void Dispose () base.Dispose (); } - protected async override Task> ResolveAsync (CancellationToken token) + protected async override Task ResolveAsync (CancellationToken token) { + var doc = IdeApp.Workbench.ActiveDocument; + //old if (doc == null || doc.FileName == FilePath.Null) + if (doc == null || doc.FilePath == FilePath.Null) + return new UsageData (); + + //old var analysisDocument = doc.AnalysisDocument; var analysisDocument = DocumentContext?.AnalysisDocument; if (analysisDocument == null) - return ImmutableArray.Empty; + return new UsageData (); + + //old var symbolInfo = await RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor, token); + var symbolInfo = await RefactoringSymbolInfo.GetSymbolInfoAsync (DocumentContext, Editor, token); + if (symbolInfo.Symbol == null && symbolInfo.DeclaredSymbol == null) + return new UsageData { + Document = analysisDocument, + //old Offset = doc.Editor.CaretOffset + Offset = Editor.CaretOffset + }; - return await highlightsService.GetDocumentHighlightsAsync (analysisDocument, Editor.CaretOffset, ImmutableHashSet.Empty.Add (analysisDocument), token); + if (symbolInfo.Symbol != null && !symbolInfo.Node.IsKind (SyntaxKind.IdentifierName) && !symbolInfo.Node.IsKind (SyntaxKind.GenericName)) + return new UsageData (); + + return new UsageData { + Document = analysisDocument, + SymbolInfo = symbolInfo, + //old Offset = doc.Editor.CaretOffset + Offset = Editor.CaretOffset + }; } - protected override Task> GetReferencesAsync (ImmutableArray resolveResult, CancellationToken token) + protected override async Task> GetReferencesAsync (UsageData resolveResult, CancellationToken token) { var result = new List (); - foreach (var highlight in resolveResult) { - foreach (var span in highlight.HighlightSpans) { - result.Add (new MemberReference (highlight, highlight.Document.FilePath, span.TextSpan.Start, span.TextSpan.Length) { - ReferenceUsageType = ConvertKind (span.Kind) + if (resolveResult.Symbol == null) { + if (resolveResult.Document == null) + return result; + var root = await resolveResult.Document.GetSyntaxRootAsync (token).ConfigureAwait (false); + var doc2 = resolveResult.Document; + var offset = resolveResult.Offset; + if (!root.Span.Contains (offset)) + return result; + foreach (var highlighter in highlighters) { + try { + foreach (var span in highlighter.GetHighlights (root, offset, token)) { + result.Add (new MemberReference (span, doc2.FilePath, span.Start, span.Length) { + ReferenceUsageType = ReferenceUsageType.Keyword + }); + } + } catch (Exception e) { + LoggingService.LogError ("Highlighter " + highlighter + " threw exception.", e); + } + } + return result; + } + + var doc = resolveResult.Document; + var documents = ImmutableHashSet.Create (doc); + + //rev foreach (var symbol in await CSharpFindReferencesProvider.GatherSymbols (resolveResult.Symbol, resolveResult.Document.Project.Solution, token)) { + var tmp1 = Microsoft.CodeAnalysis.FindSymbols.SymbolAndProjectId.Create( resolveResult.Symbol, resolveResult.Document.Project.Id ); + foreach (var symbol in await CSharpFindReferencesProvider.GatherSymbols (tmp1, resolveResult.Document.Project.Solution, token)) { + // "symbol" old type is ISymbol but new type is SymbolAndProjectId. + //rev foreach (var loc in symbol.Locations) { + foreach (var loc in symbol.Symbol.Locations) { + if (loc.IsInSource && loc.SourceTree.FilePath == doc.FilePath) + result.Add (new MemberReference (symbol, doc.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length) { + ReferenceUsageType = ReferenceUsageType.Declaration + }); + } + + //rev foreach (var mref in await SymbolFinder.FindReferencesAsync (symbol, DocumentContext.AnalysisDocument.Project.Solution, documents, token)) { + foreach (var mref in await SymbolFinder.FindReferencesAsync (symbol.Symbol, DocumentContext.AnalysisDocument.Project.Solution, documents, token)) { + foreach (var loc in mref.Locations) { + Microsoft.CodeAnalysis.Text.TextSpan span = loc.Location.SourceSpan; + var root = loc.Location.SourceTree.GetRoot (); + var node = root.FindNode (loc.Location.SourceSpan); + var trivia = root.FindTrivia (loc.Location.SourceSpan.Start); + if (!trivia.IsKind (SyntaxKind.SingleLineDocumentationCommentTrivia)) { + span = node.Span; + } + + if (span.Start != loc.Location.SourceSpan.Start) { + span = loc.Location.SourceSpan; + } + result.Add (new MemberReference (symbol, doc.FilePath, span.Start, span.Length) { + ReferenceUsageType = GetUsage (node) + }); + } + } + + //rev foreach (var loc in await GetAdditionalReferencesAsync (doc, symbol, token)) { + foreach (var loc in await GetAdditionalReferencesAsync (doc, symbol.Symbol, token)) { + result.Add (new MemberReference (symbol, doc.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length) { + ReferenceUsageType = ReferenceUsageType.Write }); } } - return Task.FromResult((IEnumerable)result); + + return result; } - static ReferenceUsageType ConvertKind (HighlightSpanKind kind) + async Task> GetAdditionalReferencesAsync (Document document, ISymbol symbol, CancellationToken cancellationToken) { - switch (kind) { - case HighlightSpanKind.Definition: - return ReferenceUsageType.Declaration; - case HighlightSpanKind.Reference: - return ReferenceUsageType.Read; - case HighlightSpanKind.WrittenReference: - return ReferenceUsageType.ReadWrite; - default: - return ReferenceUsageType.Unknown; + // The FindRefs engine won't find references through 'var' for performance reasons. + // Also, they are not needed for things like rename/sig change, and the normal find refs + // feature. However, we would lke the results to be highlighted to get a good experience + // while editing (especially since highlighting may have been invoked off of 'var' in + // the first place). + // + // So we look for the references through 'var' directly in this file and add them to the + // results found by the engine. + List results = null; + + if (symbol is INamedTypeSymbol && symbol.Name != "var") { + var originalSymbol = symbol.OriginalDefinition; + var root = await document.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false); + + var descendents = root.DescendantNodes (); + var semanticModel = default (SemanticModel); + + foreach (var type in descendents.OfType ()) { + cancellationToken.ThrowIfCancellationRequested (); + + if (type.IsVar) { + if (semanticModel == null) { + semanticModel = await document.GetSemanticModelAsync (cancellationToken).ConfigureAwait (false); + } + + var boundSymbol = semanticModel.GetSymbolInfo (type, cancellationToken).Symbol; + boundSymbol = boundSymbol == null ? null : boundSymbol.OriginalDefinition; + + if (originalSymbol.Equals (boundSymbol)) { + if (results == null) { + results = new List (); + } + + results.Add (type.GetLocation ()); + } + } + } } + + return results ?? SpecializedCollections.EmptyEnumerable (); } internal static ReferenceUsageType GetUsage (SyntaxNode node) @@ -148,5 +284,7 @@ internal static ReferenceUsageType GetUsage (SyntaxNode node) return ReferenceUsageType.ReadWrite; return ReferenceUsageType.Read; } + } -} \ No newline at end of file +} + diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AbstractAsyncHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AbstractAsyncHighlighter.cs new file mode 100644 index 00000000000..5342e80f7a8 --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AbstractAsyncHighlighter.cs @@ -0,0 +1,87 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Linq; +using ICSharpCode.NRefactory6; +using ICSharpCode.NRefactory6.CSharp; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Extensions; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; +using Microsoft.CodeAnalysis.Shared.Extensions; +using Microsoft.CodeAnalysis.Text; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal abstract class AbstractAsyncHighlighter : AbstractKeywordHighlighter where TNode : SyntaxNode + { + protected void HighlightRelatedKeywords(SyntaxNode node, List spans) + { + // Highlight async keyword + node.TypeSwitch( + (MethodDeclarationSyntax methodDeclaration) => + { + var asyncModifier = methodDeclaration.Modifiers.FirstOrDefault(m => m.Kind() == SyntaxKind.AsyncKeyword); + if (asyncModifier.Kind() != SyntaxKind.None) + { + spans.Add(asyncModifier.Span); + } + }, + (SimpleLambdaExpressionSyntax simpleLambda) => + { + if (simpleLambda.AsyncKeyword.Kind() == SyntaxKind.AsyncKeyword) + { + spans.Add(simpleLambda.AsyncKeyword.Span); + } + }, + (ParenthesizedLambdaExpressionSyntax parenthesizedLambda) => + { + if (parenthesizedLambda.AsyncKeyword.Kind() == SyntaxKind.AsyncKeyword) + { + spans.Add(parenthesizedLambda.AsyncKeyword.Span); + } + }, + (AnonymousMethodExpressionSyntax anonymousMethod) => + { + if (anonymousMethod.AsyncKeyword.Kind() == SyntaxKind.AsyncKeyword) + { + spans.Add(anonymousMethod.AsyncKeyword.Span); + } + }); + + // Highlight await keywords + var awaitExpression = node as AwaitExpressionSyntax; + if (awaitExpression != null) { + // Note if there is already a highlight for the previous token, merge it + // with this span. That way, we highlight nested awaits with a single span. + var handled = false; + var awaitToken = awaitExpression.AwaitKeyword; + var previousToken = awaitToken.GetPreviousToken(); + if (!previousToken.Span.IsEmpty) + { + var index = spans.FindIndex(s => s.Contains(previousToken.Span)); + if (index >= 0) + { + var span = spans[index]; + spans[index] = TextSpan.FromBounds(span.Start, awaitToken.Span.End); + handled = true; + } + } + + if (!handled) + { + spans.Add(awaitToken.Span); + } + }; + + foreach (var child in node.ChildNodes()) + { + // Only recurse if we have anything to do + if (!child.IsReturnableConstruct()) + { + HighlightRelatedKeywords(child, spans); + } + } + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncAnonymousMethodHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncAnonymousMethodHighlighter.cs new file mode 100644 index 00000000000..7861625b17f --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncAnonymousMethodHighlighter.cs @@ -0,0 +1,29 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Threading; +using ICSharpCode.NRefactory6.CSharp; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class AsyncAnonymousMethodHighlighter : AbstractAsyncHighlighter + { + protected override IEnumerable GetHighlights(AnonymousMethodExpressionSyntax node, CancellationToken cancellationToken) + { + if (node.AsyncKeyword.Kind() != SyntaxKind.AsyncKeyword) + { + return SpecializedCollections.EmptyEnumerable(); + } + + var spans = new List(); + + HighlightRelatedKeywords(node, spans); + + return spans; + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncMethodHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncMethodHighlighter.cs new file mode 100644 index 00000000000..eaa20b27e33 --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncMethodHighlighter.cs @@ -0,0 +1,29 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Threading; +using ICSharpCode.NRefactory6.CSharp; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class AsyncMethodHighlighter : AbstractAsyncHighlighter + { + protected override IEnumerable GetHighlights(MethodDeclarationSyntax node, CancellationToken cancellationToken) + { + if (!node.Modifiers.Any(SyntaxKind.AsyncKeyword)) + { + return SpecializedCollections.EmptyEnumerable(); + } + + var spans = new List(); + + HighlightRelatedKeywords(node, spans); + + return spans; + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncParenthesizedLambdaHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncParenthesizedLambdaHighlighter.cs new file mode 100644 index 00000000000..81e1d4a9908 --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncParenthesizedLambdaHighlighter.cs @@ -0,0 +1,29 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Threading; +using ICSharpCode.NRefactory6.CSharp; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class AsyncParenthesizedLambdaHighlighter : AbstractAsyncHighlighter + { + protected override IEnumerable GetHighlights(ParenthesizedLambdaExpressionSyntax node, CancellationToken cancellationToken) + { + if (node.AsyncKeyword.Kind() != SyntaxKind.AsyncKeyword) + { + return SpecializedCollections.EmptyEnumerable(); + } + + var spans = new List(); + + HighlightRelatedKeywords(node, spans); + + return spans; + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncSimpleLambdaHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncSimpleLambdaHighlighter.cs new file mode 100644 index 00000000000..d6ecbea7d75 --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncSimpleLambdaHighlighter.cs @@ -0,0 +1,29 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Threading; +using ICSharpCode.NRefactory6.CSharp; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class AsyncSimpleLambdaHighlighter : AbstractAsyncHighlighter + { + protected override IEnumerable GetHighlights(SimpleLambdaExpressionSyntax node, CancellationToken cancellationToken) + { + if (node.AsyncKeyword.Kind() != SyntaxKind.AsyncKeyword) + { + return SpecializedCollections.EmptyEnumerable(); + } + + var spans = new List(); + + HighlightRelatedKeywords(node, spans); + + return spans; + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AwaitHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AwaitHighlighter.cs new file mode 100644 index 00000000000..8dfb69f7dce --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AwaitHighlighter.cs @@ -0,0 +1,35 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using ICSharpCode.NRefactory6.CSharp; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Extensions; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class AwaitHighlighter : AbstractAsyncHighlighter + { + protected override IEnumerable GetHighlights(AwaitExpressionSyntax awaitExpression, CancellationToken cancellationToken) + { + var parent = awaitExpression + .AncestorsAndSelf() + .FirstOrDefault(n => n.IsReturnableConstruct()); + + if (parent == null) + { + return SpecializedCollections.EmptyEnumerable(); + } + + var spans = new List(); + + HighlightRelatedKeywords(parent, spans); + + return spans; + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/CheckedExpressionHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/CheckedExpressionHighlighter.cs new file mode 100644 index 00000000000..0a5e8991dad --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/CheckedExpressionHighlighter.cs @@ -0,0 +1,28 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Threading; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; +using Microsoft.CodeAnalysis.Text; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class CheckedExpressionHighlighter : AbstractKeywordHighlighter + { + protected override IEnumerable GetHighlights( + CheckedExpressionSyntax checkedExpressionSyntax, CancellationToken cancellationToken) + { + switch (checkedExpressionSyntax.Kind()) + { + case SyntaxKind.CheckedExpression: + case SyntaxKind.UncheckedExpression: + yield return checkedExpressionSyntax.Keyword.Span; + break; + default: + yield break; + } + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/CheckedStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/CheckedStatementHighlighter.cs new file mode 100644 index 00000000000..12f5349a120 --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/CheckedStatementHighlighter.cs @@ -0,0 +1,19 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; +using Microsoft.CodeAnalysis.Text; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class CheckedStatementHighlighter : AbstractKeywordHighlighter + { + protected override IEnumerable GetHighlights( + CheckedStatementSyntax checkedStatement, CancellationToken cancellationToken) + { + yield return checkedStatement.Keyword.Span; + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/ConditionalPreprocessorHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/ConditionalPreprocessorHighlighter.cs new file mode 100644 index 00000000000..eb3695b9c79 --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/ConditionalPreprocessorHighlighter.cs @@ -0,0 +1,32 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Extensions; +using Microsoft.CodeAnalysis.Shared.Extensions; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; +using Microsoft.CodeAnalysis.Text; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class ConditionalPreprocessorHighlighter : AbstractKeywordHighlighter + { + protected override IEnumerable GetHighlights( + DirectiveTriviaSyntax directive, CancellationToken cancellationToken) + { + var conditionals = directive.GetMatchingConditionalDirectives(cancellationToken); + if (conditionals == null) + { + yield break; + } + + foreach (var conditional in conditionals) + { + yield return TextSpan.FromBounds( + conditional.HashToken.SpanStart, + conditional.DirectiveNameToken.Span.End); + } + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/IfStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/IfStatementHighlighter.cs new file mode 100644 index 00000000000..0063878bbc2 --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/IfStatementHighlighter.cs @@ -0,0 +1,75 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using ICSharpCode.NRefactory6.CSharp; +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Extensions; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; +using Microsoft.CodeAnalysis.Text; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting +{ + internal class IfStatementHighlighter : AbstractKeywordHighlighter + { + protected override IEnumerable GetHighlights( + IfStatementSyntax ifStatement, CancellationToken cancellationToken) + { + if (ifStatement.Parent.Kind() != SyntaxKind.ElseClause) + { + return ComputeSpans(ifStatement); + } + + return Enumerable.Empty(); + } + + private IEnumerable ComputeSpans( + IfStatementSyntax ifStatement) + { + yield return ifStatement.IfKeyword.Span; + + // Loop to get all the else if parts + while (ifStatement != null && ifStatement.Else != null) + { + // Check for 'else if' scenario' (the statement in the else clause is an if statement) + var elseKeyword = ifStatement.Else.ElseKeyword; + var elseIfStatement = ifStatement.Else.Statement as IfStatementSyntax; + + if (elseIfStatement != null) + { + if (OnlySpacesBetween(elseKeyword, elseIfStatement.IfKeyword)) + { + // Highlight both else and if tokens if they are on the same line + yield return TextSpan.FromBounds( + elseKeyword.SpanStart, + elseIfStatement.IfKeyword.Span.End); + } + else + { + // Highlight the else and if tokens separately + yield return elseKeyword.Span; + yield return elseIfStatement.IfKeyword.Span; + } + + // Continue the enumeration looking for more else blocks + ifStatement = elseIfStatement; + } + else + { + // Highlight just the else and we're done + yield return elseKeyword.Span; + break; + } + } + } + + public static bool OnlySpacesBetween(SyntaxToken first, SyntaxToken second) + { + return first.TrailingTrivia.AsString().All(c => c == ' ') && + second.LeadingTrivia.AsString().All(c => c == ' '); + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/LockStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/LockStatementHighlighter.cs new file mode 100644 index 00000000000..217da2a1a26 --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/LockStatementHighlighter.cs @@ -0,0 +1,19 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; +using Microsoft.CodeAnalysis.Text; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class LockStatementHighlighter : AbstractKeywordHighlighter + { + protected override IEnumerable GetHighlights( + LockStatementSyntax lockStatement, CancellationToken cancellationToken) + { + yield return lockStatement.LockKeyword.Span; + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/LoopHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/LoopHighlighter.cs new file mode 100644 index 00000000000..24e56c8c5cd --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/LoopHighlighter.cs @@ -0,0 +1,118 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Threading; +using ICSharpCode.NRefactory6.CSharp; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Extensions; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; +using Microsoft.CodeAnalysis.Shared.Extensions; +using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class LoopHighlighter : AbstractKeywordHighlighter + { + protected override IEnumerable GetHighlights( + SyntaxNode node, CancellationToken cancellationToken) + { + var loop = node.GetAncestorsOrThis() + .FirstOrDefault(ancestor => ancestor.IsContinuableConstruct()); + + if (loop != null) + { + return KeywordHighlightsForLoop(loop); + } + + return SpecializedCollections.EmptyEnumerable(); + } + + private IEnumerable KeywordHighlightsForLoop(SyntaxNode loopNode) + { + var spans = new List(); + + switch (loopNode.Kind()) + { + case SyntaxKind.DoStatement: + HighlightDoStatement((DoStatementSyntax)loopNode, spans); + break; + case SyntaxKind.ForStatement: + HighlightForStatement((ForStatementSyntax)loopNode, spans); + break; + + case SyntaxKind.ForEachStatement: + HighlightForEachStatement((ForEachStatementSyntax)loopNode, spans); + break; + + case SyntaxKind.WhileStatement: + HighlightWhileStatement((WhileStatementSyntax)loopNode, spans); + break; + } + + HighlightRelatedKeywords(loopNode, spans, true, true); + + return spans; + } + + private void HighlightDoStatement(DoStatementSyntax statement, List spans) + { + spans.Add(statement.DoKeyword.Span); + spans.Add(statement.WhileKeyword.Span); + spans.Add(EmptySpan(statement.SemicolonToken.Span.End)); + } + + private void HighlightForStatement(ForStatementSyntax statement, List spans) + { + spans.Add(statement.ForKeyword.Span); + } + + private void HighlightForEachStatement(ForEachStatementSyntax statement, List spans) + { + spans.Add(statement.ForEachKeyword.Span); + } + + private void HighlightWhileStatement(WhileStatementSyntax statement, List spans) + { + spans.Add(statement.WhileKeyword.Span); + } + + /// + /// Finds all breaks and continues that are a child of this node, and adds the appropriate spans to the spans list. + /// + private void HighlightRelatedKeywords(SyntaxNode node, List spans, bool highlightBreaks, bool highlightContinues) + { + Debug.Assert(highlightBreaks || highlightContinues); + + if (highlightBreaks && node is BreakStatementSyntax) + { + var statement = (BreakStatementSyntax)node; + spans.Add(statement.BreakKeyword.Span); + spans.Add(EmptySpan(statement.SemicolonToken.Span.End)); + } + else if (highlightContinues && node is ContinueStatementSyntax) + { + var statement = (ContinueStatementSyntax)node; + spans.Add(statement.ContinueKeyword.Span); + spans.Add(EmptySpan(statement.SemicolonToken.Span.End)); + } + else + { + foreach (var child in node.ChildNodes()) + { + var highlightBreaksForChild = highlightBreaks && !child.IsBreakableConstruct(); + var highlightContinuesForChild = highlightContinues && !child.IsContinuableConstruct(); + + // Only recurse if we have anything to do + if (highlightBreaksForChild || highlightContinuesForChild) + { + HighlightRelatedKeywords(child, spans, highlightBreaksForChild, highlightContinuesForChild); + } + } + } + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/RegionHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/RegionHighlighter.cs new file mode 100644 index 00000000000..07d918d95de --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/RegionHighlighter.cs @@ -0,0 +1,33 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Threading; +using ICSharpCode.NRefactory6.CSharp; +using Microsoft.CodeAnalysis.CSharp.Extensions; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; +using Microsoft.CodeAnalysis.Text; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class RegionHighlighter : AbstractKeywordHighlighter + { + protected override IEnumerable GetHighlights( + DirectiveTriviaSyntax directive, CancellationToken cancellationToken) + { + var matchingDirective = directive.GetMatchingDirective(cancellationToken); + if (matchingDirective == null) + { + yield break; + } + + yield return TextSpan.FromBounds( + directive.HashToken.SpanStart, + directive.DirectiveNameToken.Span.End); + + yield return TextSpan.FromBounds( + matchingDirective.HashToken.SpanStart, + matchingDirective.DirectiveNameToken.Span.End); + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/ReturnStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/ReturnStatementHighlighter.cs new file mode 100644 index 00000000000..32d42b280fb --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/ReturnStatementHighlighter.cs @@ -0,0 +1,54 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Extensions; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; +using Microsoft.CodeAnalysis.Shared.Extensions; +using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class ReturnStatementHighlighter : AbstractKeywordHighlighter + { + protected override IEnumerable GetHighlights ( + ReturnStatementSyntax returnStatement, CancellationToken cancellationToken) + { + var parent = returnStatement + .GetAncestorsOrThis () + .FirstOrDefault (n => n.IsReturnableConstruct ()); + + if (parent == null) { + return SpecializedCollections.EmptyEnumerable (); + } + + var spans = new List (); + + HighlightRelatedKeywords (parent, spans); + + return spans; + } + + /// + /// Finds all returns that are children of this node, and adds the appropriate spans to the spans list. + /// + private void HighlightRelatedKeywords (SyntaxNode node, List spans) + { + var statement = node as ReturnStatementSyntax; + if (statement != null) { + spans.Add (statement.ReturnKeyword.Span); + spans.Add (EmptySpan (statement.SemicolonToken.Span.End)); + } else { + foreach (var child in node.ChildNodes ()) { + // Only recurse if we have anything to do + if (!child.IsReturnableConstruct ()) { + HighlightRelatedKeywords (child, spans); + } + } + } + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/SwitchStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/SwitchStatementHighlighter.cs new file mode 100644 index 00000000000..626bd299e0b --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/SwitchStatementHighlighter.cs @@ -0,0 +1,76 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Threading; +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Extensions; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; +using Microsoft.CodeAnalysis.Shared.Extensions; +using Microsoft.CodeAnalysis.Text; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class SwitchStatementHighlighter : AbstractKeywordHighlighter + { + protected override IEnumerable GetHighlights( + SwitchStatementSyntax switchStatement, CancellationToken cancellationToken) + { + var spans = new List(); + + spans.Add(switchStatement.SwitchKeyword.Span); + + foreach (var switchSection in switchStatement.Sections) + { + foreach (var label in switchSection.Labels) + { + spans.Add(label.Keyword.Span); + spans.Add(EmptySpan(label.ColonToken.Span.End)); + } + + foreach (var statement in switchSection.Statements) + { + HighlightRelatedKeywords(statement, spans); + } + } + + return spans; + } + + /// + /// Finds all breaks and continues that are a child of this node, and adds the appropriate spans to the spans + /// list. + /// + private void HighlightRelatedKeywords(SyntaxNode node, List spans) + { + node.TypeSwitch( + (BreakStatementSyntax breakStatement) => + { + spans.Add(breakStatement.BreakKeyword.Span); + spans.Add(EmptySpan(breakStatement.SemicolonToken.Span.End)); + }, + (GotoStatementSyntax gotoStatement) => + { + var start = gotoStatement.GotoKeyword.SpanStart; + var end = !gotoStatement.CaseOrDefaultKeyword.IsKind(SyntaxKind.None) + ? gotoStatement.CaseOrDefaultKeyword.Span.End + : gotoStatement.GotoKeyword.Span.End; + + spans.Add(TextSpan.FromBounds(start, end)); + spans.Add(EmptySpan(gotoStatement.SemicolonToken.Span.End)); + }, + _ => + { + foreach (var child in node.ChildNodes()) + { + // Only recurse if we have anything to do + if (child.IsBreakableConstruct()) + { + HighlightRelatedKeywords(child, spans); + } + } + }); + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/TryStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/TryStatementHighlighter.cs new file mode 100644 index 00000000000..f84041102c8 --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/TryStatementHighlighter.cs @@ -0,0 +1,34 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; +using Microsoft.CodeAnalysis.Text; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class TryStatementHighlighter : AbstractKeywordHighlighter + { + protected override IEnumerable GetHighlights( + TryStatementSyntax tryStatement, CancellationToken cancellationToken) + { + yield return tryStatement.TryKeyword.Span; + + foreach (var catchDeclaration in tryStatement.Catches) + { + yield return catchDeclaration.CatchKeyword.Span; + + if (catchDeclaration.Filter != null) + { + yield return catchDeclaration.Filter.WhenKeyword.Span; + } + } + + if (tryStatement.Finally != null) + { + yield return tryStatement.Finally.FinallyKeyword.Span; + } + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/UnsafeStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/UnsafeStatementHighlighter.cs new file mode 100644 index 00000000000..04834ab3cc8 --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/UnsafeStatementHighlighter.cs @@ -0,0 +1,19 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; +using Microsoft.CodeAnalysis.Text; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class UnsafeStatementHighlighter : AbstractKeywordHighlighter + { + protected override IEnumerable GetHighlights( + UnsafeStatementSyntax unsafeStatement, CancellationToken cancellationToken) + { + yield return unsafeStatement.UnsafeKeyword.Span; + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/UsingStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/UsingStatementHighlighter.cs new file mode 100644 index 00000000000..c6ad88d6139 --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/UsingStatementHighlighter.cs @@ -0,0 +1,19 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Threading; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; +using Microsoft.CodeAnalysis.Text; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class UsingStatementHighlighter : AbstractKeywordHighlighter + { + protected override IEnumerable GetHighlights( + UsingStatementSyntax usingStatement, CancellationToken cancellationToken) + { + yield return usingStatement.UsingKeyword.Span; + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/YieldStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/YieldStatementHighlighter.cs new file mode 100644 index 00000000000..c377cb819f0 --- /dev/null +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/YieldStatementHighlighter.cs @@ -0,0 +1,62 @@ +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using ICSharpCode.NRefactory6; +using ICSharpCode.NRefactory6.CSharp; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Extensions; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting; +using Microsoft.CodeAnalysis.Shared.Extensions; +using Microsoft.CodeAnalysis.Text; +using Roslyn.Utilities; + +namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters +{ + internal class YieldStatementHighlighter : AbstractKeywordHighlighter + { + protected override IEnumerable GetHighlights( + YieldStatementSyntax yieldStatement, CancellationToken cancellationToken) + { + var parent = yieldStatement + .GetAncestorsOrThis() + .FirstOrDefault(n => n.IsReturnableConstruct()); + + if (parent == null) + { + return SpecializedCollections.EmptyEnumerable(); + } + + var spans = new List(); + + HighlightRelatedKeywords(parent, spans); + + return spans; + } + + /// + /// Finds all returns that are children of this node, and adds the appropriate spans to the spans list. + /// + private void HighlightRelatedKeywords(SyntaxNode node, List spans) + { + var statement = node as YieldStatementSyntax; + if (statement != null) { + spans.Add ( + TextSpan.FromBounds ( + statement.YieldKeyword.SpanStart, + statement.ReturnOrBreakKeyword.Span.End)); + + spans.Add (EmptySpan (statement.SemicolonToken.Span.End)); + } else { + foreach (var child in node.ChildNodes ()) { + // Only recurse if we have anything to do + if (!child.IsReturnableConstruct ()) { + HighlightRelatedKeywords (child, spans); + } + } + } + } + } +} diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs index 733744f93a2..156ebc5077a 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs @@ -1,4 +1,4 @@ -// +// // CSharpCodeGenerator.cs // // Author: @@ -322,7 +322,7 @@ public static CodeGeneratorMemberResult CreatePartialMemberImplementation(Docume static void AppendReturnType(StringBuilder result, CodeGenerationOptions options, ITypeSymbol type) { if (type == null) - throw new ArgumentNullException("type"); + throw new ArgumentNullException(nameof(type)); result.Append(CSharpAmbience.SafeMinimalDisplayString (type, options.SemanticModel, options.Part.SourceSpan.Start, Ambience.LabelFormat)); // var implementingType = options.Part; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CodeGenerationService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CodeGenerationService.cs index db6a03e457a..471942f8577 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CodeGenerationService.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CodeGenerationService.cs @@ -1,4 +1,4 @@ -// +// // CodeGenerationService.cs // // Author: @@ -258,7 +258,7 @@ public static MonoDevelop.Ide.TypeSystem.CodeGenerator CreateCodeGenerator (this public static void AddAttribute (INamedTypeSymbol cls, string name, params object [] parameters) { if (cls == null) - throw new ArgumentNullException ("cls"); + throw new ArgumentNullException (nameof(cls)); bool isOpen; string fileName = cls.Locations.First ().SourceTree.FilePath; var buffer = TextFileProvider.Instance.GetTextEditorData (fileName, out isOpen); diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoBaseDeclarationHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoBaseDeclarationHandler.cs index 80d7f3bb338..616105c4339 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoBaseDeclarationHandler.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoBaseDeclarationHandler.cs @@ -1,4 +1,4 @@ -// +// // GotoBaseDeclarationHandler.cs // // Author: @@ -38,7 +38,7 @@ static class GotoBaseDeclarationHandler public static string GetDescription (ISymbol symbol) { if (symbol == null) - throw new ArgumentNullException ("symbol"); + throw new ArgumentNullException (nameof(symbol)); switch (symbol.Kind) { case SymbolKind.NamedType: return GettextCatalog.GetString ("Go to _Base Type"); @@ -78,9 +78,9 @@ public static bool CanGotoBase (ISymbol symbol) public static async Task GotoBase (MonoDevelop.Ide.Gui.Document doc, ISymbol symbol) { if (doc == null) - throw new ArgumentNullException ("doc"); + throw new ArgumentNullException (nameof(doc)); if (symbol == null) - throw new ArgumentNullException ("symbol"); + throw new ArgumentNullException (nameof(symbol)); var metadata = Navigation.Counters.CreateNavigateToMetadata ("Base"); using (var timer = Navigation.Counters.NavigateTo.BeginTiming (metadata)) { diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs index 5f897a1eabe..bbcdc89e9a9 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs @@ -1,4 +1,4 @@ -// +// // HelperMethods.cs // // Author: @@ -103,7 +103,7 @@ public static OptionSet GetFormattingOptions (this DocumentContext doc) // public static bool TryResolveAt (this DocumentContext documentContext, DocumentLocation loc, out ResolveResult result, out AstNode node) // { // if (documentContext == null) -// throw new ArgumentNullException ("documentContext"); +// throw new ArgumentNullException (nameof(documentContext)); // result = null; // node = null; // var parsedDocument = documentContext.ParsedDocument; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs index 2167db0eeff..56b347e2a01 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs @@ -200,7 +200,7 @@ static CSharpAmbience () public override Task GetTooltip (CancellationToken token, Microsoft.CodeAnalysis.ISymbol entity) { if (entity == null) - throw new ArgumentNullException ("entity"); + throw new ArgumentNullException (nameof(entity)); return SourceEditor.LanguageItemTooltipProvider.CreateTooltipInformation (token, null, null, entity, false, true); } diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs index e33dd53a9ed..044c1d702b6 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs @@ -1,4 +1,4 @@ -// +// // PathedDocumentTextEditorExtension.cs // // Author: @@ -372,7 +372,7 @@ class DataProvider : DropDownBoxListWindow.IListDataProvider public DataProvider (PathedDocumentTextEditorExtension ext, object tag) { if (ext == null) - throw new ArgumentNullException ("ext"); + throw new ArgumentNullException (nameof(ext)); this.ext = ext; this.tag = tag; Reset (); diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs index 25a7535243a..2093e8b2b34 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs @@ -1,4 +1,4 @@ -// +// // SignatureMarkupCreator.cs // // Author: @@ -172,7 +172,7 @@ public string GetTypeReferenceString (ITypeSymbol type, bool highlight = true) public string GetMarkup (ITypeSymbol type) { if (type == null) - throw new ArgumentNullException ("entity"); + throw new ArgumentNullException (nameof(type)); return GetTypeMarkup (type); } @@ -180,7 +180,7 @@ public string GetMarkup (ITypeSymbol type) public string GetMarkup (Microsoft.CodeAnalysis.ISymbol entity) { if (entity == null) - throw new ArgumentNullException ("entity"); + throw new ArgumentNullException (nameof(entity)); string result; try { switch (entity.Kind) { @@ -391,7 +391,7 @@ static bool IsObjectOrValueType (ITypeSymbol type) string GetTypeParameterMarkup (ITypeSymbol t) { if (t == null) - throw new ArgumentNullException ("t"); + throw new ArgumentNullException (nameof(t)); var result = StringBuilderCache.Allocate (); var highlightedTypeName = Highlight (FilterEntityName (t.Name), GetThemeColor (userTypes)); result.Append (highlightedTypeName); @@ -486,7 +486,7 @@ public static bool IsNullableType (ITypeSymbol type) string GetTypeMarkup (ITypeSymbol t, bool includeDeclaringTypes = false) { if (t == null) - throw new ArgumentNullException ("t"); + throw new ArgumentNullException (nameof(t)); if (t.TypeKind == TypeKind.Error) return GettextCatalog.GetString ("Type can not be resolved."); if (t.TypeKind == TypeKind.Delegate) @@ -629,7 +629,7 @@ static string FilterEntityName (string name) public string GetDelegateInfo (ITypeSymbol type) { if (type == null) - throw new ArgumentNullException ("type"); + throw new ArgumentNullException (nameof(type)); var t = type; var result = StringBuilderCache.Allocate (); @@ -704,7 +704,7 @@ string GetDelegateMarkup (INamedTypeSymbol delegateType) string GetLocalVariableMarkup (ILocalSymbol local) { if (local == null) - throw new ArgumentNullException ("local"); + throw new ArgumentNullException (nameof(local)); var result = StringBuilderCache.Allocate (); @@ -735,7 +735,7 @@ string GetLocalVariableMarkup (ILocalSymbol local) string GetParameterVariableMarkup (IParameterSymbol parameter) { if (parameter == null) - throw new ArgumentNullException ("parameter"); + throw new ArgumentNullException (nameof(parameter)); var result = StringBuilderCache.Allocate (); AppendParameter (result, parameter); @@ -756,7 +756,7 @@ string GetParameterVariableMarkup (IParameterSymbol parameter) string GetFieldMarkup (IFieldSymbol field) { if (field == null) - throw new ArgumentNullException ("field"); + throw new ArgumentNullException (nameof(field)); var result = StringBuilderCache.Allocate (); bool isEnum = field.ContainingType.TypeKind == TypeKind.Enum; @@ -806,7 +806,7 @@ string GetFieldMarkup (IFieldSymbol field) string GetMethodMarkup (IMethodSymbol method) { if (method == null) - throw new ArgumentNullException ("method"); + throw new ArgumentNullException (nameof(method)); var result = StringBuilderCache.Allocate (); AppendModifiers (result, method); @@ -852,7 +852,7 @@ string GetMethodMarkup (IMethodSymbol method) string GetConstructorMarkup (IMethodSymbol method) { if (method == null) - throw new ArgumentNullException ("method"); + throw new ArgumentNullException (nameof(method)); var result = StringBuilderCache.Allocate (); @@ -882,7 +882,7 @@ string GetConstructorMarkup (IMethodSymbol method) string GetDestructorMarkup (IMethodSymbol method) { if (method == null) - throw new ArgumentNullException ("method"); + throw new ArgumentNullException (nameof(method)); var result = StringBuilderCache.Allocate (); AppendModifiers (result, method); @@ -920,7 +920,7 @@ bool IsAccessibleOrHasSourceCode (ISymbol entity) string GetPropertyMarkup (IPropertySymbol property) { if (property == null) - throw new ArgumentNullException ("property"); + throw new ArgumentNullException (nameof(property)); var result = StringBuilderCache.Allocate (); AppendModifiers (result, property); result.Append (GetTypeReferenceString (property.Type)); @@ -1544,7 +1544,7 @@ public TooltipInformation GetTypeOfTooltip (TypeOfExpressionSyntax typeOfExpress string GetEventMarkup (IEventSymbol evt) { if (evt == null) - throw new ArgumentNullException ("evt"); + throw new ArgumentNullException (nameof(evt)); var result = StringBuilderCache.Allocate (); AppendModifiers (result, evt); result.Append (Highlight ("event ", GetThemeColor (modifierColor))); @@ -1823,7 +1823,7 @@ HslColor AlphaBlend (HslColor color, HslColor color2, double alpha) public string GetArrayIndexerMarkup (IArrayTypeSymbol arrayType) { if (arrayType == null) - throw new ArgumentNullException ("arrayType"); + throw new ArgumentNullException (nameof(arrayType)); var result = StringBuilderCache.Allocate (); result.Append (GetTypeReferenceString (arrayType.ElementType)); if (BreakLineAfterReturnType) { diff --git a/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonIndentEngine.cs b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonIndentEngine.cs index f63c179045f..b77b8b3a128 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonIndentEngine.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonIndentEngine.cs @@ -48,7 +48,7 @@ class JSonIndentEngine : IStateMachineIndentEngine public JSonIndentEngine (Ide.Editor.TextEditor editor) { if (editor == null) - throw new ArgumentNullException ("editor"); + throw new ArgumentNullException (nameof(editor)); this.editor = editor; Reset (); } diff --git a/main/src/addins/CSharpBinding/Util/CompilationExtensions.cs b/main/src/addins/CSharpBinding/Util/CompilationExtensions.cs index 39d7d56bf13..09552f0dd92 100644 --- a/main/src/addins/CSharpBinding/Util/CompilationExtensions.cs +++ b/main/src/addins/CSharpBinding/Util/CompilationExtensions.cs @@ -1,4 +1,4 @@ -// +// // CompilationExtensions.cs // // Author: @@ -56,7 +56,7 @@ static class CompilationExtensions public static ITypeSymbol GetTypeSymbol(this Compilation compilation, string ns, string name, int arity, CancellationToken cancellationToken = default(CancellationToken)) { if (compilation == null) - throw new ArgumentNullException("compilation"); + throw new ArgumentNullException(nameof(compilation)); var nsSymbol = FindNamespace (compilation.GlobalNamespace, ns, cancellationToken); if (nsSymbol == null) return null; diff --git a/main/src/addins/CSharpBinding/Util/FormatStringHelper.cs b/main/src/addins/CSharpBinding/Util/FormatStringHelper.cs index 3c26915b121..1281a38dbed 100644 --- a/main/src/addins/CSharpBinding/Util/FormatStringHelper.cs +++ b/main/src/addins/CSharpBinding/Util/FormatStringHelper.cs @@ -44,9 +44,9 @@ public static bool TryGetFormattingParameters( CancellationToken cancellationToken = default (CancellationToken)) { if (semanticModel == null) - throw new ArgumentNullException("semanticModel"); + throw new ArgumentNullException(nameof(semanticModel)); if (invocationExpression == null) - throw new ArgumentNullException("invocationExpression"); + throw new ArgumentNullException(nameof(invocationExpression)); var symbolInfo = semanticModel.GetSymbolInfo(invocationExpression.Expression, cancellationToken); if (argumentFilter == null) argumentFilter = (p, e) => true; diff --git a/main/src/addins/CSharpBinding/Util/PortingExtensions.cs b/main/src/addins/CSharpBinding/Util/PortingExtensions.cs index 3d465bf428b..a23edcc6d7e 100644 --- a/main/src/addins/CSharpBinding/Util/PortingExtensions.cs +++ b/main/src/addins/CSharpBinding/Util/PortingExtensions.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Collections.Generic; @@ -114,7 +114,7 @@ public static IEnumerable GetAllBaseClassesAndInterfaces (this public static System.ComponentModel.EditorBrowsableState GetEditorBrowsableState (this ISymbol symbol) { if (symbol == null) - throw new ArgumentNullException ("symbol"); + throw new ArgumentNullException (nameof(symbol)); var browsableState = symbol.GetAttributes ().FirstOrDefault (attr => attr.AttributeClass.Name == "EditorBrowsableAttribute" && attr.AttributeClass.ContainingNamespace.MetadataName == "System.ComponentModel"); if (browsableState != null && browsableState.ConstructorArguments.Length == 1) { try { @@ -138,7 +138,7 @@ public static System.ComponentModel.EditorBrowsableState GetEditorBrowsableState public static bool IsEditorBrowsable (this ISymbol symbol) { if (symbol == null) - throw new ArgumentNullException ("symbol"); + throw new ArgumentNullException (nameof(symbol)); return GetEditorBrowsableState (symbol) != System.ComponentModel.EditorBrowsableState.Never; } diff --git a/main/src/addins/GnomePlatform/Gio.cs b/main/src/addins/GnomePlatform/GioGtk2.cs similarity index 99% rename from main/src/addins/GnomePlatform/Gio.cs rename to main/src/addins/GnomePlatform/GioGtk2.cs index 38372b760e6..d7e87aed52d 100644 --- a/main/src/addins/GnomePlatform/Gio.cs +++ b/main/src/addins/GnomePlatform/GioGtk2.cs @@ -3,7 +3,7 @@ // Author: Mike Kestner // // Copyright (c) 2008 Novell, Inc (http://www.novell.com) -// +// // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the // "Software"), to deal in the Software without restriction, including @@ -11,10 +11,10 @@ // distribute, sublicense, and/or sell copies of the Software, and to // permit persons to whom the Software is furnished to do so, subject to // the following conditions: -// +// // The above copyright notice and this permission notice shall be // included in all copies or substantial portions of the Software. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -35,34 +35,34 @@ internal static class Gio { const string gio = "libgio-2.0-0.dll"; const string glib = "libglib-2.0-0.dll"; - const string gobject = "libgobject-2.0-0.dll"; - + const string gobject = "libgobject-2.0-0.dll"; + [DllImport (gio, CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr g_app_info_get_executable (IntPtr raw); + static extern IntPtr g_app_info_get_executable (IntPtr raw); [DllImport (gio, CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr g_app_info_get_id (IntPtr raw); + static extern IntPtr g_app_info_get_id (IntPtr raw); [DllImport (gio, CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr g_app_info_get_name (IntPtr raw); + static extern IntPtr g_app_info_get_name (IntPtr raw); [DllImport (gio, CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr g_app_info_get_default_for_type (IntPtr content_type, bool must_support_uris); + static extern IntPtr g_app_info_get_default_for_type (IntPtr content_type, bool must_support_uris); [DllImport (gio, CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr g_app_info_get_all_for_type (IntPtr content_type); + static extern IntPtr g_app_info_get_all_for_type (IntPtr content_type); [DllImport (gio, CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr g_content_type_from_mime_type (IntPtr mime_type); + static extern IntPtr g_content_type_from_mime_type (IntPtr mime_type); [DllImport (gio, CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr g_content_type_get_description (IntPtr mime_type); + static extern IntPtr g_content_type_get_description (IntPtr mime_type); [DllImport (gio, CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr g_content_type_get_mime_type (IntPtr content_type); + static extern IntPtr g_content_type_get_mime_type (IntPtr content_type); [DllImport (gio, CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr g_file_info_get_content_type (IntPtr handle); + static extern IntPtr g_file_info_get_content_type (IntPtr handle); [DllImport (gio, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_file_info_get_icon (IntPtr fileinfo); [DllImport (gio, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_file_new_for_path (IntPtr path); [DllImport (gio, CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr g_file_new_for_uri (IntPtr uri); + static extern IntPtr g_file_new_for_uri (IntPtr uri); [DllImport (gio, CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr g_file_query_info (IntPtr handle, IntPtr attrs, int flags, IntPtr cancellable, out IntPtr error); + static extern IntPtr g_file_query_info (IntPtr handle, IntPtr attrs, int flags, IntPtr cancellable, out IntPtr error); [DllImport (gio, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_icon_to_string (IntPtr icon); [DllImport(gio, CallingConvention = CallingConvention.Cdecl)] @@ -72,7 +72,7 @@ internal static class Gio { [DllImport (glib, CallingConvention = CallingConvention.Cdecl)] static extern void g_error_free (IntPtr raw); [DllImport (glib, CallingConvention = CallingConvention.Cdecl)] - static extern void g_list_free (IntPtr raw); + static extern void g_list_free (IntPtr raw); [DllImport (gobject, CallingConvention = CallingConvention.Cdecl)] static extern void g_object_unref (IntPtr handle); @@ -89,7 +89,7 @@ static GnomeDesktopApplication AppFromAppInfoPtr (IntPtr handle, DesktopApplicat string id = GLib.Marshaller.Utf8PtrToString (g_app_info_get_id (handle)); string name = GLib.Marshaller.Utf8PtrToString (g_app_info_get_name (handle)); string executable = GLib.Marshaller.Utf8PtrToString (g_app_info_get_executable (handle)); - + if (!string.IsNullOrEmpty (name) && !string.IsNullOrEmpty (executable) && !executable.Contains ("monodevelop ")) return new GnomeDesktopApplication (executable, name, defaultApp != null && defaultApp.Id == id); return null; @@ -108,7 +108,7 @@ static IntPtr ContentTypeFromMimeType (string mime_type) return content_type; } - public static DesktopApplication GetDefaultForType (string mime_type) + public static DesktopApplication GetDefaultForType (string mime_type) { IntPtr content_type = ContentTypeFromMimeType (mime_type); IntPtr ret = g_app_info_get_default_for_type (content_type, false); @@ -119,7 +119,7 @@ public static DesktopApplication GetDefaultForType (string mime_type) public static System.Collections.Generic.IList GetAllForType (string mime_type) { var def = GetDefaultForType (mime_type); - + IntPtr content_type = ContentTypeFromMimeType (mime_type); IntPtr ret = g_app_info_get_all_for_type (content_type); GLib.Marshaller.Free (content_type); diff --git a/main/src/addins/GnomePlatform/GioGtkSharp.cs b/main/src/addins/GnomePlatform/GioGtkSharp.cs new file mode 100644 index 00000000000..72ee28b8380 --- /dev/null +++ b/main/src/addins/GnomePlatform/GioGtkSharp.cs @@ -0,0 +1,131 @@ +// Gio.cs +// +// Authors: +// Mike Kestner +// Copyright (c) 2008 Novell, Inc (http://www.novell.com) +// +// Refactoring to GtkSharp: +// Lytico (http://www.limada.org) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +using System.Collections.Generic; +using System.Linq; +using GLib; +using MonoDevelop.Ide.Desktop; + +namespace MonoDevelop.Platform +{ + + internal static class Gio + { + + static GnomeDesktopApplication AppFromAppInfoPtr (IAppInfo handle, DesktopApplication defaultApp) + { + string id = handle.Id; + string name = handle.Name; + string executable = handle.Executable; + + if (!string.IsNullOrEmpty (name) && !string.IsNullOrEmpty (executable) && + !executable.Contains ("monodevelop ")) + return new GnomeDesktopApplication (executable, name, defaultApp != null && defaultApp.Id == id); + return null; + } + + static string ContentTypeFromMimeType (string mime_type) + { + var content_type = ContentType.FromMimeType (mime_type); + return content_type; + } + + public static DesktopApplication GetDefaultForType (string mime_type) + { + var content_type = ContentTypeFromMimeType (mime_type); + var ret = AppInfoAdapter.GetDefaultForType (content_type, false); + return ret == default ? null : AppFromAppInfoPtr (ret, null); + } + + public static IList GetAllForType (string mime_type) + { + var def = GetDefaultForType (mime_type); + + var content_type = ContentTypeFromMimeType (mime_type); + var ret = AppInfoAdapter.GetAllForType (content_type); + if (ret == null || ret.Length == 0) + return new DesktopApplication[0]; + return ret.Select (i => AppFromAppInfoPtr (i, def)).ToArray (); + } + + public static string GetGSettingsString (string schema, string key) + { + using var gsettings = new Settings (schema); + var ret = gsettings.GetString (key); + return ret; + } + + public static string GetIconIdForFile (string filename) + { + if (string.IsNullOrEmpty (filename)) + return null; + + var gfile = FileFactory.NewForPath (filename); + var native_attrs = "standard::icon"; + using var info = gfile.QueryInfo (native_attrs, FileQueryInfoFlags.None, null); + + var iconnative = info?.Icon?.ToString (); + if (iconnative == null) + return default; + + var iconid = iconnative.Split (' '); + // g_icon_to_string should give us 4 fields, 2nd is GThemedIcon + // if this isn't the case, we're into crazyland, and fall back + if (iconid.Length == 4 && iconid[1].Trim () == "GThemedIcon") + return iconid[2].Trim (); + return null; + } + + public static string GetMimeTypeDescription (string mime_type) + { + var content_type = ContentTypeFromMimeType (mime_type); + var desc = ContentType.GetDescription (content_type); + + return desc; + } + + public static string GetMimeTypeForUri (string uri) + { + if (string.IsNullOrEmpty (uri)) + return null; + var gfile = FileFactory.NewForPath (uri); + var native_attrs = "standard::content-type"; + + using var info = gfile.QueryInfo (native_attrs, FileQueryInfoFlags.None, null); + + var content_type = info?.ContentType; + if (content_type == default) + return default; + + string mime_type = ContentType.GetMimeType (content_type); + + return mime_type; + } + } + +} \ No newline at end of file diff --git a/main/src/addins/GnomePlatform/GnomePlatform.cs b/main/src/addins/GnomePlatform/GnomePlatform.cs index f597e4a9306..f775d460162 100644 --- a/main/src/addins/GnomePlatform/GnomePlatform.cs +++ b/main/src/addins/GnomePlatform/GnomePlatform.cs @@ -6,7 +6,7 @@ // Matthias Gliwka // // Copyright (C) 2007 Novell, Inc (http://www.novell.com) -// +// // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the // "Software"), to deal in the Software without restriction, including @@ -14,10 +14,10 @@ // distribute, sublicense, and/or sell copies of the Software, and to // permit persons to whom the Software is furnished to do so, subject to // the following conditions: -// +// // The above copyright notice and this permission notice shall be // included in all copies or substantial portions of the Software. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -32,6 +32,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Linq; using MonoDevelop.Core.Execution; using MonoDevelop.Core; @@ -42,7 +43,7 @@ public class GnomePlatform : PlatformService static GnomePlatform () { } - + public override IEnumerable GetApplications (string filename) { var mimeType = GetMimeTypeForUri (filename); @@ -53,7 +54,7 @@ IEnumerable GetApplicationsForMimeType (string mimeType) { return Gio.GetAllForType (mimeType); } - + struct GnomeVfsApp { #pragma warning disable 649 // never assigned public string Id, DisplayName, Command; @@ -69,7 +70,7 @@ protected override string OnGetMimeTypeForUri (string uri) { if (uri == null) return null; - + return Gio.GetMimeTypeForUri (uri); } @@ -77,7 +78,7 @@ public override void ShowUrl (string url) { Runtime.ProcessService.StartProcess ("xdg-open", url, null, null); } - + public override string DefaultMonospaceFont { get { try { @@ -87,7 +88,7 @@ public override string DefaultMonospaceFont { } } } - + public override string Name { get { return "Gnome"; } } @@ -96,31 +97,31 @@ protected override string OnGetIconIdForFile (string filename) { if (filename == "Documentation") { return "gnome-fs-regular"; - } + } if (System.IO.Directory.Exists (filename)) { return "gnome-fs-directory"; } else if (System.IO.File.Exists (filename)) { filename = EscapeFileName (filename); if (filename == null) return "gnome-fs-regular"; - + string icon = null; try { icon = Gio.GetIconIdForFile (filename); } catch {} if (icon != null && icon.Length > 0) return icon; - } + } return "gnome-fs-regular"; - + } - + protected override Xwt.Drawing.Image OnGetIconForFile (string filename) { string icon = OnGetIconIdForFile (filename); return GetIconForType (icon); } - + string EscapeFileName (string filename) { foreach (char c in filename) { @@ -131,7 +132,7 @@ string EscapeFileName (string filename) } return ConvertFileNameToVFS (filename); } - + static string ConvertFileNameToVFS (string fileName) { string result = fileName; @@ -140,8 +141,8 @@ static string ConvertFileNameToVFS (string fileName) result = result.Replace ("?", "%3F"); return result; } - - + + delegate string TerminalRunnerHandler (string command, string args, string dir, string title, bool pause, Guid applicationId); delegate string TerminalOpenFolderRunnerHandler (string dir); @@ -149,15 +150,22 @@ static string ConvertFileNameToVFS (string fileName) bool terminal_probed; TerminalRunnerHandler runner; TerminalOpenFolderRunnerHandler openDirectoryRunner; - + + private static string _gts_command; + + private static string GtsCommand => _gts_command ?? + (_gts_command = new[] {"/usr/libexec", "/usr/lib/gnome-terminal"} + .Select (c=>Path.Combine (c,"gnome-terminal-server")) + .FirstOrDefault (File.Exists)); + public override ProcessAsyncOperation StartConsoleProcess (string command, string arguments, string workingDirectory, - IDictionary environmentVariables, + IDictionary environmentVariables, string title, bool pauseWhenFinished) { ProbeTerminal (); - + //generate unique guid to derive application id for gnome terminal server - var consoleGuid = Guid.NewGuid (); + var consoleGuid = Guid.NewGuid (); string exec = runner (command, arguments, workingDirectory, title, pauseWhenFinished, consoleGuid); @@ -169,11 +177,11 @@ public override ProcessAsyncOperation StartConsoleProcess (string command, strin foreach (var env in environmentVariables) psi.EnvironmentVariables [env.Key] = env.Value; } - + ProcessWrapper proc = new ProcessWrapper (); if (terminal_command.Contains ("gnome-terminal")) { var parameter = String.Format ("--app-id {0}", GenerateAppId (consoleGuid)); - var terminalProcessStartInfo = new ProcessStartInfo ("/usr/lib/gnome-terminal/gnome-terminal-server", parameter) { + var terminalProcessStartInfo = new ProcessStartInfo(GtsCommand, parameter) { CreateNoWindow = true, UseShellExecute = false, }; @@ -188,15 +196,15 @@ public override ProcessAsyncOperation StartConsoleProcess (string command, strin } return proc.ProcessAsyncOperation; } - + #region Terminal runner implementations - + private static string GnomeTerminalRunner (string command, string args, string dir, string title, bool pause, Guid applicationId) { - string extra_commands = pause + string extra_commands = pause ? BashPause.Replace ("'", "\\\"") : String.Empty; - + return String.Format (@" --app-id {5} --name ""{4}"" -e ""bash -c 'cd {3} ; {0} {1} ; {2}'""", command, EscapeArgs (args), @@ -205,13 +213,13 @@ private static string GnomeTerminalRunner (string command, string args, string d title, GenerateAppId (applicationId)); } - + private static string MateTerminalRunner (string command, string args, string dir, string title, bool pause, Guid applicationId) { - string extra_commands = pause + string extra_commands = pause ? BashPause.Replace ("'", "\\\"") : String.Empty; - + return String.Format (@"--name ""{4}"" -e ""bash -c 'cd {3} ; {0} {1} ; {2}'""", command, EscapeArgs (args), @@ -224,13 +232,13 @@ private static string GenerateAppId (Guid applicationId) { return String.Format("mono.develop.id{0}", applicationId.ToString ().Replace ("-", "")); } - + private static string XtermRunner (string command, string args, string dir, string title, bool pause, Guid applicationId) { - string extra_commands = pause + string extra_commands = pause ? BashPause : String.Empty; - + return String.Format (@" -title ""{4}"" -e bash -c ""cd {3} ; '""{0}""' {1} ; {2}""", command, EscapeArgs (args), @@ -238,13 +246,13 @@ private static string XtermRunner (string command, string args, string dir, stri EscapeDir (dir), title); } - + private static string Xfce4TerminalRunner (string command, string args, string dir, string title, bool pause, Guid applicationId) { - string extra_commands = pause + string extra_commands = pause ? BashPause : String.Empty; - + return String.Format (@" -T ""{4}"" --working-directory=""{3}"" -x bash -c ""'{0}' {1} ; {2}""", command, EscapeArgs (args), @@ -255,7 +263,7 @@ private static string Xfce4TerminalRunner (string command, string args, string d private static string KdeTerminalRunner (string command, string args, string dir, string title, bool pause, Guid applicationId) { - string extra_commands = pause + string extra_commands = pause ? BashPause.Replace ("'", "\"") : String.Empty; @@ -286,12 +294,12 @@ private static string EscapeArgs (string args) { return args.Replace ("\\", "\\\\").Replace ("\"", "\\\""); } - + private static string EscapeDir (string dir) { return dir.Replace (" ", "\\ ").Replace (";", "\\;"); } - + private static string BashPause { get { return @"echo; read -p 'Press any key to continue...' -n1;"; } } @@ -305,9 +313,9 @@ private void ProbeTerminal () if (terminal_probed) { return; } - + terminal_probed = true; - + string fallback_terminal = PropertyService.Get ("MonoDevelop.Shell", "xterm"); string preferred_terminal; TerminalRunnerHandler preferred_runner = null; @@ -325,8 +333,8 @@ private void ProbeTerminal () preferred_terminal = "mate-terminal"; preferred_runner = MateTerminalRunner; preferedOpenFolderRunner = GnomeTerminalOpenFolderRunner; - } - else if (!String.IsNullOrEmpty (Environment.GetEnvironmentVariable ("KDE_SESSION_VERSION"))) { + } + else if (!String.IsNullOrEmpty (Environment.GetEnvironmentVariable ("KDE_SESSION_VERSION"))) { preferred_terminal = "konsole"; preferred_runner = KdeTerminalRunner; preferedOpenFolderRunner = KdeTerminalOpenFolderRunner; @@ -335,7 +343,7 @@ private void ProbeTerminal () preferred_terminal = "xfce4-terminal"; preferred_runner = Xfce4TerminalRunner; preferedOpenFolderRunner = Xfce4TerminalOpenFolderRunner; - } + } else { preferred_terminal = fallback_terminal; preferred_runner = fallback_runner; @@ -348,7 +356,7 @@ private void ProbeTerminal () openDirectoryRunner = preferedOpenFolderRunner; return; } - + terminal_command = FindExec (fallback_terminal); runner = fallback_runner; openDirectoryRunner = fallbackOpenFolderRunner; @@ -383,7 +391,7 @@ private string [] GetExecPaths () } #endregion - + public override bool CanOpenTerminal { get { return true; @@ -396,17 +404,17 @@ public override void OpenTerminal (FilePath directory, IDictionary - - + + + - Debug - AnyCPU {AE84B4A7-E6B1-4565-8904-16284DCE41B6} $(MDFrameworkVersion) ..\..\..\build\bin + false + false + false + true - - - - + + + + - - - {7525BB88-6142-4A26-93B9-A30C6983390A} - MonoDevelop.Core - False - - - {27096E7F-C91C-4AC6-B289-6897A701DF21} - MonoDevelop.Ide - False - - - {92494904-35FA-4DC9-BDE9-3A3E87AC49D3} - Xwt - False - - - {91DD5A2D-9FE3-4C3C-9253-876141874DAD} - Mono.Addins - False - - - - - - - - - - + + + + Never + - + + PreserveNewest - - + + \ No newline at end of file diff --git a/main/src/addins/GnomePlatform/AddinInfo.cs b/main/src/addins/GnomePlatform/Properties/AddinInfo.cs similarity index 100% rename from main/src/addins/GnomePlatform/AddinInfo.cs rename to main/src/addins/GnomePlatform/Properties/AddinInfo.cs diff --git a/main/src/addins/GnomePlatform/AssemblyInfo.cs b/main/src/addins/GnomePlatform/Properties/AssemblyInfo.cs similarity index 100% rename from main/src/addins/GnomePlatform/AssemblyInfo.cs rename to main/src/addins/GnomePlatform/Properties/AssemblyInfo.cs diff --git a/main/src/addins/GnomePlatform/GnomePlatform.addin.xml b/main/src/addins/GnomePlatform/Properties/GnomePlatform.addin.xml similarity index 100% rename from main/src/addins/GnomePlatform/GnomePlatform.addin.xml rename to main/src/addins/GnomePlatform/Properties/GnomePlatform.addin.xml diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj index eca7d6cbc08..6b18dd3fa04 100644 --- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj +++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.csproj @@ -6,7 +6,7 @@ AnyCPU {B3E73DE7-8AFC-429A-9B68-5699B1E63A02} $(MDFrameworkVersion) - 1.0.0-beta2-20170430-208 + 1.0.0-beta2-20170629-269 1.0.0-beta2-20170727-301 ..\..\..\build\AddIns\AspNetCore @@ -18,7 +18,7 @@ - + diff --git a/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml b/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml index 65267a36850..6df895b7001 100644 --- a/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml +++ b/main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml @@ -83,6 +83,351 @@ For example, .NET Core 1.1 SDK does not have a Razor template so having the 1.1 templates first would cause the Razor template to be last in the New Project dialog if both 1.1 and 2.x templates are available. --> + + + +