From 7276f30dae527faa0aaef911b02ee8223ae7b3ca Mon Sep 17 00:00:00 2001
From: Tomasz Swierczek <t.swierczek@samsung.com>
Date: Tue, 23 May 2017 14:49:10 +0200
Subject: [PATCH] Adjustment to VS 2017

* changed csproj file format
* removed JSON & AssemblyInfo files
* added "strong name key pair" (generated on Windows with "sn -k" VS developer tool)

Change-Id: I9b65732dae6b1ce4d580549901f5f74266b3407b
---
 .../Properties/AssemblyInfo.cs                |  27 ------
 .../Tizen.Security.TEEC.csproj                |  13 +++
 .../Tizen.Security.TEEC.nuspec                |  23 +++--
 .../{libteec.sln => Tizen.Security.TEEC.sln}  |   2 +-
 Tizen.Security.TEEC/Tizen.Security.TEEC.snk   | Bin 0 -> 596 bytes
 Tizen.Security.TEEC/libteec.csproj            |  85 ------------------
 Tizen.Security.TEEC/libteec.project.json      |   8 --
 packaging/csapi-security-libteec.spec         |   1 -
 8 files changed, 28 insertions(+), 131 deletions(-)
 delete mode 100644 Tizen.Security.TEEC/Properties/AssemblyInfo.cs
 create mode 100755 Tizen.Security.TEEC/Tizen.Security.TEEC.csproj
 rename Tizen.Security.TEEC/{libteec.sln => Tizen.Security.TEEC.sln} (83%)
 create mode 100755 Tizen.Security.TEEC/Tizen.Security.TEEC.snk
 delete mode 100755 Tizen.Security.TEEC/libteec.csproj
 delete mode 100755 Tizen.Security.TEEC/libteec.project.json

