diff --git a/EOM.Client.TopSkyHotelManagerSystem.sln b/EOM.Client.TopSkyHotelManagerSystem.sln index 4ae2ce93987d4f14ee70b7f2dbe6fa80ce580538..358811680b54e997bc9aeb6f56fe932581406726 100644 --- a/EOM.Client.TopSkyHotelManagerSystem.sln +++ b/EOM.Client.TopSkyHotelManagerSystem.sln @@ -12,8 +12,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.EntityFr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.WebApi", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.WebApi\EOM.TSHotelManager.WebApi.csproj", "{566D7064-EA90-45C1-93B7-F512BBAD7BA1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Library", "topsky-hotel-manager-system-web-api\Library\Library.csproj", "{5C7B9A47-90AD-4300-BF7F-64D9EBA9705C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Common.Core", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.Common.Core\EOM.TSHotelManager.Common.Core.csproj", "{48B3F864-88D2-4BD1-A766-B9EBF342AED1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Common.Util", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.Common.Util\EOM.TSHotelManager.Common.Util.csproj", "{9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}" @@ -42,10 +40,6 @@ Global {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Debug|Any CPU.Build.0 = Debug|Any CPU {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Release|Any CPU.ActiveCfg = Release|Any CPU {566D7064-EA90-45C1-93B7-F512BBAD7BA1}.Release|Any CPU.Build.0 = Release|Any CPU - {5C7B9A47-90AD-4300-BF7F-64D9EBA9705C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C7B9A47-90AD-4300-BF7F-64D9EBA9705C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C7B9A47-90AD-4300-BF7F-64D9EBA9705C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C7B9A47-90AD-4300-BF7F-64D9EBA9705C}.Release|Any CPU.Build.0 = Release|Any CPU {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Debug|Any CPU.Build.0 = Debug|Any CPU {48B3F864-88D2-4BD1-A766-B9EBF342AED1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -74,7 +68,6 @@ Global {B55975AB-2C89-4C01-B107-D87FCA21A5E3} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} {8F5CF88A-1111-44CC-AFFA-4637EA10E191} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} {566D7064-EA90-45C1-93B7-F512BBAD7BA1} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} - {5C7B9A47-90AD-4300-BF7F-64D9EBA9705C} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} {48B3F864-88D2-4BD1-A766-B9EBF342AED1} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} {9A62B6BE-7C26-465F-A8D1-2CEE66D6F837} = {6A3E4936-8B95-49E0-842B-E002C0E024CE} {781CEE04-DDB4-4037-8175-9A6548716871} = {3B8902EC-CAB9-406A-AAF7-24DABD885AC0} diff --git a/EOM.TSHotelManager.FormUI/EOM.TSHotelManager.FormUI.csproj b/EOM.TSHotelManager.FormUI/EOM.TSHotelManager.FormUI.csproj index ed6889a251700ab4d6eb5502b084ba27cf3d7282..e617beeae3bd6f0db180d000844f707c80ac23d9 100644 --- a/EOM.TSHotelManager.FormUI/EOM.TSHotelManager.FormUI.csproj +++ b/EOM.TSHotelManager.FormUI/EOM.TSHotelManager.FormUI.csproj @@ -14,6 +14,7 @@ logo.ico $(SolutionDir)packages\Fody\build\Fody.targets false + app.manifest diff --git a/EOM.TSHotelManager.FormUI/Program.cs b/EOM.TSHotelManager.FormUI/Program.cs index 9384bf06b3b61bada4c8ce2039bffa1616d6c70f..5f8c6d38176d52e62d537869f1461cf2c92fb3b8 100644 --- a/EOM.TSHotelManager.FormUI/Program.cs +++ b/EOM.TSHotelManager.FormUI/Program.cs @@ -10,6 +10,7 @@ namespace EOM.TSHotelManager.FormUI { // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. + Application.SetHighDpiMode(HighDpiMode.DpiUnaware); Initialize.CustomizeInitialize(); Application.Run(new FrmLoading()); } diff --git a/EOM.TSHotelManager.FormUI/app.manifest b/EOM.TSHotelManager.FormUI/app.manifest new file mode 100644 index 0000000000000000000000000000000000000000..12ac6f7a3de51debb5bb4f755c9e3c716999814c --- /dev/null +++ b/EOM.TSHotelManager.FormUI/app.manifest @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + diff --git a/topsky-hotel-manager-system-web-api b/topsky-hotel-manager-system-web-api index 8e01c77c0219e0c72642ffee976220c77ea223b0..80f78a0ded1bb91e68a19acf62647449f59bbaea 160000 --- a/topsky-hotel-manager-system-web-api +++ b/topsky-hotel-manager-system-web-api @@ -1 +1 @@ -Subproject commit 8e01c77c0219e0c72642ffee976220c77ea223b0 +Subproject commit 80f78a0ded1bb91e68a19acf62647449f59bbaea