Merge packaging information to csproj

Change-Id: Idc9f8ac4893171ba423b73b405e313977fdbab1a
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..46619d5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+bin/
+obj/
+*.exe
+*.dll
+*.csproj.user
+*.lock.json
+.vs/

diff --git a/Tizen.Applications.WatchApplication/Properties/AssemblyInfo.cs b/Tizen.Applications.WatchApplication/Properties/AssemblyInfo.cs
deleted file mode 100755 (executable)
index 6aa4d54..0000000
--- a/Tizen.Applications.WatchApplication/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.Applications.WatchApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tizen.Applications.WatchApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[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("cc2aa967-232a-4a16-9b46-45f3fdb44e0d")]
-
-// 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.csproj b/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.csproj
old mode 100755 (executable)
new mode 100644 (file)
index 0ed5bbc..3e844b4
--- a/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.csproj
+++ b/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.csproj
@@ -1,89 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{CC2AA967-232A-4A16-9B46-45F3FDB44E0D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Tizen.Applications.WatchApplication</RootNamespace>
-    <AssemblyName>Tizen.Applications.WatchApplication</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <DefaultLanguage>en-US</DefaultLanguage>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v1.3</TargetFrameworkVersion>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-    <NoStdLib>true</NoStdLib>
-    <NoWarn>$(NoWarn);1701</NoWarn>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <Version>1.0.1</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>Provides the Watch Application API for Tizen .NET</Description>
+    <PackageProjectUrl>https://www.tizen.org/</PackageProjectUrl>
+    <PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <PackageIconUrl>https://developer.tizen.org/sites/default/files/images/tizen-pinwheel-on-light-rgb_64_64.png</PackageIconUrl>
   </PropertyGroup>
+
   <PropertyGroup>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Tizen.Applications.WatchApplication.snk</AssemblyOriginatorKeyFile>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
   </PropertyGroup>
+
   <ItemGroup>
-    <None Include="Tizen.Applications.WatchApplication.project.json" />
-    <None Include="Tizen.Applications.WatchApplication.nuspec" />
-    <None Include="Tizen.Applications.WatchApplication.snk" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Interop\Interop.Libraries.cs" />
-    <Compile Include="Interop\Interop.Watch.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Tizen.Applications.CoreBackend\WatchCoreBackend.cs" />
-    <Compile Include="Tizen.Applications.CoreBackend\WatchEventType.cs" />
-    <Compile Include="Tizen.Applications\AmbientEventArgs.cs" />
-    <Compile Include="Tizen.Applications\AmbientTickType.cs" />
-    <Compile Include="Tizen.Applications\SafeWatchTimeHandle.cs" />
-    <Compile Include="Tizen.Applications\TimeEventArgs.cs" />
-    <Compile Include="Tizen.Applications\TimeTickResolution.cs" />
-    <Compile Include="Tizen.Applications\WatchApplication.cs" />
-    <Compile Include="Tizen.Applications\WatchTime.cs" />
-    <Compile Include="Tizen.Applications\WatchWindow.cs" />
+    <PackageReference Include="ElmSharp" Version="1.2.0" />
+    <PackageReference Include="Tizen" Version="1.0.5" />
+    <PackageReference Include="Tizen.Applications.Common" Version="1.5.8" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-               Other similar extension points exist, see Microsoft.Common.targets.
-       <Target Name="BeforeBuild">
-       </Target>
-       <Target Name="AfterBuild">
-       </Target>
-       -->
-  <PropertyGroup>
-    <!-- https://github.com/dotnet/corefxlab/tree/master/samples/NetCoreSample and
-                        https://docs.microsoft.com/en-us/dotnet/articles/core/tutorials/target-dotnetcore-with-msbuild
-               -->
-    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two
-                        properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and
-                        to prevent it from outputting a warning (MSB3644).
-               -->
-    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories>
-    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>
-    <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
-  </PropertyGroup>
+
 </Project>

diff --git a/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.nuspec b/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.nuspec
deleted file mode 100755 (executable)
index 95a5eb8..0000000
--- a/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.nuspec
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<package>
-       <metadata>
-               <id>Tizen.Applications.WatchApplication</id>
-               <version>$version$</version>
-               <authors>Samsung Electronics</authors>
-               <requireLicenseAcceptance>false</requireLicenseAcceptance>
-               <licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
-               <projectUrl>https://www.tizen.org/</projectUrl>
-               <iconUrl>https://developer.tizen.org/sites/default/files/images/tizen-pinwheel-on-light-rgb_64_64.png</iconUrl>
-               <copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright>
-               <description>Provides the Watch Application API for Tizen.Net</description>
-               <dependencies>
-                       <dependency id="Tizen" version="1.0.2" />
-                       <dependency id="Tizen.Applications.Common" version="1.2.0" />
-                       <dependency id="ElmSharp" version="1.0.14" />
-               </dependencies>
-       </metadata>
-       <files>
-               <file src="bin/$Configuration$/Tizen.Applications.WatchApplication.dll" target="lib/netstandard1.3" />
-       </files>
-</package>

diff --git a/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.project.json b/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.project.json
deleted file mode 100755 (executable)
index 07c1a4f..0000000
--- a/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.project.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{\r
-  "dependencies": {\r
-    "ElmSharp": "1.1.0-*",\r
-    "NETStandard.Library": "1.6.0",\r
-    "Tizen": "1.0.2",\r
-    "Tizen.Applications.Common": "1.2.0"\r
-  },\r
-  "frameworks": {\r
-    "netstandard1.3": {}\r
-  }\r
-}\r

diff --git a/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.sln b/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.sln
new file mode 100644 (file)
index 0000000..718383b
--- /dev/null
+++ b/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.sln
@@ -0,0 +1,22 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio 15\r
+VisualStudioVersion = 15.0.26430.12\r
+MinimumVisualStudioVersion = 10.0.40219.1\r
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Applications.WatchApplication", "Tizen.Applications.WatchApplication.csproj", "{4895FC4E-3C2A-4FCF-ABA7-A70597E2EFD8}"\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
+               {4895FC4E-3C2A-4FCF-ABA7-A70597E2EFD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {4895FC4E-3C2A-4FCF-ABA7-A70597E2EFD8}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {4895FC4E-3C2A-4FCF-ABA7-A70597E2EFD8}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {4895FC4E-3C2A-4FCF-ABA7-A70597E2EFD8}.Release|Any CPU.Build.0 = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r

diff --git a/packaging/csapi-watch-application.spec b/packaging/csapi-watch-application.spec
index 34b2ef5..47e2cd9 100755 (executable)
--- a/packaging/csapi-watch-application.spec
+++ b/packaging/csapi-watch-application.spec
@@ -32,7 +32,7 @@ cp %{SOURCE1} .
 %build
 for ASM in %{Assemblies}; do
 %dotnet_build $ASM
-%dotnet_pack $ASM/$ASM.nuspec %{version}
+%dotnet_pack $ASM
 done
 
 %install