projects / profile / iot / apps / native / oobe.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2580295)
Upgrading NUI 88/252988/2
authork.stepaniuk <k.stepaniuk@samsung.com>
Wed, 3 Feb 2021 18:26:47 +0000 (19:26 +0100)
committerk.stepaniuk <k.stepaniuk@samsung.com>
Thu, 4 Feb 2021 15:49:25 +0000 (16:49 +0100)
Updating jenkinsfile

Change-Id: I5c11e63d81beb094c0ada08144bc5e5edc94ab8f
Signed-off-by: k.stepaniuk <k.stepaniuk@samsung.com>
Jenkinsfile patch | blob | history
Oobe/Oobe.Common/Controls/CarouselPicker.cs patch | blob | history
Oobe/Oobe.Common/Oobe.Common.csproj patch | blob | history
Oobe/Oobe.Language/Oobe.Language.csproj patch | blob | history
Oobe/Oobe.Region/Oobe.Region.csproj patch | blob | history
Oobe/Oobe.Terms/Oobe.Terms.csproj patch | blob | history
Oobe/Oobe.Welcome/Oobe.Welcome.csproj patch | blob | history
Oobe/Oobe.Wifi/Oobe.Wifi.csproj patch | blob | history
Oobe/Oobe/Oobe.csproj patch | blob | history

diff --git a/Jenkinsfile b/Jenkinsfile
index 93fe2901065ae5527d1d6bf6a7a595c10c8c1a2c..86e4538ba6b0bc7ff542209c56a0d7a57de7632e 100644 (file)
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,7 +42,7 @@ pipeline {
         sh "dotnet clean ${SOLUTION_PATH}"
         sh "dotnet restore --source https://tizen.myget.org/F/dotnet/api/v3/index.json ${SOLUTION_PATH} || true"
         sh "dotnet build ${SOLUTION_PATH} --configuration Release"
-        sh "cp Oobe/Oobe/bin/Release/tizen80/*.tpk \"${WORKSPACE}\""
+        sh "cp Oobe/Oobe/bin/Release/tizen90/*.tpk \"${WORKSPACE}\""
       }
     }
     stage('Code checks') {
@@ -63,10 +63,10 @@ pipeline {
                 }
                 def path = "~/www/${www_path}"
                 if(BRANCH_NAME == "tizen") {
-                  sh "sshpass -p ${PASSWORD} ssh -o StrictHostKeychecking=no ${user_host} rm -rf \"${path}\""
+                  sh "ssh -o StrictHostKeychecking=no ${user_host} rm -rf \"${path}\""
                 }
-                sh "sshpass -p ${PASSWORD} ssh -o StrictHostKeychecking=no ${user_host} mkdir -p \"${path}\""
-                sh "sshpass -p ${PASSWORD} scp ${SOLUTION_DIR}/dotnet-format-report/format-report.json \"${user_host}:${path}\""
+                sh "ssh -o StrictHostKeychecking=no ${user_host} mkdir -p \"${path}\""
+                sh "scp ${SOLUTION_DIR}/dotnet-format-report/format-report.json \"${user_host}:${path}\""
                 DOTNET_FORMAT_RESULT_URL="${HTTP_BASE_URL_PATH}/${www_path}/format-report.json"
               }
             }
@@ -106,10 +106,10 @@ pipeline {
                 }
                 def path = "~/www/${www_path}"
                 if(BRANCH_NAME == "tizen") {
-                  sh "sshpass -p ${PASSWORD} ssh -o StrictHostKeychecking=no ${user_host} rm -rf \"${path}\""
+                  sh "ssh -o StrictHostKeychecking=no ${user_host} rm -rf \"${path}\""
                 }
-                sh "sshpass -p ${PASSWORD} ssh -o StrictHostKeychecking=no ${user_host} mkdir -p \"${path}\""
-                sh "sshpass -p ${PASSWORD} scp clang_format.diff \"${user_host}:${path}\""
+                sh "ssh -o StrictHostKeychecking=no ${user_host} mkdir -p \"${path}\""
+                sh "scp clang_format.diff \"${user_host}:${path}\""
                 CLANG_RESULT_URL="${HTTP_BASE_URL_PATH}/${www_path}/clang_format.diff"
               }
             }
