Skip to content

Draft: Windows build: Do not merge #152

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
MakiWolf wants to merge 36 commits into from
Closed

Draft: Windows build: Do not merge #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
44cffd2
Look in Mono for Windows install dir for monodoc.dll
May 1, 2018
047d83c
Remove duplicate monodoc.dll reference
May 1, 2018
eb09226
update
MakiWolf Jan 26, 2024
588bcaa
Update Directory.Build.props
MakiWolf Jan 26, 2024
8504ba7
Update .gitmodules
MakiWolf Jan 26, 2024
ce962c1
Update .gitmodules
MakiWolf Jan 26, 2024
ce6e331
Update Main.sln
MakiWolf Jan 26, 2024
a4643ee
update
MakiWolf Jan 26, 2024
93c2f90
update
MakiWolf Jan 26, 2024
db74c2e
update
MakiWolf Jan 26, 2024
86a1455
update
MakiWolf Jan 26, 2024
0434283
update
MakiWolf Jan 26, 2024
320e159
update
MakiWolf Jan 26, 2024
4154fa2
update
MakiWolf Jan 26, 2024
ba83ea4
update
MakiWolf Jan 27, 2024
94f5b6a
update
MakiWolf Jan 27, 2024
8651af7
update
MakiWolf Jan 27, 2024
6a16eb9
update
MakiWolf Jan 27, 2024
4b351af
update
MakiWolf Jan 27, 2024
a5f2dbe
Merge branch 'use-mono-for-monodoc-on-windows' of https://github.com/…
MakiWolf Jan 27, 2024
892acb1
update
MakiWolf Jan 27, 2024
2806eca
remove gtk3
MakiWolf Jan 27, 2024
7be19f6
update
MakiWolf Feb 3, 2024
b54a76f
update
MakiWolf Feb 3, 2024
513d744
update
MakiWolf Feb 4, 2024
5fc1c86
update
MakiWolf Feb 4, 2024
1c0e67f
Merge branch 'windows' of https://github.com/MakiWolf/dotdevelop into…
MakiWolf Feb 4, 2024
47af2eb
update
MakiWolf Feb 4, 2024
fb4afc6
Update .gitmodules
MakiWolf Feb 4, 2024
d38c522
update
MakiWolf Feb 4, 2024
4cc2286
Update .gitmodules
MakiWolf Feb 4, 2024
a36173f
update
MakiWolf Feb 4, 2024
aae3e64
update
MakiWolf Feb 4, 2024
08edfa9
update
MakiWolf Feb 4, 2024
83427b5
update
MakiWolf Feb 9, 2024
22990e4
update
MakiWolf Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[submodule "main/external/debugger-libs"]
path = main/external/debugger-libs
url = https://github.com/dotdevelop/debugger-libs.git
url = https://github.com/easysimplified/debugger-libs.git
branch = master
[submodule "main/external/guiunit"]
path = main/external/guiunit
url = https://github.com/dotdevelop/guiunit.git
url = https://github.com/easysimplified/guiunit.git
[submodule "main/external/macdoc"]
path = main/external/macdoc
url = https://github.com/dotdevelop/macdoc
Expand All @@ -20,21 +20,21 @@
url = https://github.com/dotdevelop/mono-tools.git
[submodule "main/external/nrefactory"]
path = main/external/nrefactory
url = https://github.com/dotdevelop/NRefactory.git
url = https://github.com/easysimplified/NRefactory.git
[submodule "main/external/sharpsvn-binary"]
path = main/external/sharpsvn-binary
url = https://github.com/dotdevelop/sharpsvn-binary.git
[submodule "main/external/xwt"]
path = main/external/xwt
url = https://github.com/dotdevelop/xwt
url = https://github.com/MakiWolf/xwt
branch = dotdevelop
[submodule "main/external/Xamarin.PropertyEditing"]
path = main/external/Xamarin.PropertyEditing
url = https://github.com/dotdevelop/Xamarin.PropertyEditing
branch = master
[submodule "main/external/vs-editor-api"]
path = main/external/vs-editor-api
url = https://github.com/dotdevelop/vs-editor-api.git
url = https://github.com/easysimplified/vs-editor-api.git
branch = dotdevelop_oe_8.1.5
[submodule "main/external/Monodevelop.Netcoredbg"]
path = main/external/Monodevelop.Netcoredbg
Expand Down
2 changes: 1 addition & 1 deletion main/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<MdAddinsDirectory>$(MSBuildThisFileDirectory)..\..\md-addins\</MdAddinsDirectory>
<!--<VSEditorCoreDirectory Condition="'$(VSEditorCoreDirectory)' == ''">$(MdAddinsDirectory)external\vs-editor-core\</VSEditorCoreDirectory>-->
<VSEditorApiDirectory Condition="'$(VSEditorApiDirectory)' == ''">$(MSBuildThisFileDirectory)external\vs-editor-api\</VSEditorApiDirectory>
<ReferencesVSEditor Condition=" '$(OS)' == 'Windows_NT' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Windows.props</ReferencesVSEditor>
<ReferencesVSEditor Condition=" '$(OS)' == 'Windows_NT' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Gtk.props</ReferencesVSEditor>
<ReferencesVSEditor Condition=" '$(OS)' == 'MAC' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Mac.props</ReferencesVSEditor>
<ReferencesVSEditor Condition=" '$(OS)' == 'UNIX' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Gtk.props</ReferencesVSEditor>
<ReferencesGtk>$(RootDirectory)\msbuild\ReferencesGtk.props</ReferencesGtk>
Expand Down
3,296 changes: 2,995 additions & 301 deletions main/Main.sln
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion main/external/debugger-libs
Open in desktop
Submodule debugger-libs updated 1 files
+6 −2 Mono.Debugger.Soft/Mono.Debugger.Soft.csproj
2 changes: 1 addition & 1 deletion main/external/guiunit
Open in desktop
Submodule guiunit updated 2 files
+5 −5 src/framework/GuiUnit_NET_4_5.csproj
+3 −0 src/framework/app.config
2 changes: 1 addition & 1 deletion main/external/nrefactory
Open in desktop
Submodule nrefactory updated 12 files
+6 −4 ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
+4 −0 ICSharpCode.NRefactory.CSharp/OutputVisitor/CodeDomConvertVisitor.cs
+31 −3 ICSharpCode.NRefactory.CSharp/Parser/mcs/assembly.cs
+1 −1 ICSharpCode.NRefactory.CSharp/Parser/mcs/class.cs
+2 −0 ICSharpCode.NRefactory.CSharp/Parser/mcs/driver.cs
+6 −0 ICSharpCode.NRefactory.CSharp/Parser/mcs/eval.cs
+11 −7 ICSharpCode.NRefactory.CSharp/Parser/mcs/method.cs
+11 −5 ICSharpCode.NRefactory.CSharp/Parser/mcs/reflection.cs
+1 −1 ICSharpCode.NRefactory.Cecil/CecilLoader.cs
+7 −7 ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
+7 −7 ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
+4 −1 ICSharpCode.NRefactory/TypeSystem/Implementation/UnresolvedSecurityDeclarationBlob.cs
2 changes: 1 addition & 1 deletion main/external/vs-editor-api
Open in desktop
Submodule vs-editor-api updated 18 files
+41 −0 SECURITY.md
+2 −0 VSEditorCore.sln
+1 −1 build/PackageVersions.targets
+1 −1 build/Project.props
+1 −1 nuget.config
+1 −1 samples/AsyncCompletion/HelloWorldCompletion/packages.config
+52 −0 src/Editor/Text/Def/TextLogic/Classification/ClassificationLayer.cs
+30 −0 src/Editor/Text/Def/TextLogic/Classification/IClassificationTypeRegistryService.cs
+22 −0 src/Editor/Text/Def/TextLogic/Classification/ILayeredClassificationType.cs
+114 −0 src/Editor/Text/Def/TextLogic/Find/ITextSearchNavigator3.cs
+1 −1 src/Editor/Text/Def/TextLogic/Find/ITextSearchNavigatorFactoryService.cs
+3 −3 src/Editor/Text/Impl/BraceCompletion/BraceCompletionAdornmentServiceMac.cs
+47 −0 src/Editor/Text/Impl/ClassificationType/ClassificationKey.cs
+14 −10 src/Editor/Text/Impl/ClassificationType/ClassificationTypeImpl.cs
+27 −18 src/Editor/Text/Impl/ClassificationType/ClassificationTypeRegistryService.cs
+26 −13 src/Editor/Text/Impl/TextSearch/TextSearchNavigator.cs
+1 −1 src/Editor/Text/Impl/TextSearch/TextSearchNavigatorFactoryService.cs
+1 −2 src/Editor/Text/Util/TextUICocoaUtil/TextUICocoaUtil.csproj
2 changes: 1 addition & 1 deletion main/external/xwt
Open in desktop
Submodule xwt updated 136 files
18 changes: 0 additions & 18 deletions main/msbuild/MDBuildTasks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,24 +176,6 @@
=================================================================
-->

