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

Remove Device Restore #3953

Merged
merged 13 commits into from
Oct 25, 2024
Merged

Remove Device Restore #3953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fa3e330
Remove RestoreState.cs
lauren-ciha Oct 9, 2024
20af2d7
Remove WinGetPackageRestoreDataSource and WinGetPackageRestoreDataSou…
lauren-ciha Oct 9, 2024
2e6f326
Remove using from BaseSetupFlowTest.cs
lauren-ciha Oct 9, 2024
1e2ff88
Remove using from ServiceExtension
lauren-ciha Oct 9, 2024
a84277e
Remove using from PackageViewModel
lauren-ciha Oct 9, 2024
bbd33f3
Remove strings
lauren-ciha Oct 9, 2024
949ca51
Updates (in progress)
lauren-ciha Oct 21, 2024
c753337
Update GetIconByTheme
lauren-ciha Oct 21, 2024
058e7ff
Split IconByTheme into GetLight/DarkThemeIcon()
lauren-ciha Oct 21, 2024
0a9357d
Refactor GetLight/DarkThemeIcon()
lauren-ciha Oct 21, 2024
5acf585
Check _package.Icon, not packageIcon
lauren-ciha Oct 22, 2024
7225b3a
Remove unnecessary usings from PackageViewModel.cs
lauren-ciha Oct 23, 2024
59b1cdc
Refactor GetIconByTheme()
lauren-ciha Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions tools/DevDiagnostics/DevHome.DevDiagnostics/Models/RestoreState.cs
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions tools/SetupFlow/DevHome.SetupFlow.UnitTest/BaseSetupFlowTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
using DevHome.SetupFlow.ViewModels;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Internal.Windows.DevHome.Helpers.Restore;
using Moq;

namespace DevHome.SetupFlow.UnitTest;
Expand All @@ -26,8 +25,6 @@ public class BaseSetupFlowTest

protected Mock<IThemeSelectorService> ThemeSelectorService { get; private set; }

protected Mock<IRestoreInfo> RestoreInfo { get; private set; }

protected Mock<ISetupFlowStringResource> StringResource { get; private set; }

protected Mock<ILocalSettingsService> LocalSettingsService { get; private set; }
Expand All @@ -40,7 +37,6 @@ public void TestInitialize()
{
WindowsPackageManager = new Mock<IWinGet>();
ThemeSelectorService = new Mock<IThemeSelectorService>();
RestoreInfo = new Mock<IRestoreInfo>();
StringResource = new Mock<ISetupFlowStringResource>();
LocalSettingsService = new Mock<ILocalSettingsService>();
TestHost = CreateTestHost();
Expand Down Expand Up @@ -76,11 +72,8 @@ private IHost CreateTestHost()
// App-management services
services.AddSingleton<IWinGet>(WindowsPackageManager.Object);
services.AddTransient<WinGetPackageJsonDataSource>();
services.AddTransient<WinGetPackageRestoreDataSource>();
services.AddSingleton<IRestoreInfo>(RestoreInfo.Object);
services.AddSingleton<PackageProvider>();
services.AddSingleton<IAppManagementInitializer, AppManagementInitializer>();
services.AddSingleton<WinGetPackageDataSource, WinGetPackageRestoreDataSource>();
services.AddSingleton<ICatalogDataSourceLoader, CatalogDataSourceLoader>();
services.AddSingleton<IScreenReaderService>(new Mock<IScreenReaderService>().Object);
services.AddSingleton<IDSC>(new Mock<IDSC>().Object);
Expand Down
231 changes: 0 additions & 231 deletions tools/SetupFlow/DevHome.SetupFlow.UnitTest/ViewModels/WinGetPackageRestoreDataSourceTest.cs
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions tools/SetupFlow/DevHome.SetupFlow/Extensions/ServiceExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Options;
using Microsoft.Internal.Windows.DevHome.Helpers;
using Microsoft.Internal.Windows.DevHome.Helpers.Restore;

namespace DevHome.SetupFlow.Extensions;

Expand Down Expand Up @@ -58,13 +57,11 @@ private static IServiceCollection AddAppManagement(this IServiceCollection servi
services.AddTransient<SearchMessageViewModel>();

// Services
services.AddSingleton<IRestoreInfo, RestoreInfo>();
services.AddSingleton<PackageProvider>();
services.AddTransient<AppManagementTaskGroup>();
services.AddSingleton<ICatalogDataSourceLoader, CatalogDataSourceLoader>();
services.AddSingleton<IAppManagementInitializer, AppManagementInitializer>();

services.AddSingleton<WinGetPackageDataSource, WinGetPackageRestoreDataSource>();
services.AddSingleton<WinGetPackageDataSource, WinGetPackageJsonDataSource>(sp =>
{
var dataSourcePath = sp.GetService<IOptions<SetupFlowOptions>>().Value.WinGetPackageJsonDataSourcePath;
Expand Down
3 changes: 0 additions & 3 deletions tools/SetupFlow/DevHome.SetupFlow/Services/StringResourceKey.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ public static class StringResourceKey
public static readonly string RemovedAllApplications = nameof(RemovedAllApplications);
public static readonly string ResultCountPlural = nameof(ResultCountPlural);
public static readonly string ResultCountSingular = nameof(ResultCountSingular);
public static readonly string RestorePackagesTitle = nameof(RestorePackagesTitle);
public static readonly string RestorePackagesDescription = nameof(RestorePackagesDescription);
public static readonly string RestorePackagesDescriptionWithDate = nameof(RestorePackagesDescriptionWithDate);
public static readonly string Repository = nameof(Repository);
public static readonly string ReviewNothingToSetUpToolTip = nameof(ReviewNothingToSetUpToolTip);
public static readonly string SelectedPackagesCount = nameof(SelectedPackagesCount);
Expand Down
Loading
Loading