diff options
| -rw-r--r-- | .nuspec/Xamarin.Forms.Maps.Tizen.nuspec | 8 | ||||
| -rw-r--r-- | .nuspec/Xamarin.Forms.Platform.Tizen.nuspec | 8 | ||||
| -rw-r--r-- | Xamarin.Forms.Maps.Tizen/Properties/AssemblyInfo.cs | 8 | ||||
| -rw-r--r-- | Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj | 71 | ||||
| -rwxr-xr-x | Xamarin.Forms.Maps.Tizen/project.json | 11 | ||||
| -rw-r--r-- | Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs | 9 | ||||
| -rw-r--r-- | Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj | 67 | ||||
| -rwxr-xr-x | Xamarin.Forms.Platform.Tizen/project.json | 12 | ||||
| -rw-r--r-- | Xamarin.Forms.Tizen.sln | 17 |
9 files changed, 36 insertions, 175 deletions
diff --git a/.nuspec/Xamarin.Forms.Maps.Tizen.nuspec b/.nuspec/Xamarin.Forms.Maps.Tizen.nuspec index 254bcb51..d9da30f2 100644 --- a/.nuspec/Xamarin.Forms.Maps.Tizen.nuspec +++ b/.nuspec/Xamarin.Forms.Maps.Tizen.nuspec @@ -13,12 +13,12 @@ <description>Xamarin.Forms.Maps Renderer for Tizen .NET</description> <copyright>Copyright 2013-2017</copyright> <dependencies> - <dependency id="Xamarin.Forms.Maps" version="2.4.0.256-pre1" /> - <dependency id="Tizen.NET" version="4.0.0-preview1-00117" /> + <dependency id="Xamarin.Forms.Maps" version="2.4.0.269-pre2" /> + <dependency id="Tizen.NET" version="4.0.0-preview1-00192" /> </dependencies> </metadata> <files> - <file src="..\Xamarin.Forms.Maps.Tizen\bin\$Configuration$\Xamarin.Forms.Maps.Tizen.dll" target="lib\netstandard1.6"/> - <file src="..\Xamarin.Forms.Maps.Tizen\bin\$Configuration$\Xamarin.Forms.Maps.Tizen.*pdb" target="lib\netstandard1.6"/> + <file src="..\Xamarin.Forms.Maps.Tizen\bin\$Configuration$\Xamarin.Forms.Maps.Tizen.dll" target="lib\tizen40"/> + <file src="..\Xamarin.Forms.Maps.Tizen\bin\$Configuration$\Xamarin.Forms.Maps.Tizen.*pdb" target="lib\tizen40"/> </files> </package> diff --git a/.nuspec/Xamarin.Forms.Platform.Tizen.nuspec b/.nuspec/Xamarin.Forms.Platform.Tizen.nuspec index 75ea1d1f..27f080d5 100644 --- a/.nuspec/Xamarin.Forms.Platform.Tizen.nuspec +++ b/.nuspec/Xamarin.Forms.Platform.Tizen.nuspec @@ -13,12 +13,12 @@ <description>Xamarin Forms Renderer to build native UIs for Tizen .NET</description> <copyright>Copyright 2013-2017</copyright> <dependencies> - <dependency id="Xamarin.Forms" version="2.4.0.266-pre1" /> - <dependency id="Tizen.NET" version="4.0.0-preview1-00117" /> + <dependency id="Xamarin.Forms" version="2.4.0.269-pre2" /> + <dependency id="Tizen.NET" version="4.0.0-preview1-00192" /> </dependencies> </metadata> <files> - <file src="..\Xamarin.Forms.Platform.Tizen\bin\$Configuration$\Xamarin.Forms.Platform.Tizen.dll" target="lib\netstandard1.6"/> - <file src="..\Xamarin.Forms.Platform.Tizen\bin\$Configuration$\Xamarin.Forms.Platform.Tizen.*pdb" target="lib\netstandard1.6"/> + <file src="..\Xamarin.Forms.Platform.Tizen\bin\$Configuration$\Xamarin.Forms.Platform.Tizen.dll" target="lib\tizen40"/> + <file src="..\Xamarin.Forms.Platform.Tizen\bin\$Configuration$\Xamarin.Forms.Platform.Tizen.*pdb" target="lib\tizen40"/> </files> </package> diff --git a/Xamarin.Forms.Maps.Tizen/Properties/AssemblyInfo.cs b/Xamarin.Forms.Maps.Tizen/Properties/AssemblyInfo.cs index 46946924..2618cf75 100644 --- a/Xamarin.Forms.Maps.Tizen/Properties/AssemblyInfo.cs +++ b/Xamarin.Forms.Maps.Tizen/Properties/AssemblyInfo.cs @@ -1,11 +1,5 @@ -using System.Reflection; -using Xamarin.Forms.Maps; +using Xamarin.Forms.Maps; using Xamarin.Forms.Maps.Tizen; using Xamarin.Forms.Platform.Tizen; -[assembly: AssemblyTitle("Xamarin.Forms.Maps.Tizen")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCulture("")] - [assembly: ExportRenderer(typeof (Map), typeof (MapRenderer))] diff --git a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj index f2c3a4ed..577fb04c 100644 --- a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj +++ b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj @@ -1,68 +1,15 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{3AD33CC8-A506-4254-B3CA-3123A25B3383}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Xamarin.Forms.Maps.Tizen</RootNamespace> - <AssemblyName>Xamarin.Forms.Maps.Tizen</AssemblyName> - <FileAlignment>512</FileAlignment> - </PropertyGroup> - <PropertyGroup> - <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> - <TargetFrameworkVersion>v1.6</TargetFrameworkVersion> - <NuGetTargetMoniker>.NETStandard,Version=v1.6</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 Condition="'$(Configuration)|$(Platform)' == 'Turkey|AnyCPU'"> - <DebugSymbols>true</DebugSymbols> - <OutputPath>bin\Turkey\</OutputPath> - <DefineConstants>TRACE;DEBUG</DefineConstants> - <DebugType>full</DebugType> - <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <TargetFramework>tizen40</TargetFramework> </PropertyGroup> + <ItemGroup> - <Compile Include="**\*.cs" Exclude="obj\**\*.cs" /> + <PackageReference Include="Tizen.NET" Version="4.0.0-preview1-00192" /> </ItemGroup> + <ItemGroup> - <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj"> - <Name>Xamarin.Forms.Core</Name> - </ProjectReference> - <ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj"> - <Name>Xamarin.Forms.Maps</Name> - </ProjectReference> - <ProjectReference Include="..\Xamarin.Forms.Platform.Tizen\Xamarin.Forms.Platform.Tizen.csproj"> - <Name>Xamarin.Forms.Platform.Tizen</Name> - </ProjectReference> + <ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj" /> + <ProjectReference Include="..\Xamarin.Forms.Platform.Tizen\Xamarin.Forms.Platform.Tizen.csproj" /> </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <PropertyGroup> - <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories> - <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths> - <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences> - </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/Xamarin.Forms.Maps.Tizen/project.json b/Xamarin.Forms.Maps.Tizen/project.json deleted file mode 100755 index 94f64b34..00000000 --- a/Xamarin.Forms.Maps.Tizen/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1", - "Tizen.NET": "4.0.0-preview1-00117" - }, - "frameworks": { - "netstandard1.6": { - "imports": "portable-net45+win8+wpa81+wp8" - } - } -}
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs b/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs index ed9123da..469754da 100644 --- a/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs +++ b/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs @@ -1,15 +1,6 @@ -using System.Reflection; using Xamarin.Forms; using Xamarin.Forms.Platform.Tizen; -[assembly: AssemblyTitle("Xamarin.Forms.Platform.Tizen")] -[assembly: AssemblyDescription("Tizen Backend for Xamarin.Forms")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCulture("")] - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - [assembly: Dependency(typeof(ResourcesProvider))] [assembly: Dependency(typeof(Deserializer))] [assembly: Dependency(typeof(NativeBindingService))] diff --git a/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj b/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj index 6aa2f39d..22be21a9 100644 --- a/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj +++ b/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj @@ -1,65 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{227D2CC5-26A1-4CE7-AE25-1B18AF625B9C}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Xamarin.Forms.Platform.Tizen</RootNamespace> - <AssemblyName>Xamarin.Forms.Platform.Tizen</AssemblyName> - <FileAlignment>512</FileAlignment> - </PropertyGroup> - <PropertyGroup> - <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> - <TargetFrameworkVersion>v1.6</TargetFrameworkVersion> - <NuGetTargetMoniker>.NETStandard,Version=v1.6</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 Condition="'$(Configuration)|$(Platform)' == 'Turkey|AnyCPU'"> - <DebugSymbols>true</DebugSymbols> - <OutputPath>bin\Turkey\</OutputPath> - <DefineConstants>TRACE;DEBUG</DefineConstants> - <DebugType>full</DebugType> - <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - <TreatWarningsAsErrors>true</TreatWarningsAsErrors> + <TargetFramework>tizen40</TargetFramework> </PropertyGroup> + <ItemGroup> - <Compile Include="**\*.cs" Exclude="obj\**\*.cs" /> + <PackageReference Include="Tizen.NET" Version="4.0.0-preview1-00192" /> </ItemGroup> + <ItemGroup> - <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj"> - <Name>Xamarin.Forms.Core</Name> - </ProjectReference> + <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj" /> </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <PropertyGroup> - <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories> - <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths> - <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences> - </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/Xamarin.Forms.Platform.Tizen/project.json b/Xamarin.Forms.Platform.Tizen/project.json deleted file mode 100755 index b77fb174..00000000 --- a/Xamarin.Forms.Platform.Tizen/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Runtime.Serialization.Xml": "4.3.0", - "Tizen.NET": "4.0.0-preview1-00117" - }, - "frameworks": { - "netstandard1.6": { - "imports": "portable-net45+win8+wpa81+wp8" - } - } -}
\ No newline at end of file diff --git a/Xamarin.Forms.Tizen.sln b/Xamarin.Forms.Tizen.sln index 0cc0b583..0d2430df 100644 --- a/Xamarin.Forms.Tizen.sln +++ b/Xamarin.Forms.Tizen.sln @@ -1,9 +1,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.13 +VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Tizen", "Xamarin.Forms.Platform.Tizen\Xamarin.Forms.Platform.Tizen.csproj", "{227D2CC5-26A1-4CE7-AE25-1B18AF625B9C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Platform.Tizen", "Xamarin.Forms.Platform.Tizen\Xamarin.Forms.Platform.Tizen.csproj", "{227D2CC5-26A1-4CE7-AE25-1B18AF625B9C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Core", "Xamarin.Forms.Core\Xamarin.Forms.Core.csproj", "{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}" EndProject @@ -13,7 +13,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform", "X EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Xaml", "Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj", "{9DB2F292-8034-4E06-89AD-98BBDA4306B9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps.Tizen", "Xamarin.Forms.Maps.Tizen\Xamarin.Forms.Maps.Tizen.csproj", "{3AD33CC8-A506-4254-B3CA-3123A25B3383}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Maps.Tizen", "Xamarin.Forms.Maps.Tizen\Xamarin.Forms.Maps.Tizen.csproj", "{3AD33CC8-A506-4254-B3CA-3123A25B3383}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Build.Tasks", "Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj", "{96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}" EndProject @@ -28,8 +28,8 @@ Global {227D2CC5-26A1-4CE7-AE25-1B18AF625B9C}.Debug|Any CPU.Build.0 = Debug|Any CPU {227D2CC5-26A1-4CE7-AE25-1B18AF625B9C}.Release|Any CPU.ActiveCfg = Release|Any CPU {227D2CC5-26A1-4CE7-AE25-1B18AF625B9C}.Release|Any CPU.Build.0 = Release|Any CPU - {227D2CC5-26A1-4CE7-AE25-1B18AF625B9C}.Turkey|Any CPU.ActiveCfg = Turkey|Any CPU - {227D2CC5-26A1-4CE7-AE25-1B18AF625B9C}.Turkey|Any CPU.Build.0 = Turkey|Any CPU + {227D2CC5-26A1-4CE7-AE25-1B18AF625B9C}.Turkey|Any CPU.ActiveCfg = Release|Any CPU + {227D2CC5-26A1-4CE7-AE25-1B18AF625B9C}.Turkey|Any CPU.Build.0 = Release|Any CPU {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|Any CPU.Build.0 = Debug|Any CPU {57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -58,8 +58,8 @@ Global {3AD33CC8-A506-4254-B3CA-3123A25B3383}.Debug|Any CPU.Build.0 = Debug|Any CPU {3AD33CC8-A506-4254-B3CA-3123A25B3383}.Release|Any CPU.ActiveCfg = Release|Any CPU {3AD33CC8-A506-4254-B3CA-3123A25B3383}.Release|Any CPU.Build.0 = Release|Any CPU - {3AD33CC8-A506-4254-B3CA-3123A25B3383}.Turkey|Any CPU.ActiveCfg = Turkey|Any CPU - {3AD33CC8-A506-4254-B3CA-3123A25B3383}.Turkey|Any CPU.Build.0 = Turkey|Any CPU + {3AD33CC8-A506-4254-B3CA-3123A25B3383}.Turkey|Any CPU.ActiveCfg = Release|Any CPU + {3AD33CC8-A506-4254-B3CA-3123A25B3383}.Turkey|Any CPU.Build.0 = Release|Any CPU {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Debug|Any CPU.Build.0 = Debug|Any CPU {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -70,4 +70,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DF49C4D7-71F4-4C91-8B32-5C347AD8DA01} + EndGlobalSection EndGlobal |