mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-03 17:56:44 +02:00
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request This PR fixes the migration of bookmarks from versions prior to 0.95, resolving an issue where hotkeys and aliases wouldn’t persist on bookmarks created with Command Palette 0.94 or earlier. It removes ID auto-fixing from `BookmarkData` in favor of an explicit migration step handled by `BookmarkManager`. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [x] Closes: #42796 - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed
52 lines
1.3 KiB
C#
52 lines
1.3 KiB
C#
// Copyright (c) Microsoft Corporation
|
|
// The Microsoft Corporation licenses this file to you under the MIT license.
|
|
// See the LICENSE file in the project root for more information.
|
|
|
|
using System;
|
|
using System.Threading;
|
|
using Microsoft.CmdPal.Ext.Bookmarks.Persistence;
|
|
|
|
namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
|
|
|
|
internal sealed class MockBookmarkDataSource : IBookmarkDataSource
|
|
{
|
|
private string _jsonData;
|
|
private int _saveCount;
|
|
|
|
public MockBookmarkDataSource(string initialJsonData = "[]")
|
|
{
|
|
_jsonData = initialJsonData;
|
|
}
|
|
|
|
public string GetBookmarkData()
|
|
{
|
|
return _jsonData;
|
|
}
|
|
|
|
public void SaveBookmarkData(string jsonData)
|
|
{
|
|
_jsonData = jsonData;
|
|
Interlocked.Increment(ref _saveCount);
|
|
}
|
|
|
|
public int SaveCount => Volatile.Read(ref _saveCount);
|
|
|
|
// Waits until at least expectedMinSaves have occurred or the timeout elapses.
|
|
// Returns true if the condition was met, false on timeout.
|
|
public bool WaitForSave(int expectedMinSaves = 1, int timeoutMs = 2000)
|
|
{
|
|
var start = Environment.TickCount;
|
|
while (Volatile.Read(ref _saveCount) < expectedMinSaves)
|
|
{
|
|
if (Environment.TickCount - start > timeoutMs)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
Thread.Sleep(50);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
}
|