Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
44cffd2
Look in Mono for Windows install dir for monodoc.dll
May 1, 2018
047d83c
Remove duplicate monodoc.dll reference
May 1, 2018
eb09226
update
MakiWolf Jan 26, 2024
588bcaa
Update Directory.Build.props
MakiWolf Jan 26, 2024
8504ba7
Update .gitmodules
MakiWolf Jan 26, 2024
ce962c1
Update .gitmodules
MakiWolf Jan 26, 2024
ce6e331
Update Main.sln
MakiWolf Jan 26, 2024
a4643ee
update
MakiWolf Jan 26, 2024
93c2f90
update
MakiWolf Jan 26, 2024
db74c2e
update
MakiWolf Jan 26, 2024
86a1455
update
MakiWolf Jan 26, 2024
0434283
update
MakiWolf Jan 26, 2024
320e159
update
MakiWolf Jan 26, 2024
4154fa2
update
MakiWolf Jan 26, 2024
ba83ea4
update
MakiWolf Jan 27, 2024
94f5b6a
update
MakiWolf Jan 27, 2024
8651af7
update
MakiWolf Jan 27, 2024
6a16eb9
update
MakiWolf Jan 27, 2024
4b351af
update
MakiWolf Jan 27, 2024
a5f2dbe
Merge branch 'use-mono-for-monodoc-on-windows' of https://github.com/…
MakiWolf Jan 27, 2024
892acb1
update
MakiWolf Jan 27, 2024
2806eca
remove gtk3
MakiWolf Jan 27, 2024
7be19f6
update
MakiWolf Feb 3, 2024
b54a76f
update
MakiWolf Feb 3, 2024
513d744
update
MakiWolf Feb 4, 2024
5fc1c86
update
MakiWolf Feb 4, 2024
1c0e67f
Merge branch 'windows' of https://github.com/MakiWolf/dotdevelop into…
MakiWolf Feb 4, 2024
47af2eb
update
MakiWolf Feb 4, 2024
fb4afc6
Update .gitmodules
MakiWolf Feb 4, 2024
d38c522
update
MakiWolf Feb 4, 2024
4cc2286
Update .gitmodules
MakiWolf Feb 4, 2024
a36173f
update
MakiWolf Feb 4, 2024
aae3e64
update
MakiWolf Feb 4, 2024
08edfa9
update
MakiWolf Feb 4, 2024
83427b5
update
MakiWolf Feb 9, 2024
22990e4
update
MakiWolf Feb 9, 2024
add31ea
Update .gitmodules
MakiWolf Feb 10, 2024
6775c50
update
MakiWolf Feb 10, 2024
ae0c763
update
MakiWolf Feb 10, 2024
387f12a
revert
MakiWolf Feb 10, 2024
bdc6c3f
update
MakiWolf Feb 10, 2024
748c680
update
MakiWolf Feb 10, 2024
f1eb206
update
MakiWolf Feb 10, 2024
d8654ab
update
MakiWolf Feb 13, 2024
9c02436
update
MakiWolf Feb 13, 2024
11653ec
remove
MakiWolf Feb 15, 2024
84ca531
update
MakiWolf Feb 16, 2024
091dbda
update
MakiWolf Feb 16, 2024
6d74fc2
update
MakiWolf Feb 16, 2024
8adbb42
update
MakiWolf Feb 16, 2024
dc70c9d
update
MakiWolf Feb 16, 2024
6ebcdf8
update
MakiWolf Feb 16, 2024
226236f
fix startup
MakiWolf Feb 16, 2024
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
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[submodule "main/external/debugger-libs"]
path = main/external/debugger-libs
url = https://github.com/dotdevelop/debugger-libs.git
url = https://github.com/easysimplified/debugger-libs.git
branch = master
[submodule "main/external/guiunit"]
path = main/external/guiunit
url = https://github.com/dotdevelop/guiunit.git
url = https://github.com/easysimplified/guiunit.git
[submodule "main/external/macdoc"]
path = main/external/macdoc
url = https://github.com/dotdevelop/macdoc
Expand All @@ -20,21 +20,21 @@
url = https://github.com/dotdevelop/mono-tools.git
[submodule "main/external/nrefactory"]
path = main/external/nrefactory
url = https://github.com/dotdevelop/NRefactory.git
url = https://github.com/easysimplified/NRefactory.git
[submodule "main/external/sharpsvn-binary"]
path = main/external/sharpsvn-binary
url = https://github.com/dotdevelop/sharpsvn-binary.git
[submodule "main/external/xwt"]
path = main/external/xwt
url = https://github.com/dotdevelop/xwt
url = https://github.com/easysimplified/xwt
branch = dotdevelop
[submodule "main/external/Xamarin.PropertyEditing"]
path = main/external/Xamarin.PropertyEditing
url = https://github.com/dotdevelop/Xamarin.PropertyEditing
branch = master
[submodule "main/external/vs-editor-api"]
path = main/external/vs-editor-api
url = https://github.com/dotdevelop/vs-editor-api.git
url = https://github.com/easysimplified/vs-editor-api.git
branch = dotdevelop_oe_8.1.5
[submodule "main/external/Monodevelop.Netcoredbg"]
path = main/external/Monodevelop.Netcoredbg
Expand Down
2 changes: 1 addition & 1 deletion main/Directory.Build.props
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,211 changes: 2,873 additions & 338 deletions main/Main.sln

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion main/external/debugger-libs
2 changes: 1 addition & 1 deletion main/external/guiunit
18 changes: 0 additions & 18 deletions main/msbuild/MDBuildTasks.targets
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
3 changes: 2 additions & 1 deletion main/msbuild/ReferencesGtk.props
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 All @@ -31,6 +31,7 @@
<Private>$(ReferencesGtkCopyToOutput)</Private>
</Reference>
<Reference Include="Mono.Cairo" />
<PackageReference Include="Microsoft.VisualStudio.InteractiveWindow" Version="2.8.0" PrivateAssets="$(ReferencesVSEditorPrivateAssets)" ExcludeAssets="$(ReferencesVSEditorExcludeAssets)" />
</ItemGroup>
<ItemGroup>
<!-- this should not be here: -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Import Project="..\..\..\MonoDevelop.props" />
<Import Project="$(ReferencesVSEditor)" />
<Import Project="$(ReferencesGtk)" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{364e4fee-0f78-4aec-a170-bb6ac93e8f9a}</ProjectGuid>
<ProjectGuid>{364E4FEE-0F78-4AEC-A170-BB6AC93E8F9A}</ProjectGuid>
<TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion>
<OutputPath>..\..\..\build\AddIns\MonoDevelop.DesignerSupport</OutputPath>
</PropertyGroup>
Expand All @@ -14,31 +14,27 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
<ItemGroup Condition=" '$(Configuration)' == 'ReleaseMac' OR '$(Configuration)' == 'DebugMac' ">
<Reference Include="Xamarin.Mac">
<HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
<Private>False</Private>
</Reference>
<ProjectReference Include="..\..\..\external\xwt\Xwt.XamMac\Xwt.XamMac.csproj">
<Project>{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}</Project>
<Name>Xwt.XamMac</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\external\Xamarin.PropertyEditing\Xamarin.PropertyEditing.Mac\Xamarin.PropertyEditing.Mac.csproj">
<Project>{E8F4F0EB-C2B1-4116-8459-E076E0E0E485}</Project>
<Name>Xamarin.PropertyEditing.Mac</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\external\Xamarin.PropertyEditing\Xamarin.PropertyEditing\Xamarin.PropertyEditing.csproj">
<Project>{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}</Project>
<Name>Xamarin.PropertyEditing</Name>
</ProjectReference>
<IncludeCopyLocal Include="Xamarin.PropertyEditing.Mac.dll" />
<IncludeCopyLocal Include="Xamarin.PropertyEditing.dll" />
<ProjectReference Include="..\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj">
<Project>{2C24D515-4A2C-445C-8419-C09231913CFA}</Project>
<Name>MonoDevelop.DesignerSupport</Name>
</ProjectReference>
<Reference Include="Xamarin.Mac">
<HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
<Private>False</Private>
</Reference>
<ProjectReference Include="..\..\..\external\xwt\Xwt.XamMac\Xwt.XamMac.csproj">
<Project>{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}</Project>
<Name>Xwt.XamMac</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\external\Xamarin.PropertyEditing\Xamarin.PropertyEditing\Xamarin.PropertyEditing.csproj">
<Project>{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}</Project>
<Name>Xamarin.PropertyEditing</Name>
</ProjectReference>
<IncludeCopyLocal Include="Xamarin.PropertyEditing.Mac.dll" />
<IncludeCopyLocal Include="Xamarin.PropertyEditing.dll" />
<ProjectReference Include="..\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj">
<Project>{2C24D515-4A2C-445C-8419-C09231913CFA}</Project>
<Name>MonoDevelop.DesignerSupport</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing.Design" />
<Reference Include="System.Design" />
Expand Down Expand Up @@ -87,9 +83,6 @@
<Compile Include="MonoDevelop.DesignerSupport.Toolbox\MacToolboxWidgetDataSource.cs" />
<Compile Include="MonoDevelop.DesignerSupport.Toolbox\MacToolboxWidgetFlowLayoutDelegate.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="MonoDevelop.DesignerSupport\" />
<Folder Include="MonoDevelop.DesignerSupport.Toolbox\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
5 changes: 0 additions & 5 deletions main/src/addins/MonoDevelop.DesignerSupport/AddinInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,3 @@

[assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)]
[assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)]

#if MAC
[assembly: ImportAddinAssembly ("Xamarin.PropertyEditing.dll")]
[assembly: ImportAddinAssembly ("Xamarin.PropertyEditing.Mac.dll")]
#endif
Original file line number Diff line number Diff line change
@@ -1,80 +1,80 @@
#if MAC
using AppKit;
using MonoDevelop.Core.FeatureConfiguration;
using MonoDevelop.Ide;
using Xamarin.PropertyEditing.Mac;
// #if MAC
// using AppKit;
// using MonoDevelop.Core.FeatureConfiguration;
// using MonoDevelop.Ide;
// using Xamarin.PropertyEditing.Mac;

namespace MonoDevelop.DesignerSupport
{
static class Styles
{
public static NSColor SectionForegroundColor { get; internal set; } = NSColor.Text;
public static NSColor SectionBackgroundColor { get; private set; } = NSColor.ControlLightHighlight;
// namespace MonoDevelop.DesignerSupport
// {
// static class Styles
// {
// public static NSColor SectionForegroundColor { get; internal set; } = NSColor.Text;
// public static NSColor SectionBackgroundColor { get; private set; } = NSColor.ControlLightHighlight;

public static NSColor CellBackgroundSelectedColor { get; private set; }
public static NSColor CellBackgroundUnfocusedSelectedColor { get; private set; } = NSColor.FromRgb (0.64f, 0.64f, 0.64f);
public static NSColor CellBackgroundColor { get; private set; } = NSColor.ControlBackground;
public static NSColor LabelSelectedForegroundColor { get; private set; }
// public static NSColor CellBackgroundSelectedColor { get; private set; }
// public static NSColor CellBackgroundUnfocusedSelectedColor { get; private set; } = NSColor.FromRgb (0.64f, 0.64f, 0.64f);
// public static NSColor CellBackgroundColor { get; private set; } = NSColor.ControlBackground;
// public static NSColor LabelSelectedForegroundColor { get; private set; }

public static NSColor HeaderBackgroundColor { get; private set; }
public static NSColor HeaderBorderBackgroundColor { get; private set; }

public static NSColor ToolbarBackgroundColor { get; private set; }

public static PropertyPadStyle PropertyPad { get; private set; }

// Used for the property panel in Xamarin.PropertyEditing
public class PropertyPadStyle
{
public NSColor Checkerboard0 { get; internal set; }
public NSColor Checkerboard1 { get; internal set; }
public NSColor ValueBlockBackgroundColor { get; internal set; }
public NSColor FrameBoxButtonBackgroundColor { get; internal set; }
public NSColor TabBorderColor { get; internal set; }
public NSColor PanelTabBackground { get; internal set; }
}
// public static NSColor HeaderBackgroundColor { get; private set; }
// public static NSColor HeaderBorderBackgroundColor { get; private set; }

static Styles ()
{
LoadStyles ();
Ide.Gui.Styles.Changed += (o, e) => LoadStyles ();
}
// public static NSColor ToolbarBackgroundColor { get; private set; }

public static void LoadStyles ()
{
if (IdeApp.Preferences.UserInterfaceTheme == Theme.Light) {
HeaderBackgroundColor = NSColor.FromRgb (0.98f, 0.98f, 0.98f);
HeaderBorderBackgroundColor = NSColor.FromRgb (0.96f, 0.96f, 0.96f);
LabelSelectedForegroundColor = NSColor.Highlight;
ToolbarBackgroundColor = NSColor.White;
CellBackgroundSelectedColor = NSColor.FromRgb (0.36f, 0.54f, 0.90f);


PropertyPad = new PropertyPadStyle {
Checkerboard0 = NSColor.FromRgb (255, 255, 255),
Checkerboard1 = NSColor.FromRgb (217, 217, 217),
PanelTabBackground = NSColor.FromRgb (248, 247, 248),
TabBorderColor = NSColor.FromRgba (0, 0, 0, 25),
ValueBlockBackgroundColor = NSColor.FromRgba (0, 0, 0, 20),
FrameBoxButtonBackgroundColor = NSColor.FromRgb (0.36f, 0.54f, 0.90f)
};
} else {
CellBackgroundSelectedColor = NSColor.FromRgb (0.38f, 0.55f, 0.91f);
HeaderBackgroundColor = NSColor.FromRgb (0.29f, 0.29f, 0.29f);
HeaderBorderBackgroundColor = NSColor.FromRgb (0.29f, 0.29f, 0.29f);
LabelSelectedForegroundColor = NSColor.SelectedText;
ToolbarBackgroundColor = NSColor.FromRgb (0.25f, 0.25f, 0.25f);
// public static PropertyPadStyle PropertyPad { get; private set; }

PropertyPad = new PropertyPadStyle {
Checkerboard0 = NSColor.FromRgb (38, 38, 38),
Checkerboard1 = NSColor.FromRgb (0, 0, 0),
PanelTabBackground = NSColor.FromRgb (85, 85, 85),
TabBorderColor = NSColor.FromRgba (255, 255, 255, 0),
ValueBlockBackgroundColor = NSColor.FromRgba (255, 255, 255, 25),
FrameBoxButtonBackgroundColor = NSColor.FromRgb (0.38f, 0.55f, 0.91f)
};
}
}
}
}
#endif
// // Used for the property panel in Xamarin.PropertyEditing
// public class PropertyPadStyle
// {
// public NSColor Checkerboard0 { get; internal set; }
// public NSColor Checkerboard1 { get; internal set; }
// public NSColor ValueBlockBackgroundColor { get; internal set; }
// public NSColor FrameBoxButtonBackgroundColor { get; internal set; }
// public NSColor TabBorderColor { get; internal set; }
// public NSColor PanelTabBackground { get; internal set; }
// }

