summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeungha Son <seungha.son@samsung.com>2017-05-23 17:32:14 +0900
committerSeungha Son <seungha.son@samsung.com>2017-05-23 17:32:44 +0900
commitdac5b1aac12dc69d85d28eb4ca30f6337e9b8c9d (patch)
tree4033b7b0719034f96a2ab581524e7f162585bf43
parent1b79338883644ac40ea50e01dc26b01ad712bcc0 (diff)
downloadwidget-control-dac5b1aac12dc69d85d28eb4ca30f6337e9b8c9d.tar.gz
widget-control-dac5b1aac12dc69d85d28eb4ca30f6337e9b8c9d.tar.bz2
widget-control-dac5b1aac12dc69d85d28eb4ca30f6337e9b8c9d.zip
- Replace .csproj file with new format - Remove existing unnecessary files - Fix .nuspec file Signed-off-by: Seungha Son <seungha.son@samsung.com> Change-Id: I8b988d4b2aea0bf151ec6a96a21059b1bcc73eff
-rwxr-xr-xTizen.Applications.WidgetControl/Properties/AssemblyInfo.cs20
-rw-r--r--Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj98
-rwxr-xr-xTizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec7
-rwxr-xr-xTizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json10
4 files changed, 19 insertions, 116 deletions
diff --git a/Tizen.Applications.WidgetControl/Properties/AssemblyInfo.cs b/Tizen.Applications.WidgetControl/Properties/AssemblyInfo.cs
deleted file mode 100755
index 2ca1853..0000000
--- a/Tizen.Applications.WidgetControl/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Tizen.Applications.WidgetControl")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Samsung Electronics")]
-[assembly: AssemblyProduct("Tizen.Applications.WidgetControl")]
-[assembly: AssemblyCopyright("Copyright (c) 2016 Samsung Electronics Co., Ltd")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-[assembly: CLSCompliant(true)]
-
-[assembly: Guid("FB08BBF4-F09B-439F-A38C-7FBAEF978443")]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj
index 60b5f27..0a00a38 100644
--- a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj
+++ b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj
@@ -1,81 +1,17 @@
-<?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>
- <ProjectGuid>{90467170-27D6-4177-B55F-FF78529F9795}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Tizen.Applications.WidgetControl</RootNamespace>
- <AssemblyName>Tizen.Applications.WidgetControl</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>
- <PropertyGroup>
- <SignAssembly>true</SignAssembly>
- </PropertyGroup>
- <PropertyGroup>
- <AssemblyOriginatorKeyFile>Tizen.Applications.WidgetControl.snk</AssemblyOriginatorKeyFile>
- </PropertyGroup>
- <ItemGroup>
- <None Include="Tizen.Applications.WidgetControl.project.json" />
- <None Include="Tizen.Applications.WidgetControl.nuspec" />
- <None Include="Tizen.Applications.WidgetControl.snk" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Interop\Interop.Libraries.cs" />
- <Compile Include="Interop\Interop.WidgetService.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Tizen.Applications\WidgetControl.cs" />
- <Compile Include="Tizen.Applications\WidgetLifecycleEventArgs.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>
-</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.Applications.WidgetControl.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.5.8" />
+ </ItemGroup>
+
+</Project>
diff --git a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec
index 494e294..5c7fb91 100755
--- a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec
+++ b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec
@@ -11,11 +11,8 @@
<copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright>
<description>Provides the Widget control API for Tizen.Net</description>
<dependencies>
- <dependency id="Tizen" version="1.0.2" />
- <dependency id="Tizen.Applications.Common" version="1.4.2" />
+ <dependency id="Tizen" version="1.0.5" />
+ <dependency id="Tizen.Applications.Common" version="1.5.8" />
</dependencies>
</metadata>
- <files>
- <file src="bin/$Configuration$/Tizen.Applications.WidgetControl.dll" target="lib/netstandard1.3" />
- </files>
</package>
diff --git a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json
deleted file mode 100755
index b189147..0000000
--- a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "dependencies": {
- "NETStandard.Library": "1.6.0",
- "Tizen": "1.0.2",
- "Tizen.Applications.Common": "1.4.2"
- },
- "frameworks": {
- "netstandard1.3": {}
- }
-} \ No newline at end of file