Skip to content
This repository has been archived by the owner on Oct 4, 2021. It is now read-only.

Bumps Xamarin.PropertyEditing #7360

Closed
wants to merge 7 commits into from
Closed

Bumps Xamarin.PropertyEditing #7360

wants to merge 7 commits into from

Conversation

netonjm
Copy link
Contributor

@netonjm netonjm commented Mar 20, 2019

-- PLEASE DO NOT MERGE -- We also need some code in ProppyEditing project to fix a problem of dupplicated resources

xamarin/Xamarin.PropertyEditing#566

This PR bumps the current branch in Xamarin.ProppertyEditing to the most recent hash
https://github.com/xamarin/Xamarin.PropertyEditing/compare/monodevelop-rebased

We are not based in current master because to build we had dependencies on the Editors and they are not merged in master yet. Because all these changes in the PR are cosmetical but we need work into our MD implementation, I created a branch which is based in master and I cherrypicked all the commits:

https://github.com/xamarin/Xamarin.PropertyEditing/tree/monodevelop-rebased

Once we do the desired cosmetical changes or fixes to the current PR's opened, validated and merged I will bump MD to point current master, what I would not have to be traumatic, since we always have the branch rebased.

Story case:
https://devdiv.visualstudio.com/DevDiv/_workitems/edit/807788

=================== HOW INSTALL ======================

This PR includes a build with the native property editor integrated.
Easy than download and install it. The native replaces the old Gtk property editor.

To enable the feature you will need to enable the feature with:

export MD_FEATURES_ENABLED=NativePropertyPanel

Proppy Editors

Proppy specific issues/missing features:

@netonjm netonjm self-assigned this Mar 20, 2019
@alanmcgovern
Copy link
Member

alanmcgovern commented Mar 20, 2019

  These actual lines are new:
  In assembly 'Xamarin.PropertyEditing.Mac, Version=1.0.6988.24325, Culture=neutral, PublicKeyToken=0738eb9f132ed756': Unable to resolve member reference 'System.Void Xamarin.PropertyEditing.Themes.BaseThemeManager::.ctor()' from assembly 'Xamarin.PropertyEditing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756'
  In assembly 'Xamarin.PropertyEditing.Mac, Version=1.0.6988.24325, Culture=neutral, PublicKeyToken=0738eb9f132ed756': Unable to resolve member reference 'System.Void Xamarin.PropertyEditing.Themes.BaseThemeManager::add_ThemeChanged(System.EventHandler)' from assembly 'Xamarin.PropertyEditing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756'
  In assembly 'Xamarin.PropertyEditing.Mac, Version=1.0.6988.24325, Culture=neutral, PublicKeyToken=0738eb9f132ed756': Unable to resolve member reference 'System.Void Xamarin.PropertyEditing.Themes.BaseThemeManager::remove_ThemeChanged(System.EventHandler)' from assembly 'Xamarin.PropertyEditing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756'
  In assembly 'Xamarin.PropertyEditing.Mac, Version=1.0.6988.24325, Culture=neutral, PublicKeyToken=0738eb9f132ed756': Unable to resolve member reference 'Xamarin.PropertyEditing.Themes.PropertyEditorTheme Xamarin.PropertyEditing.Themes.BaseThemeManager::get_Theme()' from assembly 'Xamarin.PropertyEditing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756'
  In assembly 'Xamarin.PropertyEditing.Mac, Version=1.0.6988.24325, Culture=neutral, PublicKeyToken=0738eb9f132ed756': Unable to resolve type reference 'Xamarin.PropertyEditing.Themes.BaseThemeManager' in 'Xamarin.PropertyEditing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null'
  In assembly 'Xamarin.PropertyEditing.Mac, Version=1.0.6988.24325, Culture=neutral, PublicKeyToken=0738eb9f132ed756': Unable to resolve type reference 'Xamarin.PropertyEditing.Themes.PropertyEditorTheme' in 'Xamarin.PropertyEditing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null'

As expected the bundling of the old assembly breaks us :) We'll need to complete MonoDevelop's bump to master!

@alanmcgovern
Copy link
Member

This commit removes these binaries from our insertion https://github.com/xamarin/designer/pull/1840

@alanmcgovern
Copy link
Member

I removed 653f2a0 from this PR as the md-addins PR has already merged :)

@netonjm
Copy link
Contributor Author

netonjm commented Mar 21, 2019

nice! thank you @alanmcgovern !

netonjm and others added 5 commits March 27, 2019 16:52
version-checks Outdated Show resolved Hide resolved
@Therzok
Copy link
Contributor

Therzok commented Apr 2, 2019

Fixed in master-vnext?

@alanmcgovern
Copy link
Member

yes!

@alanmcgovern alanmcgovern deleted the proppertypanel-rebase branch April 2, 2019 10:28
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants