summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rwxr-xr-x[-rw-r--r--].nuget/NuGet.exebin692736 -> 3957976 bytes
-rw-r--r--.nuget/packages/Mono.Cecil.0.10.0-beta2.nupkgbin0 -> 687828 bytes
-rw-r--r--.nuspec/Xamarin.Forms.Tizen.nuspec48
-rw-r--r--Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.nuspec (renamed from .nuspec/Xamarin.Forms.Maps.Tizen.nuspec)0
-rw-r--r--[-rwxr-xr-x]Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.project.json4
-rw-r--r--Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.nuspec (renamed from .nuspec/Xamarin.Forms.Platform.Tizen.nuspec)0
-rw-r--r--Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.project.json4
-rw-r--r--Xamarin.Forms.Tizen.sln8
-rw-r--r--packaging/xamarin-forms-tizen.spec41
10 files changed, 95 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index f69592b6..dd726ad5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,4 +46,4 @@ Xamarin.Forms.Controls/secrets.txt
Xamarin.Forms.Controls/controlgallery.config
Xamarin.Forms.ControlGallery.Android/Properties/MapsKey.cs
*.tss
-*.bak \ No newline at end of file
+*.bak
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
index cb3ed036..6bb79fe5 100644..100755
--- a/.nuget/NuGet.exe
+++ b/.nuget/NuGet.exe
Binary files differ
diff --git a/.nuget/packages/Mono.Cecil.0.10.0-beta2.nupkg b/.nuget/packages/Mono.Cecil.0.10.0-beta2.nupkg
new file mode 100644
index 00000000..3ffbbcfc
--- /dev/null
+++ b/.nuget/packages/Mono.Cecil.0.10.0-beta2.nupkg
Binary files differ
diff --git a/.nuspec/Xamarin.Forms.Tizen.nuspec b/.nuspec/Xamarin.Forms.Tizen.nuspec
new file mode 100644
index 00000000..99d8186b
--- /dev/null
+++ b/.nuspec/Xamarin.Forms.Tizen.nuspec
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<package >
+ <metadata>
+ <id>Xamarin.Forms$IdAppend$</id>
+ <version>1.0.0</version>
+ <authors>Xamarin Inc.</authors>
+ <owners>Xamarin Inc.</owners>
+ <tags>xamarin forms xamarinforms xamarin.forms</tags>
+ <licenseUrl>http://aka.ms/xamarin-forms-license</licenseUrl>
+ <iconUrl>http://xamarin.com/content/images/nuget/xamarin.png</iconUrl>
+ <projectUrl>http://xamarin.com/forms</projectUrl>
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
+ <description>Build native UIs for iOS, Android, and Windows Phone from a single, shared C# codebase</description>
+ <copyright>Copyright 2013-2017</copyright>
+ <references>
+ <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20">
+ <reference file="Xamarin.Forms.Core.dll" />
+ <reference file="Xamarin.Forms.Platform.dll" />
+ <reference file="Xamarin.Forms.Xaml.dll" />
+ </group>
+ </references>
+ </metadata>
+ <files>
+ <!--PCL-->
+ <file src="../Xamarin.Forms.Core/bin/$Configuration$/Xamarin.Forms.Core.dll" target="lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+ <file src="../Xamarin.Forms.Core/bin/$Configuration$/Xamarin.Forms.Core.*pdb" target="lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+ <file src="../Xamarin.Forms.Core/bin/$Configuration$/Xamarin.Forms.Core.*mdb" target="lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+ <file src="../Xamarin.Forms.Xaml/bin/$Configuration$/Xamarin.Forms.Xaml.dll" target="lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+ <file src="../Xamarin.Forms.Xaml/bin/$Configuration$/Xamarin.Forms.Xaml.*pdb" target="lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+ <file src="../Xamarin.Forms.Xaml/bin/$Configuration$/Xamarin.Forms.Xaml.*mdb" target="lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+ <file src="../Xamarin.Forms.Platform/bin/$Configuration$/Xamarin.Forms.Platform.dll" target="lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+ <file src="../Xamarin.Forms.Platform/bin/$Configuration$/Xamarin.Forms.Platform.*pdb" target="lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+ <file src="../Xamarin.Forms.Platform/bin/$Configuration$/Xamarin.Forms.Platform.*mdb" target="lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+
+ <!--Xaml PCL Stuff-->
+ <file src="Xamarin.Forms.targets" target="build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20/Xamarin.Forms$IdAppend$.targets" />
+ <file src="../Xamarin.Forms.Build.Tasks/bin/$Configuration$/Xamarin.Forms.Build.Tasks.dll" target="build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+ <file src="../Xamarin.Forms.Build.Tasks/bin/$Configuration$/Xamarin.Forms.Core.dll" target="build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+ <file src="../Xamarin.Forms.Build.Tasks/bin/$Configuration$/Xamarin.Forms.Xaml.dll" target="build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+
+ <!-- XamlC stuffs -->
+ <file src="../Xamarin.Forms.Build.Tasks/bin/$Configuration$/Mono.Cecil.dll" target="build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+ <file src="../Xamarin.Forms.Build.Tasks/bin/$Configuration$/Mono.Cecil.Mdb.dll" target="build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+ <file src="../Xamarin.Forms.Build.Tasks/bin/$Configuration$/Mono.Cecil.Pdb.dll" target="build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+ <file src="../Xamarin.Forms.Build.Tasks/bin/$Configuration$/Mono.Cecil.Rocks.dll" target="build/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
+
+ </files>
+</package>
diff --git a/.nuspec/Xamarin.Forms.Maps.Tizen.nuspec b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.nuspec
index b951d4aa..b951d4aa 100644
--- a/.nuspec/Xamarin.Forms.Maps.Tizen.nuspec
+++ b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.nuspec
diff --git a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.project.json b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.project.json
index ccd5b6b4..e81665e9 100755..100644
--- a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.project.json
+++ b/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.project.json
@@ -1,8 +1,8 @@
{
"dependencies": {
- "ElmSharp": "1.1.0-beta-010",
+ "ElmSharp": "1.1.0-beta-016",
"NETStandard.Library": "1.6.0",
- "Tizen.Applications": "1.1.0",
+ "Tizen.Applications": "1.2.6",
"Tizen.Location": "1.0.5",
"Tizen.Maps": "1.0.8"
},
diff --git a/.nuspec/Xamarin.Forms.Platform.Tizen.nuspec b/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.nuspec
index 3dee835a..3dee835a 100644
--- a/.nuspec/Xamarin.Forms.Platform.Tizen.nuspec
+++ b/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.nuspec
diff --git a/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.project.json b/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.project.json
index 9c281cb5..1c3cb430 100644
--- a/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.project.json
+++ b/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.project.json
@@ -2,8 +2,8 @@
"dependencies": {
"ElmSharp": "1.1.0-beta-016",
"NETStandard.Library": "1.6.0",
- "System.Runtime.Serialization.Xml": "4.1.1",
- "Tizen.Applications": "1.1.0",
+ "System.Runtime.Serialization.Xml": "4.1.2",
+ "Tizen.Applications": "1.2.6",
"Tizen.System.Information": "1.0.1",
"Tizen.WebView": "1.0.0"
},
diff --git a/Xamarin.Forms.Tizen.sln b/Xamarin.Forms.Tizen.sln
index ecc5d8f5..6cea1efb 100644
--- a/Xamarin.Forms.Tizen.sln
+++ b/Xamarin.Forms.Tizen.sln
@@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps", "Xamar
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Maps.Tizen", "Xamarin.Forms.Maps.Tizen\Xamarin.Forms.Maps.Tizen.csproj", "{D29D5750-9A39-4E92-A19E-62567D660B7D}"
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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -58,6 +60,12 @@ Global
{D29D5750-9A39-4E92-A19E-62567D660B7D}.Release|Any CPU.Build.0 = Release|Any CPU
{D29D5750-9A39-4E92-A19E-62567D660B7D}.Turkey|Any CPU.ActiveCfg = Release|Any CPU
{D29D5750-9A39-4E92-A19E-62567D660B7D}.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
+ {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Turkey|Any CPU.ActiveCfg = Turkey|Any CPU
+ {96D89208-4EB9-4451-BE73-8A9DF3D9D7B7}.Turkey|Any CPU.Build.0 = Turkey|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/packaging/xamarin-forms-tizen.spec b/packaging/xamarin-forms-tizen.spec
index c53e141d..4a309f21 100644
--- a/packaging/xamarin-forms-tizen.spec
+++ b/packaging/xamarin-forms-tizen.spec
@@ -1,7 +1,8 @@
%define XF_VERSION 2.3.4
+%define XF_RELEASE 192
-# Increase this XF_TIZEN_VERSION when any public APIs of Xamarin.Forms.Platform.Tizen are changed.
-%define XF_TIZEN_VERSION r192-006
+# Increase this XF_DEV_VERSION when any public APIs of Xamarin.Forms.Platform.Tizen are changed.
+%define XF_DEV_VERSION 007
Name: xamarin-forms-tizen
Summary: Xamarin.Forms for Tizen platform
@@ -12,7 +13,7 @@ Group: Graphics & UI Framework/Libraries
Source0: %{name}-%{version}.tar.gz
Source1: %{name}.manifest
-%define NUPKG_VERSION %{XF_VERSION}-%{XF_TIZEN_VERSION}
+%define NUPKG_VERSION %{XF_VERSION}-r%{XF_RELEASE}-%{XF_DEV_VERSION}
AutoReqProv: no
ExcludeArch: aarch64
@@ -37,7 +38,20 @@ Allows one to use portable controls subsets that are mapped to native
controls of Android, iOS, Windows Phone, and Tizen.
# make -nuget sub package
-%_nuget_package
+%package nuget
+Summary: NuGet package for %{name}
+Group: Development/Libraries
+
+%description nuget
+NuGet package for %{name}
+
+# for private nuget package
+%package nuget-private
+Summary: Xamarin Forms Private NuGet
+Group: Development/Libraries
+
+%description nuget-private
+Xamarin Forms Private NuGet for internal uses
%prep
%setup -q
@@ -49,11 +63,15 @@ cp %{SOURCE1} .
%dotnet_restore Xamarin.Forms.Maps.Tizen
# Build
-%dotnet_build Xamarin.Forms.Tizen.sln /p:PackageSources=/nuget
+PKGSRC="$(readlink -f .nuget/packages)"
+%dotnet_build Xamarin.Forms.Tizen.sln "/p:PackageSources=$PKGSRC"
# Create NuGet Packages
-%dotnet_pack .nuspec/Xamarin.Forms.Platform.Tizen.nuspec %{NUPKG_VERSION} "-BasePath ./.nuspec"
-%dotnet_pack .nuspec/Xamarin.Forms.Maps.Tizen.nuspec %{NUPKG_VERSION} "-BasePath ./.nuspec"
+%dotnet_pack Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.nuspec %{NUPKG_VERSION} "-BasePath ./.nuspec"
+%dotnet_pack Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.nuspec %{NUPKG_VERSION} "-BasePath ./.nuspec"
+
+# Xamarin.Forms NuGet Package for private uses
+%dotnet_pack .nuspec/Xamarin.Forms.Tizen.nuspec %{XF_VERSION}.%{XF_RELEASE}-tizen-%{XF_DEV_VERSION} "-BasePath ./.nuspec"
%install
function install_asm()
@@ -77,3 +95,12 @@ install -p -m 644 *.nupkg %{buildroot}/nuget
%license LICENSE
%attr(644,root,root) %{dotnet_assembly_files}
+%files nuget
+/nuget/Xamarin.Forms.Platform.Tizen.%{NUPKG_VERSION}.nupkg
+/nuget/Xamarin.Forms.Maps.Tizen.%{NUPKG_VERSION}.nupkg
+
+%files nuget-private
+/nuget/Xamarin.Forms.%{XF_VERSION}.%{XF_RELEASE}-tizen-%{XF_DEV_VERSION}.nupkg
+
+
+