Merge packaging information to csproj

Change-Id: I8947053c38c574c4f184ac5edf775a51d906701f
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/packaging/csapi-account-oauth2.spec b/packaging/csapi-account-oauth2.spec
index df3726b..35281d7 100644 (file)
--- a/packaging/csapi-account-oauth2.spec
+++ b/packaging/csapi-account-oauth2.spec
@@ -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
@@ -41,4 +41,4 @@ done
 %files
 %manifest %{name}.manifest
 %license LICENSE
-%attr(644,root,root) %{dotnet_assembly_files}
\ No newline at end of file
+%attr(644,root,root) %{dotnet_assembly_files}

diff --git a/src/Tizen.Account.OAuth2/Properties/AssemblyInfo.cs b/src/Tizen.Account.OAuth2/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index 7b80571..0000000
--- a/src/Tizen.Account.OAuth2/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.Account.OAuth2")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tizen.Account.OAuth2")]
-[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("dde83913-af4e-4998-ada7-6cba479e9709")]
-
-// 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/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.csproj b/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.csproj
index 526aa1c..a6150b1 100644 (file)
--- a/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.csproj
+++ b/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.csproj
@@ -1,132 +1,25 @@
-<?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>{DDE83913-AF4E-4998-ADA7-6CBA479E9709}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Tizen.Account.OAuth2</RootNamespace>
-    <AssemblyName>Tizen.Account.OAuth2</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <DefaultLanguage>en-US</DefaultLanguage>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v1.6</TargetFrameworkVersion>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
-    <TargetFrameworkMoniker>.NETStandard,Version=v1.6</TargetFrameworkMoniker>
-    <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>
-  </PropertyGroup>
+    <Version>1.0.6</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>OAuth2.0 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.Account.OAuth2.snk</AssemblyOriginatorKeyFile>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
   </PropertyGroup>
+  
   <ItemGroup>
