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

diff --git a/Tizen.Security.TEEC/Properties/AssemblyInfo.cs b/Tizen.Security.TEEC/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
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 (executable)
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 f39d10c9f69d21d60186833a6775d0aa8ac7785a..fa25ce68f2924d5d1e822800c3a0ce61678fe0ff 100755 (executable)
--- 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/Tizen.Security.TEEC.sln b/Tizen.Security.TEEC/Tizen.Security.TEEC.sln
new file mode 100755 (executable)
index 0000000..92ea35e
--- /dev/null
+++ b/Tizen.Security.TEEC/Tizen.Security.TEEC.sln
@@ -0,0 +1,22 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio 14\r
+VisualStudioVersion = 14.0.25420.1\r
+MinimumVisualStudioVersion = 10.0.40219.1\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tizen.Security.TEEC", "Tizen.Security.TEEC.csproj", "{4EE6C458-AA49-402C-89A1-5A12B54E6108}"\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
+               {4EE6C458-AA49-402C-89A1-5A12B54E6108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {4EE6C458-AA49-402C-89A1-5A12B54E6108}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {4EE6C458-AA49-402C-89A1-5A12B54E6108}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {4EE6C458-AA49-402C-89A1-5A12B54E6108}.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/Tizen.Security.TEEC/Tizen.Security.TEEC.snk b/Tizen.Security.TEEC/Tizen.Security.TEEC.snk
new file mode 100755 (executable)
index 0000000..eff1940
Binary files /dev/null and b/Tizen.Security.TEEC/Tizen.Security.TEEC.snk differ

diff --git a/Tizen.Security.TEEC/libteec.csproj b/Tizen.Security.TEEC/libteec.csproj
deleted file mode 100755 (executable)
index b5846fc..0000000
--- a/Tizen.Security.TEEC/libteec.csproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>8.0.30703</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectTypeGuids>{2F98DAC9-6F16-457B-AED7-D43CAC379341};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>\r
-    <ProjectGuid>{4EE6C458-AA49-402C-89A1-5A12B54E6108}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>libteec</RootNamespace>\r
-    <AssemblyName>Tizen.Security.TEEC</AssemblyName>\r
-    <FileAlignment>512</FileAlignment>\r
-    <DefaultLanguage>en-US</DefaultLanguage>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>\r
-    <TargetFrameworkVersion>v1.3</TargetFrameworkVersion>\r
-    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-    <NoStdLib>true</NoStdLib>\r
-    <NoWarn>$(NoWarn);1701</NoWarn>\r
-    <UseVSHostingProcess>false</UseVSHostingProcess>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <Optimize>false</Optimize>\r
-    <OutputPath>bin\Debug\</OutputPath>\r
-    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <Optimize>true</Optimize>\r
-    <OutputPath>bin\Release\</OutputPath>\r
-    <DefineConstants>TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <None Include="libteec.project.json" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="Tizen.Security.TEEC/Libteec.cs" />\r
-    <Compile Include="Interop/Interop.Errors.cs" />\r
-    <Compile Include="Interop/Interop.Libraries.cs" />\r
-    <Compile Include="Interop/Interop.Libteec.cs" />\r
-    <Compile Include="Interop/Interop.Types.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.\r
-               Other similar extension points exist, see Microsoft.Common.targets.\r
-       <Target Name="BeforeBuild">\r
-       </Target>\r
-       <Target Name="AfterBuild">\r
-       </Target>\r
-       -->\r
-  <PropertyGroup>\r
-    <!-- https://github.com/dotnet/corefxlab/tree/master/samples/NetCoreSample and\r
-                        https://docs.microsoft.com/en-us/dotnet/articles/core/tutorials/target-dotnetcore-with-msbuild\r
-               -->\r
-    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two\r
-                        properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and\r
-                        to prevent it from outputting a warning (MSB3644).\r
-               -->\r
-    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories>\r
-    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>\r
-    <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>\r
-  </PropertyGroup>\r
-  <ProjectExtensions>\r
-    <VisualStudio>\r
-      <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Debug|Any CPU">\r
-        <ProjectCorporateFlavorCfg />\r
-      </FlavorProperties>\r
-      <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Release|Any CPU">\r
-        <ProjectCorporateFlavorCfg />\r
-      </FlavorProperties>\r
-    </VisualStudio>\r
-  </ProjectExtensions>\r
-</Project>\r

diff --git a/Tizen.Security.TEEC/libteec.project.json b/Tizen.Security.TEEC/libteec.project.json
deleted file mode 100755 (executable)
index 521934a..0000000
--- a/Tizen.Security.TEEC/libteec.project.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{\r
-       "dependencies": {\r
-               "NETStandard.Library": "1.6.0"\r
-       },\r
-       "frameworks": {\r
-               "netstandard1.3": {}\r
-       }\r
-}\r

diff --git a/Tizen.Security.TEEC/libteec.sln b/Tizen.Security.TEEC/libteec.sln
deleted file mode 100755 (executable)
index f9208fe..0000000
--- a/Tizen.Security.TEEC/libteec.sln
+++ /dev/null
@@ -1,22 +0,0 @@
-\r
-Microsoft Visual Studio Solution File, Format Version 12.00\r
-# Visual Studio 14\r
-VisualStudioVersion = 14.0.25420.1\r
-MinimumVisualStudioVersion = 10.0.40219.1\r
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libteec", "libteec.csproj", "{4EE6C458-AA49-402C-89A1-5A12B54E6108}"\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
-               {4EE6C458-AA49-402C-89A1-5A12B54E6108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {4EE6C458-AA49-402C-89A1-5A12B54E6108}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {4EE6C458-AA49-402C-89A1-5A12B54E6108}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {4EE6C458-AA49-402C-89A1-5A12B54E6108}.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-security-libteec.spec b/packaging/csapi-security-libteec.spec
index 629bfa12949d367971facbe9560d2c2c85ea411b..9c237a653e7dcbb8f5531e7fa6a957143c7c61be 100755 (executable)
--- 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