Update build system for updated sdk

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

diff --git a/.gitignore b/.gitignore
index 7f59aeabbe9dfdfb4caa0636f9e8e68aefb85a19..16dbe5e6732f7f019b121746ca3420cf758adf69 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 **/[Bb]uild/
 **/res/allowed/*.dll
 **/res/allowed/locale/
+**/res/allowed/org.*
 .vs/
 .vscode/*
 tags

diff --git a/SettingWiFiDirect/SettingWiFiDirect/Directory.Build.targets b/SettingWiFiDirect/SettingWiFiDirect/Directory.Build.targets
index 2281c6eabf0add4b0985f2f76f43f8c06cecae8e..1af49f89612892fb31caa33b479214452e065481 100644 (file)
--- a/SettingWiFiDirect/SettingWiFiDirect/Directory.Build.targets
+++ b/SettingWiFiDirect/SettingWiFiDirect/Directory.Build.targets
@@ -7,15 +7,9 @@ WARNING:  DO NOT MODIFY this file. Incorrect changes to this file will make it
 ***********************************************************************************************
 -->
 
-<Project>    
+<Project>
        <Target Name="BuildDotnet" AfterTargets="TizenPackage" >
-        <Message Text="Tizen Build starts here ------------" Importance="high"/>
-        <Message Text="$(MSBuildProjectDirectory)" Importance="high"/>
-        <PropertyGroup>
-            <WorkspaceFolder>$([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))</WorkspaceFolder>
-        </PropertyGroup>
-        <Message Text="Workspace: '$(WorkspaceFolder)'"  Importance="high" />
-
-               <Exec Command="C:\tizen\tools\tizen-core\tz.exe pack  -S $(ProjectDir) $(WorkspaceFolder)"> </Exec>
-    </Target>
+               <Message Text="Tizen Build starts here ------------" Importance="high"/>
+               <Exec Command="C:\tizen\tools\tizen-core\tz.exe pack-chain -w $(ProjectDir) -S $(ProjectDir)"> </Exec>
+       </Target>
 </Project>

diff --git a/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.csproj b/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.csproj
index 51388a8a32fa3c4775c1827f9d28fdf59fa92d5a..1d436b0188b7cf42f9cc65eedf06f388ec00cf45 100644 (file)
--- a/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.csproj
+++ b/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Tizen.NET.Sdk/1.1.9">
+<Project Sdk="Tizen.NET.Sdk/1.2.0">
 
        <PropertyGroup>
-               <TargetFramework>netcoreapp3.1</TargetFramework>
+               <TargetFramework>net6.0</TargetFramework>
                <TizenCreateTpkOnBuild>false</TizenCreateTpkOnBuild>
        </PropertyGroup>
 
@@ -13,12 +13,7 @@
        </PropertyGroup>
 
        <ItemGroup>
-               <Folder Include="res\" />
+               <PackageReference Include="SettingCore" Version="1.0.346" />
+               <PackageReference Include="Tizen.NET" Version="12.0.0.18043" />
        </ItemGroup>
-
-       <ItemGroup>
-               <PackageReference Include="SettingCore" Version="1.0.260" />
-               <PackageReference Include="Tizen.NET" Version="11.0.0.17739" />
-       </ItemGroup>
-
 </Project>

diff --git a/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml b/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml
index 1d9f801dce8672e13aec35449ce3629bfce8f5af..4cddbaed2b1ed3072e74b9c45ecba2bc90528b86 100644 (file)
--- a/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml
+++ b/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="7.0"
-  package="org.tizen.cssetting-wifi-direct" version="1.0.0"
+  package="org.tizen.cssetting-wifi-direct" version="1.0.1"
   res-type="org.tizen.appfw.gadget.setting-wifi-direct" res-version="1.0.0">
        <allowed-package id="org.tizen.*">
                <required-privileges>

diff --git a/SettingWiFiDirect/SettingWiFiDirect/tizen_dotnet_project.yaml b/SettingWiFiDirect/SettingWiFiDirect/tizen_dotnet_project.yaml
index 01478b04d6c21554f09a7040e188d0df93c45208..26c1f0787db3d573bc98df41d3f113a07dfc49ae 100644 (file)
--- a/SettingWiFiDirect/SettingWiFiDirect/tizen_dotnet_project.yaml
+++ b/SettingWiFiDirect/SettingWiFiDirect/tizen_dotnet_project.yaml
@@ -1,15 +1,69 @@
 # csproj file path
 csproj_file: SettingWiFiDirect.csproj
 
-# files monitored for dirty/modified status
-files:
-  - SettingWiFiDirect.csproj
-  - SettingWiFiDirect.cs
-  - tizen-manifest.xml
+# Default profile, Tizen API version
+profile: tizen
+api_version: "9.0"
+
+# Build type [Debug/ Release/ Test]
+build_type: Debug
 
-# Enable to pack as rpk
+# 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:
+  - Directory.Build.targets
+  - Logger.cs
+  - MenuProvider.cs
+  - SettingWiFiDirect.cs
+  - SettingWiFiDirect.csproj
+  - WiFiDirectConfig.cs
+  - controller/Interop/WiFiDirect.cs
+  - controller/WiFiDirect.cs
+  - model/Peer.cs
+  - model/WfdEnumerations.cs
+  - res/icons/settings_wifi_direct.png
+  - res/images/00_list_bar_press_1x80.png
+  - res/images/A09_device_Medical.png
+  - res/images/A09_device_camera.png
+  - res/images/A09_device_computer.png
+  - res/images/A09_device_display.png
+  - res/images/A09_device_gaming.png
+  - res/images/A09_device_headphone.png
+  - res/images/A09_device_headset.png
+  - res/images/A09_device_input_device.png
+  - res/images/A09_device_mouse.png
+  - res/images/A09_device_multimedia.png
+  - res/images/A09_device_network_infrastructure.png
+  - res/images/A09_device_printer.png
+  - res/images/A09_device_storage.png
+  - res/images/A09_device_telephone.png
+  - res/images/A09_device_unknown.png
+  - res/images/U04_device_BD.png
+  - res/images/U04_device_Dongle.png
+  - res/images/U04_device_Home_Theater.png
+  - res/images/U04_device_STB.png
+  - res/images/icon_select_all.png
+  - tizen-manifest.xml
+  - view/Resources.cs
+  - view/WiFiDirectDeviceView.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/SettingWiFiDirect/tizen_workspace.yaml b/SettingWiFiDirect/tizen_workspace.yaml
deleted file mode 100644 (file)
index fecdc0d..0000000
--- a/SettingWiFiDirect/tizen_workspace.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-#  Enable auto build file generation
-auto_gen_build_files: true
-#  Workspace type, [native/web/dotnet]
-type: hybrid
-#  Package ID for the Tizen package
-package_id: 
-#  version for the Tizen package
-version: 
-#  Default profile
-profile: mobile
-#  Tizen API version
-api_version: 7.0
-#  Path of profiles.xml, containing the signing profiles 
- # If value is empty, the profiles.xml in the data_path specified in tizen-studio/tools/tizen-core/config.yaml will be used
-profiles_xml_path: 
-#  Signing profile to be used for Tizen package signing 
- # If value is empty, active signing profile will be used
-signing_profile: ''
-#  Build type [debug/ release/ test]
-build_type: debug
-#  Rootstrap for compiling native app
-rootstrap: public
-#  Default compiler for native app compilation
-compiler: llvm
-#  Default path for dotnet-cli
-dotnet_cli_path: 
-#  Default path for msbuild
-msbuild_path: 
-#  Default tool for dotnet build [dotnet-cli/ msbuild]
-dotnet_build_tool: dotnet-cli
-#  Default nuget version for Tizen.Net
-tizen_net_version: 
-#  Default nuget version for Xamarin.Forms
-tizen_net_sdk_verison: 1.1.9
-#  Default nuget version for MSBuild.Tasks
-xamarin_forms_version: 5.0.0.2515
-#  Default nuget version for Tizen.Wearable.CircleUI
-msbuild_tasks_version: 
-#  Default nuget version for Tizen.Wearable.CircleUI
-tizen_wearable_circleui_version: 1.5.0
-#  Default nuget version for Tizen.OpenTK
-tizen_opentk_version: 3.0.2
-#  Default nuget version for Tizen.NUI.Xaml
-tizen_nuixaml_version: 1.0.34
-#  Default nuget version for Tizen.HotReload
-tizen_hotreload_version: 1.0.1
-#  Working folder for dotnet & web workspace, paths to csproj or sln or config.xml, if empty all projects will be build
-working_folder: 
-#  Default path for Google Chrome
-chrome_path: 
-#  Default options to be passed to Chrome when running web simulator
-chrome_simulator_options:
-- --allow-file-access-from-files
-- --disable-web-security
-- --proxy-auto-detect
-#  Default path for Web Simulator data
-chrome_simulator_data_path: C:\tizen\tools\websimulator\sdk-profile-data
-#  Default path for Samsung Tizen TV Simulator
-tv_simulator_path: C:\tizen\tools\sec-tv-simulator\simulator.exe
-#  Default options to be passed to Chrome when running web inspector
-chrome_inspector_options:
-- --no-first-run
-- --activate-on-launch
-- --no-default-browser-check
-- --allow-file-access-from-files
-- --disable-web-security
-- --disable-translate
-- --proxy-auto-detect
-- --proxy-bypass-list=127.0.0.1
-- --enable-blink-features=ShadowDOMV0
-- --enable-blink-features=CustomElementsV0
-#  Default path for Web Inspector data
-chrome_inspector_data_path: C:\tizen-data\chrome-user-data
-#  default arch for build, [x86/ x86_64/ arm/ aarch64]
-arch: x86
-#  Enable size optimization of wgt for web workspace
-opt: false
-#  Source files matching these pattern will always be excluded from build
-src_file_patterns:
-- _exclude*
-#  Source files matching these patterns will only be included while building in test mode
-test_file_patterns:
-- _test*
-#  List of projects in the workspace and their dependencies
-projects:
-  SettingWiFiDirect: []
-#  Skip generating files needed for VS
-skip_vs_files: false

diff --git a/packaging/org.tizen.cssetting-wifi-direct-1.0.0.rpk b/packaging/org.tizen.cssetting-wifi-direct-1.0.0.rpk
deleted file mode 100644 (file)
index 3a4dcda..0000000
Binary files a/packaging/org.tizen.cssetting-wifi-direct-1.0.0.rpk and /dev/null differ

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

diff --git a/packaging/org.tizen.setting-wifi-direct.spec b/packaging/org.tizen.setting-wifi-direct.spec
index f583977bdcf47007f0fce12e4b07c81ca5f987ac..e0973b4d4993907a912bb25368132f2f533295d3 100644 (file)
--- a/packaging/org.tizen.setting-wifi-direct.spec
+++ b/packaging/org.tizen.setting-wifi-direct.spec
@@ -1,6 +1,6 @@
 Name:          org.tizen.setting-wifi-direct
 summary:       NUI wifi-direct setting application
-Version:       1.0.0
+Version:       1.0.1
 Release:       1
 Provides:      org.tizen.setting-wifi-direct = %{version}-%{release}
 Group:         Applications/Security