search

MvvmCross / MvvmCross-Forms

Support for Xamarin.Forms on MvvmCross: The .NET MVVM framework for cross-platform solutions, including Xamarin.iOS, Xamarin.Android, Windows and Mac.
http://mvvmcross.com
6 stars 2 forks source link

Upgrades references to MvvmCross (4.0.0.0-beta1) to (4.0.0.0-beta3). … #25

Closed PeterBurke closed 9 years ago

PeterBurke commented 9 years ago

…Some Beta1 references had strong names, the Beta3 versions do not.

martijn00 commented 9 years ago

Seems good to merge, but there are some conflicts. Can you resolve them first.

PeterBurke commented 9 years ago

OK

Actually the only files I wanted in the PR were the 5 csproj and 5 packages.config files because I have not made any changes to the c# code. However Tomasz a couple of months back made come c# changes in one file that were not were not in my GitHib Repo. So I simply downloaded that one separately, but GitHub seems to think that there are conflicts.

Also there is now one more change, that is to the NuSpec updating version numbers of dependencies and also renaming this to 4.0.0-beta3.

It all runs OK.

So give me a few more hours and I should have a new PR.

Can you point me at the GitHub that would allow me to pull the current file from the remote master into my remote fork and so that file will not be in the next PR. Don't worry if you can't answer within 60 seconds.

martijn00 commented 9 years ago

You can update this PR. I would add this repo as remote to yours, and hit merge on the head of this one. That will merge all the latest stuff in and probably fix merge conflicts.

martijn00 commented 9 years ago

Should it be closed?

PeterBurke commented 9 years ago

Hmmm

Sent from my Windows Phone

From: Martijn van Dijkmailto:notifications@github.com Sent: �9/�10/�2015 7:01 PM To: MvvmCross/MvvmCross-Formsmailto:MvvmCross-Forms@noreply.github.com Cc: peter j c. burkemailto:peter@burke.ws Subject: Re: [MvvmCross-Forms] Upgrades references to MvvmCross (4.0.0.0-beta1) to (4.0.0.0-beta3). � (#25)

Should it be closed?

� Reply to this email directly or view it on GitHubhttps://github.com/MvvmCross/MvvmCross-Forms/pull/25#issuecomment-146790337.

martijn00 commented 9 years ago

@PeterBurke I've merged it manually now in #26 I can merge that if no more changes are required.

PeterBurke commented 9 years ago

Thanks Martijn