@@ -135,11 +135,11 @@ pipeline {
                 }
                 def path = "~/www/${www_path}"
                 if(BRANCH_NAME == "tizen") {
-                  sh "sshpass -p ${PASSWORD} ssh -o StrictHostKeychecking=no ${user_host} rm -rf \"${path}\""
+                  sh "ssh -o StrictHostKeychecking=no ${user_host} rm -rf \"${path}\""
                 }
-                sh "sshpass -p ${PASSWORD} ssh -o StrictHostKeychecking=no ${user_host} mkdir -p \"${path}\""
-                sh "sshpass -p ${PASSWORD} scp -r output \"${user_host}:${path}\""
-                sh "sshpass -p ${PASSWORD} scp ${PROJECT_NAME}_SAM.zip \"${user_host}:${path}\""
+                sh "ssh -o StrictHostKeychecking=no ${user_host} mkdir -p \"${path}\""
+                sh "scp -r output \"${user_host}:${path}\""
+                sh "scp ${PROJECT_NAME}_SAM.zip \"${user_host}:${path}\""
                 SAM_RESULT_URL="${HTTP_BASE_URL_PATH}/${www_path}/output/html/report.html"
               }
             }
diff --git a/Oobe/Oobe.Common/Controls/CarouselPicker.cs b/Oobe/Oobe.Common/Controls/CarouselPicker.cs
index 77b13ad70878c48c65cf4ee1d309e8a3a5831837..054a27f37b67b387259ca669e8e43c5a22614f8e 100644 (file)
--- a/Oobe/Oobe.Common/Controls/CarouselPicker.cs
+++ b/Oobe/Oobe.Common/Controls/CarouselPicker.cs
@@ -220,12 +220,6 @@ namespace Oobe.Common.Controls
             base.Dispose(type);
         }
 