-    <None Include="Settings.StyleCop" />
-    <None Include="Tizen.Account.OAuth2.project.json" />
-    <None Include="Tizen.Account.OAuth2.snk" />
+    <PackageReference Include="Tizen" Version="1.0.5" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Tizen.Account.OAuth2\AuthenticationScheme.cs" />
-    <Compile Include="Interop\Interop.Common.cs" />
-    <Compile Include="Interop\Interop.Error.cs" />
-    <Compile Include="Interop\Interop.Libraries.cs" />
-    <Compile Include="Interop\Interop.Manager.cs" />
-    <Compile Include="Interop\Interop.Request.cs" />
-    <Compile Include="Interop\Interop.Response.cs" />
-    <Compile Include="Interop\Interop.Types.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Tizen.Account.OAuth2\OAuth2ErrorResponse.cs" />
-    <Compile Include="Tizen.Account.OAuth2\OAuth2ErrorFactory.cs" />
-    <Compile Include="Tizen.Account.OAuth2\AccessToken.cs" />
-    <Compile Include="Tizen.Account.OAuth2\AuthorizationRequest.cs" />
-    <Compile Include="Tizen.Account.OAuth2\AuthorizationResponse.cs" />
-    <Compile Include="Tizen.Account.OAuth2\Authorizer.cs" />
-    <Compile Include="Tizen.Account.OAuth2\ClientCredentials.cs" />
-    <Compile Include="Tizen.Account.OAuth2\ClientCredentialsAuthorizer.cs" />
-    <Compile Include="Tizen.Account.OAuth2\ClientCredentialsTokenRequest.cs" />
-    <Compile Include="Tizen.Account.OAuth2\CodeGrantAuthorizationRequest.cs" />
-    <Compile Include="Tizen.Account.OAuth2\CodeGrantAuthorizer.cs" />
-    <Compile Include="Tizen.Account.OAuth2\CodeGrantTokenRequest.cs" />
-    <Compile Include="Tizen.Account.OAuth2\ImplicitGrantAuthorizationRequest.cs" />
-    <Compile Include="Tizen.Account.OAuth2\ImplicitGrantAuthorizer.cs" />
-    <Compile Include="Tizen.Account.OAuth2\RefreshToken.cs" />
-    <Compile Include="Tizen.Account.OAuth2\RefreshTokenRequest.cs" />
-    <Compile Include="Tizen.Account.OAuth2\ResourceOwnerPwdCredentialsAuthorizer.cs" />
-    <Compile Include="Tizen.Account.OAuth2\ResourceOwnerPwdCredentialsTokenRequest.cs" />
-    <Compile Include="Tizen.Account.OAuth2\TokenRequest.cs" />
-    <Compile Include="Tizen.Account.OAuth2\TokenResponse.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets" Condition="Exists('$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets')" />
-  <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>
-  <!-- Include tasks for Tizen -->
-  <PropertyGroup>
-    <TizenBuildPath>$(MSBuildExtensionsPath)\Tizen</TizenBuildPath>
-    <TizenToolsPath>$(TizenBuildPath)\bin</TizenToolsPath>
-  </PropertyGroup>
-  <UsingTask TaskName="Tizen.Tasks.SignPackage.TizenCleanPackageSource" AssemblyFile="$(TizenToolsPath)\Tizen.Tasks.SignPackage.dll" />
-  <UsingTask TaskName="Tizen.Tasks.SignPackage.TizenPreparePackageManifest" AssemblyFile="$(TizenToolsPath)\Tizen.Tasks.SignPackage.dll" />
-  <UsingTask TaskName="Tizen.Tasks.SignPackage.TizenPreparePackageSource" AssemblyFile="$(TizenToolsPath)\Tizen.Tasks.SignPackage.dll" />
-  <UsingTask TaskName="Tizen.Tasks.SignPackage.TizenSignPackage" AssemblyFile="$(TizenToolsPath)\Tizen.Tasks.SignPackage.dll" />
-  <!-- Task to clean package source -->
-  <Target Name="_TizenCleanPkgSrc">
-    <TizenCleanPackageSource SolutionPath="$(SolutionPath)" ProjectPath="$(MSBuildProjectFullPath)" />
-  </Target>
-  <!-- Task to prepare tizen-manifest.xml file -->
-  <Target Name="_TizenPrepManifest">
-    <TizenPreparePackageManifest SolutionPath="$(SolutionPath)" ProjectPath="$(MSBuildProjectFullPath)" />
-  </Target>
-  <!-- Task to prepare package sources(executable, dlls, resource files) -->
-  <Target Name="_TizenPrepPkgSrc">
-    <TizenPreparePackageSource SolutionPath="$(SolutionPath)" ProjectPath="$(MSBuildProjectFullPath)" AssemblyName="$(AssemblyName)" TargetPath="$(TargetPath)" />
-  </Target>
-  <!-- Task to signing and packaging -->
-  <Target Name="_TizenSignPackge">
-    <TizenSignPackage SolutionPath="$(SolutionPath)" ProjectPath="$(MSBuildProjectFullPath)" SolutionName="$(SolutionName)" AuthorCertificate="$(AuthorCertificate)" AuthorPasswd="$(AuthorPasswd)" DistribCertificate="$(DistribCertificate)" DistribPasswd="$(DistribPasswd)" />
-  </Target>
-</Project>
\ No newline at end of file
+  
+</Project>

diff --git a/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.nuspec b/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.nuspec
deleted file mode 100644 (file)
index 871cb2e..0000000
--- a/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.nuspec
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-    <id>Tizen.Account.OAuth2</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>OAuth2.0 API for Tizen.Net</description>
-    <dependencies>
-      <dependency id="Tizen" version="1.0.0" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin/$Configuration$/Tizen.Account.OAuth2.dll" target="lib/netstandard1.3" />
-  </files>
-</package>
\ No newline at end of file

diff --git a/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.project.json b/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.project.json
deleted file mode 100644 (file)
index 1797ae7..0000000
--- a/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.project.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "buildOptions": {
-    "debugType": "portable",
-    "platform": "AnyCPU",
-    "preserveCompilationContext": true
-  },
-  "dependencies": {
-    "NETStandard.Library": "1.6.0",
-    "Tizen": "1.0.1"
-  },
-  "frameworks": {
-    "netstandard1.6": {}
-  }
-}

diff --git a/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.sln b/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.sln
new file mode 100644 (file)
index 0000000..5b746fe
--- /dev/null
+++ b/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.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.Account.OAuth2", "Tizen.Account.OAuth2.csproj", "{1DD0AA66-371B-4A1B-9D39-E4DF4D2385C4}"\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
+               {1DD0AA66-371B-4A1B-9D39-E4DF4D2385C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {1DD0AA66-371B-4A1B-9D39-E4DF4D2385C4}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {1DD0AA66-371B-4A1B-9D39-E4DF4D2385C4}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {1DD0AA66-371B-4A1B-9D39-E4DF4D2385C4}.Release|Any CPU.Build.0 = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r