From d9c06d0d022101448d59d093c20df67cddecfc47 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Wed, 21 Jun 2017 14:45:47 +0900 Subject: [PATCH] [Tizen] Merge packaging information to csproj This reverts commit 138c259942245d77729311f5ec1a1d3807a07df4. Conflicts: Tizen.NUI/Tizen.NUI.csproj Change-Id: Ia5f2102818470a1df315f4c482ec3b43ae56cb9c --- packaging/csapi-nui.spec | 4 +- src/Tizen.NUI/Properties/AssemblyInfo.cs | 36 --- src/Tizen.NUI/Tizen.NUI.csproj | 411 +++---------------------------- 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, 38 insertions(+), 462 deletions(-) delete mode 100755 src/Tizen.NUI/Properties/AssemblyInfo.cs delete mode 100755 src/Tizen.NUI/Tizen.NUI.nuspec delete mode 100755 src/Tizen.NUI/Tizen.NUI.project.json mode change 100755 => 100644 src/Tizen.NUI/Tizen.NUI.sln diff --git a/packaging/csapi-nui.spec b/packaging/csapi-nui.spec index b1d3646..35bc5a2 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 /p:DefineConstants="DOT_NET_CORE","DEBUG_ON" -%dotnet_pack $ASM/$ASM.nuspec %{version} +%dotnet_build $ASM +%dotnet_pack $ASM done diff --git a/src/Tizen.NUI/Properties/AssemblyInfo.cs b/src/Tizen.NUI/Properties/AssemblyInfo.cs deleted file mode 100755 index f8c7f4f..0000000 --- a/src/Tizen.NUI/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -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 37d690b..e460d87 100755 --- a/src/Tizen.NUI/Tizen.NUI.csproj +++ b/src/Tizen.NUI/Tizen.NUI.csproj @@ -1,382 +1,29 @@ - - - - 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 - - - - - - - - - - - - + + + + 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 + + + + + + + + + + diff --git a/src/Tizen.NUI/Tizen.NUI.nuspec b/src/Tizen.NUI/Tizen.NUI.nuspec deleted file mode 100755 index b75edff..0000000 --- a/src/Tizen.NUI/Tizen.NUI.nuspec +++ /dev/null @@ -1,22 +0,0 @@ - - - - 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 deleted file mode 100755 index 8456a7c..0000000 --- a/src/Tizen.NUI/Tizen.NUI.project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "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 100755 new mode 100644 index 5d64075..e94a32b --- 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 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.12 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tizen.NUI", "Tizen.NUI.csproj", "{F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.NUI", "Tizen.NUI.csproj", "{3EAC9B20-9F79-4997-A168-C79E64DF6277}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {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 + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- 2.7.4