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

Refining Repository Management's UI. #3557

Merged
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
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
24 changes: 24 additions & 0 deletions DevHome.sln
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHome.FileExplorerSourceC
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHome.FileExplorerSourceControlIntegrationUnitTest", "tools\Customization\DevHome.FileExplorerSourceControlIntegrationUnitTest\DevHome.FileExplorerSourceControlIntegrationUnitTest.csproj", "{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RepositoryManagement", "RepositoryManagement", "{414E801F-103E-4A5C-86A0-CD6C2E48199B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHome.RepositoryManagement", "tools\RepositoryManagement\DevHome.RepositoryManagement\DevHome.RepositoryManagement.csproj", "{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_FailFast|arm64 = Debug_FailFast|arm64
Expand Down Expand Up @@ -1161,6 +1165,24 @@ Global
{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Release|x64.Build.0 = Release|x64
{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Release|x86.ActiveCfg = Release|x86
{A1FAE679-39D4-4278-A8E8-EA351F21A3E7}.Release|x86.Build.0 = Release|x86
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Debug_FailFast|arm64.ActiveCfg = Debug_FailFast|arm64
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Debug_FailFast|arm64.Build.0 = Debug_FailFast|arm64
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Debug_FailFast|x64.ActiveCfg = Debug_FailFast|x64
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Debug_FailFast|x64.Build.0 = Debug_FailFast|x64
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Debug_FailFast|x86.ActiveCfg = Debug_FailFast|x86
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Debug_FailFast|x86.Build.0 = Debug_FailFast|x86
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Debug|arm64.ActiveCfg = Debug|arm64
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Debug|arm64.Build.0 = Debug|arm64
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Debug|x64.ActiveCfg = Debug|x64
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Debug|x64.Build.0 = Debug|x64
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Debug|x86.ActiveCfg = Debug|x86
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Debug|x86.Build.0 = Debug|x86
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Release|arm64.ActiveCfg = Release|arm64
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Release|arm64.Build.0 = Release|arm64
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Release|x64.ActiveCfg = Release|x64
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Release|x64.Build.0 = Release|x64
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Release|x86.ActiveCfg = Release|x86
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1228,6 +1250,8 @@ Global
{8C1C7BF8-B27B-4F4D-97E5-A16E02C7860E} = {01AB3100-A939-41DD-A67F-1F8C275A307D}
{83D12033-364A-45F2-8FCA-9BD8E8322D91} = {623998FD-B0A6-4980-95D5-A5072301CA10}
{A1FAE679-39D4-4278-A8E8-EA351F21A3E7} = {623998FD-B0A6-4980-95D5-A5072301CA10}
{414E801F-103E-4A5C-86A0-CD6C2E48199B} = {A972EC5B-FC61-4964-A6FF-F9633EB75DFD}
{B4B2F5EA-BCD3-4F3E-856C-F6C32433BA41} = {414E801F-103E-4A5C-86A0-CD6C2E48199B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {030B5641-B206-46BB-BF71-36FF009088FA}
Expand Down
66 changes: 36 additions & 30 deletions settings/DevHome.Settings/Strings/en-us/Resources.resw
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

<!--
Microsoft ResX Schema
Version 2.0

The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.

Example:

... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
Expand All @@ -26,36 +26,36 @@
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>

There are any number of "resheader" rows that contain simple
dhoehna marked this conversation as resolved.
Show resolved Hide resolved
There are any number of "resheader" rows that contain simple
name/value pairs.

Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.

The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:

Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.

mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
Expand Down Expand Up @@ -571,10 +571,16 @@
</data>
<data name="FileExplorerSourceControlIntegration_Name" xml:space="preserve">
<value>File Explorer Source Control Integration</value>
<comment>Name of experimental feature 'FileExplorer SourceControl Integration' on the 'Settings -> Experiments' page where you enable it.</comment>
<comment>Name of experimental feature 'FileExplorer SourceControl Integration' on the 'Settings -&gt; Experiments' page where you enable it.</comment>
</data>
<data name="FileExplorerSourceControlIntegration_Description" xml:space="preserve">
<value>View property information (such as commit status, last commit date etc.) from source control technologies inside FileExplorer</value>
<comment>Inline description of the FileExplorerSourceControlIntegration experimental feature on the 'Settings -> Experiments' page where you enable it.</comment>
<comment>Inline description of the FileExplorerSourceControlIntegration experimental feature on the 'Settings -&gt; Experiments' page where you enable it.</comment>
</data>
<data name="RepositoryManagement_Description" xml:space="preserve">
<value>A page to see all the repositories Dev Home knows about.</value>
</data>
<data name="RepositoryManagement_Name" xml:space="preserve">
<value>Repository Management</value>
</data>
</root>
</root>
2 changes: 1 addition & 1 deletion src/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ResourceDictionary Source="/Styles/Thickness.xaml" />
<ResourceDictionary Source="/Styles/WindowTitleBar_ThemeResources.xaml" />

<!-- Resources from other projects -->
<!-- Resources from other projects -->
dhoehna marked this conversation as resolved.
Show resolved Hide resolved
<ResourceDictionary Source="ms-appx:///DevHome.Dashboard/Styles/Dashboard_ThemeResources.xaml" />
<ResourceDictionary Source="ms-appx:///DevHome.SetupFlow/Styles/SetupFlow_ThemeResources.xaml" />
<ResourceDictionary Source="ms-appx:///DevHome.Common/Environments/Styles/HorizontalCardStyles.xaml" />
Expand Down
5 changes: 5 additions & 0 deletions src/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
using DevHome.Dashboard.Extensions;
using DevHome.ExtensionLibrary.Extensions;
using DevHome.Helpers;
using DevHome.RepositoryManagement.Extensions;
using DevHome.RepositoryManagement.ViewModels;
using DevHome.Services;
using DevHome.Services.Core.Extensions;
using DevHome.Services.DesiredStateConfiguration.Extensions;
Expand Down Expand Up @@ -159,6 +161,9 @@ public App()
// Setup flow
services.AddSetupFlow(context);

// Repository Management
services.AddRepositoryManagement(context);

// Dashboard
services.AddDashboard(context);

Expand Down
1 change: 1 addition & 0 deletions src/DevHome.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
<ProjectReference Include="..\tools\QuietBackgroundProcesses\DevHome.QuietBackgroundProcesses.ElevatedServer.Projection\DevHome.QuietBackgroundProcesses.ElevatedServer.Projection.csproj" />
<ProjectReference Include="..\tools\QuietBackgroundProcesses\DevHome.QuietBackgroundProcesses.ElevatedServer\DevHome.QuietBackgroundProcesses.ElevatedServer.vcxproj" />
<ProjectReference Include="..\tools\QuietBackgroundProcesses\DevHome.QuietBackgroundProcesses.Server\DevHome.QuietBackgroundProcesses.Server.vcxproj" />
<ProjectReference Include="..\tools\RepositoryManagement\DevHome.RepositoryManagement\DevHome.RepositoryManagement.csproj" />
dhoehna marked this conversation as resolved.
Show resolved Hide resolved
<ProjectReference Include="..\tools\SetupFlow\DevHome.SetupFlow\DevHome.SetupFlow.csproj" />
<ProjectReference Include="..\tools\ExtensionLibrary\DevHome.ExtensionLibrary\DevHome.ExtensionLibrary.csproj" />
<ProjectReference Include="..\extensions\HyperVExtension\src\HyperVExtensionServer\HyperVExtensionServer.csproj" />
Expand Down
30 changes: 30 additions & 0 deletions src/NavConfig.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@
"viewModelFullName": "DevHome.Utilities.ViewModels.UtilitiesMainPageViewModel",
"iconFontFamily": "DevHomeFluentIcons",
"icon": "ECED"
},
{
"identity": "DevHome.RepositoryManagement",
"assembly": "DevHome.RepositoryManagement",
"viewFullName": "DevHome.RepositoryManagement.Views.RepositoryManagementMainPageView",
"viewModelFullName": "DevHome.RepositoryManagement.ViewModels.RepositoryManagementMainPageViewModel",
"iconFontFamily": "DevHomeFluentIcons",
"icon": "F03F",
"experimentalFeatureIdentity": "RepositoryManagement"
}
]
}
Expand Down Expand Up @@ -130,6 +139,27 @@
"visible": true
}
]
},
{
"identity": "RepositoryManagement",
"enabledByDefault": false,
"buildTypeOverrides": [
{
"buildType": "dev",
"enabledByDefault": false,
"visible": true
},
{
"buildType": "canary",
"enabledByDefault": false,
"visible": false
},
{
"buildType": "stable",
"enabledByDefault": false,
"visible": false
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)ToolingVersions.props" />
dhoehna marked this conversation as resolved.
Show resolved Hide resolved
<PropertyGroup>
<RootNamespace>DevHome.RepositoryManagement</RootNamespace>
<Platforms>x86;x64;arm64</Platforms>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
<UseWinUI>true</UseWinUI>
<Configurations>Debug;Release;Debug_FailFast</Configurations>
</PropertyGroup>
<ItemGroup>
<None Remove="Views\RepositoriesPageView.xaml" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\common\DevHome.Common.csproj" />
</ItemGroup>

<ItemGroup>
<Page Update="Views\RepositoryManagementMainPageView.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>

<ItemGroup>
<Folder Include="Models\" />
</ItemGroup>
</Project>
Copy link
Member

Choose a reason for hiding this comment

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

Does this icon mean the file is missing a newline at the end?

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
dhoehna marked this conversation as resolved.
Show resolved Hide resolved
using DevHome.RepositoryManagement.ViewModels;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;

namespace DevHome.RepositoryManagement.Extensions;

public static class ServiceExtensions
{
public static IServiceCollection AddRepositoryManagement(this IServiceCollection services, HostBuilderContext context)
{
services.AddTransient<RepositoryManagementMainPageViewModel>();
services.AddTransient<RepositoryManagementItemViewModel>();

return services;
}
}
Loading
Loading