Merge packaging information to csproj
authorWonYoung Choi <wy80.choi@samsung.com>
Thu, 8 Jun 2017 00:18:49 +0000 (09:18 +0900)
committerWonYoung Choi <wy80.choi@samsung.com>
Thu, 8 Jun 2017 00:18:49 +0000 (09:18 +0900)
Change-Id: Id84a8ec4db4c47bb631d414c339c969dc07fb04d
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
.gitignore [new file with mode: 0644]
packaging/csapi-calendar-service.spec
src/Tizen.Pims.Calendar/Properties/AssemblyInfo.cs [deleted file]
src/Tizen.Pims.Calendar/Tizen.Pims.Calendar.csproj
src/Tizen.Pims.Calendar/Tizen.Pims.Calendar.project.json [deleted file]
src/Tizen.Pims.Calendar/Tizen.Pims.Calendar.sln

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..46619d5
--- /dev/null
@@ -0,0 +1,7 @@
+bin/
+obj/
+*.exe
+*.dll
+*.csproj.user
+*.lock.json
+.vs/
index 17694d7..582e8a1 100755 (executable)
@@ -30,7 +30,7 @@ cp %{SOURCE1} .
 %build
 for ASM in %{Assemblies}; do
 %dotnet_build $ASM
-%dotnet_pack $ASM/$ASM.nuspec %{version}
+%dotnet_pack $ASM
 done
 
 %install
diff --git a/src/Tizen.Pims.Calendar/Properties/AssemblyInfo.cs b/src/Tizen.Pims.Calendar/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index b740a0a..0000000
+++ /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.Content")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tizen.Content")]
-[assembly: AssemblyCopyright("Copyright \u00A9  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("61334a1f-008b-44b5-afcd-063a3e063d45")]
-
-// 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")]
index 13fe120..2c183b6 100644 (file)
@@ -1,95 +1,21 @@
-<?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>{98DD51D2-9332-47AA-B4EA-D1DB7E71C395}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Tizen.Pims.Calendar</RootNamespace>
-    <AssemblyName>Tizen.Pims.Calendar</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <Version>1.0.0</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>Calendar Service 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>
-    <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>
+    <TargetFramework>netstandard1.6</TargetFramework>
   </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>
-  <ItemGroup>
-    <None Include="Tizen.Pims.Calendar.project.json" />
-  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Interop\Interop.Calendar.Vcalendar.cs" />
-    <Compile Include="Interop\Interop.Calendar.Reminder.cs" />
-    <Compile Include="Interop\Interop.Calendar.Record.cs" />
-    <Compile Include="Interop\Interop.Calendar.Query.cs" />
-    <Compile Include="Interop\Interop.Calendar.List.cs" />
-    <Compile Include="Interop\Interop.Calendar.Filter.cs" />
-    <Compile Include="Interop\Interop.Calendar.Database.cs" />
-    <Compile Include="Interop\Interop.Calendar.Service.cs" />
-    <Compile Include="Interop\Interop.Calendar.Libraries.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Tizen.Pims.Calendar\CalendarDatabase.cs" />
-    <Compile Include="Tizen.Pims.Calendar\CalendarFilter.cs" />
-    <Compile Include="Tizen.Pims.Calendar\CalendarList.cs" />
-    <Compile Include="Tizen.Pims.Calendar\CalendarManager.cs" />
-    <Compile Include="Tizen.Pims.Calendar\CalendarRecord.cs" />
-    <Compile Include="Tizen.Pims.Calendar\CalendarReminder.cs" />
-    <Compile Include="Tizen.Pims.Calendar\CalendarTypes.cs" />
-    <Compile Include="Tizen.Pims.Calendar\CalendarVcalendar.cs" />
-    <Compile Include="Tizen.Pims.Calendar\CalendarViews.cs" />
-    <Compile Include="Tizen.Pims.Calendar\CalendarQuery.cs" />
-    <Compile Include="Tizen.Pims.Calendar\CalendarStructs.cs" />
-    <Compile Include="Tizen.Pims.Calendar\CalendarErrorFactory.cs" />
-    <Compile Include="Tizen.Pims.Calendar\ReminderEventArgs.cs" />
-    <Compile Include="Tizen.Pims.Calendar\NamespaceDoc.cs" />
+    <PackageReference Include="Tizen" Version="1.0.5" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
-  </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/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar.project.json b/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar.project.json
deleted file mode 100644 (file)
index 0486945..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "dependencies": {
-    "NETStandard.Library": "1.6.0",
-    "Tizen": "1.0.1"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  }
-}
\ No newline at end of file
index 702e5eb..89d2cc5 100644 (file)
@@ -1,28 +1,22 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tizen.Pims.Calendar", "Tizen.Pims.Calendar.csproj", "{98DD51D2-9332-47AA-B4EA-D1DB7E71C395}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamarinApplication2.Tizen", "..\..\XamarinApplication2\XamarinApplication2\XamarinApplication2.Tizen\XamarinApplication2.Tizen.csproj", "{47A990B2-CC6D-48D3-8007-38308056E3E0}"
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug|Any CPU = Debug|Any CPU
-               Release|Any CPU = Release|Any CPU
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {98DD51D2-9332-47AA-B4EA-D1DB7E71C395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {98DD51D2-9332-47AA-B4EA-D1DB7E71C395}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {98DD51D2-9332-47AA-B4EA-D1DB7E71C395}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {98DD51D2-9332-47AA-B4EA-D1DB7E71C395}.Release|Any CPU.Build.0 = Release|Any CPU
-               {47A990B2-CC6D-48D3-8007-38308056E3E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {47A990B2-CC6D-48D3-8007-38308056E3E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {47A990B2-CC6D-48D3-8007-38308056E3E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {47A990B2-CC6D-48D3-8007-38308056E3E0}.Release|Any CPU.Build.0 = Release|Any CPU
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-EndGlobal
+\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.Pims.Calendar", "Tizen.Pims.Calendar.csproj", "{E43A6288-59D5-45B6-A141-B1E3D575600F}"\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
+               {E43A6288-59D5-45B6-A141-B1E3D575600F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {E43A6288-59D5-45B6-A141-B1E3D575600F}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {E43A6288-59D5-45B6-A141-B1E3D575600F}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {E43A6288-59D5-45B6-A141-B1E3D575600F}.Release|Any CPU.Build.0 = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r