summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiung Yu <jiung.yu@samsung.com>2017-05-29 04:22:05 (GMT)
committerJiung Yu <jiung.yu@samsung.com>2017-05-29 04:47:35 (GMT)
commit74f2198ef2a2ceb6b226be9ec9a2baaf25a12920 (patch)
tree097b8cbcdf4bf231aa91c9adb41d846dc0d06fae
parent33d262be5104e8080958c32b254930ce3361b77c (diff)
downloadwifi-direct-74f2198ef2a2ceb6b226be9ec9a2baaf25a12920.zip
wifi-direct-74f2198ef2a2ceb6b226be9ec9a2baaf25a12920.tar.gz
wifi-direct-74f2198ef2a2ceb6b226be9ec9a2baaf25a12920.tar.bz2
Migration to visual studio 2017refs/changes/04/131404/2
Description: Replace .csproj file with new format Remove existing unnecessary files Fix .nuspec file Change-Id: Ieb84d55ae5f763458d388396a95b6ac8a8f210f5 Signed-off-by: Yu jiung <jiung.yu@samsung.com>
-rw-r--r--Tizen.Network.WiFiDirect/Properties/AssemblyInfo.cs36
-rw-r--r--[-rwxr-xr-x]Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.csproj89
-rw-r--r--Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.nuspec5
-rwxr-xr-xTizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.project.json10
4 files changed, 13 insertions, 127 deletions
diff --git a/Tizen.Network.WiFiDirect/Properties/AssemblyInfo.cs b/Tizen.Network.WiFiDirect/Properties/AssemblyInfo.cs
deleted file mode 100644
index ca90f33..0000000
--- a/Tizen.Network.WiFiDirect/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.Network.WiFiDirect")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Samsung Electronics")]
-[assembly: AssemblyProduct("Tizen.Network.WiFiDirect")]
-[assembly: AssemblyCopyright("Copyright © Samsung Electronics 2016")]
-[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("08c34d73-7986-4e6e-8c21-5343c7feec86")]
-
-// 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.Network.WiFiDirect/Tizen.Network.WiFiDirect.csproj b/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.csproj
index 83600d1..faf9546 100755..100644
--- a/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.csproj
+++ b/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.csproj
@@ -1,82 +1,17 @@
-<?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>{08C34D73-7986-4E6E-8C21-5343C7FEEC86}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Tizen.Network.WiFiDirect</RootNamespace>
- <AssemblyName>Tizen.Network.WiFiDirect</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>
- </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>
+<Project Sdk="Microsoft.NET.Sdk">
+
<PropertyGroup>
+ <TargetFramework>netstandard1.3</TargetFramework>
+ <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+ <SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>Tizen.Network.WiFiDirect.snk</AssemblyOriginatorKeyFile>
+ <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+ <GenerateReferenceAssembly>True</GenerateReferenceAssembly>
</PropertyGroup>
+
<ItemGroup>
- <Compile Include="Interop\Interop.Libraries.cs" />
- <Compile Include="Interop\Interop.WiFiDirect.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Tizen.Network.WiFiDirect\WiFiDirectData.cs" />
- <Compile Include="Tizen.Network.WiFiDirect\WiFiDirectEnumerations.cs" />
- <Compile Include="Tizen.Network.WiFiDirect\WiFiDirectError.cs" />
- <Compile Include="Tizen.Network.WiFiDirect\WiFiDirectEventArgs.cs" />
- <Compile Include="Tizen.Network.WiFiDirect\WiFiDirectManager.cs" />
- <Compile Include="Tizen.Network.WiFiDirect\WiFiDirectManagerImpl.cs" />
- <Compile Include="Tizen.Network.WiFiDirect\WiFiDirectPeer.cs" />
- <Compile Include="Tizen.Network.WiFiDirect\WiFiDirectPersistentGroup.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Tizen.Network.WiFiDirect.nuspec" />
- <None Include="Tizen.Network.WiFiDirect.project.json" />
- <None Include="Tizen.Network.WiFiDirect.snk" />
+ <PackageReference Include="Tizen" Version="1.0.5" />
+ <PackageReference Include="System.Threading.Thread" Version="4.3.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> \ No newline at end of file
+
+</Project>
diff --git a/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.nuspec b/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.nuspec
index b318a4a..0d977b8 100644
--- a/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.nuspec
+++ b/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.nuspec
@@ -11,10 +11,7 @@
<copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright>
<description>Provides the Wi-Fi Direct APIs for Tizen.Network.WiFiDirect</description>
<dependencies>
- <dependency id="Tizen" version="1.0.2" />
+ <dependency id="Tizen" version="1.0.5" />
</dependencies>
</metadata>
- <files>
- <file src="bin/$Configuration$/Tizen.Network.WiFiDirect.dll" target="lib/netstandard1.3" />
- </files>
</package>
diff --git a/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.project.json b/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.project.json
deleted file mode 100755
index f463d9b..0000000
--- a/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.project.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "dependencies": {
- "NETStandard.Library": "1.6.0",
- "System.Threading.Thread": "4.3.0",
- "Tizen": "1.0.2"
- },
- "frameworks": {
- "netstandard1.3": {}
- }
-}