mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-06-07 01:08:18 +08:00
updated namespaces
This commit is contained in:
Lavius Motileng
parent
59a2415a0d
commit
8f02cbc234
@ -175,12 +175,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "powerpreview", "src\modules
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "powerpreviewTest", "src\modules\previewpane\powerpreviewTest\powerpreviewTest.vcxproj", "{47310AB4-9034-4BD1-8D8B-E88AD21A171B}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "settingsui", "src\settingsui\settingsui.csproj", "{A7D5099E-F0FD-4BF3-8522-5A682759F915}"
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{C3081D9A-1586-441A-B5F4-ED815B3719C1}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "settingswpf", "src\settings_v2\settingswpf.csproj", "{806222E4-A9BE-431D-A1E7-3B0B15ABD160}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Settings.Test", "src\core\Microsoft.PowerToys.Settings.Test\Microsoft.PowerToys.Settings.Test.csproj", "{6F2B5799-36AE-4D10-9DCF-B19CD26A5DBC}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "settingsUintTests", "src\settingsUintTests\settingsUintTests.csproj", "{E56203D2-1BC4-4D4B-A5D8-F6302ADED104}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.PowerToys.Settings.UI", "src\core\Microsoft.PowerToys.Settings.UI\Microsoft.PowerToys.Settings.UI.csproj", "{A7D5099E-F0FD-4BF3-8522-5A682759F915}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "settingsv2", "settingsv2", "{852D6EFE-D679-409D-A112-AEC69DB2DEE7}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Settings.UI.Island", "src\core\Microsoft.PowerToys.Settings.UI.Island\Microsoft.PowerToys.Settings.UI.Island.csproj", "{AE3EFE25-662D-4987-B24E-30E729701B2E}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
@ -328,20 +329,20 @@ Global
|
||||
{47310AB4-9034-4BD1-8D8B-E88AD21A171B}.Debug|x64.Build.0 = Debug|x64
|
||||
{47310AB4-9034-4BD1-8D8B-E88AD21A171B}.Release|x64.ActiveCfg = Release|x64
|
||||
{47310AB4-9034-4BD1-8D8B-E88AD21A171B}.Release|x64.Build.0 = Release|x64
|
||||
{6F2B5799-36AE-4D10-9DCF-B19CD26A5DBC}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{6F2B5799-36AE-4D10-9DCF-B19CD26A5DBC}.Debug|x64.Build.0 = Debug|x64
|
||||
{6F2B5799-36AE-4D10-9DCF-B19CD26A5DBC}.Release|x64.ActiveCfg = Release|x64
|
||||
{6F2B5799-36AE-4D10-9DCF-B19CD26A5DBC}.Release|x64.Build.0 = Release|x64
|
||||
{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Debug|x64.Build.0 = Debug|x64
|
||||
{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Debug|x64.Deploy.0 = Debug|x64
|
||||
{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.ActiveCfg = Release|x64
|
||||
{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.Build.0 = Release|x64
|
||||
{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.Deploy.0 = Release|x64
|
||||
{806222E4-A9BE-431D-A1E7-3B0B15ABD160}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{806222E4-A9BE-431D-A1E7-3B0B15ABD160}.Debug|x64.Build.0 = Debug|x64
|
||||
{806222E4-A9BE-431D-A1E7-3B0B15ABD160}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{806222E4-A9BE-431D-A1E7-3B0B15ABD160}.Release|x64.Build.0 = Release|Any CPU
|
||||
{E56203D2-1BC4-4D4B-A5D8-F6302ADED104}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{E56203D2-1BC4-4D4B-A5D8-F6302ADED104}.Debug|x64.Build.0 = Debug|x64
|
||||
{E56203D2-1BC4-4D4B-A5D8-F6302ADED104}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{E56203D2-1BC4-4D4B-A5D8-F6302ADED104}.Release|x64.Build.0 = Release|Any CPU
|
||||
{AE3EFE25-662D-4987-B24E-30E729701B2E}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{AE3EFE25-662D-4987-B24E-30E729701B2E}.Debug|x64.Build.0 = Debug|x64
|
||||
{AE3EFE25-662D-4987-B24E-30E729701B2E}.Release|x64.ActiveCfg = Release|x64
|
||||
{AE3EFE25-662D-4987-B24E-30E729701B2E}.Release|x64.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@ -388,6 +389,9 @@ Global
|
||||
{A7D5099E-F0FD-4BF3-8522-5A682759F915} = {852D6EFE-D679-409D-A112-AEC69DB2DEE7}
|
||||
{806222E4-A9BE-431D-A1E7-3B0B15ABD160} = {852D6EFE-D679-409D-A112-AEC69DB2DEE7}
|
||||
{E56203D2-1BC4-4D4B-A5D8-F6302ADED104} = {852D6EFE-D679-409D-A112-AEC69DB2DEE7}
|
||||
{6F2B5799-36AE-4D10-9DCF-B19CD26A5DBC} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
|
||||
{A7D5099E-F0FD-4BF3-8522-5A682759F915} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
|
||||
{AE3EFE25-662D-4987-B24E-30E729701B2E} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
<IsPackable>false</IsPackable>
|
||||
|
||||
<Platforms>AnyCPU;x64</Platforms>
|
||||
<Platforms>x64</Platforms>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@ -1,7 +1,7 @@
|
||||
<Application x:Class="settings_v2.App"
|
||||
<Application x:Class="SettingsMain.App"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="clr-namespace:settings_v2"
|
||||
xmlns:local="clr-namespace:SettingsMain"
|
||||
StartupUri="MainWindow.xaml">
|
||||
<Application.Resources>
|
||||
|
||||
@ -6,7 +6,7 @@ using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
|
||||
namespace settings_v2
|
||||
namespace SettingsMain
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaction logic for App.xaml
|
||||
@ -1,9 +1,9 @@
|
||||
<Window x:Class="settings_v2.MainWindow"
|
||||
<Window x:Class="SettingsMain.MainWindow"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:local="clr-namespace:settings_v2"
|
||||
xmlns:local="clr-namespace:SettingsMain"
|
||||
xmlns:Controls="clr-namespace:Microsoft.Toolkit.Wpf.UI.Controls;assembly=Microsoft.Toolkit.Wpf.UI.Controls"
|
||||
mc:Ignorable="d"
|
||||
Title="PowerToys Settings" Height="800" Width="800">
|
||||
@ -1,7 +1,7 @@
|
||||
using System.Windows;
|
||||
using Microsoft.Toolkit.Win32.UI.Controls.Interop.WinRT;
|
||||
|
||||
namespace settings_v2
|
||||
namespace SettingsMain
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaction logic for MainWindow.xaml
|
||||
@ -4,7 +4,7 @@
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<UseWPF>true</UseWPF>
|
||||
<StartupObject>settings_v2.Program</StartupObject>
|
||||
<StartupObject>SettingsMain.Program</StartupObject>
|
||||
<Authors>Microsoft Corporation</Authors>
|
||||
<Product>PowerToys</Product>
|
||||
<Description>Windows system utilities to maximize productivity</Description>
|
||||
@ -15,17 +15,14 @@
|
||||
<RepositoryType>Github</RepositoryType>
|
||||
<PackageTags>PowerToys</PackageTags>
|
||||
<Version>0.15.2.0</Version>
|
||||
<Platforms>AnyCPU;x64</Platforms>
|
||||
<Platforms>x64</Platforms>
|
||||
<ApplicationIcon>icon.ico</ApplicationIcon>
|
||||
<Win32Resource />
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls" Version="6.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\settingsui\settingsui.csproj" />
|
||||
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@ -35,4 +32,8 @@
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Microsoft.PowerToys.Settings.UI\Microsoft.PowerToys.Settings.UI.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@ -2,16 +2,16 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace settings_v2
|
||||
namespace SettingsMain
|
||||
{
|
||||
public class Program
|
||||
{
|
||||
[System.STAThreadAttribute()]
|
||||
public static void Main()
|
||||
{
|
||||
using (new settingsui.App())
|
||||
using (new SettingsUI.App())
|
||||
{
|
||||
settings_v2.App app = new settings_v2.App();
|
||||
SettingsMain.App app = new SettingsMain.App();
|
||||
app.InitializeComponent();
|
||||
app.Run();
|
||||
}
|
||||
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
@ -1,7 +1,7 @@
|
||||
<xaml:XamlApplication
|
||||
x:Class="settingsui.App"
|
||||
x:Class="SettingsUI.App"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:xaml="using:Microsoft.Toolkit.Win32.UI.XamlHost"
|
||||
xmlns:local="using:settingsui">
|
||||
xmlns:local="using:SettingsUI">
|
||||
</xaml:XamlApplication>
|
||||
@ -1,9 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using Microsoft.Toolkit.Win32.UI.XamlHost;
|
||||
using Microsoft.Toolkit.Win32.UI.XamlHost;
|
||||
|
||||
namespace settingsui
|
||||
namespace SettingsUI
|
||||
{
|
||||
public sealed partial class App : XamlApplication
|
||||
{
|
||||
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Loading…
Reference in New Issue
Block a user