diff --git a/DevHome.sln b/DevHome.sln index 6ab2a0efdb..7c9dfcd078 100644 --- a/DevHome.sln +++ b/DevHome.sln @@ -159,6 +159,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{E768 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHome.Services.DesiredStateConfiguration", "services\DevHome.Services.DesiredStateConfiguration\DevHome.Services.DesiredStateConfiguration.csproj", "{D7A1C2CE-36B1-43A8-9BA6-1EE2CF24479F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WSLExtension", "WSLExtension", "{73D1E84F-56CC-412B-BF2B-FA692BF6B396}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WSLExtension", "extensions\WSLExtension\WSLExtension.csproj", "{B6153EEA-EADE-4BAA-B47D-6B48205C6696}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_FailFast|arm64 = Debug_FailFast|arm64 @@ -1057,6 +1061,24 @@ Global {D7A1C2CE-36B1-43A8-9BA6-1EE2CF24479F}.Release|x64.Build.0 = Release|x64 {D7A1C2CE-36B1-43A8-9BA6-1EE2CF24479F}.Release|x86.ActiveCfg = Release|x86 {D7A1C2CE-36B1-43A8-9BA6-1EE2CF24479F}.Release|x86.Build.0 = Release|x86 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Debug_FailFast|arm64.ActiveCfg = Debug|ARM64 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Debug_FailFast|arm64.Build.0 = Debug|ARM64 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Debug_FailFast|x64.ActiveCfg = Debug|x64 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Debug_FailFast|x64.Build.0 = Debug|x64 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Debug_FailFast|x86.ActiveCfg = Debug|x86 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Debug_FailFast|x86.Build.0 = Debug|x86 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Debug|arm64.ActiveCfg = Debug|ARM64 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Debug|arm64.Build.0 = Debug|ARM64 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Debug|x64.ActiveCfg = Debug|x64 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Debug|x64.Build.0 = Debug|x64 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Debug|x86.ActiveCfg = Debug|x86 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Debug|x86.Build.0 = Debug|x86 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Release|arm64.ActiveCfg = Release|ARM64 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Release|arm64.Build.0 = Release|ARM64 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Release|x64.ActiveCfg = Release|x64 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Release|x64.Build.0 = Release|x64 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Release|x86.ActiveCfg = Release|x86 + {B6153EEA-EADE-4BAA-B47D-6B48205C6696}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1117,6 +1139,8 @@ Global {8FB1EF90-B693-4A2A-A7F2-44ECA499D769} = {E0A15760-487A-4CCB-8093-DE6FF3C4BC23} {E768781A-D1F7-4C03-B46D-E76354FAB587} = {A972EC5B-FC61-4964-A6FF-F9633EB75DFD} {D7A1C2CE-36B1-43A8-9BA6-1EE2CF24479F} = {E0A15760-487A-4CCB-8093-DE6FF3C4BC23} + {73D1E84F-56CC-412B-BF2B-FA692BF6B396} = {DCAF188B-60C3-4EDB-8049-BAA927FBCD7D} + {B6153EEA-EADE-4BAA-B47D-6B48205C6696} = {73D1E84F-56CC-412B-BF2B-FA692BF6B396} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {030B5641-B206-46BB-BF71-36FF009088FA} diff --git a/common/Environments/Styles/HorizontalCardStyles.xaml b/common/Environments/Styles/HorizontalCardStyles.xaml index 7a9e98c2b8..db6109d5e2 100644 --- a/common/Environments/Styles/HorizontalCardStyles.xaml +++ b/common/Environments/Styles/HorizontalCardStyles.xaml @@ -238,4 +238,12 @@ + diff --git a/common/Helpers/CommonConstants.cs b/common/Helpers/CommonConstants.cs index 9e3c5c86a2..e1238da23e 100644 --- a/common/Helpers/CommonConstants.cs +++ b/common/Helpers/CommonConstants.cs @@ -5,7 +5,9 @@ namespace DevHome.Common.Helpers; public static class CommonConstants { - public const string HyperVExtensionClassId = "F8B26528-976A-488C-9B40-7198FB425C9E"; + public const string HyperVExtensionClassId = "F8B26528-976A-488C-9B40-7198FB425C9E"; + + public const string WSLExtensionClassId = "121253AB-BA5D-4E73-99CF-25A2CB8BF173"; public const string HyperVWindowsOptionalFeatureName = "Microsoft-Hyper-V"; } diff --git a/common/Views/AdaptiveCardViews/AdaptiveCardResourceTemplates.xaml b/common/Views/AdaptiveCardViews/AdaptiveCardResourceTemplates.xaml index d43ba0d760..90f6183f2c 100644 --- a/common/Views/AdaptiveCardViews/AdaptiveCardResourceTemplates.xaml +++ b/common/Views/AdaptiveCardViews/AdaptiveCardResourceTemplates.xaml @@ -4,19 +4,32 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cardModels="using:DevHome.Common.DevHomeAdaptiveCards.CardModels" - xmlns:controls="using:CommunityToolkit.WinUI.Controls"> + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:local="using:DevHome.Common.Views.AdaptiveCardViews" + xmlns:converters="using:CommunityToolkit.WinUI.Converters"> - + + - + + 40 + + + diff --git a/tools/ExtensionLibrary/DevHome.ExtensionLibrary/ViewModels/ExtensionLibraryViewModel.cs b/tools/ExtensionLibrary/DevHome.ExtensionLibrary/ViewModels/ExtensionLibraryViewModel.cs index 02e22967ad..5efa729773 100644 --- a/tools/ExtensionLibrary/DevHome.ExtensionLibrary/ViewModels/ExtensionLibraryViewModel.cs +++ b/tools/ExtensionLibrary/DevHome.ExtensionLibrary/ViewModels/ExtensionLibraryViewModel.cs @@ -19,6 +19,7 @@ using Windows.ApplicationModel; using Windows.Data.Json; using Windows.Storage; +using static DevHome.Common.Helpers.CommonConstants; namespace DevHome.ExtensionLibrary.ViewModels; @@ -35,7 +36,8 @@ public partial class ExtensionLibraryViewModel : ObservableObject // their class Ids to this set. private readonly HashSet _internalClassIdsToBeShownInExtensionsPage = new() { - CommonConstants.HyperVExtensionClassId, + HyperVExtensionClassId, + WSLExtensionClassId, }; public ObservableCollection StorePackagesList { get; set; } diff --git a/tools/SetupFlow/DevHome.SetupFlow/Views/Environments/SelectEnvironmentProviderView.xaml b/tools/SetupFlow/DevHome.SetupFlow/Views/Environments/SelectEnvironmentProviderView.xaml index 1fb724c57c..f558c3d559 100644 --- a/tools/SetupFlow/DevHome.SetupFlow/Views/Environments/SelectEnvironmentProviderView.xaml +++ b/tools/SetupFlow/DevHome.SetupFlow/Views/Environments/SelectEnvironmentProviderView.xaml @@ -18,6 +18,14 @@ + + 40 +