Skip to content

A Swiss Army knife for developers.

Renamed DevToys.Windows to DevToys.UWP

Etienne Baudouxb9b6978348db
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b6ca689cd..26f87260b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,7 +33,7 @@ You can contribute to DevToys app by:
### Build, Run & Debug
1. Open `src/DevToys-Windows.sln` with Visual Studio.
-1. In Visual Studio, set `app/dev/platforms/web/DevToys.Wasm` or `app/dev/platforms/desktop/windows/DevToys.Windows` or `app/dev/platforms/desktop/DevToys.CLI` as startup project.
+1. In Visual Studio, set `app/dev/platforms/web/DevToys.Wasm` or `app/dev/platforms/desktop/windows/DevToys.UWP` or `app/dev/platforms/desktop/windows/DevToys.Wasdk` or `app/dev/platforms/desktop/DevToys.CLI` as startup project.
1. Now you should be able to build and run DevToys on your machine by pressing `F5`.
## From macOS
diff --git a/src/DevToys-Windows.sln b/src/DevToys-Windows.sln
index 9760d39b6..8402465bd 100644
--- a/src/DevToys-Windows.sln
+++ b/src/DevToys-Windows.sln
@@ -39,9 +39,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "windows", "windows", "{AFE3
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "web", "web", "{04F9E03E-B519-49C5-BC6A-2131ED9BADC0}"
EndProject
-Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "DevToys.Windows", "app\dev\platforms\desktop\windows\DevToys.Windows\DevToys.Windows.wapproj", "{34D966D5-5756-4192-B4AB-44AD6FF07CC5}"
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "DevToys.UWP", "app\dev\platforms\desktop\windows\DevToys.UWP\DevToys.UWP.wapproj", "{34D966D5-5756-4192-B4AB-44AD6FF07CC5}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevToys.Windows.Core", "app\dev\platforms\desktop\windows\DevToys.Windows.Core\DevToys.Windows.Core.csproj", "{97AA45F4-41E2-4FDA-B5B7-F4579DF2C7EE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevToys.UWP.Core", "app\dev\platforms\desktop\windows\DevToys.UWP.Core\DevToys.UWP.Core.csproj", "{97AA45F4-41E2-4FDA-B5B7-F4579DF2C7EE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.CLI", "app\dev\platforms\desktop\DevToys.CLI\DevToys.CLI.csproj", "{8C72D38A-658D-4C9D-B0AD-2DA975BE7826}"
EndProject
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Assets/LockScreenLogo.scale-200.png b/src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Assets/LockScreenLogo.scale-200.png
similarity index 100%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Assets/LockScreenLogo.scale-200.png
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Assets/LockScreenLogo.scale-200.png
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Assets/SplashScreen.scale-200.png b/src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Assets/SplashScreen.scale-200.png
similarity index 100%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Assets/SplashScreen.scale-200.png
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Assets/SplashScreen.scale-200.png
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Assets/Square150x150Logo.scale-200.png b/src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Assets/Square150x150Logo.scale-200.png
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Assets/Square150x150Logo.scale-200.png
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Assets/Square44x44Logo.scale-200.png b/src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Assets/Square44x44Logo.scale-200.png
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Assets/Square44x44Logo.scale-200.png
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Assets/StoreLogo.png b/src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Assets/StoreLogo.png
similarity index 100%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Assets/StoreLogo.png
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Assets/StoreLogo.png
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Assets/Wide310x150Logo.scale-200.png b/src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Assets/Wide310x150Logo.scale-200.png
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Assets/Wide310x150Logo.scale-200.png
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/DevToys.Windows.Core.csproj b/src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/DevToys.UWP.Core.csproj
similarity index 98%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/DevToys.Windows.Core.csproj
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/DevToys.UWP.Core.csproj
index 5e5f6f17a..52a75e5e5 100644
--- a/src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/DevToys.Windows.Core.csproj
+++ b/src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/DevToys.UWP.Core.csproj
@@ -31,8 +31,8 @@
<ProjectGuid>{97AA45F4-41E2-4FDA-B5B7-F4579DF2C7EE}</ProjectGuid>
<OutputType>AppContainerExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>DevToys.Windows.Core</RootNamespace>
- <AssemblyName>DevToys.Windows.Core</AssemblyName>
+ <RootNamespace>DevToys.UWP.Core</RootNamespace>
+ <AssemblyName>DevToys.UWP.Core</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>$(Windows10SDKVersion)</TargetPlatformVersion>
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Package.appxmanifest b/src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Package.appxmanifest
similarity index 93%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Package.appxmanifest
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Package.appxmanifest
index 6d4b12c62..f99b49916 100644
--- a/src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Package.appxmanifest
+++ b/src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Package.appxmanifest
@@ -34,10 +34,10 @@
<Application Id="App"
Executable="$targetnametoken$.exe"
EntryPoint="DevToys.App">
- <uap:VisualElements DisplayName="DevToys.Windows.Core"
+ <uap:VisualElements DisplayName="DevToys.UWP.Core"
Square150x150Logo="Assets\Square150x150Logo.png"
Square44x44Logo="Assets\Square44x44Logo.png"
- Description="DevToys.Windows.Core"
+ Description="DevToys.UWP.Core"
BackgroundColor="transparent">
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
<uap:SplashScreen Image="Assets\SplashScreen.png" />
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Properties/Default.rd.xml b/src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Properties/Default.rd.xml
similarity index 100%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows.Core/Properties/Default.rd.xml
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP.Core/Properties/Default.rd.xml
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows/DevToys.Windows.wapproj b/src/app/dev/platforms/desktop/windows/DevToys.UWP/DevToys.UWP.wapproj
similarity index 94%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows/DevToys.Windows.wapproj
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP/DevToys.UWP.wapproj
index 1185c7136..9a907eeaf 100644
--- a/src/app/dev/platforms/desktop/windows/DevToys.Windows/DevToys.Windows.wapproj
+++ b/src/app/dev/platforms/desktop/windows/DevToys.UWP/DevToys.UWP.wapproj
@@ -44,17 +44,17 @@
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
<AppxPackageDir>..\..\..\..\..\..\..\publish\MSIX\</AppxPackageDir>
<AppxBundle>Always</AppxBundle>
- <EntryPointProjectUniqueName>..\DevToys.Windows.Core\DevToys.Windows.Core.csproj</EntryPointProjectUniqueName>
<UapAppxPackageBuildMode>StoreAndSideload</UapAppxPackageBuildMode>
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+ <EntryPointProjectUniqueName>..\DevToys.UWP.Core\DevToys.UWP.Core.csproj</EntryPointProjectUniqueName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<!-- Workaround to https://github.com/microsoft/microsoft-ui-xaml/issues/6195 -->
<AppxUseHardlinksIfPossible>false</AppxUseHardlinksIfPossible>
</PropertyGroup>
<ItemGroup>
- <ProjectReference Include="..\DevToys.Windows.Core\DevToys.Windows.Core.csproj" />
+ <ProjectReference Include="..\DevToys.UWP.Core\DevToys.UWP.Core.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="DevToys.Windows_TemporaryKey.pfx" />
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows/Images/LockScreenLogo.scale-200.png b/src/app/dev/platforms/desktop/windows/DevToys.UWP/Images/LockScreenLogo.scale-200.png
similarity index 100%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows/Images/LockScreenLogo.scale-200.png
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP/Images/LockScreenLogo.scale-200.png
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows/Images/SplashScreen.scale-200.png b/src/app/dev/platforms/desktop/windows/DevToys.UWP/Images/SplashScreen.scale-200.png
similarity index 100%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows/Images/SplashScreen.scale-200.png
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP/Images/SplashScreen.scale-200.png
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows/Images/Square150x150Logo.scale-200.png b/src/app/dev/platforms/desktop/windows/DevToys.UWP/Images/Square150x150Logo.scale-200.png
similarity index 100%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows/Images/Square150x150Logo.scale-200.png
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP/Images/Square150x150Logo.scale-200.png
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows/Images/Square44x44Logo.scale-200.png b/src/app/dev/platforms/desktop/windows/DevToys.UWP/Images/Square44x44Logo.scale-200.png
similarity index 100%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows/Images/Square44x44Logo.scale-200.png
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP/Images/Square44x44Logo.scale-200.png
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/src/app/dev/platforms/desktop/windows/DevToys.UWP/Images/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows/Images/Square44x44Logo.targetsize-24_altform-unplated.png
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP/Images/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows/Images/StoreLogo.png b/src/app/dev/platforms/desktop/windows/DevToys.UWP/Images/StoreLogo.png
similarity index 100%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows/Images/StoreLogo.png
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP/Images/StoreLogo.png
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows/Images/Wide310x150Logo.scale-200.png b/src/app/dev/platforms/desktop/windows/DevToys.UWP/Images/Wide310x150Logo.scale-200.png
similarity index 100%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows/Images/Wide310x150Logo.scale-200.png
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP/Images/Wide310x150Logo.scale-200.png
diff --git a/src/app/dev/platforms/desktop/windows/DevToys.Windows/Package.appxmanifest b/src/app/dev/platforms/desktop/windows/DevToys.UWP/Package.appxmanifest
similarity index 95%
rename from src/app/dev/platforms/desktop/windows/DevToys.Windows/Package.appxmanifest
rename to src/app/dev/platforms/desktop/windows/DevToys.UWP/Package.appxmanifest
index ea8f6e8fa..4de8ec79a 100644
--- a/src/app/dev/platforms/desktop/windows/DevToys.Windows/Package.appxmanifest
+++ b/src/app/dev/platforms/desktop/windows/DevToys.UWP/Package.appxmanifest
@@ -39,8 +39,8 @@
<Application Id="App"
Executable="$targetnametoken$.exe"
EntryPoint="$targetentrypoint$">
- <uap:VisualElements DisplayName="DevToys.Windows"
- Description="DevToys.Windows"
+ <uap:VisualElements DisplayName="DevToys.UWP"
+ Description="DevToys.UWP"
BackgroundColor="transparent"
Square150x150Logo="Images\Square150x150Logo.png"
Square44x44Logo="Images\Square44x44Logo.png">