summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Tizen.Security.SecureRepository/Properties/AssemblyInfo.cs34
-rw-r--r--Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj91
-rw-r--r--Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.nuspec5
-rw-r--r--Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.project.json9
-rw-r--r--Tizen.Security/Properties/AssemblyInfo.cs34
-rwxr-xr-x[-rw-r--r--]Tizen.Security/Tizen.Security.csproj92
-rwxr-xr-xTizen.Security/Tizen.Security.nuspec4
-rwxr-xr-xTizen.Security/Tizen.Security.project.json10
-rwxr-xr-x[-rw-r--r--]Tizen.Security/Tizen.Security.snkbin596 -> 596 bytes
9 files changed, 31 insertions, 248 deletions
diff --git a/Tizen.Security.SecureRepository/Properties/AssemblyInfo.cs b/Tizen.Security.SecureRepository/Properties/AssemblyInfo.cs
deleted file mode 100644
index 5aca817..0000000
--- a/Tizen.Security.SecureRepository/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Tizen.Security.SecureRepository")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Samsung Electronics")]
-[assembly: AssemblyProduct("Tizen.Security.SecureRepository")]
-[assembly: AssemblyCopyright("Copyright (c) 2016 Samsung Electronics Co., Ltd")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-[assembly: CLSCompliant(true)]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj
index c71a469..31bcdda 100644
--- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj
+++ b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj
@@ -1,77 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{3D811DEE-9FD9-4534-BD3C-A7C31C3B9EF7}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <AssemblyName>Tizen.Security.SecureRepository</AssemblyName>
- <FileAlignment>512</FileAlignment>
- </PropertyGroup>
- <PropertyGroup>
- <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
- <TargetFrameworkVersion>v1.3</TargetFrameworkVersion>
- <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
- <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
- <NoStdLib>true</NoStdLib>
- <NoWarn>$(NoWarn);1701;1702</NoWarn>
- </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>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <DocumentationFile>bin\Debug\Tizen.Security.SecureRepository.XML</DocumentationFile>
- <CodeAnalysisRuleSet>ExtendedDesignGuidelineRules.ruleset</CodeAnalysisRuleSet>
- </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>
- <PropertyGroup>
- <AssemblyOriginatorKeyFile>Tizen.Security.SecureRepository.snk</AssemblyOriginatorKeyFile>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="Interop\*.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Tizen.Security.SecureRepository\*.cs" />
- <Compile Include="Tizen.Security.SecureRepository\Crypto\*.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Tizen.Security.SecureRepository.nuspec" />
- <None Include="Tizen.Security.SecureRepository.project.json" />
- <None Include="Tizen.Security.SecureRepository.snk" />
- </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>
+<Project Sdk="Microsoft.NET.Sdk">
+ <PropertyGroup>
+ <TargetFramework>netstandard1.3</TargetFramework>
+ <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+ <SignAssembly>True</SignAssembly>
+ <AssemblyOriginatorKeyFile>Tizen.Security.SecureRepository.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.SecureRepository/Tizen.Security.SecureRepository.nuspec b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.nuspec
index 01e3d14..3b30f12 100644
--- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.nuspec
+++ b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.nuspec
@@ -11,10 +11,7 @@
<copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright>
<description>Provides the secure repository protected by Tizen platform for keys, certificates, and sensitive data of users and/or their apps. Additionally, secure cryptographic operations for non-exportable keys without revealing key values to clients are provided.</description>
<dependencies>
- <dependency id="Tizen" version="1.0.2" />
+ <dependency id="Tizen" version="1.0.5" />
</dependencies>
</metadata>
- <files>
- <file src="bin/$Configuration$/Tizen.Security.SecureRepository.dll" target="lib/netstandard1.3" />
- </files>
</package>
diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.project.json b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.project.json
deleted file mode 100644
index 55ec093..0000000
--- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.project.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "dependencies": {
- "NETStandard.Library": "1.6.0",
- "Tizen": "1.0.2"
- },
- "frameworks": {
- "netstandard1.3": {}
- }
-}
diff --git a/Tizen.Security/Properties/AssemblyInfo.cs b/Tizen.Security/Properties/AssemblyInfo.cs
deleted file mode 100644
index 41ef0bb..0000000
--- a/Tizen.Security/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Tizen.Security")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Samsung Electronics")]
-[assembly: AssemblyProduct("Tizen.Security")]
-[assembly: AssemblyCopyright("Copyright (c) 2016 Samsung Electronics Co., Ltd")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-[assembly: CLSCompliant(true)]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Tizen.Security/Tizen.Security.csproj b/Tizen.Security/Tizen.Security.csproj
index 44e7abc..edfcc65 100644..100755
--- a/Tizen.Security/Tizen.Security.csproj
+++ b/Tizen.Security/Tizen.Security.csproj
@@ -1,77 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{0EA0E64F-637A-480A-8746-4ACC1B0FE022}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <AssemblyName>Tizen.Security</AssemblyName>
- <FileAlignment>512</FileAlignment>
- </PropertyGroup>
- <PropertyGroup>
- <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
- <TargetFrameworkVersion>v1.3</TargetFrameworkVersion>
- <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
- <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
- <NoStdLib>true</NoStdLib>
- <NoWarn>$(NoWarn);1701;1702</NoWarn>
- </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>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <DocumentationFile>bin\Debug\Tizen.Security.XML</DocumentationFile>
- <CodeAnalysisRuleSet>ExtendedDesignGuidelineRules.ruleset</CodeAnalysisRuleSet>
- </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>
- <PropertyGroup>
- <AssemblyOriginatorKeyFile>Tizen.Security.snk</AssemblyOriginatorKeyFile>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="Interop\Interop.Privilege.cs" />
- <Compile Include="Interop\Interop.Libraries.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Tizen.Security\Privilege.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Tizen.Security.nuspec" />
- <None Include="Tizen.Security.project.json" />
- <None Include="Tizen.Security.snk" />
- </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> \ No newline at end of file
+<Project Sdk="Microsoft.NET.Sdk">
+ <PropertyGroup>
+ <TargetFramework>netstandard1.3</TargetFramework>
+ <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+ <SignAssembly>True</SignAssembly>
+ <AssemblyOriginatorKeyFile>Tizen.Security.snk</AssemblyOriginatorKeyFile>
+ <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+ <GenerateReferenceAssembly>True</GenerateReferenceAssembly>
+ </PropertyGroup>
+ <ItemGroup>
+ <PackageReference Include="Tizen" Version="1.0.5" />
+ <PackageReference Include="Tizen.Applications.Common" Version="1.4.2"/>
+ <PackageReference Include="Tizen.Applications.PackageManager" Version="1.4.2"/>
+ </ItemGroup>
+</Project>
diff --git a/Tizen.Security/Tizen.Security.nuspec b/Tizen.Security/Tizen.Security.nuspec
index e7aabf9..3e63539 100755
--- a/Tizen.Security/Tizen.Security.nuspec
+++ b/Tizen.Security/Tizen.Security.nuspec
@@ -11,11 +11,9 @@
<copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright>
<description>Provides the display name or description of privileges.</description>
<dependencies>
+ <dependency id="Tizen" version="1.0.5" />
<dependency id="Tizen.Applications.Common" version="1.4.2" />
<dependency id="Tizen.Applications.PackageManager" version="1.4.2" />
</dependencies>
</metadata>
- <files>
- <file src="bin/$Configuration$/Tizen.Security.dll" target="lib/netstandard1.3" />
- </files>
</package>
diff --git a/Tizen.Security/Tizen.Security.project.json b/Tizen.Security/Tizen.Security.project.json
deleted file mode 100755
index 416ba1f..0000000
--- a/Tizen.Security/Tizen.Security.project.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "dependencies": {
- "NETStandard.Library": "1.6.0",
- "Tizen.Applications.Common": "1.4.2",
- "Tizen.Applications.PackageManager": "1.4.2"
- },
- "frameworks": {
- "netstandard1.3": {}
- }
-} \ No newline at end of file
diff --git a/Tizen.Security/Tizen.Security.snk b/Tizen.Security/Tizen.Security.snk
index 135c8ba..135c8ba 100644..100755
--- a/Tizen.Security/Tizen.Security.snk
+++ b/Tizen.Security/Tizen.Security.snk
Binary files differ