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.

Sign up for GitHub

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

Jump to bottom

Don't reset App.Current OnResume if it's already set #15496

Merged
merged 1 commit into from
Jun 7, 2023
Merged

Don't reset App.Current OnResume if it's already set #15496

merged 1 commit into from
Jun 7, 2023

Conversation

PureWeen
Copy link
Member

@PureWeen PureWeen commented Jun 7, 2023

Description of Change

During a device test run the Current application was getting reset to ApplicationStub whenever a test would minimize and then maximize a window as part of the test. This would then cause the VisualRunner to start failing.

This code was originally added here xamarin/Xamarin.Forms#5994

StephaneDelcroix
StephaneDelcroix approved these changes Jun 7, 2023
View reviewed changes
src/Controls/src/Core/Application.cs
@@ -348,7 +348,9 @@ public void SendOnAppLinkRequestReceived(Uri uri)

internal void SendResume()
{
if (Current is null)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd do if (Current != this), but we don't really handle multiple Application, so 👍

@PureWeen PureWeen enabled auto-merge (squash) June 7, 2023 07:17
@PureWeen PureWeen merged commit c35d72b into main Jun 7, 2023
@PureWeen PureWeen deleted the only_set_app_if_not_already_set branch June 7, 2023 08:43
rmarinho added a commit that referenced this pull request Jun 14, 2023
@rmarinho @mattleibow
@PureWeen @dependabot @hartez @expensivecow @jknaudt21 @dotnet-maestro @sbanni @MartyIX @tj-devel709 @jfversluis
[net8.0] Merge main to net8 (#15478)
b965617 
* Update Win2D (#15400)

Fixes #9104

* Fix broken button when adding PGR implicitly (#15419)

* Fix broken button when adding PGR implicitly

* - fix conditional

* Bump Xamarin.GooglePlayServices.Maps from 118.1.0.1 to 118.1.0.2 (#15409)

Bumps [Xamarin.GooglePlayServices.Maps](https://github.com/xamarin/GooglePlayServicesComponents) from 118.1.0.1 to 118.1.0.2.
- [Release notes](https://github.com/xamarin/GooglePlayServicesComponents/releases)
- [Commits](https://github.com/xamarin/GooglePlayServicesComponents/commits)

---
updated-dependencies:
- dependency-name: Xamarin.GooglePlayServices.Maps
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Correct docs for Grid ColumnSpacing/RowSpacing (#15425)

* Bump Xamarin.Firebase.AppIndexing from 120.0.0.11 to 120.0.0.12 (#15406)

Bumps [Xamarin.Firebase.AppIndexing](https://github.com/xamarin/GooglePlayServicesComponents) from 120.0.0.11 to 120.0.0.12.
- [Release notes](https://github.com/xamarin/GooglePlayServicesComponents/releases)
- [Commits](https://github.com/xamarin/GooglePlayServicesComponents/commits)

---
updated-dependencies:
- dependency-name: Xamarin.Firebase.AppIndexing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Modify generated ID starting point to prevent collision with ItemViewType (#15438)

* Move Windows and iOS Frame measure and arrange to xplat layer (#14987)

* Fix Windows frame not resizing with screen

Fixes #13552

* Make iOS Frame renderer us shared implementation

Moving some frame border calculations to the xplat layer with more shared code

* Add test

* Auto-format source code

* Remove padding update

Windows was double counting padding

* Fix test for other platforms

* Auto-format source code

* Fix typo

* Add padding test

---------

Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com>

* Bump Microsoft.NET.Test.Sdk from 17.6.0 to 17.6.1 (#15408)

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.6.0 to 17.6.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md)
- [Commits](microsoft/vstest@v17.6.0...v17.6.1)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Pin main branch to net7 (#15452)

* [uitests] Fix appium versions (#15453)

* Upload appium

* Pin all versions

* Use variables

* Prep better the script

* Update dependencies from https://github.com/dotnet/xharness build 20230529.1 (#15450)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 8.0.0-prerelease.23272.1 -> To Version 8.0.0-prerelease.23279.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* [net8.0] Don't pin sdk on net8 branch

* Add the drag and drop gestures back to the appium ui tests for mac/ios targets

* Update ModalNavigationManager.cs (#15483)

* Don't reset App.Current OnResume if it's already set (#15496)

* First pass at adding developer layout docs (#15426)

* First pass at adding developer layout docs

* Update docs/design/layout.md

Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com>

---------

Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com>

* Clear window from ContextStub after it's closed (#15495)

* Remove legacy launch settings (#15511)

* Skip tests currently having issues on WinUI (#15527)

* Skip tests currently having issues

* Update AssertionExtensions.Windows.cs

* - Update skip notes

* - update notes

* - update test notes

* - update tests that have always been failing

* - update test notes

* - fix compile errors

* Fix incorrect calculation of expansion size when *s have different scalars (#15532)

Fixes #15494

* Change the tokens to null (#15560)

Co-authored-by: tj-devel709 <tjlambert@microsoft.com>

* Add all platforms if build args don't restrict to a single platform (#15561)

* Restore & obsolete Windows MauiWebView ctor (#15541)

* Restore & obsolete Windows MauiWebView ctor

* Reinstate functionality for obsoleted ctor

* Ignore additional tests for iOS (#15513)

* Bump Microsoft.NET.Test.Sdk from 17.6.1 to 17.6.2 (#15502)

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.6.1 to 17.6.2.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md)
- [Commits](microsoft/vstest@v17.6.1...v17.6.2)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/xharness build 20230607.1 (#15581)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 8.0.0-prerelease.23279.1 -> To Version 8.0.0-prerelease.23307.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update Versions.props

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
Co-authored-by: Michael Cao <poppop208@gmail.com>
Co-authored-by: Juan Diego Herrera <juherrera@microsoft.com>
Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Scott Banning <scoban@microsoft.com>
Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com>
Co-authored-by: scoban <sbanni@users.noreply.github.com>
Co-authored-by: TJ Lambert <50846373+tj-devel709@users.noreply.github.com>
Co-authored-by: tj-devel709 <tjlambert@microsoft.com>
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
StephaneDelcroix pushed a commit that referenced this pull request Jun 19, 2023
@PureWeen @StephaneDelcroix
Don't reset App.Current OnResume if it's already set (#15496)
0dc98ed
@samhouts samhouts added the area-core-hosting Extensions / Hosting / AppBuilder / Startup label Jul 20, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Dec 9, 2023
@samhouts samhouts added the fixed-in-8.0.0-preview.6.8686 Look for this fix in 8.0.0-preview.6.8686! label Aug 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@StephaneDelcroix StephaneDelcroix StephaneDelcroix approved these changes

Assignees
No one assigned
Labels
area-core-hosting Extensions / Hosting / AppBuilder / Startup fixed-in-8.0.0-preview.6.8686 Look for this fix in 8.0.0-preview.6.8686!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@PureWeen @StephaneDelcroix @samhouts