Add changes for build environment based on updated sdk

Change-Id: I8a5a7fdf762151f93e4b12cd1a6c859ce9888fe9
Signed-off-by: Akash Kumar <akash1.kumar@samsung.com>

diff --git a/SettingWiFi/SettingWiFi/Directory.Build.targets b/SettingWiFi/SettingWiFi/Directory.Build.targets
index 3088641e8b238fa13eb7c840b7b6cc3a7a14ded3..4889d4bd6a525d3a6417a1cc11c39c20a2c40a2f 100755 (executable)
--- a/SettingWiFi/SettingWiFi/Directory.Build.targets
+++ b/SettingWiFi/SettingWiFi/Directory.Build.targets
@@ -10,12 +10,7 @@ WARNING:  DO NOT MODIFY this file. Incorrect changes to this file will make it
 <Project>    \r
        <Target Name="BuildDotnet" AfterTargets="TizenPackage" >\r
         <Message Text="Tizen Build starts here ------------" Importance="high"/>\r
-        <Message Text="$(MSBuildProjectDirectory)" Importance="high"/>\r
-        <PropertyGroup>\r
-            <WorkspaceFolder>$([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))</WorkspaceFolder>\r
-        </PropertyGroup>\r
-        <Message Text="Workspace: '$(WorkspaceFolder)'"  Importance="high" />\r
 \r
-               <Exec Command="D:\Tizen_SDK\tools\tizen-core\tz.exe pack  -S $(ProjectDir) $(WorkspaceFolder)"> </Exec>\r
+               <Exec Command="C:\tizen\tools\tizen-core\tz.exe pack-chain -w $(ProjectDir) -S $(ProjectDir)"> </Exec>\r
     </Target>\r
 </Project>\r

diff --git a/SettingWiFi/SettingWiFi/SettingWiFi.csproj b/SettingWiFi/SettingWiFi/SettingWiFi.csproj
index 3b537810dfbff84f54b03bba949ba0b946fb7da4..615b0413d716c55249f5ecd8ccc14e59a53d71a2 100755 (executable)
--- a/SettingWiFi/SettingWiFi/SettingWiFi.csproj
+++ b/SettingWiFi/SettingWiFi/SettingWiFi.csproj
@@ -43,7 +43,11 @@
        </PropertyGroup>\r
 \r
        <Target Name="PostBuild" AfterTargets="PostBuildEvent">\r
-               <Exec Command=":: Copy resource dll&#xD;&#xA;rmdir /S /Q res\allowed\$(GadgetResourceType)&#xD;&#xA;mkdir res\allowed\$(GadgetResourceType)&#xD;&#xA;rmdir /S /Q res\allowed\locale&#xD;&#xA;mkdir res\allowed\locale&#xD;&#xA;dir $(OutDir)\&#xD;&#xA;xcopy /S /K /D /H /Y $(OutDir)\ res\allowed\locale&#xD;&#xA;del /Q res\allowed\locale\*.*&#xD;&#xA;xcopy /S /K /D /H /Y res\allowed\locale\* res\allowed\$(GadgetResourceType)&#xD;&#xA;rmdir /S /Q res\allowed\locale&#xD;&#xA;" />\r
+               <Exec Command=":: Copy resource dll&#xD;&#xA;\r
+               dir $(OutDir)\&#xD;&#xA;\r
+               mkdir res\allowed\$(GadgetResourceType)&#xD;&#xA;\r
+               xcopy /S /K /D /H /Y $(OutDir)\en-US res\allowed\$(GadgetResourceType)\en-US\&#xD;&#xA;\r
+               xcopy /S /K /D /H /Y $(OutDir)\ko-KR res\allowed\$(GadgetResourceType)\ko-KR\&#xD;&#xA;" />\r
        </Target>\r
 \r
 </Project>\r

diff --git a/SettingWiFi/SettingWiFi/tizen-manifest.xml b/SettingWiFi/SettingWiFi/tizen-manifest.xml
index 028836c4afbacad3bb27a3d9355bcc01917947d9..aeac274a0a1b1bc90976080578765fb7282a33ac 100755 (executable)
--- a/SettingWiFi/SettingWiFi/tizen-manifest.xml
+++ b/SettingWiFi/SettingWiFi/tizen-manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="6.5"
-  package="org.tizen.cssetting-wifi" version="1.1.6"
+  package="org.tizen.cssetting-wifi" version="1.1.7"
   res-type="org.tizen.appfw.gadget.setting-wifi" res-version="1.5.0">
        <allowed-package id="org.tizen.*">
                <required-privileges>

