Apply new csproj format for VS2017

This patch applies new csproj format for VS2017.
Plus, updates version of reference packages.

Change-Id: Ib2cb91b106def5f1771747ffd88ca19bd0a1fdd2
Signed-off-by: yh106.jung <yh106.jung@samsung.com>

diff --git a/Tizen.WebView.Test/Tizen.WebView.Test.project.json b/Tizen.WebView.Test/Tizen.WebView.Test.project.json
index 8de2d93..b330acf 100644 (file)
--- a/Tizen.WebView.Test/Tizen.WebView.Test.project.json
+++ b/Tizen.WebView.Test/Tizen.WebView.Test.project.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
-    "ElmSharp": "1.1.0-*",
+    "ElmSharp": "1.2.0-*",
     "Microsoft.NETCore.App": "1.0.0",
-    "Tizen": "1.0.2",
-    "Tizen.Applications": "1.2.0"
+    "Tizen": "1.0.3",
+    "Tizen.Applications": "1.3.2"
   },
   "frameworks": {
     "netcoreapp1.0": {}

diff --git a/Tizen.WebView/Properties/AssemblyInfo.cs b/Tizen.WebView/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index 75cc36c..0000000
--- a/Tizen.WebView/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;\r
-using System.Runtime.CompilerServices;\r
-using System.Runtime.InteropServices;\r
-\r
-// General Information about an assembly is controlled through the following\r
-// set of attributes. Change these attribute values to modify the information\r
-// associated with an assembly.\r
-[assembly: AssemblyTitle("Tizen.WebView")]\r
-[assembly: AssemblyDescription("")]\r
-[assembly: AssemblyConfiguration("")]\r
-[assembly: AssemblyCompany("Samsung Electronics")]\r
-[assembly: AssemblyProduct("Tizen.WebView")]\r
-[assembly: AssemblyCopyright("Copyright © Samsung Electronics 2017")]\r
-[assembly: AssemblyTrademark("")]\r
-[assembly: AssemblyCulture("")]\r
-\r
-// Setting ComVisible to false makes the types in this assembly not visible\r
-// to COM components.  If you need to access a type in this assembly from\r
-// COM, set the ComVisible attribute to true on that type.\r
-[assembly: ComVisible(false)]\r
-\r
-// The following GUID is for the ID of the typelib if this project is exposed to COM\r
-[assembly: Guid("8405e84f-b920-4aac-9ad5-001b9debc9ca")]\r
-\r
-// Version information for an assembly consists of the following four values:\r
-//\r
-//      Major Version\r
-//      Minor Version\r
-//      Build Number\r
-//      Revision\r
-//\r
-// You can specify all the values or you can default the Build and Revision Numbers\r
-// by using the '*' as shown below:\r
-// [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.0.0.0")]\r
-[assembly: AssemblyFileVersion("1.0.0.0")]\r

diff --git a/Tizen.WebView/Tizen.WebView.csproj b/Tizen.WebView/Tizen.WebView.csproj
old mode 100755 (executable)
new mode 100644 (file)
index 29df008..7c234db
--- a/Tizen.WebView/Tizen.WebView.csproj
+++ b/Tizen.WebView/Tizen.WebView.csproj
@@ -1,99 +1,16 @@
-<?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>{8405E84F-B920-4AAC-9AD5-001B9DEBC9CA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Tizen.WebView</RootNamespace>
-    <AssemblyName>Tizen.WebView</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>true</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>;1701;1702</NoWarn>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </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>
-    <NoWarn>;1701;1702</NoWarn>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Tizen.WebView.snk</AssemblyOriginatorKeyFile>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+    <GenerateReferenceAssembly>True</GenerateReferenceAssembly>
   </PropertyGroup>
+
   <ItemGroup>
-    <None Include="Tizen.WebView.nuspec" />
-    <None Include="Tizen.WebView.project.json" />
-    <None Include="Tizen.WebView.snk" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Interop\Interop.ChromiumEwk.Context.cs" />
-    <Compile Include="Interop\Interop.ChromiumEwk.CookieManager.cs" />
-    <Compile Include="Interop\Interop.ChromiumEwk.cs" />
-    <Compile Include="Interop\Interop.ChromiumEwk.Error.cs" />
-    <Compile Include="Interop\Interop.ChromiumEwk.Settings.cs" />
-    <Compile Include="Interop\Interop.ChromiumEwk.View.cs" />
-    <Compile Include="Interop\Interop.Elementary.cs" />
-    <Compile Include="Interop\Interop.Evas.cs" />
-    <Compile Include="Interop\Interop.Libraries.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Tizen.WebView\Chromium.cs" />
-    <Compile Include="Tizen.WebView\Context.cs" />
-    <Compile Include="Tizen.WebView\CookieManager.cs" />
-    <Compile Include="Tizen.WebView\JavaScriptMessage.cs" />
-    <Compile Include="Tizen.WebView\Settings.cs" />
-    <Compile Include="Tizen.WebView\SmartCallbackLoadErrorArgs.cs" />
-    <Compile Include="Tizen.WebView\SmartCallbackArgs.cs" />
-    <Compile Include="Tizen.WebView\WebView.cs" />
+    <PackageReference Include="ElmSharp" Version="1.2.0-*" />
   </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>

diff --git a/Tizen.WebView/Tizen.WebView.nuspec b/Tizen.WebView/Tizen.WebView.nuspec
index a0bfe59..0f5e654 100644 (file)
--- a/Tizen.WebView/Tizen.WebView.nuspec
+++ b/Tizen.WebView/Tizen.WebView.nuspec
@@ -10,10 +10,7 @@
     <description>Tizen WebView API for C#</description>\r
     <copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright>\r
     <dependencies>\r
-      <dependency id="ElmSharp" version="1.1.0" />\r
+      <dependency id="ElmSharp" version="1.2.0" />\r
     </dependencies>\r
   </metadata>\r
-  <files>\r
-    <file src="bin/$Configuration$/Tizen.WebView.dll" target="lib/netstandard1.3" />\r
-  </files>\r
 </package>\r

diff --git a/Tizen.WebView/Tizen.WebView.project.json b/Tizen.WebView/Tizen.WebView.project.json
deleted file mode 100644 (file)
index 389f3bf..0000000
--- a/Tizen.WebView/Tizen.WebView.project.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "dependencies": {
-    "ElmSharp": "1.1.0-*",
-    "NETStandard.Library": "1.6.0"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  }
-}