fix ExeMover project and fix solution configuration

Aurora-RGB · Mar 21, 2024 · adca8e7 · adca8e7
1 parent 2640c24
commit adca8e7
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 21 deletions.
diff --git a/Project-Aurora/Aurora-Updater/Aurora-Updater.csproj b/Project-Aurora/Aurora-Updater/Aurora-Updater.csproj
@@ -25,6 +25,9 @@
     <OutputPath>$(SolutionDir)..\Build\$(Configuration)\win10-x64</OutputPath>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
+
+    <Configurations>Release;Debug</Configurations>
+    <Platforms>x64</Platforms>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">

diff --git a/Project-Aurora/AuroraCommon/AuroraCommon.csproj b/Project-Aurora/AuroraCommon/AuroraCommon.csproj
@@ -7,6 +7,9 @@
         <Nullable>enable</Nullable>
         <RootNamespace>Common</RootNamespace>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
+        <Configurations>Release;Debug</Configurations>
+        <Platforms>x64</Platforms>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Project-Aurora/AuroraDeviceManager/AuroraDeviceManager.csproj b/Project-Aurora/AuroraDeviceManager/AuroraDeviceManager.csproj
@@ -17,6 +17,9 @@
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
         <WarningsAsErrors>CA2244</WarningsAsErrors>
+
+        <Configurations>Release;Debug</Configurations>
+        <Platforms>x64</Platforms>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Project-Aurora/ExeMover/ExeMover.csproj b/Project-Aurora/ExeMover/ExeMover.csproj
@@ -2,18 +2,30 @@
 
     <PropertyGroup>
         <AssemblyName>Aurora</AssemblyName>
+        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
         <OutputType>Exe</OutputType>
         <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <ApplicationManifest>app.manifest</ApplicationManifest>
-
-        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+        <PublishSelfContained>true</PublishSelfContained>
+        <PublishSingleFile>true</PublishSingleFile>
+        <PublishTrimmed>true</PublishTrimmed>
+
         <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <UseRidGraph>true</UseRidGraph>
-        <OutputPath>$(SolutionDir)..\Project-Aurora\Build\$(Configuration)\win10-x64</OutputPath>
+        <OutputPath>$(SolutionDir)..\Build\$(Configuration)\win10-x64</OutputPath>
+        <Configurations>Release;Debug</Configurations>
+        <Platforms>x64</Platforms>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+        <DefineConstants>DEBUG;TRACE</DefineConstants>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+        <Optimize>true</Optimize>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Project-Aurora/MemoryAccessProfiles/MemoryAccessProfiles.csproj b/Project-Aurora/MemoryAccessProfiles/MemoryAccessProfiles.csproj
@@ -15,6 +15,8 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
+        <Configurations>Release;Debug</Configurations>
+        <Platforms>x64</Platforms>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Project-Aurora/Plugin-Example/Plugin-Example.csproj b/Project-Aurora/Plugin-Example/Plugin-Example.csproj
@@ -13,6 +13,8 @@
     <Product>Plugin-Example</Product>
     <Copyright>Copyright ©  2017</Copyright>
     <UseWPF>true</UseWPF>
+    <Configurations>Release;Debug</Configurations>
+    <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Project-Aurora/Project-Aurora.sln b/Project-Aurora/Project-Aurora.sln
@@ -35,10 +35,10 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6F81D40A-6AA0-4C8B-A395-779EF3003CA4}.Debug|x64.ActiveCfg = Debug|x64
-		{6F81D40A-6AA0-4C8B-A395-779EF3003CA4}.Debug|x64.Build.0 = Debug|x64
 		{6F81D40A-6AA0-4C8B-A395-779EF3003CA4}.Release|x64.ActiveCfg = Release|x64
 		{6F81D40A-6AA0-4C8B-A395-779EF3003CA4}.Release|x64.Build.0 = Release|x64
+		{6F81D40A-6AA0-4C8B-A395-779EF3003CA4}.Debug|x64.ActiveCfg = Debug|x64
+		{6F81D40A-6AA0-4C8B-A395-779EF3003CA4}.Debug|x64.Build.0 = Debug|x64
 		{40085232-ACED-4CBE-945B-90BA8153C151}.Debug|x64.ActiveCfg = Debug|x64
 		{40085232-ACED-4CBE-945B-90BA8153C151}.Debug|x64.Build.0 = Debug|x64
 		{40085232-ACED-4CBE-945B-90BA8153C151}.Release|x64.ActiveCfg = Release|x64
@@ -51,26 +51,26 @@ Global
 		{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Debug|x64.Build.0 = Debug|x64
 		{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Release|x64.ActiveCfg = Release|x64
 		{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Release|x64.Build.0 = Release|x64
-		{18D2D471-3F57-4ECE-9C62-836A801473D8}.Debug|x64.ActiveCfg = Debug|x64
-		{18D2D471-3F57-4ECE-9C62-836A801473D8}.Debug|x64.Build.0 = Debug|x64
 		{18D2D471-3F57-4ECE-9C62-836A801473D8}.Release|x64.ActiveCfg = Release|x64
 		{18D2D471-3F57-4ECE-9C62-836A801473D8}.Release|x64.Build.0 = Release|x64
-		{DD71932E-8E70-4733-AD2B-4BA3C2BA2409}.Debug|x64.ActiveCfg = Debug|x64
-		{DD71932E-8E70-4733-AD2B-4BA3C2BA2409}.Debug|x64.Build.0 = Debug|x64
+		{18D2D471-3F57-4ECE-9C62-836A801473D8}.Debug|x64.ActiveCfg = Debug|x64
+		{18D2D471-3F57-4ECE-9C62-836A801473D8}.Debug|x64.Build.0 = Debug|x64
 		{DD71932E-8E70-4733-AD2B-4BA3C2BA2409}.Release|x64.ActiveCfg = Release|x64
 		{DD71932E-8E70-4733-AD2B-4BA3C2BA2409}.Release|x64.Build.0 = Release|x64
+		{DD71932E-8E70-4733-AD2B-4BA3C2BA2409}.Debug|x64.ActiveCfg = Debug|x64
+		{DD71932E-8E70-4733-AD2B-4BA3C2BA2409}.Debug|x64.Build.0 = Debug|x64
+		{743820FF-0E94-4EDC-A75E-BFCD5B2DD9BA}.Debug|x64.ActiveCfg = Debug|x64
+		{743820FF-0E94-4EDC-A75E-BFCD5B2DD9BA}.Debug|x64.Build.0 = Debug|x64
+		{743820FF-0E94-4EDC-A75E-BFCD5B2DD9BA}.Release|x64.ActiveCfg = Release|x64
+		{743820FF-0E94-4EDC-A75E-BFCD5B2DD9BA}.Release|x64.Build.0 = Release|x64
 		{86F15079-BB2C-499D-ACD7-A7086CEB8720}.Debug|x64.ActiveCfg = Debug|x64
 		{86F15079-BB2C-499D-ACD7-A7086CEB8720}.Debug|x64.Build.0 = Debug|x64
-		{86F15079-BB2C-499D-ACD7-A7086CEB8720}.Release|x64.ActiveCfg = Release|Any CPU
-		{86F15079-BB2C-499D-ACD7-A7086CEB8720}.Release|x64.Build.0 = Release|Any CPU
-		{743820FF-0E94-4EDC-A75E-BFCD5B2DD9BA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{743820FF-0E94-4EDC-A75E-BFCD5B2DD9BA}.Debug|x64.Build.0 = Debug|Any CPU
-		{743820FF-0E94-4EDC-A75E-BFCD5B2DD9BA}.Release|x64.ActiveCfg = Release|Any CPU
-		{743820FF-0E94-4EDC-A75E-BFCD5B2DD9BA}.Release|x64.Build.0 = Release|Any CPU
-		{41D44E05-290D-4527-AA35-F95019934039}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{41D44E05-290D-4527-AA35-F95019934039}.Debug|x64.Build.0 = Debug|Any CPU
-		{41D44E05-290D-4527-AA35-F95019934039}.Release|x64.ActiveCfg = Release|Any CPU
-		{41D44E05-290D-4527-AA35-F95019934039}.Release|x64.Build.0 = Release|Any CPU
+		{86F15079-BB2C-499D-ACD7-A7086CEB8720}.Release|x64.ActiveCfg = Release|x64
+		{86F15079-BB2C-499D-ACD7-A7086CEB8720}.Release|x64.Build.0 = Release|x64
+		{41D44E05-290D-4527-AA35-F95019934039}.Debug|x64.ActiveCfg = Debug|x64
+		{41D44E05-290D-4527-AA35-F95019934039}.Debug|x64.Build.0 = Debug|x64
+		{41D44E05-290D-4527-AA35-F95019934039}.Release|x64.ActiveCfg = Release|x64
+		{41D44E05-290D-4527-AA35-F95019934039}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -23,11 +23,13 @@
     <ApplicationIcon>Resources\aurora_icon.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-    <Configurations>Debug;Release</Configurations>
+    <Configurations>Release;Debug</Configurations>
     <Nullable>enable</Nullable>
     <StartupObject>AuroraRgb.App</StartupObject>
 
     <WarningsAsErrors>CA2244;SYSLIB1054</WarningsAsErrors>
+
+    <Platforms>x64</Platforms>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">