[Build] Bump API Level 6

diff --git a/README.md b/README.md
index 91c56c2..abb643b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,35 +1,48 @@
 # TizenFX
 
 [![License](https://img.shields.io/badge/licence-Apache%202.0-brightgreen.svg?style=flat)](LICENSE)
-[![Build Status](http://13.124.0.26:8080/buildStatus/icon?job=TizenFX/API5_Build_Checker)](http://13.124.0.26:8080/job/TizenFX/job/API5_Build_Checker/)
+[![Build Status](http://13.124.0.26:8080/buildStatus/icon?job=TizenFX/API6_Build_Checker)](http://13.124.0.26:8080/job/TizenFX/job/API6_Build_Checker/)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/90e062a552024a1c94e3ffeeae946f65)](https://www.codacy.com/app/tizenapi/TizenFX?utm_source=github.com&utm_medium=referral&utm_content=Samsung/TizenFX&utm_campaign=Badge_Grade)
 
 TizenFX API, which allows you to access platform-specific features not covered by the generic .NET and Xamarin.Forms features, such as system information and status, battery status, sensor date, and account and connectivity services.
 
 ## Contents
-> [Branches of TizenFX](#branches)  
-> [Quick Start](#quick-start)  
+> [Branches of TizenFX](#branches)
+> [Quick Start](#quick-start)
 > [Tizen Project](#tizen-project)
 
 ## Branches
 
 | Branch | API Level | Target Framework | API Reference | Platform          | myget.org | nuget.org  |
 |--------|:---------:|------------------|---------------|-------------------|-----------|------------|
-|master  | 5         | tizen50 | [Link](https://samsung.github.io/TizenFX/master/) | Tizen vNext (5.0) | [![api5_myget](https://img.shields.io/tizen.myget/dotnet/vpre/Tizen.NET.API5.svg)](https://tizen.myget.org/feed/dotnet/package/nuget/Tizen.NET) | |
-|API4    | 4         | tizen40 | [Link](https://samsung.github.io/TizenFX/API4/) | Tizen 4.0         | [![api4_myget](https://img.shields.io/tizen.myget/dotnet/vpre/Tizen.NET.API4.svg)](https://tizen.myget.org/feed/dotnet/package/nuget/Tizen.NET) | [![api4_nuget](https://img.shields.io/nuget/v/Tizen.NET.svg)](https://www.nuget.org/packages/Tizen.NET/) |
+|master  | 6         | tizen60 | [Link](https://samsung.github.io/TizenFX/master/) | Tizen vNext (5.5) | [![api6_myget](https://img.shields.io/tizen.myget/dotnet/vpre/Tizen.NET.API6.svg)](https://tizen.myget.org/feed/dotnet/package/nuget/Tizen.NET) | |
+|API5    | 5         | tizen50 | [Link](https://samsung.github.io/TizenFX/master/) | Tizen 5.0       | [![api5_myget](https://img.shields.io/tizen.myget/dotnet/vpre/Tizen.NET.API5.svg)](https://tizen.myget.org/feed/dotnet/package/nuget/Tizen.NET) | [![api5_nuget](https://img.shields.io/nuget/v/Tizen.NET.API5.svg)](https://www.nuget.org/packages/Tizen.NET/) |
+|API4    | 4         | tizen40 | [Link](https://samsung.github.io/TizenFX/API4/) | Tizen 4.0         | [![api4_myget](https://img.shields.io/tizen.myget/dotnet/vpre/Tizen.NET.API4.svg)](https://tizen.myget.org/feed/dotnet/package/nuget/Tizen.NET) | [![api4_nuget](https://img.shields.io/nuget/v/Tizen.NET.API4.svg)](https://www.nuget.org/packages/Tizen.NET/) |
 
 ### master
-The __master__ branch is the main development branch for the Tizen .NET __API Level 5__.
+The __master__ branch is the main development branch for the Tizen .NET __API Level 6__.
 
-The following NuGet packages will be published to [Tizen MyGet Gallery](https://tizen.myget.org/gallery/dotnet) every day if there are any changes. (Nightly Build) 
+The following NuGet packages will be published to [Tizen MyGet Gallery](https://tizen.myget.org/gallery/dotnet) every day if there are any changes. (Nightly Build)
+* Tizen.NET-6.0.0.#####
+* Tizen.NET.API6-6.0.0.#####
+* Tizen.NET.Internals-6.0.0.#####
+
+And, This branch is pushed to the [tizen branch](https://git.tizen.org/cgit/platform/core/csapi/tizenfx/?h=tizen) in the tizen gerrit and submitted for the Tizen vNext (5.5) platform.
+
+### API5
+The __API5__ branch is the release branch for Tizen .NET __API Level 5__.
+
+The API Level 5 was __FROZEN__. No new public APIs can be added to this branch, only bug fixes and internal APIs can be added.
+
+The following NuGet packages are published to [Tizen MyGet Gallery](https://tizen.myget.org/gallery/dotnet) on demand.
 * Tizen.NET-5.0.0.#####
 * Tizen.NET.API5-5.0.0.#####
 * Tizen.NET.Internals-5.0.0.#####
 
-And, This branch is pushed to the [tizen branch](https://git.tizen.org/cgit/platform/core/csapi/tizenfx/?h=tizen) in the tizen gerrit and submitted for the Tizen vNext (5.0) platform.
+And, This branch is pushed to the [tizen_5.0 branch](https://git.tizen.org/cgit/platform/core/csapi/tizenfx/?h=tizen_5.0) in the tizen gerrit and submitted for the Tizen 5.0 platform.
 
 ### API4
-The __API4__ branch is the release branch for Tizen .NET __API Level 4__. 
+The __API4__ branch is the release branch for Tizen .NET __API Level 4__.
 
 The API Level 4 was __FROZEN__. No new public APIs can be added to this branch, only bug fixes and internal APIs can be added.
 
@@ -54,17 +67,18 @@ cd TizenFX
 ### How to build
 ```bash
 ./build.sh full
-./build.sh pack 
+./build.sh pack
 ```
 
 
 ## Tizen Project
-TizenFX is a part of the [Tizen project](https://www.tizen.org) and has been officially included since [4.0 M2 release](https://www.tizen.org/blogs/tsg/2017/tizen-4.0-m2-source-code-release).  
-You can download the latest binaries with TizenFX from the link below :  
+TizenFX is a part of the [Tizen project](https://www.tizen.org) and has been officially.
+You can download the latest binaries with TizenFX from the link below :
 
 | Tizen Version     | Link |
 |-------------------|------|
 | Tizen 4.0         | http://download.tizen.org/snapshots/tizen/4.0-unified/latest/ |
-| Tizen vNext (5.0) | http://download.tizen.org/snapshots/tizen/unified/latest/ |
+| Tizen 5.0         | http://download.tizen.org/snapshots/tizen/5.0-unified/latest/ |
+| Tizen vNext (5.5) | http://download.tizen.org/snapshots/tizen/unified/latest/ |
 
 

diff --git a/build.sh b/build.sh
index f886049..7dcc299 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -11,7 +11,7 @@ DOTNET_CMD="$RETRY_CMD $TIMEOUT_CMD 600 dotnet"
 
 RUN_BUILD="$DOTNET_CMD msbuild $SCRIPT_DIR/build/build.proj /nologo"
 
-VERSION_PREFIX=5.0.0
+VERSION_PREFIX=6.0.0
 
 usage() {
   echo "Usage: $0 [command] [args]"

diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec
index e4136ea..3c1efc3 100644 (file)
--- a/packaging/csapi-tizenfx.spec
+++ b/packaging/csapi-tizenfx.spec
@@ -1,8 +1,8 @@
 # Auto-generated from csapi-tizenfx.spec.in by makespec.sh
 
-%define TIZEN_NET_API_VERSION 5
-%define TIZEN_NET_RPM_VERSION 5.0.0.999+nui504
-%define TIZEN_NET_NUGET_VERSION 5.0.0.99999
+%define TIZEN_NET_API_VERSION 6
+%define TIZEN_NET_RPM_VERSION 6.0.0.999+nui504
+%define TIZEN_NET_NUGET_VERSION 6.0.0.99999
 
 %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework
 %define DOTNET_ASSEMBLY_DUMMY_PATH %{DOTNET_ASSEMBLY_PATH}/ref
@@ -194,7 +194,6 @@ install -p -m 644 %{_tizenfx_bin_path}/*.nupkg %{buildroot}%{DOTNET_NUGET_SOURCE
 %attr(644,root,root) %{DOTNET_ASSEMBLY_RES_PATH}/*
 
 %files debug
-%manifest %{name}.manifest
 %attr(644,root,root) %{DOTNET_ASSEMBLY_PATH}/*.pdb
 
 %files common -f common.filelist

diff --git a/packaging/version.txt b/packaging/version.txt
index 4b15cb1..829b7c9 100755 (executable)
--- a/packaging/version.txt
+++ b/packaging/version.txt
@@ -1,9 +1,9 @@
 # Tizen .NET API Level
-API_VERSION=5
+API_VERSION=6
 
 # Default Versions (will be replaced by CI)
-RPM_VERSION=5.0.0.999
-NUGET_VERSION=5.0.0.99999
+RPM_VERSION=6.0.0.999
+NUGET_VERSION=6.0.0.99999
 
 # RPM Version Suffix
 RPM_VERSION_SUFFIX=nui504

diff --git a/pkg/Tizen.NET.API5.nuspec b/pkg/Tizen.NET.API6.nuspec
similarity index 97%
rename from pkg/Tizen.NET.API5.nuspec
rename to pkg/Tizen.NET.API6.nuspec
index c4804f5..85b2d8c 100644 (file)
--- a/pkg/Tizen.NET.API5.nuspec
+++ b/pkg/Tizen.NET.API6.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
-    <id>Tizen.NET.API5</id>
+    <id>Tizen.NET.API6</id>
     <version>$fxversion$</version>
     <authors>Samsung Electronics</authors>
     <owners>Samsung Electronics</owners>

diff --git a/pkg/Tizen.NET.nuspec b/pkg/Tizen.NET.nuspec
index 770a60c..bbf12d4 100644 (file)
--- a/pkg/Tizen.NET.nuspec
+++ b/pkg/Tizen.NET.nuspec
@@ -17,6 +17,10 @@
         <dependency id="Microsoft.NETCore.Platforms" version="2.0.0" />
       </group>
       <group targetFramework="Tizen5.0">
+        <dependency id="Tizen.NET.API5" version="5.0.0.14562" />
+        <dependency id="Microsoft.NETCore.Platforms" version="2.0.0" />
+      </group>
+      <group targetFramework="Tizen6.0">
         <dependency id="Tizen.NET.API5" version="$fxversion$" />
         <dependency id="Microsoft.NETCore.Platforms" version="2.0.0" />
       </group>