From fe93e7f0b6c6fdafec7cfee66dff27e2eb6ae4f7 Mon Sep 17 00:00:00 2001 From: alexander <116556921+al-kau@users.noreply.github.com> Date: Wed, 30 Oct 2024 14:22:15 +0200 Subject: [PATCH] refactor: add Eppie.App.UI.* projects (#394) feat: add Eppie.App.UI.* projects - Add Eppie.App.UI.Shared project - Add Eppie.App.UI.Uno project - Add Eppie.App.UI.UWP project References: Eppie-io/Eppie-App#382 --- .gitignore | 7 +- .../Eppie.App.UI.Shared.projitems | 13 ++ .../Eppie.App.UI.Shared.shproj | 13 ++ .../Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj | 141 ++++++++++++++++++ .../Properties/AssemblyInfo.cs | 26 ++++ .../Properties/Eppie.App.UI.UWP.rd.xml | 33 ++++ .../Eppie.App.UI.Uno/Eppie.App.UI.Uno.csproj | 42 ++++++ .../Eppie.App.UI/Eppie.App.UI.Uno/global.json | 5 + .../Eppie.App.UWP/Eppie.App.UWP.csproj | 4 + source/Eppie.App/Eppie.App.sln | 57 ++++++- source/Eppie.App/Eppie.App/Eppie.App.csproj | 1 + 11 files changed, 340 insertions(+), 2 deletions(-) create mode 100644 source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems create mode 100644 source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.shproj create mode 100644 source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj create mode 100644 source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Properties/AssemblyInfo.cs create mode 100644 source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Properties/Eppie.App.UI.UWP.rd.xml create mode 100644 source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/Eppie.App.UI.Uno.csproj create mode 100644 source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/global.json diff --git a/.gitignore b/.gitignore index b436b990..49e24173 100644 --- a/.gitignore +++ b/.gitignore @@ -41,10 +41,15 @@ source/Eppie.App/Eppie.App.Converters/Eppie.App.Converters.Uno/obj/ source/Eppie.App/Eppie.App.Converters/Eppie.App.Converters.UWP/.vs/ source/Eppie.App/Eppie.App.Converters/Eppie.App.Converters.UWP/bin/ source/Eppie.App/Eppie.App.Converters/Eppie.App.Converters.UWP/obj/ +source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/bin/ +source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/obj/ +source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/.vs/ +source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/bin/ +source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/obj/ source/Eppie.App/Eppie.App.UWP/.vs/ -source/Eppie.App/Eppie.App.UWP/Eppie.App.UWP.csproj.user source/Eppie.App/Eppie.App.UWP/bin/ source/Eppie.App/Eppie.App.UWP/obj/ +source/Eppie.App/Eppie.App.UWP/Eppie.App.UWP.csproj.user source/Eppie.App/Eppie.App.ViewModels/bin/ source/Eppie.App/Eppie.App.ViewModels/obj/ source/Eppie.App/Eppie.Authorization.OAuth2/bin diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems new file mode 100644 index 00000000..e638d933 --- /dev/null +++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems @@ -0,0 +1,13 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 2443c114-c401-45fc-91dc-6c6f1ea97d58 + + + Eppie.App.UI + + + + \ No newline at end of file diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.shproj b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.shproj new file mode 100644 index 00000000..603fafa1 --- /dev/null +++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.shproj @@ -0,0 +1,13 @@ + + + + 2443c114-c401-45fc-91dc-6c6f1ea97d58 + 14.0 + + + + + + + + diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj new file mode 100644 index 00000000..bf5d1dab --- /dev/null +++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj @@ -0,0 +1,141 @@ + + + + + Debug + AnyCPU + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E} + Library + Properties + Eppie.App.UI + Eppie.App.UI + en-US + UAP + 10.0.22621.0 + 10.0.19041.0 + 14 + 512 + {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + prompt + 4 + + + x86 + true + bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + x86 + bin\x86\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + + + ARM + true + bin\ARM\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + ARM + bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + + + ARM64 + true + bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + ARM64 + bin\ARM64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + + + x64 + true + bin\x64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + x64 + bin\x64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + + + PackageReference + + + + + + + + + + + 14.0 + + + + \ No newline at end of file diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Properties/AssemblyInfo.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..0e000457 --- /dev/null +++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Properties/AssemblyInfo.cs @@ -0,0 +1,26 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Eppie.App.UI.UWP")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Eppie.App.UI.UWP")] +[assembly: AssemblyCopyright("Copyright © 2024")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision + +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: ComVisible(false)] diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Properties/Eppie.App.UI.UWP.rd.xml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Properties/Eppie.App.UI.UWP.rd.xml new file mode 100644 index 00000000..edc0bb05 --- /dev/null +++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Properties/Eppie.App.UI.UWP.rd.xml @@ -0,0 +1,33 @@ + + + + + + + + + diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/Eppie.App.UI.Uno.csproj b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/Eppie.App.UI.Uno.csproj new file mode 100644 index 00000000..75fa09e3 --- /dev/null +++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/Eppie.App.UI.Uno.csproj @@ -0,0 +1,42 @@ + + + net8.0;net8.0-ios;net8.0-maccatalyst;net8.0-android;net8.0-windows10.0.19041;net8.0-browserwasm;net8.0-desktop + true + Library + + true + disable + disable + Eppie.App.UI + Eppie.App.UI + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/global.json b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/global.json new file mode 100644 index 00000000..f4286971 --- /dev/null +++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/global.json @@ -0,0 +1,5 @@ +{ + "msbuild-sdks": { + "Uno.Sdk": "5.4.10" + } +} diff --git a/source/Eppie.App/Eppie.App.UWP/Eppie.App.UWP.csproj b/source/Eppie.App/Eppie.App.UWP/Eppie.App.UWP.csproj index 7194a012..a4e80759 100644 --- a/source/Eppie.App/Eppie.App.UWP/Eppie.App.UWP.csproj +++ b/source/Eppie.App/Eppie.App.UWP/Eppie.App.UWP.csproj @@ -180,6 +180,10 @@ {d392835a-52ae-4529-aac0-52d3189cb461} Eppie.App.Converters.UWP + + {a6c30ed1-6213-427e-b255-e5e8c69e6d0e} + Eppie.App.UI.UWP + {2da63e2a-a0ac-4c55-b912-04d8970bced3} Eppie.App.ViewModels diff --git a/source/Eppie.App/Eppie.App.sln b/source/Eppie.App/Eppie.App.sln index 324c53cb..de557262 100644 --- a/source/Eppie.App/Eppie.App.sln +++ b/source/Eppie.App/Eppie.App.sln @@ -95,7 +95,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eppie.App.Converters.Uno", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eppie.App.Converters.UWP", "Eppie.App.Converters\Eppie.App.Converters.UWP\Eppie.App.Converters.UWP.csproj", "{D392835A-52AE-4529-AAC0-52D3189CB461}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eppie.Authorization.OAuth2", "Eppie.Authorization.OAuth2\Eppie.Authorization.OAuth2.csproj", "{B2128895-1CB6-4DCD-BD31-D0B561029F4F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eppie.Authorization.OAuth2", "Eppie.Authorization.OAuth2\Eppie.Authorization.OAuth2.csproj", "{B2128895-1CB6-4DCD-BD31-D0B561029F4F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Eppie.App.UI", "Eppie.App.UI", "{81CA54E8-7F67-46D9-B576-938590F95453}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eppie.App.UI.Uno", "Eppie.App.UI\Eppie.App.UI.Uno\Eppie.App.UI.Uno.csproj", "{E66E9BBD-2F75-453F-83B9-709F67517261}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eppie.App.UI.UWP", "Eppie.App.UI\Eppie.App.UI.UWP\Eppie.App.UI.UWP.csproj", "{A6C30ED1-6213-427E-B255-E5E8C69E6D0E}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Eppie.App.UI.Shared", "Eppie.App.UI\Eppie.App.UI.Shared\Eppie.App.UI.Shared.shproj", "{2443C114-C401-45FC-91DC-6C6F1EA97D58}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -811,6 +819,46 @@ Global {B2128895-1CB6-4DCD-BD31-D0B561029F4F}.Release|x64.Build.0 = Release|Any CPU {B2128895-1CB6-4DCD-BD31-D0B561029F4F}.Release|x86.ActiveCfg = Release|Any CPU {B2128895-1CB6-4DCD-BD31-D0B561029F4F}.Release|x86.Build.0 = Release|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Debug|ARM.ActiveCfg = Debug|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Debug|ARM.Build.0 = Debug|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Debug|ARM64.Build.0 = Debug|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Debug|x64.ActiveCfg = Debug|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Debug|x64.Build.0 = Debug|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Debug|x86.ActiveCfg = Debug|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Debug|x86.Build.0 = Debug|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Release|Any CPU.Build.0 = Release|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Release|ARM.ActiveCfg = Release|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Release|ARM.Build.0 = Release|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Release|ARM64.ActiveCfg = Release|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Release|ARM64.Build.0 = Release|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Release|x64.ActiveCfg = Release|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Release|x64.Build.0 = Release|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Release|x86.ActiveCfg = Release|Any CPU + {E66E9BBD-2F75-453F-83B9-709F67517261}.Release|x86.Build.0 = Release|Any CPU + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|ARM.ActiveCfg = Debug|ARM + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|ARM.Build.0 = Debug|ARM + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|ARM64.Build.0 = Debug|ARM64 + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|x64.ActiveCfg = Debug|x64 + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|x64.Build.0 = Debug|x64 + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|x86.ActiveCfg = Debug|x86 + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Debug|x86.Build.0 = Debug|x86 + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|Any CPU.Build.0 = Release|Any CPU + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|ARM.ActiveCfg = Release|ARM + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|ARM.Build.0 = Release|ARM + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|ARM64.ActiveCfg = Release|ARM64 + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|ARM64.Build.0 = Release|ARM64 + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|x64.ActiveCfg = Release|x64 + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|x64.Build.0 = Release|x64 + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|x86.ActiveCfg = Release|x86 + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -855,16 +903,23 @@ Global {5D45BB98-D000-4210-BEDD-FB7E2E2694D6} = {22520875-73AA-4209-A3BC-7D02D567996E} {D392835A-52AE-4529-AAC0-52D3189CB461} = {22520875-73AA-4209-A3BC-7D02D567996E} {B2128895-1CB6-4DCD-BD31-D0B561029F4F} = {06BC7768-4BDC-4C5C-BA2F-B422F0A33200} + {81CA54E8-7F67-46D9-B576-938590F95453} = {BAADA1AF-033B-4254-9B27-CA301F69EEFE} + {E66E9BBD-2F75-453F-83B9-709F67517261} = {81CA54E8-7F67-46D9-B576-938590F95453} + {A6C30ED1-6213-427E-B255-E5E8C69E6D0E} = {81CA54E8-7F67-46D9-B576-938590F95453} + {2443C114-C401-45FC-91DC-6C6F1EA97D58} = {81CA54E8-7F67-46D9-B576-938590F95453} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1BCAC5D9-CEF8-4D64-8F16-3A0FEE49CF42} EndGlobalSection GlobalSection(SharedMSBuildProjectFiles) = preSolution Eppie.App.Shared\Eppie.App.Shared.projitems*{0d949175-5a8b-4474-9f7b-529a1b5ad025}*SharedItemsImports = 5 + Eppie.App.UI\Eppie.App.UI.Shared\Eppie.App.UI.Shared.projitems*{2443c114-c401-45fc-91dc-6c6f1ea97d58}*SharedItemsImports = 13 Eppie.App.Converters\Eppie.App.Converters.Shared\Eppie.App.Converters.Shared.projitems*{5d45bb98-d000-4210-bedd-fb7e2e2694d6}*SharedItemsImports = 5 + Eppie.App.UI\Eppie.App.UI.Shared\Eppie.App.UI.Shared.projitems*{a6c30ed1-6213-427e-b255-e5e8c69e6d0e}*SharedItemsImports = 4 Eppie.App.Shared\Eppie.App.Shared.projitems*{c4918d44-fb8a-442f-bde5-69106b2da412}*SharedItemsImports = 13 Eppie.App.Converters\Eppie.App.Converters.Shared\Eppie.App.Converters.Shared.projitems*{c5445205-872e-4523-a637-642703ef4b2f}*SharedItemsImports = 13 Eppie.App.Shared\Eppie.App.Shared.projitems*{cae118dc-8f0d-476e-a64a-ae165c754c92}*SharedItemsImports = 4 Eppie.App.Converters\Eppie.App.Converters.Shared\Eppie.App.Converters.Shared.projitems*{d392835a-52ae-4529-aac0-52d3189cb461}*SharedItemsImports = 4 + Eppie.App.UI\Eppie.App.UI.Shared\Eppie.App.UI.Shared.projitems*{e66e9bbd-2f75-453f-83b9-709f67517261}*SharedItemsImports = 5 EndGlobalSection EndGlobal diff --git a/source/Eppie.App/Eppie.App/Eppie.App.csproj b/source/Eppie.App/Eppie.App/Eppie.App.csproj index f274eab3..8f16c277 100644 --- a/source/Eppie.App/Eppie.App/Eppie.App.csproj +++ b/source/Eppie.App/Eppie.App/Eppie.App.csproj @@ -56,6 +56,7 @@ +