A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Added NavigationView
Etienne Baudouxdd91c3c895a7
diff --git a/src/DevTools.sln b/src/DevTools.slnindex 7eb0fa5f0..3e661d1d9 100644--- a/src/DevTools.sln+++ b/src/DevTools.sln@@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "startup", "startup", "{93B7EndProjectProject("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "DevTools.Startup", "dev\startup\DevTools.Startup\DevTools.Startup.wapproj", "{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}"EndProject-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Uwp", "dev\startup\DevTools.Uwp\DevTools.Uwp.csproj", "{E3E4E200-B380-4207-9A7E-4C9421904502}"+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools", "dev\startup\DevTools\DevTools.csproj", "{E3E4E200-B380-4207-9A7E-4C9421904502}"EndProjectProject("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B4C026E3-9BBF-434B-A14D-712C6A3731E4}"ProjectSection(SolutionItems) = preProject@@ -38,6 +38,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Providers.Impl", "EndProjectProject("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Localization", "dev\impl\DevTools.Localization\DevTools.Localization.csproj", "{935D5DF8-C400-4CA6-AABE-34A06A69AF85}"EndProject+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTools.Impl", "dev\impl\DevTools.Impl\DevTools.Impl.csproj", "{E2F0C303-04FC-4504-A272-7662AF9A0A80}"+EndProjectGlobalGlobalSection(SolutionConfigurationPlatforms) = preSolutionDebug|Any CPU = Debug|Any CPU@@ -192,6 +194,26 @@ Global{935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|x64.Build.0 = Release|x64{935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|x86.ActiveCfg = Release|x86{935D5DF8-C400-4CA6-AABE-34A06A69AF85}.Release|x86.Build.0 = Release|x86+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|Any CPU.Build.0 = Debug|Any CPU+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|ARM.ActiveCfg = Debug|ARM+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|ARM.Build.0 = Debug|ARM+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|ARM64.ActiveCfg = Debug|ARM64+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|ARM64.Build.0 = Debug|ARM64+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|x64.ActiveCfg = Debug|x64+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|x64.Build.0 = Debug|x64+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|x86.ActiveCfg = Debug|x86+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Debug|x86.Build.0 = Debug|x86+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|Any CPU.ActiveCfg = Release|Any CPU+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|Any CPU.Build.0 = Release|Any CPU+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|ARM.ActiveCfg = Release|ARM+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|ARM.Build.0 = Release|ARM+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|ARM64.ActiveCfg = Release|ARM64+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|ARM64.Build.0 = Release|ARM64+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|x64.ActiveCfg = Release|x64+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|x64.Build.0 = Release|x64+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|x86.ActiveCfg = Release|x86+ {E2F0C303-04FC-4504-A272-7662AF9A0A80}.Release|x86.Build.0 = Release|x86EndGlobalSectionGlobalSection(SolutionProperties) = preSolutionHideSolutionNode = FALSE@@ -208,6 +230,7 @@ Global{98274C08-4636-45EE-95AF-2C069BFBABD4} = {AC0D0928-8390-4929-801E-A9923DBB369F}{8621ED11-E9DD-480A-BE2B-C1DB00919B6F} = {AC0D0928-8390-4929-801E-A9923DBB369F}{935D5DF8-C400-4CA6-AABE-34A06A69AF85} = {AC0D0928-8390-4929-801E-A9923DBB369F}+ {E2F0C303-04FC-4504-A272-7662AF9A0A80} = {AC0D0928-8390-4929-801E-A9923DBB369F}EndGlobalSectionGlobalSection(ExtensibilityGlobals) = postSolutionSolutionGuid = {78B10789-385B-4F7D-8E06-D86143CD76B5}diff --git a/src/dev/impl/DevTools.Core.Impl/DevTools.Core.Impl.csproj b/src/dev/impl/DevTools.Core.Impl/DevTools.Core.Impl.csprojindex d4b6bf7fb..46fd99e9c 100644--- a/src/dev/impl/DevTools.Core.Impl/DevTools.Core.Impl.csproj+++ b/src/dev/impl/DevTools.Core.Impl/DevTools.Core.Impl.csproj@@ -80,8 +80,6 @@</ItemGroup><ItemGroup><PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(NuGet_MicrosoftNETCoreUniversalWindowsPlatform)" />- <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="$(NuGet_MicrosoftToolkitMvvm)" />- <PackageReference Include="Microsoft.UI.Xaml" Version="$(NuGet_MicrosoftUIXaml)" /><PackageReference Include="System.Composition" Version="$(NuGet_SystemComposition)" /></ItemGroup><ItemGroup>@@ -89,15 +87,8 @@<Project>{ef6a6707-44f2-4e76-98b8-11c9b40adc7e}</Project><Name>DevTools.Core</Name></ProjectReference>- <ProjectReference Include="..\..\def\DevTools.Providers\DevTools.Providers.csproj">- <Project>{ada9988b-e19b-4ee5-9162-dab3b12bcf9e}</Project>- <Name>DevTools.Providers</Name>- </ProjectReference>- <ProjectReference Include="..\DevTools.Localization\DevTools.Localization.csproj">- <Project>{935d5df8-c400-4ca6-aabe-34a06a69af85}</Project>- <Name>DevTools.Localization</Name>- </ProjectReference></ItemGroup>+ <ItemGroup /><Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" /><!-- To modify your build process, add your task inside one of the targets below and uncomment it.Other similar extension points exist, see Microsoft.Common.targets.diff --git a/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj b/src/dev/impl/DevTools.Impl/DevTools.Impl.csprojnew file mode 100644index 000000000..6b9dc5f48--- /dev/null+++ b/src/dev/impl/DevTools.Impl/DevTools.Impl.csproj@@ -0,0 +1,122 @@+<?xml version="1.0" encoding="utf-8"?>+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />+ <PropertyGroup>+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>+ <ProjectGuid>{E2F0C303-04FC-4504-A272-7662AF9A0A80}</ProjectGuid>+ <OutputType>Library</OutputType>+ <AppDesignerFolder>Properties</AppDesignerFolder>+ <RootNamespace>DevTools.Impl</RootNamespace>+ <AssemblyName>DevTools.Impl</AssemblyName>+ <DefaultLanguage>en-US</DefaultLanguage>+ <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>+ <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(Windows10SDKVersion)</TargetPlatformVersion>+ <TargetPlatformMinVersion>$(Windows10MinSDKVersion)</TargetPlatformMinVersion>+ <MinimumVisualStudioVersion>16</MinimumVisualStudioVersion>+ <FileAlignment>512</FileAlignment>+ <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>+ </PropertyGroup>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">+ <DebugSymbols>true</DebugSymbols>+ <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>+ <DebugType>full</DebugType>+ <PlatformTarget>x86</PlatformTarget>+ </PropertyGroup>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">+ <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>+ <Optimize>true</Optimize>+ <DebugType>pdbonly</DebugType>+ <PlatformTarget>x86</PlatformTarget>+ <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>+ </PropertyGroup>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">+ <DebugSymbols>true</DebugSymbols>+ <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>+ <DebugType>full</DebugType>+ <PlatformTarget>ARM</PlatformTarget>+ </PropertyGroup>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">+ <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>+ <Optimize>true</Optimize>+ <DebugType>pdbonly</DebugType>+ <PlatformTarget>ARM</PlatformTarget>+ <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>+ </PropertyGroup>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">+ <DebugSymbols>true</DebugSymbols>+ <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>+ <DebugType>full</DebugType>+ <PlatformTarget>ARM64</PlatformTarget>+ <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>+ </PropertyGroup>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">+ <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>+ <Optimize>true</Optimize>+ <DebugType>pdbonly</DebugType>+ <PlatformTarget>ARM64</PlatformTarget>+ <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>+ </PropertyGroup>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">+ <DebugSymbols>true</DebugSymbols>+ <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>+ <DebugType>full</DebugType>+ <PlatformTarget>x64</PlatformTarget>+ </PropertyGroup>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">+ <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>+ <Optimize>true</Optimize>+ <DebugType>pdbonly</DebugType>+ <PlatformTarget>x64</PlatformTarget>+ <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>+ </PropertyGroup>+ <ItemGroup>+ <Compile Include="..\..\shared\SharedAssemblyInfo.cs">+ <Link>Properties\SharedAssemblyInfo.cs</Link>+ </Compile>+ <Compile Include="Dummy.cs" />+ <Compile Include="Properties\AssemblyInfo.cs" />+ <Compile Include="Views\MainPage.xaml.cs">+ <DependentUpon>MainPage.xaml</DependentUpon>+ </Compile>+ </ItemGroup>+ <ItemGroup>+ <Content Include="..\..\startup\DevTools.Startup\Assets\Logo\Square44x44Logo.scale-200.png">+ <Link>Assets\Logo\Square44x44Logo.scale-200.png</Link>+ </Content>+ </ItemGroup>+ <ItemGroup>+ <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(NuGet_MicrosoftNETCoreUniversalWindowsPlatform)" />+ <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="$(NuGet_MicrosoftToolkitMvvm)" />+ <PackageReference Include="Microsoft.UI.Xaml" Version="$(NuGet_MicrosoftUIXaml)" />+ <PackageReference Include="System.Composition" Version="$(NuGet_SystemComposition)" />+ </ItemGroup>+ <ItemGroup>+ <ProjectReference Include="..\..\def\DevTools.Core\DevTools.Core.csproj">+ <Project>{ef6a6707-44f2-4e76-98b8-11c9b40adc7e}</Project>+ <Name>DevTools.Core</Name>+ </ProjectReference>+ <ProjectReference Include="..\..\def\DevTools.Providers\DevTools.Providers.csproj">+ <Project>{ada9988b-e19b-4ee5-9162-dab3b12bcf9e}</Project>+ <Name>DevTools.Providers</Name>+ </ProjectReference>+ <ProjectReference Include="..\DevTools.Localization\DevTools.Localization.csproj">+ <Project>{935d5df8-c400-4ca6-aabe-34a06a69af85}</Project>+ <Name>DevTools.Localization</Name>+ </ProjectReference>+ </ItemGroup>+ <ItemGroup>+ <Page Include="Views\MainPage.xaml">+ <SubType>Designer</SubType>+ <Generator>MSBuild:Compile</Generator>+ </Page>+ </ItemGroup>+ <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.+ Other similar extension points exist, see Microsoft.Common.targets.+ <Target Name="BeforeBuild">+ </Target>+ <Target Name="AfterBuild">+ </Target>+ -->+</Project>\ No newline at end of filediff --git a/src/dev/impl/DevTools.Impl/Dummy.cs b/src/dev/impl/DevTools.Impl/Dummy.csnew file mode 100644index 000000000..bfea93578--- /dev/null+++ b/src/dev/impl/DevTools.Impl/Dummy.cs@@ -0,0 +1,6 @@+namespace DevTools.Impl+{+ public class Dummy+ {+ }+}diff --git a/src/dev/impl/DevTools.Impl/Properties/AssemblyInfo.cs b/src/dev/impl/DevTools.Impl/Properties/AssemblyInfo.csnew file mode 100644index 000000000..c8f2171f4--- /dev/null+++ b/src/dev/impl/DevTools.Impl/Properties/AssemblyInfo.cs@@ -0,0 +1,3 @@+using System.Reflection;++[assembly: AssemblyTitle("DevTools.Impl")]\ No newline at end of filediff --git a/src/dev/impl/DevTools.Impl/Properties/DevTools.Impl.rd.xml b/src/dev/impl/DevTools.Impl/Properties/DevTools.Impl.rd.xmlnew file mode 100644index 000000000..285804529--- /dev/null+++ b/src/dev/impl/DevTools.Impl/Properties/DevTools.Impl.rd.xml@@ -0,0 +1,33 @@+<?xml version="1.0" encoding="utf-8"?>+<!--+ This file contains Runtime Directives, specifications about types your application accesses+ through reflection and other dynamic code patterns. Runtime Directives are used to control the+ .NET Native optimizer and ensure that it does not remove code accessed by your library. If your+ library does not do any reflection, then you generally do not need to edit this file. However,+ if your library reflects over types, especially types passed to it or derived from its types,+ then you should write Runtime Directives.++ The most common use of reflection in libraries is to discover information about types passed+ to the library. Runtime Directives have three ways to express requirements on types passed to+ your library.++ 1. Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter+ Use these directives to reflect over types passed as a parameter.++ 2. SubTypes+ Use a SubTypes directive to reflect over types derived from another type.++ 3. AttributeImplies+ Use an AttributeImplies directive to indicate that your library needs to reflect over+ types or methods decorated with an attribute.++ For more information on writing Runtime Directives for libraries, please visit+ https://go.microsoft.com/fwlink/?LinkID=391919+-->+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">+ <Library Name="DevTools.Impl">++ <!-- add directives for your library here -->++ </Library>+</Directives>diff --git a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml b/src/dev/impl/DevTools.Impl/Views/MainPage.xamlnew file mode 100644index 000000000..65234d7b3--- /dev/null+++ b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml@@ -0,0 +1,94 @@+<Page+ x:Class="DevTools.Impl.Views.MainPage"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:local="using:DevTools.Impl.Views"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:muxc="using:Microsoft.UI.Xaml.Controls"+ xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"+ mc:Ignorable="d"+ muxc:BackdropMaterial.ApplyToRootOrPageBackground="True">+ <Page.Resources>+ <!--This top margin is the height of the custom TitleBar-->+ <Thickness x:Key="NavigationViewContentMargin">0,48,0,0</Thickness>+ </Page.Resources>++ <Grid>+ <Border+ IsHitTestVisible="False"+ VerticalAlignment="Top"+ Height="48"+ Margin="48,0,0,0">+ <StackPanel Orientation="Horizontal">+ <Image+ HorizontalAlignment="Left"+ VerticalAlignment="Center"+ Source="/DevTools.Impl/Assets/Logo/Square44x44Logo.scale-200.png"+ Width="16"+ Height="16"/>+ <TextBlock+ x:Name="AppTitle"+ Text="DevTools"+ VerticalAlignment="Center"+ Margin="12,0,0,0"+ Style="{StaticResource CaptionTextBlockStyle}" />+ </StackPanel>+ </Border>+ <muxc:NavigationView+ x:Name="nvSample"+ IsTitleBarAutoPaddingEnabled="True"+ IsSettingsVisible="False"+ IsBackButtonVisible="Collapsed"+ IsBackEnabled="False"+ Header="Header"+ AlwaysShowHeader="True"+ CompactModeThresholdWidth="450"+ ExpandedModeThresholdWidth="550"+ PaneDisplayMode="Auto"+ SelectionFollowsFocus="Disabled"+ IsTabStop="False">++ <muxc:NavigationView.AutoSuggestBox>+ <AutoSuggestBox QueryIcon="Find" AutomationProperties.Name="Search" />+ </muxc:NavigationView.AutoSuggestBox>++ <muxc:NavigationView.MenuItems>+ <muxc:NavigationViewItem Content="Menu Item1" Tag="SamplePage1" x:Name="SamplePage1Item">+ <muxc:NavigationViewItem.Icon>+ <SymbolIcon Symbol="Play" />+ </muxc:NavigationViewItem.Icon>+ </muxc:NavigationViewItem>+ <muxc:NavigationViewItem Content="Menu Item2" Tag="SamplePage2" x:Name="SamplePage2Item" SelectsOnInvoked="True">+ <muxc:NavigationViewItem.Icon>+ <SymbolIcon Symbol="Save" />+ </muxc:NavigationViewItem.Icon>+ </muxc:NavigationViewItem>+ <muxc:NavigationViewItem Content="Menu Item3" Tag="SamplePage3" x:Name="SamplePage3Item">+ <muxc:NavigationViewItem.Icon>+ <SymbolIcon Symbol="Refresh" />+ </muxc:NavigationViewItem.Icon>+ </muxc:NavigationViewItem>+ </muxc:NavigationView.MenuItems>++ <muxc:NavigationView.PaneFooter>+ <StackPanel x:Name="FooterStackPanel" Orientation="Vertical">+ <muxc:NavigationViewItem Content="Settings">+ <muxc:NavigationViewItem.Icon>+ <muxc:AnimatedIcon x:Name='AnimatedIcon'>+ <muxc:AnimatedIcon.Source>+ <animatedvisuals:AnimatedSettingsVisualSource/>+ </muxc:AnimatedIcon.Source>+ <muxc:AnimatedIcon.FallbackIconSource>+ <muxc:FontIconSource FontFamily="Segoe MDL2 Assets" Glyph=""/>+ </muxc:AnimatedIcon.FallbackIconSource>+ </muxc:AnimatedIcon>+ </muxc:NavigationViewItem.Icon>+ </muxc:NavigationViewItem>+ </StackPanel>+ </muxc:NavigationView.PaneFooter>++ <Frame x:Name="contentFrame" />+ </muxc:NavigationView>+ </Grid>+</Page>diff --git a/src/dev/startup/DevTools.Uwp/MainPage.xaml.cs b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cssimilarity index 84%rename from src/dev/startup/DevTools.Uwp/MainPage.xaml.csrename to src/dev/impl/DevTools.Impl/Views/MainPage.xaml.csindex e699c4416..c1630b155 100644--- a/src/dev/startup/DevTools.Uwp/MainPage.xaml.cs+++ b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs@@ -1,8 +1,8 @@using Windows.UI.Xaml.Controls;-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238-namespace DevTools.Uwp+namespace DevTools.Impl.Views{/// <summary>/// An empty page that can be used on its own or navigated to within a Frame.diff --git a/src/dev/startup/DevTools.Startup/DevTools.Startup.wapproj b/src/dev/startup/DevTools.Startup/DevTools.Startup.wapprojindex d9c426031..52c9e0fa1 100644--- a/src/dev/startup/DevTools.Startup/DevTools.Startup.wapproj+++ b/src/dev/startup/DevTools.Startup/DevTools.Startup.wapproj@@ -1,77 +1,77 @@<?xml version="1.0" encoding="utf-8"?><Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">- <ItemGroup Label="ProjectConfigurations">- <ProjectConfiguration Include="Debug|x86">- <Configuration>Debug</Configuration>- <Platform>x86</Platform>- </ProjectConfiguration>- <ProjectConfiguration Include="Release|x86">- <Configuration>Release</Configuration>- <Platform>x86</Platform>- </ProjectConfiguration>- <ProjectConfiguration Include="Debug|x64">- <Configuration>Debug</Configuration>- <Platform>x64</Platform>- </ProjectConfiguration>- <ProjectConfiguration Include="Release|x64">- <Configuration>Release</Configuration>- <Platform>x64</Platform>- </ProjectConfiguration>- <ProjectConfiguration Include="Debug|ARM">- <Configuration>Debug</Configuration>- <Platform>ARM</Platform>- </ProjectConfiguration>- <ProjectConfiguration Include="Release|ARM">- <Configuration>Release</Configuration>- <Platform>ARM</Platform>- </ProjectConfiguration>- <ProjectConfiguration Include="Debug|ARM64">- <Configuration>Debug</Configuration>- <Platform>ARM64</Platform>- </ProjectConfiguration>- <ProjectConfiguration Include="Release|ARM64">- <Configuration>Release</Configuration>- <Platform>ARM64</Platform>- </ProjectConfiguration>- </ItemGroup>- <PropertyGroup>- <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>- </PropertyGroup>- <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />- <PropertyGroup>- <ProjectGuid>361db7bc-be7b-41a2-a29a-978a9e3b4aa7</ProjectGuid>- <TargetPlatformVersion>$(Windows10SDKVersion)</TargetPlatformVersion>- <TargetPlatformMinVersion>$(Windows10MinSDKVersion)</TargetPlatformMinVersion>- <DefaultLanguage>en</DefaultLanguage>- <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>- <GenerateAppInstallerFile>False</GenerateAppInstallerFile>- <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>- <GenerateTestArtifacts>True</GenerateTestArtifacts>- <AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>- <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>- <AppxPackageDir>..\..\..\..\bin\AppPackages\</AppxPackageDir>- <AppxBundle>Always</AppxBundle>- <EntryPointProjectUniqueName>..\DevTools.Uwp\DevTools.Uwp.csproj</EntryPointProjectUniqueName>- </PropertyGroup>- <ItemGroup>- <AppxManifest Include="Package.appxmanifest">- <SubType>Designer</SubType>- </AppxManifest>- </ItemGroup>- <ItemGroup>- <Content Include="Assets\Logo\SplashScreen.scale-200.png" />- <Content Include="Assets\Logo\LockScreenLogo.scale-200.png" />- <Content Include="Assets\Logo\Square150x150Logo.scale-200.png" />- <Content Include="Assets\Logo\Square44x44Logo.scale-200.png" />- <Content Include="Assets\Logo\Square44x44Logo.targetsize-24_altform-unplated.png" />- <Content Include="Assets\Logo\StoreLogo.png" />- <Content Include="Assets\Logo\Wide310x150Logo.scale-200.png" />- </ItemGroup>- <ItemGroup>- <ProjectReference Include="..\DevTools.Uwp\DevTools.Uwp.csproj" />- </ItemGroup>- <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />- <ItemGroup>- <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="$(NuGet_MicrosoftWindowsSDKBuildTools)" PrivateAssets="all" />- </ItemGroup>+ <ItemGroup Label="ProjectConfigurations">+ <ProjectConfiguration Include="Debug|x86">+ <Configuration>Debug</Configuration>+ <Platform>x86</Platform>+ </ProjectConfiguration>+ <ProjectConfiguration Include="Release|x86">+ <Configuration>Release</Configuration>+ <Platform>x86</Platform>+ </ProjectConfiguration>+ <ProjectConfiguration Include="Debug|x64">+ <Configuration>Debug</Configuration>+ <Platform>x64</Platform>+ </ProjectConfiguration>+ <ProjectConfiguration Include="Release|x64">+ <Configuration>Release</Configuration>+ <Platform>x64</Platform>+ </ProjectConfiguration>+ <ProjectConfiguration Include="Debug|ARM">+ <Configuration>Debug</Configuration>+ <Platform>ARM</Platform>+ </ProjectConfiguration>+ <ProjectConfiguration Include="Release|ARM">+ <Configuration>Release</Configuration>+ <Platform>ARM</Platform>+ </ProjectConfiguration>+ <ProjectConfiguration Include="Debug|ARM64">+ <Configuration>Debug</Configuration>+ <Platform>ARM64</Platform>+ </ProjectConfiguration>+ <ProjectConfiguration Include="Release|ARM64">+ <Configuration>Release</Configuration>+ <Platform>ARM64</Platform>+ </ProjectConfiguration>+ </ItemGroup>+ <PropertyGroup>+ <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>+ </PropertyGroup>+ <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />+ <PropertyGroup>+ <ProjectGuid>361db7bc-be7b-41a2-a29a-978a9e3b4aa7</ProjectGuid>+ <TargetPlatformVersion>$(Windows10SDKVersion)</TargetPlatformVersion>+ <TargetPlatformMinVersion>$(Windows10MinSDKVersion)</TargetPlatformMinVersion>+ <DefaultLanguage>en</DefaultLanguage>+ <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>+ <GenerateAppInstallerFile>False</GenerateAppInstallerFile>+ <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>+ <GenerateTestArtifacts>True</GenerateTestArtifacts>+ <AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>+ <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>+ <AppxPackageDir>..\..\..\..\bin\AppPackages\</AppxPackageDir>+ <AppxBundle>Always</AppxBundle>+ <EntryPointProjectUniqueName>..\DevTools\DevTools.csproj</EntryPointProjectUniqueName>+ </PropertyGroup>+ <ItemGroup>+ <AppxManifest Include="Package.appxmanifest">+ <SubType>Designer</SubType>+ </AppxManifest>+ </ItemGroup>+ <ItemGroup>+ <Content Include="Assets\Logo\SplashScreen.scale-200.png" />+ <Content Include="Assets\Logo\LockScreenLogo.scale-200.png" />+ <Content Include="Assets\Logo\Square150x150Logo.scale-200.png" />+ <Content Include="Assets\Logo\Square44x44Logo.scale-200.png" />+ <Content Include="Assets\Logo\Square44x44Logo.targetsize-24_altform-unplated.png" />+ <Content Include="Assets\Logo\StoreLogo.png" />+ <Content Include="Assets\Logo\Wide310x150Logo.scale-200.png" />+ </ItemGroup>+ <ItemGroup>+ <ProjectReference Include="..\DevTools\DevTools.csproj" />+ </ItemGroup>+ <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />+ <ItemGroup>+ <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="$(NuGet_MicrosoftWindowsSDKBuildTools)" PrivateAssets="all" />+ </ItemGroup></Project>\ No newline at end of filediff --git a/src/dev/startup/DevTools.Uwp/MainPage.xaml b/src/dev/startup/DevTools.Uwp/MainPage.xamldeleted file mode 100644index 09b25a854..000000000--- a/src/dev/startup/DevTools.Uwp/MainPage.xaml+++ /dev/null@@ -1,28 +0,0 @@-<Page- x:Class="DevTools.Uwp.MainPage"- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"- xmlns:local="using:DevTools.Uwp"- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:muxc="using:Microsoft.UI.Xaml.Controls"- mc:Ignorable="d"- Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">-- <Grid>- <ScrollViewer Padding="16" Height="300">- <StackPanel Orientation="Vertical" HorizontalAlignment="Left">- <TextBox PlaceholderText="TextBox" Width="200" />- <Button Content="Standard XAML button" />- <CheckBox Content="Two-state CheckBox"/>- <CheckBox Content="Two-state CheckBox" IsChecked="True"/>- <Slider Width="200"/>- <muxc:RadioButtons>- <x:String>One</x:String>- <x:String>Two</x:String>- <x:String>Three</x:String>- </muxc:RadioButtons>- </StackPanel>- </ScrollViewer>- </Grid>-</Page>diff --git a/src/dev/startup/DevTools.Uwp/Properties/AssemblyInfo.cs b/src/dev/startup/DevTools.Uwp/Properties/AssemblyInfo.csdeleted file mode 100644index 1590d147d..000000000--- a/src/dev/startup/DevTools.Uwp/Properties/AssemblyInfo.cs+++ /dev/null@@ -1,3 +0,0 @@-using System.Reflection;--[assembly: AssemblyTitle("DevTools.UWP")]\ No newline at end of filediff --git a/src/dev/startup/DevTools.Uwp/Properties/Default.rd.xml b/src/dev/startup/DevTools.Uwp/Properties/Default.rd.xmldeleted file mode 100644index af00722cd..000000000--- a/src/dev/startup/DevTools.Uwp/Properties/Default.rd.xml+++ /dev/null@@ -1,31 +0,0 @@-<!--- This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most- developers. However, you can modify these parameters to modify the behavior of the .NET Native- optimizer.-- Runtime Directives are documented at https://go.microsoft.com/fwlink/?LinkID=391919-- To fully enable reflection for App1.MyClass and all of its public/private members- <Type Name="App1.MyClass" Dynamic="Required All"/>-- To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32- <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />-- Using the Namespace directive to apply reflection policy to all the types in a particular namespace- <Namespace Name="DataClasses.ViewModels" Serialize="All" />--->--<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">- <Application>- <!--- An Assembly element with Name="*Application*" applies to all assemblies in- the application package. The asterisks are not wildcards.- -->- <Assembly Name="*Application*" Dynamic="Required All" />--- <!-- Add your application specific runtime directives here. -->--- </Application>-</Directives>\ No newline at end of filediff --git a/src/dev/startup/DevTools.Uwp/App.xaml b/src/dev/startup/DevTools/App.xamlsimilarity index 94%rename from src/dev/startup/DevTools.Uwp/App.xamlrename to src/dev/startup/DevTools/App.xamlindex b54a3c658..fc0b72917 100644--- a/src/dev/startup/DevTools.Uwp/App.xaml+++ b/src/dev/startup/DevTools/App.xaml@@ -1,5 +1,5 @@<Application- x:Class="DevTools.Uwp.App"+ x:Class="DevTools.App"xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:controls="using:Microsoft.UI.Xaml.Controls">diff --git a/src/dev/startup/DevTools.Uwp/App.xaml.cs b/src/dev/startup/DevTools/App.xaml.cssimilarity index 90%rename from src/dev/startup/DevTools.Uwp/App.xaml.csrename to src/dev/startup/DevTools/App.xaml.csindex 166ce0c96..4d0e46727 100644--- a/src/dev/startup/DevTools.Uwp/App.xaml.cs+++ b/src/dev/startup/DevTools/App.xaml.cs@@ -1,16 +1,19 @@#nullable enableusing DevTools.Core.Impl.Injection;+using DevTools.Impl.Views;using DevTools.Localization;using System;using System.Globalization;using Windows.ApplicationModel;using Windows.ApplicationModel.Activation;+using Windows.UI.ViewManagement;+using Windows.UI.WindowManagement.Preview;using Windows.UI.Xaml;using Windows.UI.Xaml.Controls;using Windows.UI.Xaml.Navigation;-namespace DevTools.Uwp+namespace DevTools{/// <summary>/// Provides application-specific behavior to supplement the default Application class.@@ -34,10 +37,11 @@ namespace DevTools.Uwp_mefComposer= new MefComposer(typeof(MefComposer).Assembly,- typeof(Providers.Impl.Dummy).Assembly);+ typeof(Providers.Impl.Dummy).Assembly,+ typeof(Impl.Dummy).Assembly);- this.InitializeComponent();- this.Suspending += OnSuspending;+ InitializeComponent();+ Suspending += OnSuspending;}~App()@@ -73,6 +77,9 @@ namespace DevTools.Uwp/// <param name="e">Details about the launch request and process.</param>protected override void OnLaunched(LaunchActivatedEventArgs e){+ ApplicationView applicationView = ApplicationView.GetForCurrentView();+ applicationView.SetPreferredMinSize(new Windows.Foundation.Size(300, 200));+// Do not repeat app initialization when the Window already has content,// just ensure that the window is activeif (Window.Current.Content is not Frame rootFrame)diff --git a/src/dev/startup/DevTools.Uwp/DevTools.Uwp.csproj b/src/dev/startup/DevTools/DevTools.csprojsimilarity index 94%rename from src/dev/startup/DevTools.Uwp/DevTools.Uwp.csprojrename to src/dev/startup/DevTools/DevTools.csprojindex fb48a5e5d..0753fa0d7 100644--- a/src/dev/startup/DevTools.Uwp/DevTools.Uwp.csproj+++ b/src/dev/startup/DevTools/DevTools.csproj@@ -5,8 +5,8 @@<ProjectGuid>{E3E4E200-B380-4207-9A7E-4C9421904502}</ProjectGuid><OutputType>AppContainerExe</OutputType><AppDesignerFolder>Properties</AppDesignerFolder>- <RootNamespace>DevTools.Uwp</RootNamespace>- <AssemblyName>DevTools.Uwp</AssemblyName>+ <RootNamespace>DevTools</RootNamespace>+ <AssemblyName>DevTools</AssemblyName><DefaultLanguage>en</DefaultLanguage><TargetPlatformIdentifier>UAP</TargetPlatformIdentifier><TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(Windows10SDKVersion)</TargetPlatformVersion>@@ -78,9 +78,6 @@<Compile Include="App.xaml.cs"><DependentUpon>App.xaml</DependentUpon></Compile>- <Compile Include="MainPage.xaml.cs">- <DependentUpon>MainPage.xaml</DependentUpon>- </Compile></ItemGroup><ItemGroup><AppxManifest Include="Package.appxmanifest">@@ -88,7 +85,6 @@</AppxManifest></ItemGroup><ItemGroup>- <Content Include="Properties\Default.rd.xml" /><Content Include="..\DevTools.Startup\Assets\Logo\LockScreenLogo.scale-200.png"><Link>Assets\Logo\LockScreenLogo.scale-200.png</Link></Content>@@ -116,10 +112,6 @@<Generator>MSBuild:Compile</Generator><SubType>Designer</SubType></ApplicationDefinition>- <Page Include="MainPage.xaml">- <Generator>MSBuild:Compile</Generator>- <SubType>Designer</SubType>- </Page></ItemGroup><ItemGroup><PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(NuGet_MicrosoftNETCoreUniversalWindowsPlatform)" />@@ -138,6 +130,10 @@<Project>{98274c08-4636-45ee-95af-2c069bfbabd4}</Project><Name>DevTools.Core.Impl</Name></ProjectReference>+ <ProjectReference Include="..\..\impl\DevTools.Impl\DevTools.Impl.csproj">+ <Project>{e2f0c303-04fc-4504-a272-7662af9a0a80}</Project>+ <Name>DevTools.Impl</Name>+ </ProjectReference><ProjectReference Include="..\..\impl\DevTools.Localization\DevTools.Localization.csproj"><Project>{935D5DF8-C400-4CA6-AABE-34A06A69AF85}</Project><Name>DevTools.Localization</Name>diff --git a/src/dev/startup/DevTools.Uwp/Package.appxmanifest b/src/dev/startup/DevTools/Package.appxmanifestsimilarity index 89%rename from src/dev/startup/DevTools.Uwp/Package.appxmanifestrename to src/dev/startup/DevTools/Package.appxmanifestindex 14847081a..ce723922a 100644--- a/src/dev/startup/DevTools.Uwp/Package.appxmanifest+++ b/src/dev/startup/DevTools/Package.appxmanifest@@ -14,7 +14,7 @@<mp:PhoneIdentity PhoneProductId="c12088ee-f979-4809-8039-7851a3aa2b7a" PhonePublisherId="00000000-0000-0000-0000-000000000000"/><Properties>- <DisplayName>DevTools.Uwp</DisplayName>+ <DisplayName>DevTools</DisplayName><PublisherDisplayName>ebaud</PublisherDisplayName><Logo>Assets\Logo\StoreLogo.png</Logo></Properties>@@ -30,12 +30,12 @@<Applications><Application Id="App"Executable="$targetnametoken$.exe"- EntryPoint="DevTools.Uwp.App">+ EntryPoint="DevTools.App"><uap:VisualElements- DisplayName="DevTools.Uwp"+ DisplayName="DevTools"Square150x150Logo="Assets\Logo\Square150x150Logo.png"Square44x44Logo="Assets\Logo\Square44x44Logo.png"- Description="DevTools.Uwp"+ Description="DevTools"BackgroundColor="transparent"><uap:DefaultTile Wide310x150Logo="Assets\Logo\Wide310x150Logo.png"/><uap:SplashScreen Image="Assets\Logo\SplashScreen.png" />diff --git a/src/dev/startup/DevTools/Properties/AssemblyInfo.cs b/src/dev/startup/DevTools/Properties/AssemblyInfo.csnew file mode 100644index 000000000..4032f0b22--- /dev/null+++ b/src/dev/startup/DevTools/Properties/AssemblyInfo.cs@@ -0,0 +1,3 @@+using System.Reflection;++[assembly: AssemblyTitle("DevTools")]\ No newline at end of file