These are chat archives for AvaloniaUI/Avalonia

20th
Aug 2017
Matthijs ter Woord
@mterwoord
Aug 20 2017 07:49
@jkoritzinsky Things start to make sense, i'm on my own fork. maybe i should just upgrade that one :)
i'm only 607 commits behind :)
Matthijs ter Woord
@mterwoord
Aug 20 2017 08:00
Lots of compiler warnings in the Cairo- and Direct2D render tests
is that a known thing?
Matthijs ter Woord
@mterwoord
Aug 20 2017 08:10
Awesome, rror handlign improved!
Nikita Tsukanov
@kekekeks
Aug 20 2017 08:32

compiler warnings

The thing about tests is that compiler warnings are kind of expected there

Matthijs ter Woord
@mterwoord
Aug 20 2017 08:33
hmm, something's off here. getting 5743 warnings, not just in tests
type conflicts mostly..
and assembly reference mismatches
Matthijs ter Woord
@mterwoord
Aug 20 2017 08:39
shoot, never mind, didn't update submodules. :)
now back to the 81 warnings i had before
no, stiull that huge amount number..
Assuming assembly reference 'System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' used by 'System.Collections' matches identity 'System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' of 'System.Runtime', you may need to supply runtime policy Avalonia.Input.UnitTests(net461)
this is on 15.3.1 (vs)
Matthijs ter Woord
@mterwoord
Aug 20 2017 08:58
few small PR's coming for assembly info changes (first is #1108)
danwalmsley
@danwalmsley
Aug 20 2017 08:58
@MonkAlex are you on nightly build feed?
Matthijs ter Woord
@mterwoord
Aug 20 2017 09:15
am i doing something wrong?
somehow the follow-up PR's are also including the first pr (for example #1109 contains the changes of #1108)
danwalmsley
@danwalmsley
Aug 20 2017 09:23
Your workflow should be make changes
Then commit and push on a new branch
Then checkout master
Then do the changes for second pr
On a new branch
To correct your current situation
You need to rebase you #1109 branch onto master
Matthijs ter Woord
@mterwoord
Aug 20 2017 09:25
hmm, my fork's master contains the fixes now. that's not correct i guess?
do i need a dev branch for work, and do the pr's afgainst master?
Not just a dev branch
A seperate branch for every item of work
Matthijs ter Woord
@mterwoord
Aug 20 2017 09:26
i mean, the pr branches should be based on a clean master, and my own work (ie, combining the pr's in this case) should be on a second one?
danwalmsley
@danwalmsley
Aug 20 2017 09:26
I.e. For 1109 you branch name might be
Matthijs ter Woord
@mterwoord
Aug 20 2017 09:26
i did make separate branches, but based on the previous one basically
danwalmsley
@danwalmsley
Aug 20 2017 09:27
The pr branches should be level with clean master
But not master
Matthijs ter Woord
@mterwoord
Aug 20 2017 09:27
clean master means in sync with upstream master (ie, avalonia's)?
danwalmsley
@danwalmsley
Aug 20 2017 09:27
I.e. Fixes-for-rendering-issues
Or something like that
Yes
Matthijs ter Woord
@mterwoord
Aug 20 2017 09:28
ok, and then i would have a secnd branch in which i mnerge the stuff?
(ie, local one, for me)
danwalmsley
@danwalmsley
Aug 20 2017 09:28
No just one branch
This explains more or less how it should be done
Your feature branch gets merged to avalonia master when pr is accepted
Matthijs ter Woord
@mterwoord
Aug 20 2017 09:37
hmm, so now i have to cleanup my foork..
danwalmsley
@danwalmsley
Aug 20 2017 09:37
Just do
Git checkout remote master
Matthijs ter Woord
@mterwoord
Aug 20 2017 09:38
remote is origin?
danwalmsley
@danwalmsley
Aug 20 2017 09:38
Where remote is the name of the remote pointing to main repo
Yeah
Matthijs ter Woord
@mterwoord
Aug 20 2017 09:38
ah ok
danwalmsley
@danwalmsley
Aug 20 2017 09:38
But your origin might be for your fork
Matthijs ter Woord
@mterwoord
Aug 20 2017 09:38
well, i'm workikng on a fork which is ahead
danwalmsley
@danwalmsley
Aug 20 2017 09:38
Git remote -v will tell you
First of all.proabbly do git branch tmp to keep your existing work on a bramch
Then checkout remote master
Matthijs ter Woord
@mterwoord
Aug 20 2017 09:39
existing work is just the pr's, nothing fancy there
danwalmsley
@danwalmsley
Aug 20 2017 09:39
Ok
Matthijs ter Woord
@mterwoord
Aug 20 2017 09:39
but i'll need the avaloniaui master?
danwalmsley
@danwalmsley
Aug 20 2017 09:40
Git checkout avalonia master where avalonia is remote pointing to main repo
Then git push origin master
Where origin points to your fork
Will update your forks master to be equal to main repo
Then you can do a git branch from there and make changes
Then push to you pr branch with --force
To overwrite existing changes
Matthijs ter Woord
@mterwoord
Aug 20 2017 09:43
my master is fixed now.
should i cancel the PR's i made?
Matthijs ter Woord
@mterwoord
Aug 20 2017 09:54
hmm, already did :)
there we go!
gitkraken is awesome . has support for doing this :)
Matthijs ter Woord
@mterwoord
Aug 20 2017 10:03
@danwalmsley please let me know if i'm doing things wrong again.. :)
Matthijs ter Woord
@mterwoord
Aug 20 2017 10:13
i think i made 6 correct PR's now?
danwalmsley
@danwalmsley
Aug 20 2017 10:37
Yeh gitkraken is really good at visualising these things, its not perfect but probably one of the best git uis
Steven Kirk
@grokys
Aug 20 2017 10:42
@mterwoord i was reading about Directory.Build.props the other day, which would allow us to remove the SharedAssemblyInfo.cs file i believe
that might be a better option
also: you didn't need to create 6 different PRs ;) one would do
MonkAlex
@MonkAlex
Aug 20 2017 10:43
@danwalmsley yes, RelativeSource work only on nightly build feed
Nikita Tsukanov
@kekekeks
Aug 20 2017 10:46
@grokys having implicit includes is probably a bad idea
It's better to have Common.props and import them explicitly
Steven Kirk
@grokys
Aug 20 2017 10:47
why is that? from what i've seen a lot of projects seems to be moving to Directory.Build.props
Nikita Tsukanov
@kekekeks
Aug 20 2017 11:59
It might affect stuff we don't want it to
Eli Arbel
@aelij
Aug 20 2017 13:35
How come Avalonia doesn't throw when I use properties that don't exist in XAML? It used to.
Steven Kirk
@grokys
Aug 20 2017 13:36
@aelij i think it's a portable.xaml thing: cwensley/Portable.Xaml#66
Jeremy Koritzinsky
@jkoritzinsky
Aug 20 2017 14:23
I'm for us switching to Directory.Build.props.
Wiesław Šoltés
@wieslawsoltes
Aug 20 2017 15:10
@grokys Regarding AvaloniaUI/Avalonia#1099
The issue may be related to fact that controls are attached to visual tree before previous ones are detached, in WPF first Unloaded is called than Loaded, in Avalonia first AttachedToVisualTree is called and than DetachedFromVisualTree
Steven Kirk
@grokys
Aug 20 2017 15:12
ah! yes that may well be the case
could you add that info to the issue?
Wiesław Šoltés
@wieslawsoltes
Aug 20 2017 15:13
yes
Steven Kirk
@grokys
Aug 20 2017 15:19
thanks! don't know if you saw but i submitted this PR AvaloniaUI/Avalonia#1106 to try to fix AvaloniaUI/Avalonia#1096
Wiesław Šoltés
@wieslawsoltes
Aug 20 2017 15:21
Yes I have seen it, didn't have time to test
Steven Kirk
@grokys
Aug 20 2017 22:04
you know, it's a bit of a PITA not having Control.Resources and having to put your resources in a style isn't it? i'm guessing everyone would be happy if we added Control.Resources?
Nikita Tsukanov
@kekekeks
Aug 20 2017 22:10
:+1: