Change assembly names of subprojects

app/.idea/.idea.DiscordHistoryTracker/.idea/avalonia.xml

@@ -11,13 +11,13 @@
         <entry key="Desktop/Main/Controls/FilterPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/ServerConfigurationPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/StatusBar.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/MainContentScreen.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/MainWindow.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/AdvancedPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/DatabasePage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/TrackingPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/ViewerPage.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/WelcomeScreen.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Screens/MainContentScreen.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Screens/WelcomeScreen.axaml" value="Desktop/Desktop.csproj" />
       </map>
     </option>
   </component>

app/Desktop/Desktop.csproj

@@ -3,6 +3,7 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <AssemblyName>DiscordHistoryTracker</AssemblyName>
     <RootNamespace>DHT.Desktop</RootNamespace>
     <PackageId>DiscordHistoryTracker</PackageId>
     <Authors>chylex</Authors>
@@ -11,7 +12,6 @@
     <ApplicationIcon>./Resources/icon.ico</ApplicationIcon>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-    <AssemblyName>DiscordHistoryTracker</AssemblyName>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
@@ -23,54 +23,37 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="0.10.13" />
     <PackageReference Include="Avalonia.Desktop" Version="0.10.13" />
-    <ProjectReference Include="..\Server\Server.csproj" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
     <PackageReference Include="Avalonia.Diagnostics" Version="0.10.13" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Server\Server.csproj" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Version.cs" Link="Version.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Update="Windows\MainWindow.axaml.cs">
+    <AvaloniaResource Include="Resources/icon.ico" />
-      <DependentUpon>MainWindow.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Dialogs\CheckBox\CheckBoxDialog.axaml.cs">
-      <DependentUpon>CheckBoxDialog.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Dialogs\Progress\ProgressDialog.axaml.cs">
-      <DependentUpon>ProgressDialog.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Dialogs\Message\MessageDialog.axaml.cs">
-      <DependentUpon>MessageDialog.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <UpToDateCheckInput Remove="Pages\DatabasePage.axaml" />
-    <UpToDateCheckInput Remove="Pages\TrackingPage.axaml" />
-    <UpToDateCheckInput Remove="Pages\ViewerPage.axaml" />
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="../Resources/Tracker/bootstrap.js">
       <LogicalName>Tracker\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
       <Link>Resources/Tracker/%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <Visible>false</Visible>
     </EmbeddedResource>
     <EmbeddedResource Include="../Resources/Tracker/scripts.min/**">
       <LogicalName>Tracker\scripts\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
       <Link>Resources/Tracker/scripts/%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <Visible>false</Visible>
     </EmbeddedResource>
     <EmbeddedResource Include="../Resources/Tracker/styles/**">
       <LogicalName>Tracker\styles\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
       <Link>Resources/Tracker/styles/%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <Visible>false</Visible>
     </EmbeddedResource>
     <EmbeddedResource Include="../Resources/Viewer/**">
       <LogicalName>Viewer\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
       <Link>Resources/Viewer/%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <Visible>false</Visible>
     </EmbeddedResource>
-    <AvaloniaResource Include="Resources/icon.ico" />
   </ItemGroup>
 </Project>

app/Desktop/Main/MainWindowModel.cs

@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.Main.Screens;
 using DHT.Desktop.Server;
 using DHT.Server.Database;
 using DHT.Utils.Models;

app/Desktop/Main/Screens/MainContentScreen.axaml

@@ -2,13 +2,13 @@
              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:main="clr-namespace:DHT.Desktop.Main"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
+             xmlns:screens="clr-namespace:DHT.Desktop.Main.Screens"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.MainContentScreen">
+             x:Class="DHT.Desktop.Main.Screens.MainContentScreen">
 
     <Design.DataContext>
-        <main:MainContentScreenModel />
+        <screens:MainContentScreenModel />
     </Design.DataContext>
 
     <UserControl.Styles>

app/Desktop/Main/Screens/MainContentScreen.axaml.cs

@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace DHT.Desktop.Main {
+namespace DHT.Desktop.Main.Screens {
 	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
 	public sealed class MainContentScreen : UserControl {
 		public MainContentScreen() {

app/Desktop/Main/Screens/MainContentScreenModel.cs

@@ -9,7 +9,7 @@ using DHT.Server.Database;
 using DHT.Server.Service;
 using DHT.Utils.Logging;
 
-namespace DHT.Desktop.Main {
+namespace DHT.Desktop.Main.Screens {
 	sealed class MainContentScreenModel : IDisposable {
 		private static readonly Log Log = Log.ForType<MainContentScreenModel>();
 

app/Desktop/Main/Screens/WelcomeScreen.axaml

@@ -2,12 +2,12 @@
              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:main="clr-namespace:DHT.Desktop.Main"
+             xmlns:screens="clr-namespace:DHT.Desktop.Main.Screens"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.WelcomeScreen">
+             x:Class="DHT.Desktop.Main.Screens.WelcomeScreen">
 
     <Design.DataContext>
-        <main:WelcomeScreenModel />
+        <screens:WelcomeScreenModel />
     </Design.DataContext>
 
     <UserControl.Background>

app/Desktop/Main/Screens/WelcomeScreen.axaml.cs

@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace DHT.Desktop.Main {
+namespace DHT.Desktop.Main.Screens {
 	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
 	public sealed class WelcomeScreen : UserControl {
 		public WelcomeScreen() {

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -7,7 +7,7 @@ using DHT.Desktop.Dialogs.Message;
 using DHT.Server.Database;
 using DHT.Utils.Models;
 
-namespace DHT.Desktop.Main {
+namespace DHT.Desktop.Main.Screens {
 	sealed class WelcomeScreenModel : BaseModel, IDisposable {
 		public string Version => Program.Version;
 

app/Server/Server.csproj

@@ -3,6 +3,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>DHT.Server</RootNamespace>
     <Nullable>enable</Nullable>
+    <AssemblyName>DiscordHistoryTracker.Server</AssemblyName>
     <PackageId>DiscordHistoryTrackerServer</PackageId>
     <Authors>chylex</Authors>
     <Company>DiscordHistoryTracker</Company>

app/Utils/Utils.csproj

@@ -3,6 +3,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>DHT.Utils</RootNamespace>
     <Nullable>enable</Nullable>
+    <AssemblyName>DiscordHistoryTracker.Utils</AssemblyName>
     <PackageId>DiscordHistoryTrackerUtils</PackageId>
     <Authors>chylex</Authors>
     <Company>DiscordHistoryTracker</Company>
@@ -11,10 +12,6 @@
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>none</DebugType>
-  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="10.3.0" />
   </ItemGroup>