diff options
author | manish.r <manish.r@samsung.com> | 2017-05-22 16:32:54 +0530 |
---|---|---|
committer | manish.r <manish.r@samsung.com> | 2017-05-22 16:32:54 +0530 |
commit | dcdf9c4ca81ebfaef9104642a7b39166ba5fd98f (patch) | |
tree | 3b4e6620eca7bdd96a134bcb139b985b5d944c7b | |
parent | 4eef49e717742f05d24adb9371a9856562f97eda (diff) | |
download | uix-voice-control-dcdf9c4ca81ebfaef9104642a7b39166ba5fd98f.tar.gz uix-voice-control-dcdf9c4ca81ebfaef9104642a7b39166ba5fd98f.tar.bz2 uix-voice-control-dcdf9c4ca81ebfaef9104642a7b39166ba5fd98f.zip |
VS 2017 Project Migration
Change-Id: I42e696cad640a3ecb911ad377e130dbac364d902
Signed-off-by: manish.r <manish.r@samsung.com>
4 files changed, 11 insertions, 150 deletions
diff --git a/Tizen.Uix.VoiceControl/Properties/AssemblyInfo.cs b/Tizen.Uix.VoiceControl/Properties/AssemblyInfo.cs deleted file mode 100755 index 9bbcd14..0000000 --- a/Tizen.Uix.VoiceControl/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.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.Uix.VoiceControl")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Tizen.Uix.VoiceControl")] -[assembly: AssemblyCopyright("Copyright \u00A9 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("23e28ff0-aa5f-457b-ad1c-ad42d5f59254")] - -// 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.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj b/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj index 1b581ca..85f46b6 100755 --- a/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj +++ b/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj @@ -1,91 +1,16 @@ -<?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>{23E28FF0-AA5F-457B-AD1C-AD42D5F59254}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Tizen.Uix.VoiceControl</RootNamespace> - <AssemblyName>Tizen.Uix.VoiceControl</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> - <Prefer32Bit>false</Prefer32Bit> - </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> - <Prefer32Bit>false</Prefer32Bit> - </PropertyGroup> - <PropertyGroup> - <SignAssembly>true</SignAssembly> - </PropertyGroup> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> + <TargetFramework>netstandard1.3</TargetFramework> + <AllowUnsafeBlocks>True</AllowUnsafeBlocks> + <SignAssembly>True</SignAssembly> <AssemblyOriginatorKeyFile>Tizen.Uix.VoiceControl.snk</AssemblyOriginatorKeyFile> + <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign> + <GenerateReferenceAssembly>True</GenerateReferenceAssembly> </PropertyGroup> + <ItemGroup> - <Compile Include="Interop\Interop.VoiceControl.cs" /> - <Compile Include="Interop\Interop.Libraries.cs" /> - <Compile Include="Interop\Interop.VoiceControlCommand.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="Tizen.Uix.VoiceControl\RecognitionResult.cs" /> - <Compile Include="Tizen.Uix.VoiceControl\VoiceCommand.cs" /> - <Compile Include="Tizen.Uix.VoiceControl\VoiceCommandList.cs" /> - <Compile Include="Tizen.Uix.VoiceControl\VoiceControlClient.cs" /> - <Compile Include="Tizen.Uix.VoiceControl\CurrentLanguageChangedEventArgs.cs" /> - <Compile Include="Tizen.Uix.VoiceControl\ErrorOccuredEventArgs.cs" /> - <Compile Include="Tizen.Uix.VoiceControl\ExceptionFactory.cs" /> - <Compile Include="Tizen.Uix.VoiceControl\RecognitionResultEventArgs.cs" /> - <Compile Include="Tizen.Uix.VoiceControl\ServiceStateChangedEventArgs.cs" /> - <Compile Include="Tizen.Uix.VoiceControl\StateChangedEventArgs.cs" /> - </ItemGroup> - <ItemGroup> - <None Include="Tizen.Uix.VoiceControl.nuspec" /> - <None Include="Tizen.Uix.VoiceControl.project.json" /> - <None Include="Tizen.Uix.VoiceControl.snk" /> + <PackageReference Include="Tizen" Version="1.0.5" /> </ItemGroup> - <ItemGroup /> - <ItemGroup> - <Reference Include="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" /> - </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.Uix.VoiceControl/Tizen.Uix.VoiceControl.nuspec b/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.nuspec index e0de829..075bbe2 100755 --- a/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.nuspec +++ b/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.nuspec @@ -14,7 +14,4 @@ <dependency id="Tizen" version="1.0.3" /> </dependencies> </metadata> - <files> - <file src="bin/$Configuration$/Tizen.Uix.VoiceControl.dll" target="lib/netstandard1.3" /> - </files> </package> diff --git a/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.project.json b/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.project.json deleted file mode 100755 index db7436c..0000000 --- a/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.0", - "Tizen": "1.0.1" - }, - "frameworks": { - "netstandard1.3": {} - } -} |