diff --git a/SettingWiFi/SettingWiFi/tizen_dotnet_project.yaml b/SettingWiFi/SettingWiFi/tizen_dotnet_project.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 1e4ae8d..081fd86
--- a/SettingWiFi/SettingWiFi/tizen_dotnet_project.yaml
+++ b/SettingWiFi/SettingWiFi/tizen_dotnet_project.yaml
@@ -1,14 +1,149 @@
 # csproj file path
 csproj_file: SettingWiFi.csproj
 
-# files monitored for dirty/modified status
-files:
-  - SettingWiFi.csproj
-  - tizen-manifest.xml
+# Default profile, Tizen API version
+profile: tizen
+api_version: "9.0"
 
-# Enable to pack as rpk
+# Build type [Debug/ Release/ Test]
+build_type: Debug
+
+# Output path for build
+output_path: 
+
+# Signing profile to be used for Tizen package signing
+# If value is empty: "", active signing profile will be used
+# Else If value is ".", default signing profile will be used
+signing_profile: 
 pack_as_rpk: true
 
 # List of resource files to be packed in rpk
 resources:
   - res/
+
+# files monitored for dirty/modified status
+files:
+  - Constants.cs
+  - Directory.Build.targets
+  - Logger.cs
+  - MenuProvider.cs
+  - SettingWiFi.csproj
+  - TextResources/Resources.Designer.cs
+  - TextResources/Resources.en-US.resx
+  - TextResources/Resources.ko-KR.resx
+  - TextResources/Resources.resx
+  - controller/Interop/WiFi.cs
+  - controller/WiFi.cs
+  - model/AP.cs
+  - res/allowed/SettingWiFi/images/close_eye.svg
+  - res/allowed/SettingWiFi/images/controller_btn_radio_off.png
+  - res/allowed/SettingWiFi/images/controller_btn_radio_on.png
+  - res/allowed/SettingWiFi/images/cross_icon.png
+  - res/allowed/SettingWiFi/images/eye_icon.png
+  - res/allowed/SettingWiFi/images/menu.png
+  - res/allowed/SettingWiFi/images/open_eye.svg
+  - res/allowed/SettingWiFi/images/rectangle_for_info_page.png
+  - res/allowed/SettingWiFi/images/setting_wifi.png
+  - res/allowed/SettingWiFi/images/tizen.png
+  - res/allowed/SettingWiFi/images/wifi-ap_icon_00.png
+  - res/allowed/SettingWiFi/images/wifi-ap_icon_01.png
+  - res/allowed/SettingWiFi/images/wifi-ap_icon_02.png
+  - res/allowed/SettingWiFi/images/wifi-ap_icon_03.png
+  - res/allowed/SettingWiFi/images/wifi-ap_icon_captive.png
+  - res/allowed/SettingWiFi/images/wifi-ap_icon_captive_press.png
+  - res/allowed/SettingWiFi/images/wifi-ap_icon_dt_00.png
+  - res/allowed/SettingWiFi/images/wifi-ap_icon_dt_01.png
+  - res/allowed/SettingWiFi/images/wifi-ap_icon_dt_02.png
+  - res/allowed/SettingWiFi/images/wifi-ap_icon_dt_03.png
+  - res/allowed/SettingWiFi/images/wifi-ap_icon_lock_00.png
+  - res/allowed/SettingWiFi/images/wifi-ap_icon_lock_01.png
+  - res/allowed/SettingWiFi/images/wifi-ap_icon_lock_02.png
+  - res/allowed/SettingWiFi/images/wifi-ap_icon_lock_03.png
+  - res/allowed/SettingWiFi/images/wifi-ap_lock_icon.png
+  - res/allowed/SettingWiFi/images/wifi-ap_lock_icon_dt.png
+  - res/allowed/SettingWiFi/images/wifi_icon_badge_container.png
+  - res/allowed/SettingWiFi/images/wifi_icon_badge_info.png
+  - res/allowed/SettingWiFi/images/wifi_icon_info.svg
+  - res/allowed/SettingWiFi/images/wifi_icon_info_dt.svg
+  - res/allowed/SettingWiFi/images/wifi_icon_wps.png
+  - res/allowed/SettingWiFi/images/wifi_icon_wps_dt.png
+  - res/allowed/SettingWiFi/loadingAnimation.json
+  - res/allowed/SettingWiFi/loading/Iot_Loading_1.png
+  - res/allowed/SettingWiFi/loading/Iot_Loading_2.png
+  - res/allowed/SettingWiFi/loading/Iot_Loading_3.png
+  - res/allowed/SettingWiFi/loading/Iot_Loading_4.png
+  - res/allowed/SettingWiFi/loading/Iot_Loading_5.png
+  - res/allowed/SettingWiFi/loading/Iot_Loading_6.png
+  - res/allowed/SettingWiFi/loading/loading_00.png
+  - res/allowed/SettingWiFi/loading/loading_01.png
+  - res/allowed/SettingWiFi/loading/loading_02.png
+  - res/allowed/SettingWiFi/loading/loading_03.png
+  - res/allowed/SettingWiFi/loading/loading_04.png
+  - res/allowed/SettingWiFi/loading/loading_05.png
+  - res/allowed/SettingWiFi/loading/loading_06.png
+  - res/allowed/SettingWiFi/loading/loading_07.png
+  - res/allowed/SettingWiFi/loading/loading_08.png
+  - res/allowed/SettingWiFi/loading/loading_09.png
+  - res/allowed/SettingWiFi/loading/loading_10.png
+  - res/allowed/SettingWiFi/loading/loading_11.png
+  - res/allowed/SettingWiFi/loading/loading_12.png
+  - res/allowed/SettingWiFi/loading/loading_13.png
+  - res/allowed/SettingWiFi/loading/loading_14.png
+  - res/allowed/SettingWiFi/loading/loading_15.png
+  - res/allowed/SettingWiFi/loading/loading_16.png
+  - res/allowed/SettingWiFi/loading/loading_17.png
+  - res/allowed/SettingWiFi/loading/loading_18.png
+  - res/allowed/SettingWiFi/loading/loading_19.png
+  - res/allowed/SettingWiFi/loading/loading_20.png
+  - res/allowed/SettingWiFi/loading/loading_21.png
+  - res/allowed/SettingWiFi/loading/loading_22.png
+  - res/allowed/SettingWiFi/loading/loading_23.png
+  - res/allowed/SettingWiFi/loading/loading_24.png
+  - res/allowed/SettingWiFi/loading/loading_25.png
+  - res/allowed/SettingWiFi/loading/loading_26.png
+  - res/allowed/SettingWiFi/loading/loading_27.png
+  - res/allowed/SettingWiFi/loading/loading_28.png
+  - res/allowed/SettingWiFi/loading/loading_29.png
+  - res/allowed/SettingWiFi/loading/loading_30.png
+  - res/allowed/SettingWiFi/loading/loading_31.png
+  - res/allowed/SettingWiFi/loading/loading_32.png
+  - res/allowed/SettingWiFi/loading/loading_33.png
+  - res/allowed/SettingWiFi/loading/loading_34.png
+  - res/allowed/SettingWiFi/loading/loading_35.png
+  - res/allowed/SettingWiFi/main-menu-wifi-icon.svg
+  - res/allowed/SettingWiFi/theme/theme.xaml
+  - res/allowed/org.tizen.appfw.gadget.setting-wifi/en-US/SettingWiFi.resources.dll
+  - res/allowed/org.tizen.appfw.gadget.setting-wifi/ko-KR/SettingWiFi.resources.dll
+  - res/images/controller_btn_radio_off.png
+  - res/images/controller_btn_radio_on.png
+  - tizen-manifest.xml
+  - view/APSource.cs
+  - view/AddNetwork.cs
+  - view/AddNetworkInfoInputPage.cs
+  - view/AddNetworkInfoSource.cs
+  - view/AdvancedPage.cs
+  - view/ApInfoSource.cs
+  - view/ConnectPage.cs
+  - view/EapInfoInputPage.cs
+  - view/EapInfoSource.cs
+  - view/EapPage.cs
+  - view/EyeButton.cs
+  - view/HiddenConnectPage.cs
+  - view/InfoInputPage.cs
+  - view/InfoItem.cs
+  - view/InfoPage.cs
+  - view/MainPage.cs
+  - view/MorePage.cs
+  - view/ResourceManager.cs
+  - view/SortBy.cs
+  - view/WPSConnectPage.cs
+  - view/WiFiDirectPage.cs
+
+# project dependencies
+deps: []
+
+# Source files matching these pattern will always be excluded from build
+src_file_patterns: []
+
+# Source files matching these patterns will only be included while building in test mode
+test_file_patterns: []

