diff options
author | yh106.jung <yh106.jung@samsung.com> | 2017-05-19 11:07:32 +0900 |
---|---|---|
committer | yh106.jung <yh106.jung@samsung.com> | 2017-05-19 11:09:41 +0900 |
commit | f614577289f8cad64c4186e0f5271dd89d624d5a (patch) | |
tree | 3b74fc2aa8a181ce32327bf48e940841d3a3c03f /Tizen.WebView | |
parent | aca675d31f77ab8373bc5487cd0ef8fc882cf831 (diff) | |
download | webview-f614577289f8cad64c4186e0f5271dd89d624d5a.tar.gz webview-f614577289f8cad64c4186e0f5271dd89d624d5a.tar.bz2 webview-f614577289f8cad64c4186e0f5271dd89d624d5a.zip |
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>
Diffstat (limited to 'Tizen.WebView')
-rw-r--r-- | Tizen.WebView/Properties/AssemblyInfo.cs | 36 | ||||
-rw-r--r--[-rwxr-xr-x] | Tizen.WebView/Tizen.WebView.csproj | 103 | ||||
-rw-r--r-- | Tizen.WebView/Tizen.WebView.nuspec | 5 | ||||
-rw-r--r-- | Tizen.WebView/Tizen.WebView.project.json | 9 |
4 files changed, 11 insertions, 142 deletions
diff --git a/Tizen.WebView/Properties/AssemblyInfo.cs b/Tizen.WebView/Properties/AssemblyInfo.cs deleted file mode 100644 index 75cc36c..0000000 --- a/Tizen.WebView/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Tizen.WebView")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Samsung Electronics")]
-[assembly: AssemblyProduct("Tizen.WebView")]
-[assembly: AssemblyCopyright("Copyright © Samsung Electronics 2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8405e84f-b920-4aac-9ad5-001b9debc9ca")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Tizen.WebView/Tizen.WebView.csproj b/Tizen.WebView/Tizen.WebView.csproj index 29df008..7c234db 100755..100644 --- 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 --- a/Tizen.WebView/Tizen.WebView.nuspec +++ b/Tizen.WebView/Tizen.WebView.nuspec @@ -10,10 +10,7 @@ <description>Tizen WebView API for C#</description>
<copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright>
<dependencies>
- <dependency id="ElmSharp" version="1.1.0" />
+ <dependency id="ElmSharp" version="1.2.0" />
</dependencies>
</metadata>
- <files>
- <file src="bin/$Configuration$/Tizen.WebView.dll" target="lib/netstandard1.3" />
- </files>
</package>
diff --git a/Tizen.WebView/Tizen.WebView.project.json b/Tizen.WebView/Tizen.WebView.project.json deleted file mode 100644 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": {} - } -} |