From 954e6a35f0a9669e665073ee1a6c801f765c283b Mon Sep 17 00:00:00 2001 From: Wonyoung Choi Date: Thu, 2 Nov 2017 06:35:17 +0900 Subject: [PATCH] Add Tizen.NET.Internals package Change-Id: Ice6bca70f4891b10104fe482a1d62db7b86db2e8 --- build.cmd | 29 ++- build.sh | 23 ++- build/build.dummy.csproj | 2 +- build/build.proj | 50 ++--- build/common.targets | 15 ++ build/directories.props | 4 +- internal/src/Directory.Build.props | 10 + internal/src/Directory.Build.targets | 5 + .../Interop/Interop.CallManager.cs | 0 .../Tizen.CallManager/Interop/Interop.GsList.cs | 0 .../Tizen.CallManager/Interop/Interop.Libraries.cs | 0 .../Tizen.CallManager/Tizen.CallManager.csproj | 4 +- .../src}/Tizen.CallManager/Tizen.CallManager.sln | 4 +- .../Tizen.CallManager/CallData.cs | 0 .../Tizen.CallManager/CallEventData.cs | 0 .../Tizen.CallManager/CallManager.cs | 0 .../Tizen.CallManager/CmClientHandle.cs | 0 .../Tizen.CallManager/CmEnumerations.cs | 0 .../Tizen.CallManager/CmEventArgs.cs | 0 .../Tizen.CallManager/CmUtility.cs | 0 .../Tizen.CallManager/ConferenceCallData.cs | 0 .../src}/Tizen.Network.Mtp/Interop/Interop.Glib.cs | 0 .../src}/Tizen.Network.Mtp/Interop/Interop.Libc.cs | 0 .../Tizen.Network.Mtp/Interop/Interop.Libraries.cs | 0 .../src}/Tizen.Network.Mtp/Interop/Interop.Mtp.cs | 0 .../Tizen.Network.Mtp/Tizen.Network.Mtp.csproj | 4 +- .../src}/Tizen.Network.Mtp/Tizen.Network.Mtp.sln | 4 +- .../Tizen.Network.Mtp/MtpDevice.cs | 0 .../Tizen.Network.Mtp/MtpEnumerations.cs | 0 .../Tizen.Network.Mtp/MtpErrorFactory.cs | 0 .../Tizen.Network.Mtp/MtpEventArgs.cs | 0 .../Tizen.Network.Mtp/MtpManager.cs | 0 .../Tizen.Network.Mtp/MtpManagerEvent.cs | 0 .../Tizen.Network.Mtp/MtpManagerImpl.cs | 0 .../Tizen.Network.Mtp/MtpObject.cs | 0 .../Tizen.Network.Mtp/MtpStorage.cs | 0 .../Tizen.Network.Mtp/doc/api/Tizen.Network.Mtp.md | 0 .../src}/Tizen.Tapi/Interop/Interop.Libraries.cs | 0 .../src}/Tizen.Tapi/Interop/Interop.Tapi.cs | 0 {src => internal/src}/Tizen.Tapi/Tizen.Tapi.csproj | 4 +- {src => internal/src}/Tizen.Tapi/Tizen.Tapi.sln | 4 +- .../src}/Tizen.Tapi/Tizen.Tapi/Call.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/CallData.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/CallEnumerations.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/CallStructs.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/Modem.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/ModemData.cs | 0 .../Tizen.Tapi/Tizen.Tapi/ModemEnumerations.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/ModemStructs.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/Network.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/NetworkData.cs | 0 .../Tizen.Tapi/Tizen.Tapi/NetworkEnumerations.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/NetworkStructs.cs | 0 {src => internal/src}/Tizen.Tapi/Tizen.Tapi/Oem.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/OemData.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/OemStructs.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/Phonebook.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/PhonebookData.cs | 0 .../Tizen.Tapi/Tizen.Tapi/PhonebookEnumerations.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/PhonebookStructs.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/SatData.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/SatEnumerations.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/SatStructs.cs | 0 {src => internal/src}/Tizen.Tapi/Tizen.Tapi/Sim.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/SimData.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/SimEnumerations.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/SimStructs.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/SmsData.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/SmsEnumerations.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/SmsStructs.cs | 0 {src => internal/src}/Tizen.Tapi/Tizen.Tapi/Ss.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/SsData.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/SsEnumerations.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/SsStructs.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/TapiEnumerations.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/TapiEventArgs.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/TapiHandle.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/TapiManager.cs | 0 .../src}/Tizen.Tapi/Tizen.Tapi/TapiUtility.cs | 0 packaging/csapi-tizenfx.spec | 30 ++- packaging/csapi-tizenfx.spec.in | 214 +++++++++++++++++++++ pkg/PublicModuleList.txt | 82 -------- ....NET.API4.nuspec => Tizen.NET.Internals.nuspec} | 12 +- pkg/Tizen.NET.Private.nuspec | 28 --- pkg/Tizen.NET.nuspec | 5 - src/Directory.Build.props | 5 + src/Directory.Build.targets | 5 + 87 files changed, 356 insertions(+), 187 deletions(-) create mode 100644 build/common.targets create mode 100644 internal/src/Directory.Build.props create mode 100644 internal/src/Directory.Build.targets rename {src => internal/src}/Tizen.CallManager/Interop/Interop.CallManager.cs (100%) rename {src => internal/src}/Tizen.CallManager/Interop/Interop.GsList.cs (100%) rename {src => internal/src}/Tizen.CallManager/Interop/Interop.Libraries.cs (100%) rename {src => internal/src}/Tizen.CallManager/Tizen.CallManager.csproj (54%) rename {src => internal/src}/Tizen.CallManager/Tizen.CallManager.sln (95%) rename {src => internal/src}/Tizen.CallManager/Tizen.CallManager/CallData.cs (100%) rename {src => internal/src}/Tizen.CallManager/Tizen.CallManager/CallEventData.cs (100%) rename {src => internal/src}/Tizen.CallManager/Tizen.CallManager/CallManager.cs (100%) rename {src => internal/src}/Tizen.CallManager/Tizen.CallManager/CmClientHandle.cs (100%) rename {src => internal/src}/Tizen.CallManager/Tizen.CallManager/CmEnumerations.cs (100%) rename {src => internal/src}/Tizen.CallManager/Tizen.CallManager/CmEventArgs.cs (100%) rename {src => internal/src}/Tizen.CallManager/Tizen.CallManager/CmUtility.cs (100%) rename {src => internal/src}/Tizen.CallManager/Tizen.CallManager/ConferenceCallData.cs (100%) rename {src => internal/src}/Tizen.Network.Mtp/Interop/Interop.Glib.cs (100%) rename {src => internal/src}/Tizen.Network.Mtp/Interop/Interop.Libc.cs (100%) rename {src => internal/src}/Tizen.Network.Mtp/Interop/Interop.Libraries.cs (100%) rename {src => internal/src}/Tizen.Network.Mtp/Interop/Interop.Mtp.cs (100%) rename {src => internal/src}/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj (54%) rename {src => internal/src}/Tizen.Network.Mtp/Tizen.Network.Mtp.sln (91%) rename {src => internal/src}/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpDevice.cs (100%) rename {src => internal/src}/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpEnumerations.cs (100%) rename {src => internal/src}/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpErrorFactory.cs (100%) rename {src => internal/src}/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpEventArgs.cs (100%) rename {src => internal/src}/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpManager.cs (100%) rename {src => internal/src}/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpManagerEvent.cs (100%) rename {src => internal/src}/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpManagerImpl.cs (100%) rename {src => internal/src}/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpObject.cs (100%) rename {src => internal/src}/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpStorage.cs (100%) rename {src => internal/src}/Tizen.Network.Mtp/doc/api/Tizen.Network.Mtp.md (100%) rename {src => internal/src}/Tizen.Tapi/Interop/Interop.Libraries.cs (100%) rename {src => internal/src}/Tizen.Tapi/Interop/Interop.Tapi.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi.csproj (51%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi.sln (91%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/Call.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/CallData.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/CallEnumerations.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/CallStructs.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/Modem.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/ModemData.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/ModemEnumerations.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/ModemStructs.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/Network.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/NetworkData.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/NetworkEnumerations.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/NetworkStructs.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/Oem.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/OemData.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/OemStructs.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/Phonebook.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/PhonebookData.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/PhonebookEnumerations.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/PhonebookStructs.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/SatData.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/SatEnumerations.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/SatStructs.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/Sim.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/SimData.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/SimEnumerations.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/SimStructs.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/SmsData.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/SmsEnumerations.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/SmsStructs.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/Ss.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/SsData.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/SsEnumerations.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/SsStructs.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/TapiEnumerations.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/TapiEventArgs.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/TapiHandle.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/TapiManager.cs (100%) rename {src => internal/src}/Tizen.Tapi/Tizen.Tapi/TapiUtility.cs (100%) create mode 100644 packaging/csapi-tizenfx.spec.in delete mode 100755 pkg/PublicModuleList.txt rename pkg/{Tizen.NET.API4.nuspec => Tizen.NET.Internals.nuspec} (68%) delete mode 100644 pkg/Tizen.NET.Private.nuspec create mode 100644 src/Directory.Build.targets diff --git a/build.cmd b/build.cmd index 2862a21..8755816 100644 --- a/build.cmd +++ b/build.cmd @@ -26,11 +26,14 @@ if /I [%2] == [] ( echo No module specified. exit /b !ERRORLEVEL! ) -call dotnet msbuild %~dp0build\build.proj /t:build /p:Project=%2 +call dotnet msbuild %~dp0build\build.proj /nologo /t:restore /p:Project=%2 +call dotnet msbuild %~dp0build\build.proj /nologo /t:build /p:Project=%2 goto :EOF :FullBuild -call dotnet msbuild %~dp0build\build.proj /t:build +call dotnet msbuild %~dp0build\build.proj /nologo /t:clean +call dotnet msbuild %~dp0build\build.proj /nologo /t:restore +call dotnet msbuild %~dp0build\build.proj /nologo /t:build goto :EOF :DummyBuild @@ -38,14 +41,26 @@ call dotnet build %~dp0build\build.dummy.csproj goto :EOF :Pack -set NUGET_VERSION_OPT= -if /I not [%2] == [] set NUGET_VERSION_OPT=-Version %2 +set VERSION=%2 +set VERSION_INTERNAL=%3 +call :GetUnixTime TIMESTAMP +if /I [%VERSION%] == [] set VERSION=5.0.0-local-%TIMESTAMP% +if /I [%VERSION_INTERNAL%] == [] set VERSION_INTERNAL=%VERSION% set OUTDIR=%~dp0Artifacts set NUGET_CMD=%~dp0tools\NuGet.exe -%NUGET_CMD% pack %~dp0pkg\Tizen.NET.Private.nuspec -Symbols -NoPackageAnalysis %NUGET_VERSION_OPT% -BasePath %~dp0 -OutputDirectory %OUTDIR% -%NUGET_CMD% pack %~dp0pkg\Tizen.NET.nuspec -Symbols -NoPackageAnalysis %NUGET_VERSION_OPT% -BasePath %~dp0 -OutputDirectory %OUTDIR% +%NUGET_CMD% pack %~dp0pkg\Tizen.NET.nuspec -NoPackageAnalysis -Version %VERSION% -BasePath %~dp0 -OutputDirectory %OUTDIR% +%NUGET_CMD% pack %~dp0pkg\Tizen.NET.Internals.nuspec -NoPackageAnalysis -Version %VERSION_INTERNAL% -BasePath %~dp0 -OutputDirectory %OUTDIR% goto :EOF :Clean -call dotnet msbuild %~dp0build\build.proj /t:clean +call dotnet msbuild %~dp0build\build.proj /nologo /t:clean goto :EOF + +:GetUnixTime +setlocal enableextensions +for /f %%x in ('wmic path win32_utctime get /format:list ^| findstr "="') do ( + set %%x) +set /a z=(14-100%Month%%%100)/12, y=10000%Year%%%10000-z +set /a ut=y*365+y/4-y/100+y/400+(153*(100%Month%%%100+12*z-3)+2)/5+Day-719469 +set /a ut=ut*86400+100%Hour%%%100*3600+100%Minute%%%100*60+100%Second%%%100 +endlocal & set "%1=%ut%" & goto :EOF diff --git a/build.sh b/build.sh index 27d8a49..d0d5538 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ RETRY_CMD="$SCRIPT_DIR/tools/retry.sh" TIMEOUT_CMD="$SCRIPT_DIR/tools/timeout.sh" DOTNET_CMD="$RETRY_CMD $TIMEOUT_CMD 600 dotnet" -RUN_BUILD="$DOTNET_CMD msbuild $SCRIPT_DIR/build/build.proj" +RUN_BUILD="$DOTNET_CMD msbuild $SCRIPT_DIR/build/build.proj /nologo" RUN_BUILD_DUMMY="$DOTNET_CMD build $SCRIPT_DIR/build/build.dummy.csproj" usage() { @@ -31,14 +31,17 @@ cmd_build() { if [ -d /nuget ]; then NUGET_SOURCE_OPT="/p:RestoreSources=/nuget" fi - $RUN_BUILD /t:build /p:Project=$1 $NUGET_SOURCE_OPT + $RUN_BUILD /t:restore /p:Project=$1 $NUGET_SOURCE_OPT + $RUN_BUILD /t:build /p:Project=$1 } cmd_full_build() { if [ -d /nuget ]; then NUGET_SOURCE_OPT="/p:RestoreSources=/nuget" fi - $RUN_BUILD /t:build $NUGET_SOURCE_OPT + $RUN_BUILD /t:clean + $RUN_BUILD /t:restore $NUGET_SOURCE_OPT + $RUN_BUILD /t:build } cmd_dummy_build() { @@ -49,12 +52,18 @@ cmd_dummy_build() { } cmd_pack() { - if [ -n "$1" ]; then - NUGET_VERSION_OPT="-Version $1" + VERSION=$1 + VERSION_INTERNAL=$2 + if [ -z "$VERSION" ]; then + TIMESTAMP=$(date +"%s") + VERSION="4.0.0-local-$TIMESTAMP" + fi + if [ -z "$VERSION_INTERNAL" ]; then + VERSION_INTERNAL=$VERSION fi - $NUGET_CMD pack $SCRIPT_DIR/pkg/Tizen.NET.Private.nuspec -Symbols -NoPackageAnalysis $NUGET_VERSION_OPT -BasePath $SCRIPT_DIR -OutputDirectory $OUTDIR - $NUGET_CMD pack $SCRIPT_DIR/pkg/Tizen.NET.nuspec -Symbols -NoPackageAnalysis $NUGET_VERSION_OPT -BasePath $SCRIPT_DIR -OutputDirectory $OUTDIR + $NUGET_CMD pack $SCRIPT_DIR/pkg/Tizen.NET.nuspec -NoPackageAnalysis -Version $VERSION -BasePath $SCRIPT_DIR -OutputDirectory $OUTDIR + $NUGET_CMD pack $SCRIPT_DIR/pkg/Tizen.NET.Internals.nuspec -NoPackageAnalysis -Version $VERSION_INTERNAL -BasePath $SCRIPT_DIR -OutputDirectory $OUTDIR } cmd_clean() { diff --git a/build/build.dummy.csproj b/build/build.dummy.csproj index c0b89c6..48bb206 100644 --- a/build/build.dummy.csproj +++ b/build/build.dummy.csproj @@ -26,7 +26,7 @@ - + diff --git a/build/build.proj b/build/build.proj index 661081e..dc28ff4 100644 --- a/build/build.proj +++ b/build/build.proj @@ -2,11 +2,6 @@ - - - $(PackageSrcDir)PublicModuleList.txt - - Release @@ -16,6 +11,7 @@ + - + + @@ -40,44 +37,37 @@ - - + + + + + + - - - - - - - <_PublicFilesToMove Include="$(OutputPlatformDir)%(PublicProject.Identity).dll" /> - <_PublicFilesToMove Include="$(OutputPlatformDir)%(PublicProject.Identity).pdb" /> - <_PublicFilesToMove Include="$(OutputPlatformDir)%(PublicProject.Identity).xml" /> - <_PublicFilesToMove Include="$(OutputPlatformDir)*\%(PublicProject.Identity).dll" /> - - - - - - + diff --git a/build/common.targets b/build/common.targets new file mode 100644 index 0000000..bb8b895 --- /dev/null +++ b/build/common.targets @@ -0,0 +1,15 @@ + + + + + + + + + + + + diff --git a/build/directories.props b/build/directories.props index 32ed386..28b5ed1 100644 --- a/build/directories.props +++ b/build/directories.props @@ -5,14 +5,14 @@ $(MSBuildThisFileDirectory)..\ $(ProjectRootDir)src\ - $(ProjectRootDir)pkg\ + $(ProjectRootDir)\internal\src\ $(ProjectRootDir)tools\ $(ToolsDir)GenAPI\ $(ProjectRootDir)Artifacts\ $(OutputBaseDir)bin\public\ - $(OutputBaseDir)bin\platform\ + $(OutputBaseDir)bin\internal\ $(OutputBaseDir)bin\dummy\ diff --git a/internal/src/Directory.Build.props b/internal/src/Directory.Build.props new file mode 100644 index 0000000..2abd25e --- /dev/null +++ b/internal/src/Directory.Build.props @@ -0,0 +1,10 @@ + + + + + + + $(OutputInternalDir) + + + \ No newline at end of file diff --git a/internal/src/Directory.Build.targets b/internal/src/Directory.Build.targets new file mode 100644 index 0000000..7e3dd2b --- /dev/null +++ b/internal/src/Directory.Build.targets @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/Tizen.CallManager/Interop/Interop.CallManager.cs b/internal/src/Tizen.CallManager/Interop/Interop.CallManager.cs similarity index 100% rename from src/Tizen.CallManager/Interop/Interop.CallManager.cs rename to internal/src/Tizen.CallManager/Interop/Interop.CallManager.cs diff --git a/src/Tizen.CallManager/Interop/Interop.GsList.cs b/internal/src/Tizen.CallManager/Interop/Interop.GsList.cs similarity index 100% rename from src/Tizen.CallManager/Interop/Interop.GsList.cs rename to internal/src/Tizen.CallManager/Interop/Interop.GsList.cs diff --git a/src/Tizen.CallManager/Interop/Interop.Libraries.cs b/internal/src/Tizen.CallManager/Interop/Interop.Libraries.cs similarity index 100% rename from src/Tizen.CallManager/Interop/Interop.Libraries.cs rename to internal/src/Tizen.CallManager/Interop/Interop.Libraries.cs diff --git a/src/Tizen.CallManager/Tizen.CallManager.csproj b/internal/src/Tizen.CallManager/Tizen.CallManager.csproj similarity index 54% rename from src/Tizen.CallManager/Tizen.CallManager.csproj rename to internal/src/Tizen.CallManager/Tizen.CallManager.csproj index 7f4584f..459fe88 100644 --- a/src/Tizen.CallManager/Tizen.CallManager.csproj +++ b/internal/src/Tizen.CallManager/Tizen.CallManager.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/Tizen.CallManager/Tizen.CallManager.sln b/internal/src/Tizen.CallManager/Tizen.CallManager.sln similarity index 95% rename from src/Tizen.CallManager/Tizen.CallManager.sln rename to internal/src/Tizen.CallManager/Tizen.CallManager.sln index 983c733..f80d411 100755 --- a/src/Tizen.CallManager/Tizen.CallManager.sln +++ b/internal/src/Tizen.CallManager/Tizen.CallManager.sln @@ -4,9 +4,9 @@ VisualStudioVersion = 15.0.26430.13 MinimumVisualStudioVersion = 15.0.26124.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.CallManager", "Tizen.CallManager.csproj", "{18DF1A45-32B3-4577-84DF-BB3A1537ADC9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen", "..\Tizen\Tizen.csproj", "{D06D0004-6A5F-4D6C-98C4-ADD3766A867A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen", "..\..\..\src\Tizen\Tizen.csproj", "{D06D0004-6A5F-4D6C-98C4-ADD3766A867A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Log", "..\Tizen.Log\Tizen.Log.csproj", "{78875590-41AB-4382-B64E-73A50DE0851C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Log", "..\..\..\src\Tizen.Log\Tizen.Log.csproj", "{78875590-41AB-4382-B64E-73A50DE0851C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Tizen.CallManager/Tizen.CallManager/CallData.cs b/internal/src/Tizen.CallManager/Tizen.CallManager/CallData.cs similarity index 100% rename from src/Tizen.CallManager/Tizen.CallManager/CallData.cs rename to internal/src/Tizen.CallManager/Tizen.CallManager/CallData.cs diff --git a/src/Tizen.CallManager/Tizen.CallManager/CallEventData.cs b/internal/src/Tizen.CallManager/Tizen.CallManager/CallEventData.cs similarity index 100% rename from src/Tizen.CallManager/Tizen.CallManager/CallEventData.cs rename to internal/src/Tizen.CallManager/Tizen.CallManager/CallEventData.cs diff --git a/src/Tizen.CallManager/Tizen.CallManager/CallManager.cs b/internal/src/Tizen.CallManager/Tizen.CallManager/CallManager.cs similarity index 100% rename from src/Tizen.CallManager/Tizen.CallManager/CallManager.cs rename to internal/src/Tizen.CallManager/Tizen.CallManager/CallManager.cs diff --git a/src/Tizen.CallManager/Tizen.CallManager/CmClientHandle.cs b/internal/src/Tizen.CallManager/Tizen.CallManager/CmClientHandle.cs similarity index 100% rename from src/Tizen.CallManager/Tizen.CallManager/CmClientHandle.cs rename to internal/src/Tizen.CallManager/Tizen.CallManager/CmClientHandle.cs diff --git a/src/Tizen.CallManager/Tizen.CallManager/CmEnumerations.cs b/internal/src/Tizen.CallManager/Tizen.CallManager/CmEnumerations.cs similarity index 100% rename from src/Tizen.CallManager/Tizen.CallManager/CmEnumerations.cs rename to internal/src/Tizen.CallManager/Tizen.CallManager/CmEnumerations.cs diff --git a/src/Tizen.CallManager/Tizen.CallManager/CmEventArgs.cs b/internal/src/Tizen.CallManager/Tizen.CallManager/CmEventArgs.cs similarity index 100% rename from src/Tizen.CallManager/Tizen.CallManager/CmEventArgs.cs rename to internal/src/Tizen.CallManager/Tizen.CallManager/CmEventArgs.cs diff --git a/src/Tizen.CallManager/Tizen.CallManager/CmUtility.cs b/internal/src/Tizen.CallManager/Tizen.CallManager/CmUtility.cs similarity index 100% rename from src/Tizen.CallManager/Tizen.CallManager/CmUtility.cs rename to internal/src/Tizen.CallManager/Tizen.CallManager/CmUtility.cs diff --git a/src/Tizen.CallManager/Tizen.CallManager/ConferenceCallData.cs b/internal/src/Tizen.CallManager/Tizen.CallManager/ConferenceCallData.cs similarity index 100% rename from src/Tizen.CallManager/Tizen.CallManager/ConferenceCallData.cs rename to internal/src/Tizen.CallManager/Tizen.CallManager/ConferenceCallData.cs diff --git a/src/Tizen.Network.Mtp/Interop/Interop.Glib.cs b/internal/src/Tizen.Network.Mtp/Interop/Interop.Glib.cs similarity index 100% rename from src/Tizen.Network.Mtp/Interop/Interop.Glib.cs rename to internal/src/Tizen.Network.Mtp/Interop/Interop.Glib.cs diff --git a/src/Tizen.Network.Mtp/Interop/Interop.Libc.cs b/internal/src/Tizen.Network.Mtp/Interop/Interop.Libc.cs similarity index 100% rename from src/Tizen.Network.Mtp/Interop/Interop.Libc.cs rename to internal/src/Tizen.Network.Mtp/Interop/Interop.Libc.cs diff --git a/src/Tizen.Network.Mtp/Interop/Interop.Libraries.cs b/internal/src/Tizen.Network.Mtp/Interop/Interop.Libraries.cs similarity index 100% rename from src/Tizen.Network.Mtp/Interop/Interop.Libraries.cs rename to internal/src/Tizen.Network.Mtp/Interop/Interop.Libraries.cs diff --git a/src/Tizen.Network.Mtp/Interop/Interop.Mtp.cs b/internal/src/Tizen.Network.Mtp/Interop/Interop.Mtp.cs similarity index 100% rename from src/Tizen.Network.Mtp/Interop/Interop.Mtp.cs rename to internal/src/Tizen.Network.Mtp/Interop/Interop.Mtp.cs diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj b/internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj similarity index 54% rename from src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj rename to internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj index 7f4584f..459fe88 100644 --- a/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj +++ b/internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp.sln b/internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp.sln similarity index 91% rename from src/Tizen.Network.Mtp/Tizen.Network.Mtp.sln rename to internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp.sln index a010f46..ea26cb1 100755 --- a/src/Tizen.Network.Mtp/Tizen.Network.Mtp.sln +++ b/internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp.sln @@ -5,9 +5,9 @@ VisualStudioVersion = 15.0.26430.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Network.Mtp", "Tizen.Network.Mtp.csproj", "{66896B73-D51B-4E1D-9A7A-B5D66FDE6E97}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen", "..\Tizen\Tizen.csproj", "{82B9BB77-6809-4DA0-9BCE-DAC24C7A7669}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen", "..\..\..\src\Tizen\Tizen.csproj", "{82B9BB77-6809-4DA0-9BCE-DAC24C7A7669}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Log", "..\Tizen.Log\Tizen.Log.csproj", "{AD803503-C70D-4CE7-A1F1-9DF0B890A42F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Log", "..\..\..\src\Tizen.Log\Tizen.Log.csproj", "{AD803503-C70D-4CE7-A1F1-9DF0B890A42F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpDevice.cs b/internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpDevice.cs similarity index 100% rename from src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpDevice.cs rename to internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpDevice.cs diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpEnumerations.cs b/internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpEnumerations.cs similarity index 100% rename from src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpEnumerations.cs rename to internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpEnumerations.cs diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpErrorFactory.cs b/internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpErrorFactory.cs similarity index 100% rename from src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpErrorFactory.cs rename to internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpErrorFactory.cs diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpEventArgs.cs b/internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpEventArgs.cs similarity index 100% rename from src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpEventArgs.cs rename to internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpEventArgs.cs diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpManager.cs b/internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpManager.cs similarity index 100% rename from src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpManager.cs rename to internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpManager.cs diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpManagerEvent.cs b/internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpManagerEvent.cs similarity index 100% rename from src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpManagerEvent.cs rename to internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpManagerEvent.cs diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpManagerImpl.cs b/internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpManagerImpl.cs similarity index 100% rename from src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpManagerImpl.cs rename to internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpManagerImpl.cs diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpObject.cs b/internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpObject.cs similarity index 100% rename from src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpObject.cs rename to internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpObject.cs diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpStorage.cs b/internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpStorage.cs similarity index 100% rename from src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpStorage.cs rename to internal/src/Tizen.Network.Mtp/Tizen.Network.Mtp/MtpStorage.cs diff --git a/src/Tizen.Network.Mtp/doc/api/Tizen.Network.Mtp.md b/internal/src/Tizen.Network.Mtp/doc/api/Tizen.Network.Mtp.md similarity index 100% rename from src/Tizen.Network.Mtp/doc/api/Tizen.Network.Mtp.md rename to internal/src/Tizen.Network.Mtp/doc/api/Tizen.Network.Mtp.md diff --git a/src/Tizen.Tapi/Interop/Interop.Libraries.cs b/internal/src/Tizen.Tapi/Interop/Interop.Libraries.cs similarity index 100% rename from src/Tizen.Tapi/Interop/Interop.Libraries.cs rename to internal/src/Tizen.Tapi/Interop/Interop.Libraries.cs diff --git a/src/Tizen.Tapi/Interop/Interop.Tapi.cs b/internal/src/Tizen.Tapi/Interop/Interop.Tapi.cs similarity index 100% rename from src/Tizen.Tapi/Interop/Interop.Tapi.cs rename to internal/src/Tizen.Tapi/Interop/Interop.Tapi.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi.csproj b/internal/src/Tizen.Tapi/Tizen.Tapi.csproj similarity index 51% rename from src/Tizen.Tapi/Tizen.Tapi.csproj rename to internal/src/Tizen.Tapi/Tizen.Tapi.csproj index 4c51c41..0d450ba 100644 --- a/src/Tizen.Tapi/Tizen.Tapi.csproj +++ b/internal/src/Tizen.Tapi/Tizen.Tapi.csproj @@ -5,8 +5,8 @@ - - + + \ No newline at end of file diff --git a/src/Tizen.Tapi/Tizen.Tapi.sln b/internal/src/Tizen.Tapi/Tizen.Tapi.sln similarity index 91% rename from src/Tizen.Tapi/Tizen.Tapi.sln rename to internal/src/Tizen.Tapi/Tizen.Tapi.sln index c699156..12cc38a 100755 --- a/src/Tizen.Tapi/Tizen.Tapi.sln +++ b/internal/src/Tizen.Tapi/Tizen.Tapi.sln @@ -5,9 +5,9 @@ VisualStudioVersion = 15.0.26430.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Tapi", "Tizen.Tapi.csproj", "{77F9FF6F-DF82-4A48-AFF8-9031B5065AA5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen", "..\Tizen\Tizen.csproj", "{79F086CB-DB6C-452F-A15C-274676452682}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen", "..\..\..\src\Tizen\Tizen.csproj", "{79F086CB-DB6C-452F-A15C-274676452682}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Log", "..\Tizen.Log\Tizen.Log.csproj", "{29669E98-429B-4FDD-8E21-85D78B07346F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Log", "..\..\..\src\Tizen.Log\Tizen.Log.csproj", "{29669E98-429B-4FDD-8E21-85D78B07346F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Tizen.Tapi/Tizen.Tapi/Call.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/Call.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/Call.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/Call.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/CallData.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/CallData.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/CallData.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/CallData.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/CallEnumerations.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/CallEnumerations.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/CallEnumerations.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/CallEnumerations.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/CallStructs.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/CallStructs.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/CallStructs.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/CallStructs.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/Modem.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/Modem.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/Modem.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/Modem.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/ModemData.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/ModemData.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/ModemData.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/ModemData.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/ModemEnumerations.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/ModemEnumerations.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/ModemEnumerations.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/ModemEnumerations.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/ModemStructs.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/ModemStructs.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/ModemStructs.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/ModemStructs.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/Network.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/Network.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/Network.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/Network.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/NetworkData.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/NetworkData.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/NetworkData.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/NetworkData.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/NetworkEnumerations.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/NetworkEnumerations.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/NetworkEnumerations.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/NetworkEnumerations.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/NetworkStructs.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/NetworkStructs.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/NetworkStructs.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/NetworkStructs.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/Oem.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/Oem.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/Oem.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/Oem.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/OemData.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/OemData.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/OemData.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/OemData.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/OemStructs.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/OemStructs.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/OemStructs.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/OemStructs.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/Phonebook.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/Phonebook.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/Phonebook.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/Phonebook.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/PhonebookData.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/PhonebookData.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/PhonebookData.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/PhonebookData.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/PhonebookEnumerations.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/PhonebookEnumerations.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/PhonebookEnumerations.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/PhonebookEnumerations.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/PhonebookStructs.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/PhonebookStructs.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/PhonebookStructs.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/PhonebookStructs.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/SatData.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/SatData.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/SatData.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/SatData.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/SatEnumerations.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/SatEnumerations.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/SatEnumerations.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/SatEnumerations.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/SatStructs.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/SatStructs.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/SatStructs.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/SatStructs.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/Sim.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/Sim.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/Sim.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/Sim.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/SimData.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/SimData.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/SimData.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/SimData.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/SimEnumerations.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/SimEnumerations.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/SimEnumerations.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/SimEnumerations.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/SimStructs.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/SimStructs.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/SimStructs.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/SimStructs.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/SmsData.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/SmsData.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/SmsData.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/SmsData.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/SmsEnumerations.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/SmsEnumerations.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/SmsEnumerations.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/SmsEnumerations.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/SmsStructs.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/SmsStructs.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/SmsStructs.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/SmsStructs.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/Ss.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/Ss.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/Ss.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/Ss.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/SsData.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/SsData.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/SsData.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/SsData.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/SsEnumerations.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/SsEnumerations.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/SsEnumerations.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/SsEnumerations.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/SsStructs.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/SsStructs.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/SsStructs.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/SsStructs.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/TapiEnumerations.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/TapiEnumerations.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/TapiEnumerations.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/TapiEnumerations.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/TapiEventArgs.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/TapiEventArgs.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/TapiEventArgs.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/TapiEventArgs.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/TapiHandle.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/TapiHandle.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/TapiHandle.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/TapiHandle.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/TapiManager.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/TapiManager.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/TapiManager.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/TapiManager.cs diff --git a/src/Tizen.Tapi/Tizen.Tapi/TapiUtility.cs b/internal/src/Tizen.Tapi/Tizen.Tapi/TapiUtility.cs similarity index 100% rename from src/Tizen.Tapi/Tizen.Tapi/TapiUtility.cs rename to internal/src/Tizen.Tapi/Tizen.Tapi/TapiUtility.cs diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec index 66b01cc..6f6b832 100644 --- a/packaging/csapi-tizenfx.spec +++ b/packaging/csapi-tizenfx.spec @@ -1,16 +1,18 @@ # !! IMPORTANT !! # This packaging spec file is for developer testing only. -# For Tizen release, the spec file in the tizen branch should be used. +# For Tizen release, the spec.in file should be used. %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework %define DOTNET_ASSEMBLY_DUMMY_PATH %{DOTNET_ASSEMBLY_PATH}/ref %define DOTNET_ASSEMBLY_RES_PATH %{DOTNET_ASSEMBLY_PATH}/res %define DOTNET_NUGET_SOURCE /nuget -%define DOTNET_TIZEN_API_VERSION 4 - %define _tizenfx_bin_path Artifacts +%define TIZEN_NET_API_VERSION 4 +%define TIZEN_NET_NUGET_VERSION 4.0.0 +%define TIZEN_NET_INTERNAL_NUGET_VERSION 4.0.0.999 + Name: csapi-tizenfx Summary: Assemblies of Tizen .NET Version: 99.99.99 @@ -148,7 +150,7 @@ rm -fr %{_tizenfx_bin_path} export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true ./build.sh --full ./build.sh --dummy -./build.sh --pack +./build.sh --pack %{TIZEN_NET_NUGET_VERSION} %{TIZEN_NET_INTERNAL_NUGET_VERSION} %install mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_PATH} @@ -156,16 +158,28 @@ mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_DUMMY_PATH} mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_RES_PATH} mkdir -p %{buildroot}%{DOTNET_NUGET_SOURCE} +# Install Runtime Assemblies install -p -m 644 %{_tizenfx_bin_path}/bin/public/*.dll %{buildroot}%{DOTNET_ASSEMBLY_PATH} +install -p -m 644 %{_tizenfx_bin_path}/bin/internal/*.dll %{buildroot}%{DOTNET_ASSEMBLY_PATH} + +# Install Debug Symbols install -p -m 644 %{_tizenfx_bin_path}/bin/public/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH} -install -p -m 644 %{_tizenfx_bin_path}/bin/platform/*.dll %{buildroot}%{DOTNET_ASSEMBLY_PATH} -install -p -m 644 %{_tizenfx_bin_path}/bin/platform/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH} -install -p -m 644 %{_tizenfx_bin_path}/bin/platform/res/* %{buildroot}%{DOTNET_ASSEMBLY_RES_PATH} +install -p -m 644 %{_tizenfx_bin_path}/bin/internal/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH} + +# Install Resource files +[ -d %{_tizenfx_bin_path}/bin/public/res ] \ + && install -p -m 644 %{_tizenfx_bin_path}/bin/public/res/* %{buildroot}%{DOTNET_ASSEMBLY_RES_PATH} +[ -d %{_tizenfx_bin_path}/bin/internal/res ] \ + && install -p -m 644 %{_tizenfx_bin_path}/bin/internal/res/* %{buildroot}%{DOTNET_ASSEMBLY_RES_PATH} + +# Install Dummy Assemblies install -p -m 644 %{_tizenfx_bin_path}/bin/dummy/*.dll %{buildroot}%{DOTNET_ASSEMBLY_DUMMY_PATH} + +# Install NuGet Packages install -p -m 644 %{_tizenfx_bin_path}/*.nupkg %{buildroot}%{DOTNET_NUGET_SOURCE} %post -vconftool set -t int "db/dotnet/tizen_api_version" %{DOTNET_TIZEN_API_VERSION} -f +vconftool set -t int "db/dotnet/tizen_api_version" %{TIZEN_NET_API_VERSION} -f %files diff --git a/packaging/csapi-tizenfx.spec.in b/packaging/csapi-tizenfx.spec.in new file mode 100644 index 0000000..29f634d --- /dev/null +++ b/packaging/csapi-tizenfx.spec.in @@ -0,0 +1,214 @@ +%define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework +%define DOTNET_ASSEMBLY_DUMMY_PATH %{DOTNET_ASSEMBLY_PATH}/ref +%define DOTNET_ASSEMBLY_RES_PATH %{DOTNET_ASSEMBLY_PATH}/res +%define DOTNET_NUGET_SOURCE /nuget + +%define _tizenfx_bin_path Artifacts + +%define TIZEN_NET_API_VERSION 4 +%define TIZEN_NET_NUGET_VERSION @nuget_version@ +%define TIZEN_NET_INTERNAL_NUGET_VERSION @internal_nuget_version@ + +Name: csapi-tizenfx +Summary: Assemblies of Tizen .NET +Version: @rpm_version@ +Release: 1 +Group: Development/Libraries +License: Apache-2.0 +URL: https://www.tizen.org +Source0: %{name}-%{version}.tar.gz +Source1: %{name}.manifest + +BuildRequires: dotnet-build-tools + +BuildArch: noarch +ExcludeArch: aarch64 +AutoReqProv: no + +Requires(post): vconf + + +%description +%{summary} + +%package nuget +Summary: NuGet package for %{name} +Group: Development/Libraries +AutoReqProv: no + +%description nuget +NuGet package for %{name} + +%package dummy +Summary: Dummy assemblies of Tizen .NET +Group: Development/Libraries +AutoReqProv: no + +%description dummy +Dummy assemblies of Tizen .NET + +%package full +Summary: All Tizen .NET assemblies +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +AutoReqProv: no + +%description full +All Tizen .NET assemblies + +%package debug +Summary: All .pdb files of Tizen .NET +Group: Development/Libraries +AutoReqProv: no + +%description debug +All .pdb files of Tizen .NET + +%package common +Summary: Tizen .NET assemblies for Common profile +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: csapi-tizenfx-dummy = %{version}-%{release} +AutoReqProv: no + +%description common +Tizen .NET assemblies for Common profile + +%package mobile +Summary: Tizen .NET assemblies for Mobile profile +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: csapi-tizenfx-dummy = %{version}-%{release} +AutoReqProv: no + +%description mobile +Tizen .NET assemblies for Mobile profile + +%package mobile-emul +Summary: Tizen .NET assemblies for Emulator of Mobile profile +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: csapi-tizenfx-dummy = %{version}-%{release} +AutoReqProv: no + +%description mobile-emul +Tizen .NET assemblies for Emulator of Mobile profile + +%package tv +Summary: Tizen .NET assemblies for TV profile +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: csapi-tizenfx-dummy = %{version}-%{release} +AutoReqProv: no + +%description tv +Tizen .NET assemblies for TV profile + +%package ivi +Summary: Tizen .NET assemblies for IVI profile +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: csapi-tizenfx-dummy = %{version}-%{release} +AutoReqProv: no + +%description ivi +Tizen .NET assemblies for IVI profile + +%package wearable +Summary: Tizen .NET assemblies for Wearable profile +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: csapi-tizenfx-dummy = %{version}-%{release} +AutoReqProv: no + +%description wearable +Tizen .NET assemblies for Wearable profile + +%prep +%setup -q +cp %{SOURCE1} . + +%build + +GetFileList() { + PROFILE=$1 + cat pkg/PlatformFileList.txt | grep -E "#$PROFILE[[:space:]]|#$PROFILE$" | cut -d# -f1 | sed "s#^#%{DOTNET_ASSEMBLY_PATH}/#" +} + +GetFileList common > common.filelist +GetFileList mobile > mobile.filelist +GetFileList mobile-emul > mobile-emul.filelist +GetFileList tv > tv.filelist +GetFileList ivi > ivi.filelist +GetFileList wearable > wearable.filelist + +rm -fr %{_tizenfx_bin_path} +export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +./build.sh --full +./build.sh --dummy +./build.sh --pack %{TIZEN_NET_NUGET_VERSION} %{TIZEN_NET_INTERNAL_NUGET_VERSION} + +%install +mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_PATH} +mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_DUMMY_PATH} +mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_RES_PATH} +mkdir -p %{buildroot}%{DOTNET_NUGET_SOURCE} + +# Install Runtime Assemblies +install -p -m 644 %{_tizenfx_bin_path}/bin/public/*.dll %{buildroot}%{DOTNET_ASSEMBLY_PATH} +install -p -m 644 %{_tizenfx_bin_path}/bin/internal/*.dll %{buildroot}%{DOTNET_ASSEMBLY_PATH} + +# Install Debug Symbols +install -p -m 644 %{_tizenfx_bin_path}/bin/public/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH} +install -p -m 644 %{_tizenfx_bin_path}/bin/internal/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH} + +# Install Resource files +[ -d %{_tizenfx_bin_path}/bin/public/res ] \ + && install -p -m 644 %{_tizenfx_bin_path}/bin/public/res/* %{buildroot}%{DOTNET_ASSEMBLY_RES_PATH} +[ -d %{_tizenfx_bin_path}/bin/internal/res ] \ + && install -p -m 644 %{_tizenfx_bin_path}/bin/internal/res/* %{buildroot}%{DOTNET_ASSEMBLY_RES_PATH} + +# Install Dummy Assemblies +install -p -m 644 %{_tizenfx_bin_path}/bin/dummy/*.dll %{buildroot}%{DOTNET_ASSEMBLY_DUMMY_PATH} + +# Install NuGet Packages +install -p -m 644 %{_tizenfx_bin_path}/*.nupkg %{buildroot}%{DOTNET_NUGET_SOURCE} + +%post +vconftool set -t int "db/dotnet/tizen_api_version" %{TIZEN_NET_API_VERSION} -f + + +%files +%license LICENSE + +%files nuget +%{DOTNET_NUGET_SOURCE}/*.nupkg + +%files dummy +%attr(644,root,root) %{DOTNET_ASSEMBLY_DUMMY_PATH}/*.dll + +%files full +%manifest %{name}.manifest +%attr(644,root,root) %{DOTNET_ASSEMBLY_PATH}/*.dll +%attr(644,root,root) %{DOTNET_ASSEMBLY_RES_PATH}/* + +%files debug +%attr(644,root,root) %{DOTNET_ASSEMBLY_PATH}/*.pdb + +%files common -f common.filelist +%manifest %{name}.manifest + +%files mobile -f mobile.filelist +%manifest %{name}.manifest + +%files mobile-emul -f mobile-emul.filelist +%manifest %{name}.manifest + +%files tv -f tv.filelist +%manifest %{name}.manifest + +%files ivi -f ivi.filelist +%manifest %{name}.manifest + +%files wearable -f wearable.filelist +%manifest %{name}.manifest diff --git a/pkg/PublicModuleList.txt b/pkg/PublicModuleList.txt deleted file mode 100755 index e0d5ed4..0000000 --- a/pkg/PublicModuleList.txt +++ /dev/null @@ -1,82 +0,0 @@ -ElmSharp -ElmSharp.Wearable -Tizen -Tizen.Account.AccountManager -Tizen.Account.FidoClient -Tizen.Account.OAuth2 -Tizen.Account.SyncManager -Tizen.Applications.Alarm -Tizen.Applications.AttachPanel -Tizen.Applications.Badge -Tizen.Applications.Common -Tizen.Applications.DataControl -Tizen.Applications.MessagePort -Tizen.Applications.Notification -Tizen.Applications.NotificationEventListener -Tizen.Applications.PackageManager -Tizen.Applications.Preference -Tizen.Applications.RemoteView -Tizen.Applications.Service -Tizen.Applications.Shortcut -Tizen.Applications.ToastMessage -Tizen.Applications.UI -Tizen.Applications.WatchApplication -Tizen.Applications.WidgetApplication -Tizen.Applications.WidgetControl -Tizen.Content.Download -Tizen.Content.MediaContent -Tizen.Content.MimeType -Tizen.Context -Tizen.Location -Tizen.Location.Geofence -Tizen.Log -Tizen.Maps -Tizen.Messaging -Tizen.Messaging.Push -Tizen.Multimedia -Tizen.Multimedia.AudioIO -Tizen.Multimedia.Camera -Tizen.Multimedia.MediaCodec -Tizen.Multimedia.MediaPlayer -Tizen.Multimedia.Metadata -Tizen.Multimedia.Radio -Tizen.Multimedia.Recorder -Tizen.Multimedia.Remoting -Tizen.Multimedia.StreamRecorder -Tizen.Multimedia.Util -Tizen.Multimedia.Vision -Tizen.Network.Bluetooth -Tizen.Network.Connection -Tizen.Network.IoTConnectivity -Tizen.Network.Nfc -Tizen.Network.Nsd -Tizen.Network.Smartcard -Tizen.Network.WiFi -Tizen.Network.WiFiDirect -Tizen.NUI -Tizen.PhonenumberUtils -Tizen.Pims.Calendar -Tizen.Pims.Contacts -Tizen.Security -Tizen.Security.PrivacyPrivilegeManager -Tizen.Security.SecureRepository -Tizen.Security.TEEC -Tizen.Sensor -Tizen.System -Tizen.System.Feedback -Tizen.System.Information -Tizen.System.MediaKey -Tizen.System.PlatformConfig -Tizen.System.Storage -Tizen.System.Usb -Tizen.System.SystemSettings -Tizen.Telephony -Tizen.Tracer -Tizen.Uix.InputMethod -Tizen.Uix.InputMethodManager -Tizen.Uix.Stt -Tizen.Uix.SttEngine -Tizen.Uix.Tts -Tizen.Uix.TtsEngine -Tizen.Uix.VoiceControl -Tizen.WebView diff --git a/pkg/Tizen.NET.API4.nuspec b/pkg/Tizen.NET.Internals.nuspec similarity index 68% rename from pkg/Tizen.NET.API4.nuspec rename to pkg/Tizen.NET.Internals.nuspec index 9c76662..8bd9b0e 100644 --- a/pkg/Tizen.NET.API4.nuspec +++ b/pkg/Tizen.NET.Internals.nuspec @@ -1,19 +1,21 @@ - Tizen.NET.API4 - 1.0.0 + Tizen.NET.Internals + 4.0.0 Samsung Electronics Samsung Electronics false https://www.apache.org/licenses/LICENSE-2.0 https://www.tizen.org/ https://developer.tizen.org/sites/default/files/images/tizen-pinwheel-on-light-rgb_64_64.png - Reference assemblies of Tizen .NET API Level 4. + Internal Use Only. Internal APIs for Tizen platform. © Samsung Electronics Co., Ltd All Rights Reserved - - + + + + diff --git a/pkg/Tizen.NET.Private.nuspec b/pkg/Tizen.NET.Private.nuspec deleted file mode 100644 index 0262b1d..0000000 --- a/pkg/Tizen.NET.Private.nuspec +++ /dev/null @@ -1,28 +0,0 @@ - - - - Tizen.NET.Private - 4.0.0 - Samsung Electronics - Samsung Electronics - false - https://www.apache.org/licenses/LICENSE-2.0 - https://www.tizen.org/ - https://developer.tizen.org/sites/default/files/images/tizen-pinwheel-on-light-rgb_64_64.png - A set of Tizen.NET APIs. This includes all of the APIs built on top of Tizen Platform. - © Samsung Electronics Co., Ltd All Rights Reserved - - - - - - - - - - - - - - - diff --git a/pkg/Tizen.NET.nuspec b/pkg/Tizen.NET.nuspec index 8a3f3bf..13aa4e7 100644 --- a/pkg/Tizen.NET.nuspec +++ b/pkg/Tizen.NET.nuspec @@ -16,12 +16,7 @@ - - diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 0faa38c..792536a 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,5 +1,10 @@ + + + + $(OutputPublicDir) + \ No newline at end of file diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets new file mode 100644 index 0000000..c0b0154 --- /dev/null +++ b/src/Directory.Build.targets @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file -- 2.7.4