diff --git a/SettingWiFi/tizen_workspace.yaml b/SettingWiFi/tizen_workspace.yaml
deleted file mode 100755 (executable)
index f29acfc..0000000
--- a/SettingWiFi/tizen_workspace.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-#  Enable auto build file generation\r
-auto_gen_build_files: true\r
-#  Workspace type, [native/web/dotnet]\r
-type: hybrid\r
-#  Package ID for the Tizen package\r
-package_id: \r
-#  version for the Tizen package\r
-version: \r
-#  Default profile\r
-profile: mobile\r
-#  Tizen API version\r
-api_version: 7.0\r
-#  Path of profiles.xml, containing the signing profiles \r
- # If value is empty, the profiles.xml in the data_path specified in tizen-studio/tools/tizen-core/config.yaml will be used\r
-profiles_xml_path: \r
-#  Signing profile to be used for Tizen package signing \r
- # If value is empty, active signing profile will be used\r
-signing_profile: ''\r
-#  Build type [debug/ release/ test]\r
-build_type: debug\r
-#  Rootstrap for compiling native app\r
-rootstrap: public\r
-#  Default compiler for native app compilation\r
-compiler: llvm\r
-#  Default path for dotnet-cli\r
-dotnet_cli_path: \r
-#  Default path for msbuild\r
-msbuild_path: \r
-#  Default tool for dotnet build [dotnet-cli/ msbuild]\r
-dotnet_build_tool: dotnet-cli\r
-#  Default nuget version for Tizen.Net\r
-tizen_net_version: \r
-#  Default nuget version for Xamarin.Forms\r
-tizen_net_sdk_verison: 1.1.9\r
-#  Default nuget version for MSBuild.Tasks\r
-xamarin_forms_version: 5.0.0.2515\r
-#  Default nuget version for Tizen.Wearable.CircleUI\r
-msbuild_tasks_version: \r
-#  Default nuget version for Tizen.Wearable.CircleUI\r
-tizen_wearable_circleui_version: 1.5.0\r
-#  Default nuget version for Tizen.OpenTK\r
-tizen_opentk_version: 3.0.2\r
-#  Default nuget version for Tizen.NUI.Xaml\r
-tizen_nuixaml_version: 1.0.34\r
-#  Default nuget version for Tizen.HotReload\r
-tizen_hotreload_version: 1.0.1\r
-#  Working folder for dotnet & web workspace, paths to csproj or sln or config.xml, if empty all projects will be build\r
-working_folder: \r
-#  Default path for Google Chrome\r
-chrome_path: \r
-#  Default options to be passed to Chrome when running web simulator\r
-chrome_simulator_options:\r
-- --allow-file-access-from-files\r
-- --disable-web-security\r
-- --proxy-auto-detect\r
-#  Default path for Web Simulator data\r
-chrome_simulator_data_path: D:\Tizen_SDK\tools\websimulator\sdk-profile-data\r
-#  Default path for Samsung Tizen TV Simulator\r
-tv_simulator_path: D:\Tizen_SDK\tools\sec-tv-simulator\simulator.exe\r
-#  Default options to be passed to Chrome when running web inspector\r
-chrome_inspector_options:\r
-- --no-first-run\r
-- --activate-on-launch\r
-- --no-default-browser-check\r
-- --allow-file-access-from-files\r
-- --disable-web-security\r
-- --disable-translate\r
-- --proxy-auto-detect\r
-- --proxy-bypass-list=127.0.0.1\r
-- --enable-blink-features=ShadowDOMV0\r
-- --enable-blink-features=CustomElementsV0\r
-#  Default path for Web Inspector data\r
-chrome_inspector_data_path: D:\Tizen_SDK-data\chrome-user-data\r
-#  default arch for build, [x86/ x86_64/ arm/ aarch64]\r
-arch: x86\r
-#  Enable size optimization of wgt for web workspace\r
-opt: false\r
-#  Source files matching these pattern will always be excluded from build\r
-src_file_patterns:\r
-- _exclude*\r
-#  Source files matching these patterns will only be included while building in test mode\r
-test_file_patterns:\r
-- _test*\r
-#  List of projects in the workspace and their dependencies\r
-projects:\r
-  SettingWiFi: []\r
-#  Skip generating files needed for VS\r
-skip_vs_files: false\r

