Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add UWP display prompt #8720

Merged
merged 7 commits into from Jan 10, 2020
Merged

Add UWP display prompt #8720

merged 7 commits into from Jan 10, 2020

Conversation

bmacombe
Copy link
Contributor

@bmacombe bmacombe commented Nov 29, 2019

Description of Change

Adds UWP Display Prompt

Issues Resolved

API Changes

None

Platforms Affected

  • UWP

Behavioral/Visual Changes

Adds Display Prompt

Before/After Screenshots

image

image

image

Testing Procedure

Use Issue 6713 with UWP

PR Checklist

  • Targets the correct branch
  • Tests are passing (or failures are unrelated)

@bmacombe
Copy link
Contributor Author

Not ready for review, I'll take it out of draft when ready

@bmacombe bmacombe marked this pull request as ready for review November 30, 2019 01:06
@bmacombe
Copy link
Contributor Author

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

@jfversluis
Copy link
Member

Maybe I'm overlooking it, but did you include the InitialValue as well? See #8362

@samhouts samhouts moved this from In Review to In Progress in v4.5.0 Dec 14, 2019
@@ -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" />
Copy link
Contributor Author

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!

Copy link
Contributor

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

Copy link
Contributor Author

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

Copy link
Contributor Author

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?

Copy link
Contributor

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

Copy link
Contributor Author

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

Copy link
Contributor

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

Copy link
Contributor Author

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.

Copy link
Contributor

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

@samhouts samhouts added this to In Progress in v4.6.0 Jan 7, 2020
@samhouts samhouts self-assigned this Jan 10, 2020
@samhouts samhouts merged commit a445bda into xamarin:master Jan 10, 2020
v4.5.0 automation moved this from In Progress to Done Jan 10, 2020
v4.6.0 automation moved this from In Progress to Done Jan 10, 2020
@bmacombe bmacombe deleted the UWP_DisplayPrompt branch January 10, 2020 02:30
@samhouts samhouts added the approved Has two approvals, no pending reviews, and no changes requested label Jan 10, 2020
tuyen-vuduc pushed a commit to NAXAM/Xamarin.Forms that referenced this pull request Jan 14, 2020
* '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
@samhouts samhouts removed this from Done in v4.5.0 Feb 13, 2020
@samhouts samhouts added this to the 4.6.0 milestone Feb 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Has two approvals, no pending reviews, and no changes requested p/UWP t/enhancement ➕
Projects
No open projects
v4.6.0
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants