Skip to content

A Swiss Army knife for developers.

Changed DevToys.Windows to have a "DevToys.exe" instead of "DevToys.Windows.exe"

Etienne Baudoux0a2d9d0742e1
diff --git a/src/app/dev/platforms/desktop/DevToys.MacOS/DevToys.MacOS.csproj b/src/app/dev/platforms/desktop/DevToys.MacOS/DevToys.MacOS.csproj
index 36a875a03..9a4233901 100644
--- a/src/app/dev/platforms/desktop/DevToys.MacOS/DevToys.MacOS.csproj
+++ b/src/app/dev/platforms/desktop/DevToys.MacOS/DevToys.MacOS.csproj
@@ -4,7 +4,6 @@
<TargetFramework>$(NetMacOS)</TargetFramework>
<SupportedOSPlatformVersion>12.0</SupportedOSPlatformVersion>
<OutputType>Exe</OutputType>
- <RootNamespace>DevToys.MacOS</RootNamespace>
<EnableDefaultCssItems>false</EnableDefaultCssItems>
<DefineConstants>$(DefineConstants);__MACOS__</DefineConstants>
@@ -13,6 +12,7 @@
<ApplicationId>com.devtoys</ApplicationId>
+ <RootNamespace>DevToys.MacOS</RootNamespace>
<AssemblyName>DevToys</AssemblyName>
</PropertyGroup>
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.cs b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.cs
index 98927d572..89bfea246 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.cs
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/Controls/MicaWindowWithOverlay.xaml.cs
@@ -37,7 +37,7 @@ public abstract partial class MicaWindowWithOverlay : Window
{
_resourceDictionary = new ResourceDictionary
{
- Source = new Uri("/DevToys.Windows;component/Controls/MicaWindowWithOverlay.xaml", UriKind.RelativeOrAbsolute)
+ Source = new Uri("/DevToys;component/Controls/MicaWindowWithOverlay.xaml", UriKind.RelativeOrAbsolute)
};
Style = _resourceDictionary["MicaWindowWithOverlayStyle"] as Style;
@@ -371,13 +371,13 @@ public abstract partial class MicaWindowWithOverlay : Window
string themeResourceDictionaryToRemovePath;
if (_themeListener.ActualAppTheme == ApplicationTheme.Dark)
{
- themeResourceDictionaryPath = "/DevToys.Windows;component/Themes/Dark.xaml";
- themeResourceDictionaryToRemovePath = "/DevToys.Windows;component/Themes/Light.xaml";
+ themeResourceDictionaryPath = "/DevToys;component/Themes/Dark.xaml";
+ themeResourceDictionaryToRemovePath = "/DevToys;component/Themes/Light.xaml";
}
else
{
- themeResourceDictionaryPath = "/DevToys.Windows;component/Themes/Light.xaml";
- themeResourceDictionaryToRemovePath = "/DevToys.Windows;component/Themes/Dark.xaml";
+ themeResourceDictionaryPath = "/DevToys;component/Themes/Light.xaml";
+ themeResourceDictionaryToRemovePath = "/DevToys;component/Themes/Dark.xaml";
}
var resourceDictionary = new ResourceDictionary
diff --git a/src/app/dev/platforms/desktop/DevToys.Windows/DevToys.Windows.csproj b/src/app/dev/platforms/desktop/DevToys.Windows/DevToys.Windows.csproj
index 894525e38..9ebab6296 100644
--- a/src/app/dev/platforms/desktop/DevToys.Windows/DevToys.Windows.csproj
+++ b/src/app/dev/platforms/desktop/DevToys.Windows/DevToys.Windows.csproj
@@ -10,6 +10,9 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
<ApplicationIcon>$(RepoRoot)\assets\logo\Icon-Windows.ico</ApplicationIcon>
+
+ <RootNamespace>DevToys.Windows</RootNamespace>
+ <AssemblyName>DevToys</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition="$(_IsPublishing) == ''">