User Inarion | chat.stackexchange.com

Inarion

Jan 31, 2019 21:47

Severity	Code	Description	Project	File	Line	Suppression State
Error	CS0006	Metadata file 'C:\Users\Inarion\Source\Repos\Inarion\Rubberduck\Rubberduck.Parsing\bin\Release\net46\Rubberduck.Parsing.dll' could not be found	Rubberduck.Main	C:\Users\Inarion\Source\Repos\Inarion\Rubberduck\Rubberduck.Main\CSC	1	Active

Inarion

Jan 31, 2019 21:47

Now after merging, two problems are remaining:
1. app.config still doesn't seem to update automatically. It's got the expected length at least. (I could update it manually, though not sure if that's allowed/recommended.)
2. Some Build+Intellisense Errors like this one:

Inarion

Jan 31, 2019 21:23

oh... I think I got it

Inarion

Jan 31, 2019 21:23

how can I tell it to take the Settings.settings that I got from upstream/next and discard the one in my PR?

Inarion

Jan 31, 2019 21:17

ah, a pull and now I've got a conflict

Inarion

Jan 31, 2019 21:13

Ok, and then I merge the changes from next?

Inarion

Jan 31, 2019 21:11

I'm referring to these commits:
1. https://github.com/rubberduck-vba/Rubberduck/pull/4612/commits/262947c34625b082b49e254d3bdf5d4a9c894ee6
2. https://github.com/rubberduck-vba/Rubberduck/pull/4612/commits/f002b70cc05df5215a4e8052df53214fa087873f

Inarion

Jan 31, 2019 21:09

(RD build fine after merging, btw.)

Inarion

Jan 31, 2019 21:09

Not today at least. Not sure what I did a couple of weeks ago. :/

Inarion

Jan 31, 2019 21:08

I don't think so.

Inarion

Jan 31, 2019 21:08

yeah

Inarion

Jan 31, 2019 21:08

git reset --hard origin/Inarion-FirstSteps

Inarion

Jan 31, 2019 21:06

The one from Dec. 5th is there, the next isn't.

Inarion

Jan 31, 2019 21:05

There's one thing I don't understand: I reset my local copy to the state of the PR. Yet there's one commit that doesn't show up. github.com/rubberduck-vba/Rubberduck/pull/4612/commits

Inarion

Jan 31, 2019 21:00

ok, still no errors though. I'll try building.

Inarion

Jan 31, 2019 20:57

Severity	Code	Description	Project	File	Line	Suppression State
Warning	MSB4011	"C:\Users\Inarion\.nuget\packages\sunburst.net.sdk.wpf\1.0.47\Sdk\Sdk.props" cannot be imported again. It was already imported at "C:\Users\Inarion\Source\Repos\Inarion\Rubberduck\Rubberduck.Resources\Rubberduck.Resources.csproj". This is most likely a build authoring error. This subsequent import will be ignored. 	Rubberduck.Resources		1

Inarion

Jan 31, 2019 20:57

I've got a bunch of warnings akin to the following:

Inarion

Jan 31, 2019 20:54

@this thought that might be correlated, i.e. the framework would get an update as well

Inarion

Jan 31, 2019 20:53

no conflict markers there, though

Inarion

Jan 31, 2019 20:53

15.9.4

Inarion

Jan 31, 2019 20:52

I have a 1.5GB update pending.

Inarion

Jan 31, 2019 20:52

guess I'll need to update VS first :D

Inarion

Jan 31, 2019 20:51

erm...

Could not resolve mscorlib for target framework '.NETFramework,Version=v4.6'.  This can happen if the target framework is not installed or if the framework moniker is incorrectly formatted.

Inarion

Jan 31, 2019 20:50

git checkout or check out something for you? ;)

Inarion

Jan 31, 2019 20:49

It would have told me otherwise I guess?

Inarion

Jan 31, 2019 20:48

$ git status
On branch Inarion-FirstSteps
Your branch is ahead of 'origin/Inarion-FirstSteps' by 368 commits.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean

Inarion

Jan 31, 2019 20:48

so now I got:

Inarion

Jan 31, 2019 20:44

hm, it told me it would abort the merge if I left the message empty. I closed it unchanged and the merge proceeded anyway. :/

Inarion

Jan 31, 2019 20:40

and where will that show up?

Inarion

Jan 31, 2019 20:40

what should I put as a reason for the upstream/next to origin/next merge?

Inarion

Jan 31, 2019 20:32

@this yeah, I guess I was understanding as much. What tripped me up was that my aliases don't follow that convention. ;D

Inarion

Jan 31, 2019 20:31

@M.Doerner ok, will do that

Inarion

Jan 31, 2019 20:30

The fetch succeeded. I was unsure whether to merge directly into the PR branch

Inarion

Jan 31, 2019 20:29

I would think so, yeah

Inarion

Jan 31, 2019 20:29

$ git remote -v
origin  github.com/Inarion/Rubberduck (fetch)
origin  github.com/Inarion/Rubberduck (push)
rubberduckvba   github.com/rubberduck-vba/Rubberduck (fetch)
rubberduckvba   github.com/rubberduck-vba/Rubberduck (push)

Inarion

Jan 31, 2019 20:28

$ git branch
* Inarion-FirstSteps
  next

Inarion

Jan 31, 2019 20:27

yeah

Inarion

Jan 31, 2019 20:25

my next would be my open PR, right? With the already committed changes?

Inarion

Jan 31, 2019 20:23

bingo, that's it

Inarion

Jan 31, 2019 20:21

Is there a command that lets me see the available repositories? I've got the feeling they are called differently.

Inarion

Jan 31, 2019 20:21

will try to follow your directions, thanks. :)

Inarion

Jan 31, 2019 20:15

@M.Doerner which was my intention. I wanted to start off where the PR stands right now, to not make too much of a mess. ;)

Inarion

Jan 31, 2019 20:13

@this should I? I did a git reset --hard origin/Inarion-FirstSteps when I started today, because I was some commits ahead of origin and wasn't too sure what that meant.

Inarion

Jan 31, 2019 20:11

then something's wrong with my build process?

Inarion

Jan 31, 2019 20:10

the one under Rubberduck.Core?

Inarion

Jan 31, 2019 20:09

@M.Doerner the app.config is only 14 lines long, though? And it doesn't seem to change.

Inarion

Jan 31, 2019 20:06

@M.Doerner in Rubberduck.Core/Settings.settings

Inarion

Jan 31, 2019 20:05

3. Build solution on Release setting and checked the changed setting appears when running RD without a config file.
4. app.config still doesn't show any changes - this confuses me. Isn't it supposed to be changed?

Inarion

Jan 31, 2019 20:03

Hey guys! I'm at home now and trying to get my [PR](https://github.com/rubberduck-vba/Rubberduck/pull/4612) sorted out. I'm still kinda lost... Here's what I've done:
1. Made sure my working copy is in the same state as origin/Inarion-FirstSteps
2. Realized the default severity for ShadowedDeclarationInspection is still DoNotShow, so changed that.
... (more coming)

Inarion

Jan 31, 2019 16:44

Have a bug causing a runtime exception in a Property Get procedure, create an instance of that class, try to inspect it in the locals window --> bye Excel, has been nice knowing you!

Inarion

VBA Rubberducking