diff --git a/Tizen.Security.TEEC/Properties/AssemblyInfo.cs b/Tizen.Security.TEEC/Properties/AssemblyInfo.cs
deleted file mode 100644
index a3cba09..0000000
--- a/Tizen.Security.TEEC/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * AssemblyInfo.cs
- *
- *  Created on: Apr 6, 2017
- *      Author: k.dynowski
- */
-
-
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Tizen.Security.Libteec")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Samsung Electronics")]
-[assembly: AssemblyProduct("Tizen.Security.Libteec")]
-[assembly: AssemblyCopyright("Copyright (c) 2017 Samsung Electronics Co., Ltd")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-
-
diff --git a/Tizen.Security.TEEC/Tizen.Security.TEEC.csproj b/Tizen.Security.TEEC/Tizen.Security.TEEC.csproj
new file mode 100755
index 0000000..b668146
--- /dev/null
+++ b/Tizen.Security.TEEC/Tizen.Security.TEEC.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard1.3</TargetFramework>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>Tizen.Security.TEEC.snk</AssemblyOriginatorKeyFile>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+    <GenerateReferenceAssembly>True</GenerateReferenceAssembly>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Tizen" Version="1.0.5" />
+  </ItemGroup>
+</Project>
diff --git a/Tizen.Security.TEEC/Tizen.Security.TEEC.nuspec b/Tizen.Security.TEEC/Tizen.Security.TEEC.nuspec
index f39d10c..fa25ce6 100755
--- a/Tizen.Security.TEEC/Tizen.Security.TEEC.nuspec
+++ b/Tizen.Security.TEEC/Tizen.Security.TEEC.nuspec
@@ -1,12 +1,17 @@
 <?xml version="1.0"?>
 <package>
-	<metadata>
-		<id>Tizen.Security.TEEC</id>
-		<version>$version$</version>
-		<authors>Tizen Developers</authors>
-		<description>Security TEEC API for Tizen.Net</description>
-		<dependencies>
-			<dependency id="Tizen" version="1.0.0" />
-		</dependencies>
-	</metadata>
+    <metadata>
+        <id>Tizen.Security.TEEC</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>Security TEEC API for Tizen.Net</description>
+            <dependencies>
+                <dependency id="Tizen" version="1.0.5" />
+            </dependencies>
+    </metadata>
 </package>
diff --git a/Tizen.Security.TEEC/libteec.sln b/Tizen.Security.TEEC/Tizen.Security.TEEC.sln
similarity index 83%
rename from Tizen.Security.TEEC/libteec.sln
rename to Tizen.Security.TEEC/Tizen.Security.TEEC.sln
index f9208fe..92ea35e 100755
--- a/Tizen.Security.TEEC/libteec.sln
+++ b/Tizen.Security.TEEC/Tizen.Security.TEEC.sln
@@ -3,7 +3,7 @@ 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}") = "libteec", "libteec.csproj", "{4EE6C458-AA49-402C-89A1-5A12B54E6108}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tizen.Security.TEEC", "Tizen.Security.TEEC.csproj", "{4EE6C458-AA49-402C-89A1-5A12B54E6108}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Tizen.Security.TEEC/Tizen.Security.TEEC.snk b/Tizen.Security.TEEC/Tizen.Security.TEEC.snk
new file mode 100755
index 0000000000000000000000000000000000000000..eff1940c45bb20a1d3ab41df0937cfe0943f74ab
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097zR43kD6CctXiX+;OgZ_8G;}`%{aU$fc
z{pw2MsKd68PXO!mxK4d$ql0GlG%^X$wq+K+jnWlmc43R0i2W*44r-vemGoYjni-eZ
zQ51N)?1(YmQH!=0L9%<hQ&#`>%c{zNt@TGa_|!z2HW#y!sa3y_y(U>tExZSuWwW$X
zxplH1OcJYll##OmJxE-|Qth_294YCKeJSoE=Uy-bIq{4mXw?P%t+RQRIMJp6IwIQt
zxXmHQ8U_4_?<W5XYP5o$j$w5EvEf$pJW<HL@&8YWi2~@I$d9VPD>+MzYwW_MKmLq~
zsf3wXgg@ULUOWXsUw*@veKz)_A5FEtkNL$L%;dRQ1kU%7;}Cv-D(Oc(#QBO_i%wkC
zh|4Ad_)GgRds?js@Sw-rJyk-wFSaRU5RaZoeBe0jsLqU&BSsW|#Scx8+_e?4jksDn
z63uelPTs8IH&Gd=NRE0!p;+yQ<%O~k-m;&Tqlcviht0EYJ#d?P$kUOH1AL38CMYXY
z(LPw|23SoZxot+jM0)N{7AF*1%pnC(I~2^#s`&ZG>uYe~5XBwSfoPK65?^19hlnXl
zG;I-%dS9T;F*1C8Sh8+N5*Mr$?t{72ukMJR$Uc3D`-y)paHjsH5r0*{$H8&sw=ma-
z`W}5gAXEh_!Kit7c(*Um2BQRwTGS5Za;%~J>R!0L#cnex%!5m#-B*KxRx5FbYJ%`I
iiM7bV*Y^WdFX~$nTJ|5Z<3}ZB9j%JWBwm}Tt{a<@Q6&`s

literal 0
HcmV?d00001

diff --git a/Tizen.Security.TEEC/libteec.csproj b/Tizen.Security.TEEC/libteec.csproj
deleted file mode 100755
index b5846fc..0000000
--- a/Tizen.Security.TEEC/libteec.csproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectTypeGuids>{2F98DAC9-6F16-457B-AED7-D43CAC379341};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{4EE6C458-AA49-402C-89A1-5A12B54E6108}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>libteec</RootNamespace>
-    <AssemblyName>Tizen.Security.TEEC</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>
-  <ItemGroup>
-    <None Include="libteec.project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Tizen.Security.TEEC/Libteec.cs" />
-    <Compile Include="Interop/Interop.Errors.cs" />
-    <Compile Include="Interop/Interop.Libraries.cs" />
-    <Compile Include="Interop/Interop.Libteec.cs" />
-    <Compile Include="Interop/Interop.Types.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </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>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Debug|Any CPU">
-        <ProjectCorporateFlavorCfg />
-      </FlavorProperties>
-      <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Release|Any CPU">
-        <ProjectCorporateFlavorCfg />
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
diff --git a/Tizen.Security.TEEC/libteec.project.json b/Tizen.Security.TEEC/libteec.project.json
deleted file mode 100755
index 521934a..0000000
--- a/Tizen.Security.TEEC/libteec.project.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"dependencies": {
-		"NETStandard.Library": "1.6.0"
-	},
-	"frameworks": {
-		"netstandard1.3": {}
-	}
-}
diff --git a/packaging/csapi-security-libteec.spec b/packaging/csapi-security-libteec.spec
index 629bfa1..9c237a6 100755
--- a/packaging/csapi-security-libteec.spec
+++ b/packaging/csapi-security-libteec.spec
@@ -36,7 +36,6 @@ done
 %install
 for ASM in %{Assemblies}; do
 %dotnet_install $ASM
-echo assembly files: %{dotnet_assembly_files}
 done
 
 %files
-- 
2.34.1