fixed project naming

d2phap · Jul 24, 2023 · f05f72e · f05f72e
1 parent 4e9635d
commit f05f72e
Show file tree

Hide file tree

Showing 28 changed files with 80 additions and 83 deletions.
diff --git a/Source/ExifGlass/AboutWindow.axaml → Source/ExifGlass.Core/AboutWindow.axaml b/Source/ExifGlass/AboutWindow.axaml → Source/ExifGlass.Core/AboutWindow.axaml
diff --git a/Source/ExifGlass/AboutWindow.axaml.cs → Source/ExifGlass.Core/AboutWindow.axaml.cs b/Source/ExifGlass/AboutWindow.axaml.cs → Source/ExifGlass.Core/AboutWindow.axaml.cs
diff --git a/Source/ExifGlass/App.axaml → Source/ExifGlass.Core/App.axaml b/Source/ExifGlass/App.axaml → Source/ExifGlass.Core/App.axaml
diff --git a/Source/ExifGlass/App.axaml.cs → Source/ExifGlass.Core/App.axaml.cs b/Source/ExifGlass/App.axaml.cs → Source/ExifGlass.Core/App.axaml.cs
diff --git a/...e/ExifGlass/Assets/exifglass_icon_512.ico → ...fGlass.Core/Assets/exifglass_icon_512.ico b/...e/ExifGlass/Assets/exifglass_icon_512.ico → ...fGlass.Core/Assets/exifglass_icon_512.ico
diff --git a/...xifGlass/Assets/exifglass_store_badge.svg → ...ass.Core/Assets/exifglass_store_badge.svg b/...xifGlass/Assets/exifglass_store_badge.svg → ...ass.Core/Assets/exifglass_store_badge.svg
diff --git a/Source/ExifGlass.Core/ExifGlass.Core.csproj b/Source/ExifGlass.Core/ExifGlass.Core.csproj
@@ -0,0 +1,54 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+    <Platforms>AnyCPU;x64</Platforms>
+  </PropertyGroup>
+
+
+  <ItemGroup>
+    <AvaloniaResource Include="Assets\**" />
+  </ItemGroup>
+
+
+  <ItemGroup>
+    <None Remove="Assets\exifglass_icon_512.ico" />
+    <None Remove="Assets\exifglass_store_badge.svg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.0" />
+    <PackageReference Include="Avalonia.Svg.Skia" Version="11.0.0" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
+    <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="CliWrap" Version="3.6.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\@imageglass\ImageGlass.Tools\Source\ImageGlass.Tools\ImageGlass.Tools.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="AboutWindow.axaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+    </Compile>
+    <Compile Update="MainWindow.axaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+    </Compile>
+    <Compile Update="SettingsWindow.axaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+    </Compile>
+    <Compile Update="UpdateWindow.axaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+    </Compile>
+  </ItemGroup>
+</Project>
diff --git a/Source/ExifGlass/ExifTools/Enums.cs → Source/ExifGlass.Core/ExifTools/Enums.cs b/Source/ExifGlass/ExifTools/Enums.cs → Source/ExifGlass.Core/ExifTools/Enums.cs
diff --git a/Source/ExifGlass/ExifTools/ExifTool.cs → Source/ExifGlass.Core/ExifTools/ExifTool.cs b/Source/ExifGlass/ExifTools/ExifTool.cs → Source/ExifGlass.Core/ExifTools/ExifTool.cs
diff --git a/Source/ExifGlass/Helpers/Extensions.cs → Source/ExifGlass.Core/Helpers/Extensions.cs b/Source/ExifGlass/Helpers/Extensions.cs → Source/ExifGlass.Core/Helpers/Extensions.cs
diff --git a/Source/ExifGlass/Helpers/JsonEx.cs → Source/ExifGlass.Core/Helpers/JsonEx.cs b/Source/ExifGlass/Helpers/JsonEx.cs → Source/ExifGlass.Core/Helpers/JsonEx.cs
diff --git a/Source/ExifGlass/MainWindow.axaml → Source/ExifGlass.Core/MainWindow.axaml b/Source/ExifGlass/MainWindow.axaml → Source/ExifGlass.Core/MainWindow.axaml
diff --git a/Source/ExifGlass/MainWindow.axaml.cs → Source/ExifGlass.Core/MainWindow.axaml.cs b/Source/ExifGlass/MainWindow.axaml.cs → Source/ExifGlass.Core/MainWindow.axaml.cs
diff --git a/Source/ExifGlass/Settings/Config.cs → Source/ExifGlass.Core/Settings/Config.cs b/Source/ExifGlass/Settings/Config.cs → Source/ExifGlass.Core/Settings/Config.cs
diff --git a/Source/ExifGlass/Settings/UpdateModel.cs → ...ce/ExifGlass.Core/Settings/UpdateModel.cs b/Source/ExifGlass/Settings/UpdateModel.cs → ...ce/ExifGlass.Core/Settings/UpdateModel.cs
diff --git a/Source/ExifGlass/Settings/UpdateService.cs → .../ExifGlass.Core/Settings/UpdateService.cs b/Source/ExifGlass/Settings/UpdateService.cs → .../ExifGlass.Core/Settings/UpdateService.cs
diff --git a/Source/ExifGlass/SettingsWindow.axaml → Source/ExifGlass.Core/SettingsWindow.axaml b/Source/ExifGlass/SettingsWindow.axaml → Source/ExifGlass.Core/SettingsWindow.axaml
diff --git a/Source/ExifGlass/SettingsWindow.axaml.cs → ...ce/ExifGlass.Core/SettingsWindow.axaml.cs b/Source/ExifGlass/SettingsWindow.axaml.cs → ...ce/ExifGlass.Core/SettingsWindow.axaml.cs
diff --git a/Source/ExifGlass/UpdateWindow.axaml → Source/ExifGlass.Core/UpdateWindow.axaml b/Source/ExifGlass/UpdateWindow.axaml → Source/ExifGlass.Core/UpdateWindow.axaml
diff --git a/Source/ExifGlass/UpdateWindow.axaml.cs → Source/ExifGlass.Core/UpdateWindow.axaml.cs b/Source/ExifGlass/UpdateWindow.axaml.cs → Source/ExifGlass.Core/UpdateWindow.axaml.cs
diff --git a/Source/ExifGlass.Desktop/ExifGlass.Desktop.csproj b/Source/ExifGlass.Desktop/ExifGlass.Desktop.csproj
diff --git a/Source/ExifGlass.sln b/Source/ExifGlass.sln
@@ -7,9 +7,9 @@ Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "MSIX", "MSIX\MSIX.wapproj",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageGlass.Tools", "..\..\..\@imageglass\ImageGlass.Tools\Source\ImageGlass.Tools\ImageGlass.Tools.csproj", "{6452B078-9F10-4673-BE73-97DC238E4AE3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExifGlass", "ExifGlass\ExifGlass.csproj", "{76743518-7B1C-45F2-977E-139B2F022B71}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExifGlass.Core", "ExifGlass.Core\ExifGlass.Core.csproj", "{76743518-7B1C-45F2-977E-139B2F022B71}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExifGlass.Desktop", "ExifGlass.Desktop\ExifGlass.Desktop.csproj", "{26F88771-AEF6-4652-9876-3D1B1B9335B6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExifGlass", "ExifGlass\ExifGlass.csproj", "{26F88771-AEF6-4652-9876-3D1B1B9335B6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Source/ExifGlass/ExifGlass.csproj b/Source/ExifGlass/ExifGlass.csproj
@@ -1,55 +1,32 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
+    One for Windows with net7.0-windows TFM, one for MacOS with net7.0-macos and one with net7.0 TFM for Linux.-->
     <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <LangVersion>latest</LangVersion>
-    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-    <Platforms>AnyCPU;x64</Platforms>
-  </PropertyGroup>
+    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <Platforms>AnyCPU;x64;x86;ARM64</Platforms>
 
-
-  <ItemGroup>
-    <AvaloniaResource Include="Assets\**" />
-  </ItemGroup>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+    <EntryPointExe>$(AssemblyName).exe</EntryPointExe>
+    <ApplicationIcon>..\ExifGlass.Core\Assets\exifglass_icon_512.ico</ApplicationIcon>
 
-
-  <ItemGroup>
-    <None Remove="Assets\exifglass_icon_512.ico" />
-    <None Remove="Assets\exifglass_store_badge.svg" />
-  </ItemGroup>
+    <TrimMode>CopyUsed</TrimMode>
+    <PublishTrimmed>true</PublishTrimmed>
 
-  <ItemGroup>
-    <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Svg.Skia" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
-    <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="CliWrap" Version="3.6.4" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-  </ItemGroup>
+    <AssemblyTitle>ExifGlass</AssemblyTitle>
+    <Copyright>Copyright © 2023 Duong Dieu Phap</Copyright>
+    <FileVersion>$(Version)</FileVersion>
+    <Version>1.1.0.0</Version>
+  </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\@imageglass\ImageGlass.Tools\Source\ImageGlass.Tools\ImageGlass.Tools.csproj" />
+    <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="AboutWindow.axaml.cs">
-      <DependentUpon>%(Filename)</DependentUpon>
-    </Compile>
-    <Compile Update="MainWindow.axaml.cs">
-      <DependentUpon>%(Filename)</DependentUpon>
-    </Compile>
-    <Compile Update="SettingsWindow.axaml.cs">
-      <DependentUpon>%(Filename)</DependentUpon>
-    </Compile>
-    <Compile Update="UpdateWindow.axaml.cs">
-      <DependentUpon>%(Filename)</DependentUpon>
-    </Compile>
+    <ProjectReference Include="..\ExifGlass.Core\ExifGlass.Core.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Source/ExifGlass.Desktop/Program.cs → Source/ExifGlass/Program.cs b/Source/ExifGlass.Desktop/Program.cs → Source/ExifGlass/Program.cs
@@ -1,9 +1,8 @@
 using System;
 
 using Avalonia;
-using Avalonia.ReactiveUI;
 
-namespace ExifGlass.Desktop;
+namespace ExifGlass;
 
 class Program
 {
@@ -19,6 +18,5 @@ public static AppBuilder BuildAvaloniaApp()
         => AppBuilder.Configure<App>()
             .UsePlatformDetect()
             .WithInterFont()
-            .LogToTrace()
-            .UseReactiveUI();
+            .LogToTrace();
 }
diff --git a/...ss.Desktop/Properties/launchSettings.json → .../ExifGlass/Properties/launchSettings.json b/...ss.Desktop/Properties/launchSettings.json → .../ExifGlass/Properties/launchSettings.json
diff --git a/Source/ExifGlass.Desktop/app.manifest → Source/ExifGlass/app.manifest b/Source/ExifGlass.Desktop/app.manifest → Source/ExifGlass/app.manifest
diff --git a/Source/MSIX/MSIX.wapproj b/Source/MSIX/MSIX.wapproj
@@ -65,7 +65,7 @@
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <AppxPackageSigningTimestampServerUrl>http://timestamp.sectigo.com</AppxPackageSigningTimestampServerUrl>
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
-    <EntryPointProjectUniqueName>..\ExifGlass.Desktop\ExifGlass.Desktop.csproj</EntryPointProjectUniqueName>
+    <EntryPointProjectUniqueName>..\ExifGlass\ExifGlass.csproj</EntryPointProjectUniqueName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <AppxBundle>Never</AppxBundle>
@@ -161,6 +161,6 @@
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ExifGlass.Desktop\ExifGlass.Desktop.csproj" />
+    <ProjectReference Include="..\ExifGlass\ExifGlass.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Source/MSIX/Package.appxmanifest b/Source/MSIX/Package.appxmanifest
@@ -11,7 +11,7 @@
   <Identity
     Name="9662DuongDieuPhap.ExifGlass"
     Publisher="CN=29F1B9EC-D220-4DC3-BEDB-01A9CCA51904"
-    Version="1.1.0.0" />
+    Version="1.1.1.0" />
 
   <Properties>
     <DisplayName>ExifGlass</DisplayName>
@@ -45,7 +45,7 @@
       </uap:VisualElements>
 
         <Extensions>
-            <desktop:Extension Category="windows.fullTrustProcess" Executable="ExifGlass.Desktop\ExifGlass.Desktop.exe"/>
+            <desktop:Extension Category="windows.fullTrustProcess" Executable="ExifGlass\ExifGlass.exe"/>
 
             <uap:Extension Category="windows.protocol">
                 <uap:Protocol Name="exifglass" />