-        protected override ViewStyle GetViewStyle()
-        {
-            var ret = new CarouselPickerStyle();
-            return ret;
-        }
-
         private float CalculateScrollerSize()
         {
             float size = 0.0f;
@@ -246,10 +240,13 @@ namespace Oobe.Common.Controls
             // everything manually
             // var view = new TextLabel(Style.CenterText);
             // view.ApplyStyle(Style.CenterText);
+            float? pixelSize = null;
+            Style.CenterText?.PixelSize.GetValue(ControlState.Normal, out pixelSize);\r
+\r
             view.Text = item.Text;
             view.TranslatableText = item.TranslatableText;
             view.Size2D = Style.CenterText?.Size2D ?? new Size2D();
-            view.PixelSize = Style.CenterText?.PixelSize ?? 10.0f;
+            view.PixelSize = pixelSize ?? 10.0f;\r
             view.Margin = Style.CenterText?.Margin ?? new Extents();
             view.HorizontalAlignment = Style.CenterText?.HorizontalAlignment ?? HorizontalAlignment.Center;
             view.VerticalAlignment = Style.CenterText?.VerticalAlignment ?? VerticalAlignment.Center;
diff --git a/Oobe/Oobe.Common/Oobe.Common.csproj b/Oobe/Oobe.Common/Oobe.Common.csproj
index b2906ca048552cb7626c9138cdff93739afca163..0153a23d1cb7c16c3361a9266472a1bc35174ab7 100644 (file)
--- a/Oobe/Oobe.Common/Oobe.Common.csproj
+++ b/Oobe/Oobe.Common/Oobe.Common.csproj
@@ -2,16 +2,16 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>tizen80</TargetFramework>
+    <TargetFramework>tizen90</TargetFramework>
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
     <CodeAnalysisRuleSet>../Settings.StyleCop</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="8.0.0.15586">
+    <PackageReference Include="Tizen.NET" Version="9.0.0.15932">
       <ExcludeAssets>Runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.2" />
+    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.6" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
diff --git a/Oobe/Oobe.Language/Oobe.Language.csproj b/Oobe/Oobe.Language/Oobe.Language.csproj
index e253c8dbf1e96a2ed1f72fc0491ac9deb98a4ceb..cd686e95e831834dcf7520f066ee715e1fa8d407 100644 (file)
--- a/Oobe/Oobe.Language/Oobe.Language.csproj
+++ b/Oobe/Oobe.Language/Oobe.Language.csproj
@@ -2,16 +2,16 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>tizen80</TargetFramework>
+    <TargetFramework>tizen90</TargetFramework>
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
     <CodeAnalysisRuleSet>../Settings.StyleCop</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="8.0.0.15586">
+    <PackageReference Include="Tizen.NET" Version="9.0.0.15932">
       <ExcludeAssets>Runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.2" />
+    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.6" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
diff --git a/Oobe/Oobe.Region/Oobe.Region.csproj b/Oobe/Oobe.Region/Oobe.Region.csproj
index a82a8a5c9d57d7a61fa780cd8b746a931fdabef7..3393421c4d8135ff5dfc768fe8e09334b6e886e2 100644 (file)
--- a/Oobe/Oobe.Region/Oobe.Region.csproj
+++ b/Oobe/Oobe.Region/Oobe.Region.csproj
@@ -2,16 +2,16 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>tizen80</TargetFramework>
+    <TargetFramework>tizen90</TargetFramework>
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
     <CodeAnalysisRuleSet>../Settings.StyleCop</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="8.0.0.15586">
+    <PackageReference Include="Tizen.NET" Version="9.0.0.15932">
       <ExcludeAssets>Runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.2" />
+    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.6" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
diff --git a/Oobe/Oobe.Terms/Oobe.Terms.csproj b/Oobe/Oobe.Terms/Oobe.Terms.csproj
index 1ec1f540bbddfc756c3e30fcaac19e1108ca7663..cff981201a8b97b680ceb07feb823dfe630404ad 100644 (file)
--- a/Oobe/Oobe.Terms/Oobe.Terms.csproj
+++ b/Oobe/Oobe.Terms/Oobe.Terms.csproj
@@ -2,16 +2,16 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>tizen80</TargetFramework>
+    <TargetFramework>tizen90</TargetFramework>
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
     <CodeAnalysisRuleSet>../Settings.StyleCop</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="8.0.0.15586">
+    <PackageReference Include="Tizen.NET" Version="9.0.0.15932">
       <ExcludeAssets>Runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.2" />
+    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.6" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
diff --git a/Oobe/Oobe.Welcome/Oobe.Welcome.csproj b/Oobe/Oobe.Welcome/Oobe.Welcome.csproj
index bd296a9919341aac0a690c191c5a33cdf7da367c..8b9f8b215f2bf6b4a6b56c086423cfd9a1167152 100644 (file)
--- a/Oobe/Oobe.Welcome/Oobe.Welcome.csproj
+++ b/Oobe/Oobe.Welcome/Oobe.Welcome.csproj
@@ -2,16 +2,16 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>tizen80</TargetFramework>
+    <TargetFramework>tizen90</TargetFramework>
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
     <CodeAnalysisRuleSet>../Settings.StyleCop</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="8.0.0.15586">
+    <PackageReference Include="Tizen.NET" Version="9.0.0.15932">
       <ExcludeAssets>Runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.2" />
+    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.6" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
diff --git a/Oobe/Oobe.Wifi/Oobe.Wifi.csproj b/Oobe/Oobe.Wifi/Oobe.Wifi.csproj
index d0c422145ecd4a6efd6732b7d56429ce2c9e67d0..a690640f959f4e37419128f8a91de3b8086e568c 100644 (file)
--- a/Oobe/Oobe.Wifi/Oobe.Wifi.csproj
+++ b/Oobe/Oobe.Wifi/Oobe.Wifi.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>tizen80</TargetFramework>
+    <TargetFramework>tizen90</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
     <CodeAnalysisRuleSet>../Settings.StyleCop</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="8.0.0.15586" />
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.2" />
+    <PackageReference Include="Tizen.NET" Version="9.0.0.15932" />
+    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.6" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
diff --git a/Oobe/Oobe/Oobe.csproj b/Oobe/Oobe/Oobe.csproj
index b3dca47342d186c849af281b1bb9d466ae476391..67b1f0bbbe2494752a61d523a08c32f116994241 100644 (file)
--- a/Oobe/Oobe/Oobe.csproj
+++ b/Oobe/Oobe/Oobe.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>tizen80</TargetFramework>
+    <TargetFramework>tizen90</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
     <CodeAnalysisRuleSet>../Settings.StyleCop</CodeAnalysisRuleSet>
@@ -23,10 +23,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="8.0.0.15586">
+    <PackageReference Include="Tizen.NET" Version="9.0.0.15932">
       <ExcludeAssets>Runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.2" />
+    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.6" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
Domain: Applications / IoT;