From 1f69c25a22acd725ee45ca47a29b17343f6c2523 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Wed, 21 Jun 2017 10:42:35 +0900 Subject: [PATCH] Revert "[Tizen] Merge packaging information to csproj" This reverts commit 9ad6224369cef649590fe3411cfdf9f15ba3337d. Change-Id: I96db36282e13ac4536428f63b46748a839117160 --- packaging/csapi-nui.spec | 4 +- src/Tizen.NUI/Properties/AssemblyInfo.cs | 36 +++ src/Tizen.NUI/Tizen.NUI.csproj | 407 ++++++++++++++++++++++++++++--- src/Tizen.NUI/Tizen.NUI.nuspec | 22 ++ src/Tizen.NUI/Tizen.NUI.project.json | 13 + src/Tizen.NUI/Tizen.NUI.sln | 14 +- 6 files changed, 459 insertions(+), 37 deletions(-) create mode 100755 src/Tizen.NUI/Properties/AssemblyInfo.cs create mode 100755 src/Tizen.NUI/Tizen.NUI.nuspec create mode 100755 src/Tizen.NUI/Tizen.NUI.project.json mode change 100644 => 100755 src/Tizen.NUI/Tizen.NUI.sln diff --git a/packaging/csapi-nui.spec b/packaging/csapi-nui.spec index 35bc5a2..b1d3646 100755 --- a/packaging/csapi-nui.spec +++ b/packaging/csapi-nui.spec @@ -32,8 +32,8 @@ cp %{SOURCE1} . %build for ASM in %{Assemblies}; do -%dotnet_build $ASM -%dotnet_pack $ASM +%dotnet_build $ASM /p:DefineConstants="DOT_NET_CORE","DEBUG_ON" +%dotnet_pack $ASM/$ASM.nuspec %{version} done diff --git a/src/Tizen.NUI/Properties/AssemblyInfo.cs b/src/Tizen.NUI/Properties/AssemblyInfo.cs new file mode 100755 index 0000000..f8c7f4f --- /dev/null +++ b/src/Tizen.NUI/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +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("Tizen.NUI")] +[assembly: AssemblyDescription("nui dll")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("sec")] +[assembly: AssemblyProduct("DALi/NUI")] +[assembly: AssemblyCopyright("sec")] +[assembly: AssemblyTrademark("sec")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("f03a3b48-9d9b-4bf3-92ce-bd63cadc3cd3")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("0.2.41.0531")] +[assembly: AssemblyFileVersion("0.2.41.0531")] diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj index 788010b..74346a4 100755 --- a/src/Tizen.NUI/Tizen.NUI.csproj +++ b/src/Tizen.NUI/Tizen.NUI.csproj @@ -1,28 +1,379 @@ - - - - 0.2.42 - Samsung Electronics - © Samsung Electronics Co., Ltd All Rights Reserved - - Tizen NUI is the UI Framework based on DALi (Dynamic Animation Library) 3D Graphic engine. - It is a quick and easy way of allowing developers to create Rich UI Applications like Image/Video galleries, - Music players, Games, Homescreens/launch pads, and so on. - - https://www.tizen.org/ - https://www.apache.org/licenses/LICENSE-2.0 - https://developer.tizen.org/sites/default/files/images/tizen-pinwheel-on-light-rgb_64_64.png - - - - netstandard1.6 - $(DefineConstants);DEBUG_ON;DOT_NET_CORE - - - - - - - - - + + + + 14.0 + Debug + AnyCPU + 8.0.30703 + 2.0 + {2F98DAC9-6F16-457B-AED7-D43CAC379341};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3} + Library + Properties + Tizen.NUI + Tizen.NUI + 512 + en-US + + + .NETStandard + v1.6 + .NETStandard,Version=v1.6 + false + true + $(NoWarn);1701 + false + + + true + full + false + bin\Debug\ + TRACE;DEBUG;DEBUG_ON;DOT_NET_CORE + prompt + 4 + + + full + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory) + <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory) + true + + + + + + + + + + + + diff --git a/src/Tizen.NUI/Tizen.NUI.nuspec b/src/Tizen.NUI/Tizen.NUI.nuspec new file mode 100755 index 0000000..b75edff --- /dev/null +++ b/src/Tizen.NUI/Tizen.NUI.nuspec @@ -0,0 +1,22 @@ + + + + Tizen.NUI + $version$ + 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 + © Samsung Electronics Co., Ltd All Rights Reserved + Tizen NUI is the UI Framework based on DALi (Dynamic Animation Library) 3D Graphic engine. It is a quick and easy way of allowing developers to create Rich UI Applications like Image/Video galleries, Music players, Games, Homescreens/launch pads, and so on. + + + + + + + + + + diff --git a/src/Tizen.NUI/Tizen.NUI.project.json b/src/Tizen.NUI/Tizen.NUI.project.json new file mode 100755 index 0000000..8456a7c --- /dev/null +++ b/src/Tizen.NUI/Tizen.NUI.project.json @@ -0,0 +1,13 @@ +{ + "dependencies": { + "Microsoft.CSharp": "4.3.0", + "NETStandard.Library": "1.6.1", + "System.Reflection": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "Tizen.Applications.Common": "1.5.1", + "Tizen.Applications.UI": "1.5.1" + }, + "frameworks": { + "netstandard1.6": {} + } +} \ No newline at end of file diff --git a/src/Tizen.NUI/Tizen.NUI.sln b/src/Tizen.NUI/Tizen.NUI.sln old mode 100644 new mode 100755 index e94a32b..5d64075 --- a/src/Tizen.NUI/Tizen.NUI.sln +++ b/src/Tizen.NUI/Tizen.NUI.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.12 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.NUI", "Tizen.NUI.csproj", "{3EAC9B20-9F79-4997-A168-C79E64DF6277}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tizen.NUI", "Tizen.NUI.csproj", "{F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3EAC9B20-9F79-4997-A168-C79E64DF6277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EAC9B20-9F79-4997-A168-C79E64DF6277}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EAC9B20-9F79-4997-A168-C79E64DF6277}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EAC9B20-9F79-4997-A168-C79E64DF6277}.Release|Any CPU.Build.0 = Release|Any CPU + {F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- 2.7.4