diff options
author | Hongkuk, Son <hongkuk.son@samsung.com> | 2017-05-23 16:56:52 +0900 |
---|---|---|
committer | Hongkuk, Son <hongkuk.son@samsung.com> | 2017-05-23 16:58:15 +0900 |
commit | 4a5a729c449eb6f2abd53cc896c77a8c3c4650c0 (patch) | |
tree | dcb7369b256f4e92d86630df0d8a95741d356715 | |
parent | 4db06a12748a6628bfb583281ad828dd964d5f89 (diff) | |
download | iotcon-4a5a729c449eb6f2abd53cc896c77a8c3c4650c0.tar.gz iotcon-4a5a729c449eb6f2abd53cc896c77a8c3c4650c0.tar.bz2 iotcon-4a5a729c449eb6f2abd53cc896c77a8c3c4650c0.zip |
Migration from VS2015 to VS2017
Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Ie34a20fffc57f02a08a506de037259d2d66b3be0
4 files changed, 17 insertions, 171 deletions
diff --git a/Tizen.Network.IoTConnectivity/Properties/AssemblyInfo.cs b/Tizen.Network.IoTConnectivity/Properties/AssemblyInfo.cs deleted file mode 100755 index 095f318..0000000 --- a/Tizen.Network.IoTConnectivity/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,52 +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.Reflection; -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.IoTConnectivity")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Tizen.Network.IoTConnectivity")] -[assembly: AssemblyCopyright("Copyright (c) 2016 Samsung Electronics Co., Ltd")] -[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("3577eae8-b409-4bae-a5da-c6340be1dbc2")] - -// 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.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj b/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj index b54878e..ece3807 100644 --- a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj +++ b/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj @@ -1,107 +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>{3577EAE8-B409-4BAE-A5DA-C6340BE1DBC2}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Tizen.Network.IoTConnectivity</RootNamespace>
- <AssemblyName>Tizen.Network.IoTConnectivity</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>true</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.Network.IoTConnectivity.snk</AssemblyOriginatorKeyFile>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="Tizen.Network.IoTConnectivity\Attributes.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\CacheUpdatedEventArgs.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\DeviceInformationFoundEventArgs.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\FindingErrorOccurredEventArgs.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\IoTConnectivityClientManager.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\IoTConnectivityErrorFactory.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\LiteResource.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\ObserverNotifiedEventArgs.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\PlatformInformationFoundEventArgs.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\PresenceReceivedEventArgs.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\RemoteResource.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\RemoteResponse.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\ResourceFoundEventArgs.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\ResourceInterfaces.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\ResourceQuery.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\Representation.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\ResourceOptions.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\ResourceTypes.cs" />
- <Compile Include="Interop\Interop.Libraries.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\IoTConnectivityServerManager.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\Request.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\Resource.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\Response.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\ObservePolicy.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\PresenceEventType.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\QualityOfService.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\FindingError.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\ResourcePolicy.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\ResourceState.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\ResponseCode.cs" />
- <Compile Include="Interop\Interop.IoTConnectivity.Client.cs" />
- <Compile Include="Interop\Interop.IoTConnectivity.Common.cs" />
- <Compile Include="Interop\Interop.IoTConnectivity.Server.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\ObserveType.cs" />
- <Compile Include="Tizen.Network.IoTConnectivity\StateChangedEventArgs.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Tizen.Network.IoTConnectivity.nuspec" />
- <None Include="Tizen.Network.IoTConnectivity.project.json" />
- <None Include="Tizen.Network.IoTConnectivity.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.Network.IoTConnectivity.snk</AssemblyOriginatorKeyFile> + <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign> + <GenerateReferenceAssembly>True</GenerateReferenceAssembly> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="Tizen" Version="1.0.1" /> + </ItemGroup> + +</Project> + diff --git a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.nuspec b/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.nuspec index 07187ae..6378081 100644 --- a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.nuspec +++ b/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.nuspec @@ -14,7 +14,4 @@ <dependency id="Tizen" version="1.0.1" /> </dependencies> </metadata> - <files> - <file src="bin/$Configuration$/Tizen.Network.IoTConnectivity.dll" target="lib/netstandard1.3" /> - </files> </package> diff --git a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.project.json b/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.project.json deleted file mode 100644 index db7436c..0000000 --- a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.0", - "Tizen": "1.0.1" - }, - "frameworks": { - "netstandard1.3": {} - } -} |