// static Styles ()
// {
// LoadStyles ();
// Ide.Gui.Styles.Changed += (o, e) => LoadStyles ();
// }

// public static void LoadStyles ()
// {
// if (IdeApp.Preferences.UserInterfaceTheme == Theme.Light) {
// HeaderBackgroundColor = NSColor.FromRgb (0.98f, 0.98f, 0.98f);
// HeaderBorderBackgroundColor = NSColor.FromRgb (0.96f, 0.96f, 0.96f);
// LabelSelectedForegroundColor = NSColor.Highlight;
// ToolbarBackgroundColor = NSColor.White;
// CellBackgroundSelectedColor = NSColor.FromRgb (0.36f, 0.54f, 0.90f);


// PropertyPad = new PropertyPadStyle {
// Checkerboard0 = NSColor.FromRgb (255, 255, 255),
// Checkerboard1 = NSColor.FromRgb (217, 217, 217),
// PanelTabBackground = NSColor.FromRgb (248, 247, 248),
// TabBorderColor = NSColor.FromRgba (0, 0, 0, 25),
// ValueBlockBackgroundColor = NSColor.FromRgba (0, 0, 0, 20),
// FrameBoxButtonBackgroundColor = NSColor.FromRgb (0.36f, 0.54f, 0.90f)
// };
// } else {
// CellBackgroundSelectedColor = NSColor.FromRgb (0.38f, 0.55f, 0.91f);
// HeaderBackgroundColor = NSColor.FromRgb (0.29f, 0.29f, 0.29f);
// HeaderBorderBackgroundColor = NSColor.FromRgb (0.29f, 0.29f, 0.29f);
// LabelSelectedForegroundColor = NSColor.SelectedText;
// ToolbarBackgroundColor = NSColor.FromRgb (0.25f, 0.25f, 0.25f);

// PropertyPad = new PropertyPadStyle {
// Checkerboard0 = NSColor.FromRgb (38, 38, 38),
// Checkerboard1 = NSColor.FromRgb (0, 0, 0),
// PanelTabBackground = NSColor.FromRgb (85, 85, 85),
// TabBorderColor = NSColor.FromRgba (255, 255, 255, 0),
// ValueBlockBackgroundColor = NSColor.FromRgba (255, 255, 255, 25),
// FrameBoxButtonBackgroundColor = NSColor.FromRgb (0.38f, 0.55f, 0.91f)
// };
// }
// }
// }
// }
// #endif
Loading