Create a common root directory for managed csprojs

diff --git a/Managed/Dotnet.Launcher.cs b/Managed/Dotnet.Launcher/Dotnet.Launcher.cs
similarity index 100%
rename from Managed/Dotnet.Launcher.cs
rename to Managed/Dotnet.Launcher/Dotnet.Launcher.cs

diff --git a/Managed/Dotnet.Launcher.csproj b/Managed/Dotnet.Launcher/Dotnet.Launcher.csproj
similarity index 88%
rename from Managed/Dotnet.Launcher.csproj
rename to Managed/Dotnet.Launcher/Dotnet.Launcher.csproj
index e5fed71..21fb5d7 100644 (file)
--- a/Managed/Dotnet.Launcher.csproj
+++ b/Managed/Dotnet.Launcher/Dotnet.Launcher.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
            <TargetFramework>netcoreapp2.1</TargetFramework>
            <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

diff --git a/Managed/Managed.sln b/Managed/Managed.sln
new file mode 100644 (file)
index 0000000..97e7406
--- /dev/null
+++ b/Managed/Managed.sln
@@ -0,0 +1,31 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio 15\r
+VisualStudioVersion = 15.0.28307.136\r
+MinimumVisualStudioVersion = 10.0.40219.1\r
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dotnet.Launcher", "Dotnet.Launcher\Dotnet.Launcher.csproj", "{92F481F9-A099-40D7-9DD7-BE1B64C010D1}"\r
+EndProject\r
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Init", "Tizen.Init\Tizen.Init.csproj", "{E43E299B-DA9A-4FE3-87EC-0E4511EA4679}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Any CPU = Debug|Any CPU\r
+               Release|Any CPU = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {92F481F9-A099-40D7-9DD7-BE1B64C010D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {92F481F9-A099-40D7-9DD7-BE1B64C010D1}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {92F481F9-A099-40D7-9DD7-BE1B64C010D1}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {92F481F9-A099-40D7-9DD7-BE1B64C010D1}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {E43E299B-DA9A-4FE3-87EC-0E4511EA4679}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {E43E299B-DA9A-4FE3-87EC-0E4511EA4679}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {E43E299B-DA9A-4FE3-87EC-0E4511EA4679}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {E43E299B-DA9A-4FE3-87EC-0E4511EA4679}.Release|Any CPU.Build.0 = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+       GlobalSection(ExtensibilityGlobals) = postSolution\r
+               SolutionGuid = {50FDDCA4-5A0D-45CE-8855-DDAA3F4AA35E}\r
+       EndGlobalSection\r
+EndGlobal\r

diff --git a/Init/Init.cs b/Managed/Tizen.Init/Tizen.Init.cs
similarity index 100%
rename from Init/Init.cs
rename to Managed/Tizen.Init/Tizen.Init.cs

diff --git a/Init/Tizen.Init.csproj b/Managed/Tizen.Init/Tizen.Init.csproj
similarity index 100%
rename from Init/Tizen.Init.csproj
rename to Managed/Tizen.Init/Tizen.Init.csproj

diff --git a/packaging/dotnet-launcher.spec b/packaging/dotnet-launcher.spec
index 97334a5..b888686 100644 (file)
--- a/packaging/dotnet-launcher.spec
+++ b/packaging/dotnet-launcher.spec
@@ -86,13 +86,9 @@ export CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/--target=i686/--target=i586/')
 %endif
 %endif
 
-dotnet msbuild Init/Tizen.Init.csproj /t:clean
-dotnet msbuild Init/Tizen.Init.csproj /t:restore /p:RestoreSources=/nuget
-dotnet msbuild Init/Tizen.Init.csproj
-
-dotnet msbuild Managed/Dotnet.Launcher.csproj /t:clean
-dotnet msbuild Managed/Dotnet.Launcher.csproj /t:restore /p:RestoreSources=/nuget
-dotnet msbuild Managed/Dotnet.Launcher.csproj
+dotnet msbuild Managed /t:clean
+dotnet msbuild Managed /t:restore /p:RestoreSources=/nuget
+dotnet msbuild Managed /p:Configuration=Release
 
 cmake \
        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
@@ -129,8 +125,8 @@ make %{?jobs:-j%jobs} VERBOSE=1
 rm -rf %{buildroot}
 %make_install
 mkdir -p %{buildroot}%{_framework_dir}
-mv Init/bin/Release/Tizen.Init.dll %{buildroot}%{_framework_dir}
-mv Managed/bin/Release/Dotnet.Launcher.dll %{buildroot}%{_framework_dir}
+mv Managed/Tizen.Init/bin/Release/Tizen.Init.dll %{buildroot}%{_framework_dir}
+mv Managed/Dotnet.Launcher/bin/Release/Dotnet.Launcher.dll %{buildroot}%{_framework_dir}
 
 mkdir -p %{buildroot}%{_tac_dir}
 mkdir -p %{buildroot}%{_native_lib_dir}