These are chat archives for Ruhrpottpatriot/GW2.NET

3rd
Oct 2015
Steven Liekens
@StevenLiekens
Oct 03 2015 08:06
well yeah I basically deleted the old converters and replaced them with better ones
without paying much attention to code style
but I mean you don't have to fix my bad code
I can do that if you want me to
I added milestones for 1.3 and 2.0
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 11:58
Don't worry, I'll fix the code. This is a good chance to get back into the whole thing. I havn't looked at it for months and the PR didn't give me a good enough overview. It'll also give me a good chance to refine the rules a bit better and see which one we might need enabled and which disabled.
Steven Liekens
@StevenLiekens
Oct 03 2015 12:26
crap
I pushed a tag too early
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 12:26
^^
happens
Steven Liekens
@StevenLiekens
Oct 03 2015 12:26
any way to delete a tag from github?
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 12:26
open the tag
and delete it
on github ofc
Steven Liekens
@StevenLiekens
Oct 03 2015 12:27
oh yeah that works
I was thinking in terms of git commands
because I don't think you can delete remote tags
see link
Steven Liekens
@StevenLiekens
Oct 03 2015 12:28
what is :refs?
I've seen it before
long live RegEx
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 12:47
@StevenLiekens you should check your git settings, I get a lot of line ending messages in VS
Steven Liekens
@StevenLiekens
Oct 03 2015 12:55
ok
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 12:55
I think I have: Checkout windows, push linux
that is imho the best solution
phew
800 fixes... done
remaining? IT'S OVER 2000!!
although most of them are: "Hey, there is a documentation missing!"
Steven Liekens
@StevenLiekens
Oct 03 2015 12:59
I finished up v1.3.0
just need to build and push packages now
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:00
are the nupkg files up to date?
then I'll push them in an hour or so
Steven Liekens
@StevenLiekens
Oct 03 2015 13:01
which files?
the nuspecs?
yes
I changed the <releaseNotes> section so that it always points to a github release page
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:01
ah ok
good
Steven Liekens
@StevenLiekens
Oct 03 2015 13:02
and this is what it says in the nuspec
<releaseNotes><![CDATA[https://github.com/Ruhrpottpatriot/GW2.NET/releases/tag/v$version$]]></releaseNotes>
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:03
ok
ok, we have 1958 informational messages on missing comments
they are not warnings, so they won't show up in the CI build log
Steven Liekens
@StevenLiekens
Oct 03 2015 13:03
nice!
I need more coffee
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:04
still, we have 450+ warnings taht I'm going to fix before pushing my commits
Steven Liekens
@StevenLiekens
Oct 03 2015 13:04
I don't know how I'm gonna merge 1.3.0 into master
they have diverged quite a bit
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:04
huh?
What do you mean?
Steven Liekens
@StevenLiekens
Oct 03 2015 13:04
the more we develop on master, the harder it becomes to merge in bugfixes
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:05
A fast forward should be possible
the Analyzer fixes are their own branch
and the only thing that changed master are the 4.6 changes
Steven Liekens
@StevenLiekens
Oct 03 2015 13:05
1.3.0 still uses the old converters
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:06
btw: do you know how i can merge one commit into a different branch?
Steven Liekens
@StevenLiekens
Oct 03 2015 13:06
yep
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:06
pray tell
I borked the 4.6 merge
I fixed it in the analyzer branch
Steven Liekens
@StevenLiekens
Oct 03 2015 13:06
git cherry-pick <sha>
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:06
and i want to merge that one commit into master
This message was deleted
checkout master
and then run your command?
Steven Liekens
@StevenLiekens
Oct 03 2015 13:07
yep
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:07
ok
what the heck
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:12
the commit in the command line is the corret one
however github shows something totally different
and it is something totally different
how is that possible?
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:36
ok
Now I fixed every Stylecop analyzer warning
the only warnings we have now are actual warnings we have to think about
Steven Liekens
@StevenLiekens
Oct 03 2015 13:46
wait so
uh
what branch are we on
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:46
I'm on my local analyzer branch
Faulty Project history.jpg
can you tell me how to fix that weird looking branch layout?
Steven Liekens
@StevenLiekens
Oct 03 2015 13:53
no idea what that means
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:53
somehow I have two branches
see the pic
Those two branches should be one branch
I guess I have to delete the merge commit
Steven Liekens
@StevenLiekens
Oct 03 2015 13:54
what did you do when you changed the gitignore file?
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:55
the right part
should be before the left part
that was the inital start
wait
is this possible...
ok
the right line is the same as the start of the left
strange
so I could delete the right line, right?
Steven Liekens
@StevenLiekens
Oct 03 2015 13:58
that looks weird
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:58
yep
Steven Liekens
@StevenLiekens
Oct 03 2015 13:58
the left one is the most up to date?
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:59
Seems I have a duplicate line
yeah
Steven Liekens
@StevenLiekens
Oct 03 2015 13:59
but you have commits on the right one that are not in the left one
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:59
apparently no
they have another SHA
Steven Liekens
@StevenLiekens
Oct 03 2015 13:59
ok in that case
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 13:59
But the commit messages are the same
So I assume they are the same
they also have the same timestamp
so I'm sure they are the same
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 14:09
So I only have to delete the right commit line?
Steven Liekens
@StevenLiekens
Oct 03 2015 14:09
yeah
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 14:09
what would be the command for that?
Steven Liekens
@StevenLiekens
Oct 03 2015 14:11
reset to the last good commit
then push -f
git reset ec00500b --hard
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 14:16
I did that, now I have those commits marked as incoming
Steven Liekens
@StevenLiekens
Oct 03 2015 14:17
because you haven't pushed yet
git push -f
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 14:18
ah ok
so with git push -f, I overwrite those commits, right?
Steven Liekens
@StevenLiekens
Oct 03 2015 14:20
yeah
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 14:20
Good, now everything is in order
One last check and maybe fixes
after that we have to talk about, how we handle 1.3.0
explain the problem to me a bit
Steven Liekens
@StevenLiekens
Oct 03 2015 14:22
which one
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 14:23
the more we develop on master, the harder it becomes to merge in bugfixes
and that 1.3.0 still uses old converters
Steven Liekens
@StevenLiekens
Oct 03 2015 14:23
because 1.3.0 is based on 1.2.0
not based on master
I checked out tag v1.2.0 and applied the bugfixes, then pushed it as tag v1.3.0
now I'm trying to merge the fixes from v1.3.0 into master
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 14:24
That'd be the best way imo
Steven Liekens
@StevenLiekens
Oct 03 2015 14:25
yes
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 14:25
if that does not work, just leave the branch, and copy paste the fixes over into master
Steven Liekens
@StevenLiekens
Oct 03 2015 14:25
it does work
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 14:25
ah good
Steven Liekens
@StevenLiekens
Oct 03 2015 14:25
you just get a lot of merge conflicts that you need to resolve manually
because v1.2.0 and master have diverged quite a bit
and the problem only gets worse the more you change stuff on master
so hopefully we don't have to fix any more bugs after 1.3.0
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 14:26
yeah
Steven Liekens
@StevenLiekens
Oct 03 2015 14:42
30 conflicts remaining
Steven Liekens
@StevenLiekens
Oct 03 2015 15:43
almost there
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 15:43
ditto
I found some more warnings and fixed them
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 15:49
do you want to merge your fixes first, or should I merge my branch first?
Steven Liekens
@StevenLiekens
Oct 03 2015 15:50
yours first
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 15:50
ok
Will do that now
Steven Liekens
@StevenLiekens
Oct 03 2015 15:51
my changes are more than style changes
while merging I found two more things that I need to do for 1.3.0
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 15:54
ok
I just merged the changes
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 16:01
So you are free to go
Steven Liekens
@StevenLiekens
Oct 03 2015 16:17
merge-ception
I applied stashed changes on top of a merge in progress
and it gave me merge conflicts
visual studio doesn't handle that so well
Steven Liekens
@StevenLiekens
Oct 03 2015 16:23
showing me a list of merge conflicts where there are none
but I admit I probably shouldn't be doing it this way
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 16:44
lol^^
Steven Liekens
@StevenLiekens
Oct 03 2015 17:04
I sent a PR
the commit history contains some stuff that isn't relevant
but it should be fine
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:05
ok
merged it
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:17
can you check, if the NuGetPackEverything script is still ok?
I get errors when I run it
Steven Liekens
@StevenLiekens
Oct 03 2015 17:20
the shortcut?
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:20
I just run the script from the VS command line
or do I need to pass arguments?
Steven Liekens
@StevenLiekens
Oct 03 2015 17:20
it used to be a shortcut to powershell.exe with a script as the first argument
I replaced it with a ps1 script file in master
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:20
yeah
that one
Steven Liekens
@StevenLiekens
Oct 03 2015 17:20
which one is giving you trouble?
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:21
the script
Steven Liekens
@StevenLiekens
Oct 03 2015 17:22
ok try rebuilding in visual studio
and also restore nuget packages
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:22
I deleted that nuget folder, it is obsolete
NuGet says, you shouldn't use it
Steven Liekens
@StevenLiekens
Oct 03 2015 17:22
the config file isn't obsolete
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:23
why wouldn't it?
Steven Liekens
@StevenLiekens
Oct 03 2015 17:23
because you can still use it for configuring nuget options
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:24
yeah, but we don't use it
Steven Liekens
@StevenLiekens
Oct 03 2015 17:24
I know
I'm just saying it's still used
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:24
yeah
for us it is useless
:)
ok, a rebuild and restore does not do anything
nuget : The replacement token 'title' has no value.
At E:\Users\Robert\Documents\Visual Studio 2013\Projects\GW2.NET\NuGetPackEverything.ps1:3 char:2
+     nuget pack $_ -Build -Properties Configuration=Release
+     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    + CategoryInfo          : NotSpecified: (The replacement...' has no value.:String) [], RemoteException
    + FullyQualifiedErrorId : NativeCommandError
That is the error
Steven Liekens
@StevenLiekens
Oct 03 2015 17:25
title?
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:25
dunno
that is the error
Steven Liekens
@StevenLiekens
Oct 03 2015 17:26
ok well
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:26
nuget : Fehler beim Erstellen von "GW2NET.V2.Skins.csproj".
At E:\Users\Robert\Documents\Visual Studio 2013\Projects\GW2.NET\NuGetPackEverything.ps1:3 char:2
+     nuget pack $_ -Build -Properties Configuration=Release
+     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    + CategoryInfo          : NotSpecified: (Fehler beim Ers....Skins.csproj".:String) [], RemoteException
    + FullyQualifiedErrorId : NativeCommandError
That's the second
Steven Liekens
@StevenLiekens
Oct 03 2015 17:26
$title$ is replaced by the value of [assembly: AssemblyTitle("...")]
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:27
can you run it on your side, and check if the script still works?
Steven Liekens
@StevenLiekens
Oct 03 2015 17:27
yea hold on
on what branch?
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:27
nuget restore
Get-ChildItem *.csproj -Recurse -Exclude *[Tt]est* | %{
    nuget pack $_ -Build -Properties Configuration=Release
}
w8 a sec
master
Steven Liekens
@StevenLiekens
Oct 03 2015 17:27
oh
why are you trying to pack master?
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:28
yeah
saw that too
w8 a sec
btw is that script ok=
Steven Liekens
@StevenLiekens
Oct 03 2015 17:28
it is
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:29
btw: I don't have a 1.3 branch on GW2.NET
Steven Liekens
@StevenLiekens
Oct 03 2015 17:29
it's not a branch it's a tag
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:29
I think it's on your fork
ah yeah
Steven Liekens
@StevenLiekens
Oct 03 2015 17:29
git checkout v1.3.0
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:29
by bad
^^
Steven Liekens
@StevenLiekens
Oct 03 2015 17:29
that will give you the right set of files to publish
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:29
ok...
PS E:\Users\Robert\Documents\Visual Studio 2013\Projects\GW2.NET> git checkout v1.3.0
error: pathspec 'v1.3.0' did not match any file(s) known to git.
hm
I'm on the latest commit
ah
ok
there was a small error
Steven Liekens
@StevenLiekens
Oct 03 2015 17:32
git fetch first
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 17:32
a pull fixed that
I did a pull after you pushed the tag
but somehow it was borked
Steven Liekens
@StevenLiekens
Oct 03 2015 18:22
Did it work?
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 18:59
yep
I'm currently batch uploading the packages
so we should be able to go live with 1.3.0 in about 15min
Steven Liekens
@StevenLiekens
Oct 03 2015 19:07
Ok
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 19:21
ok
done
Steven Liekens
@StevenLiekens
Oct 03 2015 19:24
ok
I hope it's the last one
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 19:25
can you change the NuGetPackEverything script a bit?
I need the nupkg files and a package.config file
The donfig hfile has to have the follwing format:
Steven Liekens
@StevenLiekens
Oct 03 2015 19:25
what's the config for?
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 19:25
<packages>
    <package id="Microsoft.Owin.Host.SystemWeb" version="1.0.0-rc1" />
    <package id="Microsoft.AspNet.FriendlyUrls" version="1.0.0-rc1" />
</packages>
It's needed for the batch upload
see here
Steven Liekens
@StevenLiekens
Oct 03 2015 19:28
oh ok
it's not a nuget official thing
Robert Logiewa
@Ruhrpottpatriot
Oct 03 2015 19:29
no it isn't
Steven Liekens
@StevenLiekens
Oct 03 2015 19:29
I was confused for a sec