From: Hyungju Lee Date: Thu, 6 Feb 2020 05:17:21 +0000 (+0900) Subject: Remove dos carriage return X-Git-Tag: accepted/tizen/5.5/unified/20200207.122753^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe97442f7a1e70658c8f60590b280480b10d41e1;p=platform%2Fcore%2Fdotnet%2Flauncher.git Remove dos carriage return Change-Id: I47f301ead24f4bfd77ce082260d80d9af0f537d9 --- diff --git a/Managed/Managed.sln b/Managed/Managed.sln index 97e7406..ee5743e 100644 --- a/Managed/Managed.sln +++ b/Managed/Managed.sln @@ -1,31 +1,31 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.136 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dotnet.Launcher", "Dotnet.Launcher\Dotnet.Launcher.csproj", "{92F481F9-A099-40D7-9DD7-BE1B64C010D1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Init", "Tizen.Init\Tizen.Init.csproj", "{E43E299B-DA9A-4FE3-87EC-0E4511EA4679}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {92F481F9-A099-40D7-9DD7-BE1B64C010D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92F481F9-A099-40D7-9DD7-BE1B64C010D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92F481F9-A099-40D7-9DD7-BE1B64C010D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92F481F9-A099-40D7-9DD7-BE1B64C010D1}.Release|Any CPU.Build.0 = Release|Any CPU - {E43E299B-DA9A-4FE3-87EC-0E4511EA4679}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E43E299B-DA9A-4FE3-87EC-0E4511EA4679}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E43E299B-DA9A-4FE3-87EC-0E4511EA4679}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E43E299B-DA9A-4FE3-87EC-0E4511EA4679}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {50FDDCA4-5A0D-45CE-8855-DDAA3F4AA35E} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.136 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dotnet.Launcher", "Dotnet.Launcher\Dotnet.Launcher.csproj", "{92F481F9-A099-40D7-9DD7-BE1B64C010D1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Init", "Tizen.Init\Tizen.Init.csproj", "{E43E299B-DA9A-4FE3-87EC-0E4511EA4679}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {92F481F9-A099-40D7-9DD7-BE1B64C010D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {92F481F9-A099-40D7-9DD7-BE1B64C010D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {92F481F9-A099-40D7-9DD7-BE1B64C010D1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {92F481F9-A099-40D7-9DD7-BE1B64C010D1}.Release|Any CPU.Build.0 = Release|Any CPU + {E43E299B-DA9A-4FE3-87EC-0E4511EA4679}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E43E299B-DA9A-4FE3-87EC-0E4511EA4679}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E43E299B-DA9A-4FE3-87EC-0E4511EA4679}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E43E299B-DA9A-4FE3-87EC-0E4511EA4679}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {50FDDCA4-5A0D-45CE-8855-DDAA3F4AA35E} + EndGlobalSection +EndGlobal diff --git a/Managed/Tizen.Init/Tizen.Init.cs b/Managed/Tizen.Init/Tizen.Init.cs index a86440c..904c48f 100644 --- a/Managed/Tizen.Init/Tizen.Init.cs +++ b/Managed/Tizen.Init/Tizen.Init.cs @@ -154,7 +154,7 @@ namespace Tizen.Init { } } - PreloadLibICU(); + PreloadLibICU(); PreloadTizenFX(); PreloadEnd(); @@ -199,17 +199,17 @@ namespace Tizen.Init { } } - static void PreloadTizenFX() - { + static void PreloadTizenFX() + { try { Assembly assem = LoadAssembly("ElmSharp"); - var type = assem.GetType("ElmSharp.Window"); - type.GetMethod("Preload", BindingFlags.NonPublic | BindingFlags.Static).Invoke(null, null); - + var type = assem.GetType("ElmSharp.Window"); + type.GetMethod("Preload", BindingFlags.NonPublic | BindingFlags.Static).Invoke(null, null); + assem = LoadAssembly("Tizen.System.Information"); type = assem.GetType("Tizen.System.Information"); - type.GetMethod("TryGetValue", BindingFlags.Public | BindingFlags.Static).MakeGenericMethod(typeof(int)).Invoke(null, new object[] { "http://tizen.org/feature/screen.width", null }); + type.GetMethod("TryGetValue", BindingFlags.Public | BindingFlags.Static).MakeGenericMethod(typeof(int)).Invoke(null, new object[] { "http://tizen.org/feature/screen.width", null }); } catch (Exception e) { diff --git a/NativeLauncher/dotnet-launcher.info b/NativeLauncher/dotnet-launcher.info index 9ebf3c1..d7aa1cc 100644 --- a/NativeLauncher/dotnet-launcher.info +++ b/NativeLauncher/dotnet-launcher.info @@ -1,2 +1,2 @@ -type="metadata";name="http://tizen.org/metadata/prefer_nuget_cache";path="/etc/package-manager/parserlib/metadata/libprefer_nuget_cache_plugin.so" -type="metadata";name="http://tizen.org/metadata/prefer_dotnet_aot";path="/etc/package-manager/parserlib/metadata/libprefer_dotnet_aot_plugin.so" +type="metadata";name="http://tizen.org/metadata/prefer_nuget_cache";path="/etc/package-manager/parserlib/metadata/libprefer_nuget_cache_plugin.so" +type="metadata";name="http://tizen.org/metadata/prefer_dotnet_aot";path="/etc/package-manager/parserlib/metadata/libprefer_dotnet_aot_plugin.so"