<Target Name="_NuGetPrivateAssetsWorkaround_FilterLocalCopyReferences" BeforeTargets="_CopyFilesMarkedCopyLocal">
<FilterLocalCopyReferences
ReferenceCopyLocalPaths="@(ReferenceCopyLocalPaths)"
IncludeList="@(IncludeCopyLocal)"
SuppressList="@(SuppressCopyLocal)"
ReferencedProjects="@(_MSBuildProjectReferenceExistent)"
Configuration="$(Configuration)"
Platform="$(Platform)"
ProjectDir="$(MSBuildProjectDirectory)"
ProjectName="$(MSBuildProjectName)"
DebugCopies="$(DebugFilterCopyReferences)">
<Output TaskParameter="ItemsToRemove" ItemName="_ReferenceCopyLocalPathsRemove" />
</FilterLocalCopyReferences>
<ItemGroup>
<ReferenceCopyLocalPaths Remove="@(_ReferenceCopyLocalPathsRemove)" />
<_ReferenceCopyLocalPathsRemove Remove="@(_ReferenceCopyLocalPathsRemove)" />
</ItemGroup>
</Target>

<!--
HACK: Another workaround for broken PrivateAssets.
Expand Down
2 changes: 1 addition & 1 deletion main/msbuild/ReferencesGtk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup Condition="$(HaveGtkSharp)">
<PackageReference Include="GtkSharp" Version="3.22.25.98" />

</ItemGroup>
<ItemGroup Condition="!$(HaveGtkSharp)">
<Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
Expand Down
Loading