diff --git a/packaging/org.tizen.cssetting-wifi-1.1.6.rpk b/packaging/org.tizen.cssetting-wifi-1.1.6.rpk
deleted file mode 100644 (file)
index 550ca5b..0000000
Binary files a/packaging/org.tizen.cssetting-wifi-1.1.6.rpk and /dev/null differ

diff --git a/packaging/org.tizen.cssetting-wifi-1.1.7.rpk b/packaging/org.tizen.cssetting-wifi-1.1.7.rpk
new file mode 100644 (file)
index 0000000..f27c920
Binary files /dev/null and b/packaging/org.tizen.cssetting-wifi-1.1.7.rpk differ

diff --git a/packaging/org.tizen.setting-wifi.spec b/packaging/org.tizen.setting-wifi.spec
index 7bea5233315ee46428af3bc6799aae0453300f38..3fd9af9dd417d89c219b01d80c191db4365685dd 100644 (file)
--- a/packaging/org.tizen.setting-wifi.spec
+++ b/packaging/org.tizen.setting-wifi.spec
@@ -1,6 +1,6 @@
 Name:          org.tizen.setting-wifi
 summary:       NUI wifi setting application
-Version:       1.1.6
+Version:       1.1.7
 Release:       1
 Provides:      org.tizen.setting-wifi = %{version}-%{release}
 Group:         Applications/Security