-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Conversation
Not ready for review, I'll take it out of draft when ready |
Ready for review. I was only able to compare functionally against android as I don't have a mac available at the moment to build the iOS control gallery |
Maybe I'm overlooking it, but did you include the |
.nuspec/Xamarin.Forms.nuspec
Outdated
@@ -229,6 +229,7 @@ | |||
<file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\Shell\ShellStyles.xbf" target="lib\uap10.0\Xamarin.Forms.Platform.UAP\Shell" /> | |||
<file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\PickerStyle.xbf" target="lib\uap10.0\Xamarin.Forms.Platform.UAP" /> | |||
<file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\Microsoft.UI.Xaml\Themes\generic.xbf" target="lib\uap10.0\Xamarin.Forms.Platform.UAP\Microsoft.UI.Xaml\Themes\" /> | |||
<file src="..\Xamarin.Forms.Platform.UAP\bin\$Configuration$\PromptDialog.xbf" target="lib\uap10.0\Xamarin.Forms.Platform.UAP" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@samhouts I believe I updated the nuspec...to be honest, I have no idea what I'm doing there...but I think I made a good guess based on other files from the UWP platform...would you please double check? Thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bmacombe can you rebase this PR? The latest master doesn't require any of these to be specified on the nuspec
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@PureWeen Sure, I'll try to do that in the next few days
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@PureWeen After a rebase I'm getting this error when trying to compile
error MSB4184: The expression "[System.Version]::Parse('')" cannot be evaluated. Version string portion was too short or too long.
Any thoughts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
delete your obj/bin directories and then you should be fine
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@PureWeen I did that a couple times and I'm down to this error on XF.Core.
Severity Code Description Project File Line Suppression State
Error MSB4062 The "XFCorePostProcessor.Tasks.FixXFCoreAssembly" task could not be loaded from the assembly C:\git\Xamarin.Forms\Xamarin.Forms.Core..\XFCorePostProcessor.Tasks\bin\Debug\net461\XFCorePostProcessor.Tasks.dll. Could not load file or assembly 'file:///C:\git\Xamarin.Forms\XFCorePostProcessor.Tasks\bin\Debug\net461\XFCorePostProcessor.Tasks.dll' or one of its dependencies. The system cannot find the file specified. Confirm that the declaration is correct, that the assembly and all its dependencies are available, and that the task contains a public class that implements Microsoft.Build.Framework.ITask. Xamarin.Forms.Core C:\git\Xamarin.Forms\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj 33
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
your best bet will probably be to cleanout the directory with git clean -xdf
keep in mind that anything you haven't checked in will get deleted
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@PureWeen That seemed to do the trick...thanks for that tip, I didn't know that one. Rebase pushing shortly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yay! We've been going through some pretty heavy csproj changes which unfortunately don't "just work" when they get merged in
a80df2b
to
895e050
Compare
* 'master' of github.com:xamarin/Xamarin.Forms: (330 commits) [Android] Fix color filter usage on API29 (xamarin#9180) Add null check to GetIconColor (xamarin#9172) Apply cecil fixes to make packages 2017 compatible (xamarin#9145) [UWP] Attempt to resolve entry on UWP not correctly calculating the correct height when in a scroll view (xamarin#8214) Fixes 7992 Changes UWP DatePicker to show the picker flyout on DatePickerFocus() (xamarin#8056) Update bug_report.md (xamarin#8688) [android/ios] improve perf when not using Application.Properties (xamarin#8887) The great Androidx IF Def'ing of 2019 (xamarin#8898) Added IconColor property for managing navigation icon color (xamarin#5185) Add UWP display prompt (xamarin#8720) fix bad merge Fix 8743 - now using specific style in SearchBar [UWP] (xamarin#8773) Added the SwipeView tag to the Core Gallery samples (xamarin#8819) [Tizen] Shell: FlyoutBackgroundImage, FlyoutBackgroundImageAspect (xamarin#8905) [Core] remove array covariant cast for UWP (xamarin#9135) [android] remove Anticipator.cs for now (xamarin#8858) Update the CarouselView Position setting the CurrentItem (xamarin#7946) fixes xamarin#7924 send remove events (xamarin#9124) [platform] improve perf of PropertyChangedEventArgsExtensions (xamarin#9084) Fix SeachBarRenderer CreateNativeControl issue (xamarin#8946) ... # Conflicts: # Xamarin.Forms.Core/FontImageSource.cs
Description of Change
Adds UWP Display Prompt
Issues Resolved
API Changes
None
Platforms Affected
Behavioral/Visual Changes
Adds Display Prompt
Before/After Screenshots
Testing Procedure
Use Issue 6713 with UWP
PR Checklist