From 38d037fcb43052d3db4e1fc0d65f618b5ff6c57b Mon Sep 17 00:00:00 2001
From: Wonyoung Choi <wy80.choi@samsung.com>
Date: Wed, 18 Sep 2019 10:34:48 +0900
Subject: [PATCH] [Build] Keep binary assembly file for Design assemblies

---
 build.sh                                       |  38 ++++++++++++++++---------
 build/build.proj                               |  20 ++++++++-----
 pkg/Tizen.NET.API6/Tizen.NET.API6.nuspec       |   2 +-
 pkg/Tizen.NET.API6/design/Tizen.NUI.Design.dll | Bin 0 -> 8704 bytes
 4 files changed, 39 insertions(+), 21 deletions(-)
 create mode 100644 pkg/Tizen.NET.API6/design/Tizen.NUI.Design.dll

diff --git a/build.sh b/build.sh
index b6d6979..e548a6a 100755
--- a/build.sh
+++ b/build.sh
@@ -20,32 +20,43 @@ usage() {
   echo "    clean              Clean all artifacts"
 }
 
+clean() {
+  $RUN_BUILD /t:clean
+  rm -f msbuild.log
+}
+
+build() {
+  if [ -d /nuget ]; then
+    NUGET_SOURCE_OPT="/p:RestoreSources=/nuget"
+  fi
+  $RUN_BUILD /t:restore $NUGET_SOURCE_OPT $@
+  $RUN_BUILD /t:build /fl $@
+}
+
 cmd_build() {
   if [ -z "$1" ]; then
     echo "No module specified."
     exit 1
   fi
-  if [ -d /nuget ]; then
-    NUGET_SOURCE_OPT="/p:RestoreSources=/nuget"
-  fi
   PROJECT=$1; shift
-  $RUN_BUILD /t:restore /p:Project=$PROJECT $NUGET_SOURCE_OPT $@
-  $RUN_BUILD /t:build /p:Project=$PROJECT $@
+  build /p:Project=$PROJECT
 }
 
 cmd_full_build() {
-  if [ -d /nuget ]; then
-    NUGET_SOURCE_OPT="/p:RestoreSources=/nuget"
+  clean
+  build $@
+  cmd_dummy_build $@
+}
+
+cmd_design_build() {
+  build /p:BuildDesignAssembly=True $@
+  if [ -d "$OUTDIR"/bin/design ]; then
+    cp -f "$OUTDIR"/bin/design/*.Design.dll "$SCRIPT_DIR"/pkg/Tizen.NET.API*/design/
   fi
-  rm -f msbuild.log
-  $RUN_BUILD /t:clean
-  $RUN_BUILD /t:restore $NUGET_SOURCE_OPT $@
-  $RUN_BUILD /t:build /fl $@
-  $RUN_BUILD /t:dummy
 }
 
 cmd_dummy_build() {
-  $RUN_BUILD /t:dummy
+  $RUN_BUILD /t:dummy $@
 }
 
 cmd_pack() {
@@ -105,6 +116,7 @@ case "$cmd" in
   build|--build|-b) cmd_build $@ ;;
   full |--full |-f) cmd_full_build $@ ;;
   dummy|--dummy|-d) cmd_dummy_build $@ ;;
+  design|--design)  cmd_design_build $@ ;;
   pack |--pack |-p) cmd_pack $@ ;;
   install |--install |-i) cmd_install $@ ;;
   clean|--clean|-c) cmd_clean $@ ;;
diff --git a/build/build.proj b/build/build.proj
index 6cddb78..e1a811d 100644
--- a/build/build.proj
+++ b/build/build.proj
@@ -11,15 +11,21 @@
 
   <!-- Projects to build -->
   <ItemGroup>
-    <ProjectToBuild Include="$(ProjectSrcDir)\$(Project)\$(Project).csproj"
-                    Condition="'$(Project)' != '' And Exists('$(ProjectSrcDir)\$(Project)\$(Project).csproj') " />
-    <ProjectToBuild Include="$(InternalProjectSrcDir)\$(Project)\$(Project).csproj"
-                    Condition="'$(Project)' != ''  And Exists('$(InternalProjectSrcDir)\$(Project)\$(Project).csproj')  " />
-    <ProjectToBuild Include="$(ProjectSrcDir)**\*.csproj" Condition="'$(Project)' == ''" />
-    <ProjectToBuild Include="$(InternalProjectSrcDir)**\*.csproj" Condition="'$(Project)' == '' " />
     <DesignProject Include="$(ProjectSrcDir)**\*.Design.csproj" />
     <DesignProject Include="$(InternalProjectSrcDir)**\*.Design.csproj" />
-    <ProjectToBuild Remove="@(DesignProject)" Condition="'$(BuildDesignAssembly)' != 'True' " />
+
+    <PublicProject Include="$(ProjectSrcDir)**\*.csproj" Condition="'$(Project)' == ''" />
+    <PublicProject Include="$(ProjectSrcDir)\$(Project)\$(Project).csproj"
+                   Condition="'$(Project)' != '' And Exists('$(ProjectSrcDir)\$(Project)\$(Project).csproj') " />
+    <PublicProject Remove="@(DesignProject)" />
+
+    <InternalProject Include="$(InternalProjectSrcDir)**\*.csproj" Condition="'$(Project)' == '' " />
+    <InternalProject Include="$(InternalProjectSrcDir)\$(Project)\$(Project).csproj"
+                     Condition="'$(Project)' != ''  And Exists('$(InternalProjectSrcDir)\$(Project)\$(Project).csproj')  " />
+    <InternalProject Remove="@(DesignProject)" />
+
+    <ProjectToBuild Include="@(DesignProject)" Condition="'$(BuildDesignAssembly)' == 'True' " />
+    <ProjectToBuild Include="@(PublicProject);@(InternalProject)" Condition="'$(BuildDesignAssembly)' != 'True' " />
   </ItemGroup>
 
   <!-- Nuspec files to pack -->
diff --git a/pkg/Tizen.NET.API6/Tizen.NET.API6.nuspec b/pkg/Tizen.NET.API6/Tizen.NET.API6.nuspec
index 5f816f8..61cdbfb 100644
--- a/pkg/Tizen.NET.API6/Tizen.NET.API6.nuspec
+++ b/pkg/Tizen.NET.API6/Tizen.NET.API6.nuspec
@@ -14,8 +14,8 @@
   </metadata>
   <files>
     <file src="pkg\Tizen.NET.API6\build\**" target="build" />
+    <file src="pkg\Tizen.NET.API6\design\*.dll" target="ref\netstandard2.0\Design" />
     <file src="Artifacts\bin\dummy\*.dll"  target="ref\netstandard2.0" />
     <file src="Artifacts\bin\public\*.xml"  target="ref\netstandard2.0" />
-    <file src="Artifacts\bin\design\*.Design.dll" target="ref\netstandard2.0\Design" />
   </files>
 </package>
diff --git a/pkg/Tizen.NET.API6/design/Tizen.NUI.Design.dll b/pkg/Tizen.NET.API6/design/Tizen.NUI.Design.dll
new file mode 100644
index 0000000000000000000000000000000000000000..2c650fb607cfa5e1854efc8722289ded4d4d8da5
GIT binary patch
literal 8704
zcmeHMYj7OZl|DT^)0PH2df2k;n8z6TA&lITpWt8{y(|#6Y*`~e2;PXEnX7T*p6+pX
zkFZQ2avVYk6)!AXTP8`R5(lUx6%s-c2vkTVDPWTnq`cW8-lQs3JhE&O*1K%gR@hxC
zu;01eJu{MwwfVD2s&Yqt`n>wwbI-Z=_UWsk58Ov85yf%6`!3P9ap%@8;f28z#Hq`l
zPSH2(UtIQWW#@~_Mh}@@y5u?q*C?iQhHX23IxEs{*-o2wx_@^jU3Bt7pFcmjJTyJL
zooJ_`(wo1&>Jw3KFVhw2i<B;+_kp7Y+)dZup2pRUi>OiJvA}O;u>Z160fNs>rS7{}
zmH(>ukYpCxD_0ZkW~7_wLmY^i?G~bo!Ta?lqS2YM3(;w!x*B;M=o@Ni-4{oF&|4M*
zKqki;`VC69G|?@(>$y2l(zk9PJkU#U)wFJSue-u>pvb<`Ex6cL8dpv0ChDyrCECJq
zMPuJ$l%N-on9np3)k|&_9K!ggs^oiO3%WEqrx4+<>CEN0x5HR6d1hG!jcKi)Tm)*x
zqD5W`veWGdyH=xneuXO6h3%5pTz#}{F54JW=ttGcw9Z$|rLb}?g;jGYw9ln*<y;D@
z=Tf+8E`^S{6xPh4Pz|4pwALm8&e4LddGsLen0igI_611LnTkPYAy0#v=aICMTVx|G
zGLs2Rf|=su7Z!ix!s1tEh}$u5w7}0eErXw!cTHXcm`N>u2ZZsMs=cFOv(P+D&}4fn
zK&?KOUXzD$LqBl`1{vsMBG&4!jH&T<Eb8QH-Gh$SzJ&41V(r+>V2xvRGF&}DjAAo_
z6s-=IBecj{ipNe%gRwK%5`%esCtQiISkt=lPK+V`j)o8hKCGBxiS#^nW^F|s!L3!t
z=puEN1OrXBt`7d-D>fMR9~;;V|D$niQe(Gs#GFfON5@=_OTg7V<XoF#4=dyUnYv{9
z;$P9~;;j?Tq!o+Ltc!g1F5`g*mQJdRXFb)RL{9}eh-q);#$JVY9yHzuCpPF^`ueW*
zYd13|K^EW-G2pg4i8kQ9a>+d48Q(SSg2x)e^TEU8ZF@6hVQb>oM%(p!2m5jV5a=|9
z($;G^Syo2FP?i1rPb>96=zo;;#M>Is^|*NdL|4orOc~ZCj7V<ttb;U39`pH%c<2Ic
zb)0ELk1kaoNoaIJ!v9bnNHoy%Fsso=l^yXUeL*=5d}HjVsz$e}pNebrlNiHY5+0Ut
ztK?rM@q6RfY8u@iV|Z4npO>V!;%wohvJg)tVhqn{Y+;|e1Mo2kzoW1ZcWd0^{KRQW
z(iP}8NvkFNFO@B9N$|5LwT1B%y+x<M*$fX;^p*I2t(iWrJ_~#*VQVSUC45w4JQ-*B
z3Nic@G*k3_?G&Zx7ZQI{!Y8HX-vc(&x!AMt;nA22Yk#GDPfd}P_#Vc7Q1-5=3puRx
z*9;I*j$tE4c#5`HsAu7u0gB5CmKkxDVWNY&F=52Zpg4Dp^eh>1)|^kO(n$Q8W~xC_
z*w#SBkXdzEBfTUkl@`G2y@{8V0B)jt>7SKFc;+{NKHzW~igcV_LNpcHc?DA+TkJ{d
zKP7dX-bkEN6k6UEXf|oTLv6Gtq*iDL(ZkJ>dcD3u5%9YpslZAdm8MZak@Y-{#3@!s
z^Ov*D=jlmMNoowKpHp4zVp<@nz)FgiN-F3fMXRRCI;T-rOX>v5iiTK<w%5oSXeg9@
z0I~+USyJ~eo=mjF8mUmD*+@>PnS^E|JseVZfZ~;-&^<_G43VwkIdIgF^K+y!l0GbP
z8&ZV=e6j|AT4nx9X=gfA$wXvLWZp|C$SUV#31E`e0yffSz(v#};h=<jB)myNLqb!+
zNx-GZF<W>La2b6`;!jC<CGAi;s7YaK_k^4mw9Rw`oNZVKUSbgZe^qw_{yuRKP(_x%
zFEuBjb1VHu;y;44L=S?~NUP{DEmp52j~Y~+E~3j~I%eW3z@;<**haf0oB+Iv{tj?G
zy$E<My$0AvZvyV1w*fPfe=}gWwAN3z!}6fSACmZMbOM}TNt_h!QB|0emUx@QyCr^$
zgmsAOR%I1!pnlqqjPbhT-EOtA1UH5;a8&T-W4DY?1^Xftph@&;tiWJ*WDd96=nZ*~
zOIs49DSDL`v)oYw4k2!*B#Or??QiHhNzOxWb-3z-C$?<cJT}%f)<s+NobR~XvLUrC
zH#XL9dL_%4?6VBdTgNIhnd_O^lh2P%mPC(_H%Yea3s2gR{2@`y3U`(y=yL6}E<tVE
zOk0MWeAyD)Xw*C=Y<<_>K^ii1uH!l5zP{hI^UiIa-Y-0}VCzG|H}ZyW(1<9Qo-f=A
z1Afw=x6iQ5JdNTzW55(vo^0WJzG3GLH&1<z?F-u<HVT6JTw(ZP)W}+b3c??&xErtr
zhh1mF%vZ-3ut&<aZx#iQ{011sv)2ossR7q1hMbH)34T!qVV6-9<T+(GC!e9b@O;xY
zeABV{De@U?&zs0WuZvN#I~gC2QP_Vpx{7-kM6qOA!o6PD!i8qOD%xvL2-h4p*-9Ti
zIjfR>ku4Vr%&+ohbXyhlcpjX$CPz)bR)5rR5vT!t<cixI_wa1}0l2kKxE=;KTR3Qs
zJ8n^q+^}Y8Wkjy*n*QXlaEqol-NJ#QWqX-&spPnRkX~tJb{9zRxLGJ8DAPQU&-aUQ
z(>A9II0JYFF~c;fnhOFfjf@D(I4Uu(Dv!d04CTu?zbY6u5St#?H72XPNSTcqc8wsM
zNs{lIS<}MktB*x9)pbhnu0}9nSY<(#b)xrTb)b@?%p}%AQ4g)^VSrhJh1zFWR@TTJ
zrb-7D4lk6QMpjsn1$M}>u}ZKe!L9ZbuD`rhQ9WQ3Bb@pSI}9bSgjtWh=X$0n^F29E
zPUOXi7`H^g87_N=ddt2KVYQP{C(?|zhatl~TrN=t+lFQJ8ZIxOf-5|a@eK9^;Z}z)
z7jtjfw5D;RphSXfs4!rOqnr@K#EPS7vxa)?N&gVST$x7{l-4!0@G-qe?z4cr-OBAL
zSbk*44b+Q<({CCD+rcK0tFWS+2J=$58R1TtIpI;TsL?s6%Hu>=^6L#aE;}l@j8r9Z
zLX<t<DNg6j+_j~>a3`qI3@2KYHodxHy_&4=9jwfwT6VADVa0_L%%k1eTajcMWCt<5
za;{lIbU4&}Oq2`ngGKDu`%G~g$+Sr<NV7!c<{kP;cxB10>pkb2zWpd(0baP^qNqos
zk+02$K61!L?J6Xsran4^D#@ZexspeNhamN-MDM3g{Cr4{Nr{dpT`GV#TEp8#dub57
zb<~B*>Kb4NP*n}lP8=T0)}ytvc{*xM)LZC-eJi48_Au}dA8~8W_XPKOUhPZIr+onS
zi~OzFkbzwuoxn(7`=Wi2SX2g0bYJ=YUh5y<8hGTjb2rD-<0*=#6{Sv1lac_^)Wop4
zg_$YI*eu~-d>**-2%u@|I1_u~X=>h+NXL{^is?%jy=3t`z~+|bBg{(IF|p^;=9^fz
zD0O2REQ3?`!tD#*eR0h%_tZUh-PnhlUP`{d?u{>$9#>Dl+FSSJv4i`TY<T&esn5}J
zlt)uUe+$PouD?K!WO~+e1;n38|IqSv>b;@oaPv=>X05kd7k=ge^_|TF5B&bxb!YF^
z@7epQ-Cwd!HC?P{|Lvhq{Mfwqm)~uz-}%Mg>K$hvEdBVVh9}&ozH#JRXDK~#+*|g$
zHTe_29e%F(%;i^q{jP_8u=DyOAD?*rtHqU~?zug!^LIY;i|ame?rZ<u{lVAH-sOJe
zpH_bM<epD<HatG{d0m;h`vU7pkEUgHja3$6N4lo4=}3qB{nmB(_Q$Uy-B-5!vMaXQ
zqU^hd)sY@9XDu_gLrji3hlRa0m%BQ<cK!HxF263H&u?7YqKw8GGl$I*ETMwP8N3@S
zaShQ{wdUoxj>v?xfKi`Tk){+dBrMiE+1#SZJF<xM3;y1Sw<BkD!6zn;065&Eu|@k`
zqqNJhw;#=k65Ag=#5IosJx&kNN`;oqdg08f^XPJg-d9zdE#IWj5`EY9Q4~_L?(2x6
zGlB5Hk<`LU5fj$BvP^4HsIh7`c-`ShMWJ~p0|a(19L*?{;Nuk>Ni9$)wUN;^C09&f
zcfz?72Er9Qrd@E8_#YcQY`p#iDMP~?VjKa{7M%TW!SP(w*wqENaF$C?L-uryjCJ@t
zsJ4w{`ZJFtpS$l{t#1#Us((~{^~i~jv5n3{PEm9oJBGJYwsSuU#7-H^fdidIgX{E8
z9O(xvF7U&0zSGIx+8Ktovt~vkQL}XQQa($W8+z7l+(e-RKRXaQfI)6LcJ!vl|K*95
zdec*19;*)z_}TF`#?y?=ZqYvi0?AmP<MvzD5MK0D^m2|XgwFL&*xp?MGc&^x3IB5c
zvyA}OJ$%Pm*VObO1gjZqeHNef_<u(Sx-qk`-$gC0ZUDNEGBgIbokoBS;y-P>Ko0^A
z1pjrTXX5|<PVlvlcadxf39kz&<_240$iS^1mjbH>-pd2B9ucr<(>Q7YZp-DD{V1dc
zxE|iwhOA7uQV7~(@hKQp;FAw66a2z?EFF|OU8q%p-v-J8!#Oifh?Gi2!F^0(L|ips
zV?;Y&RnZTbhn@<d4>w91k@tZ#Cw(bR^Y#B?s{>~!O2z+uVZCC?%832hKsx;9i|9sb
zfi6cYsB3KaZPj=`SARNcKMOx@?Z^zyG0|T^THzY2gjjGy3#b%*=%jIt$Ub+6e2zBv
z8I7H(AaZ|5-$4$BVbg&}Wy+zqKQsq8wS@oEZOn|`#!BqgU~F9VPGEEbCsBCIp<RQs
zB!y1~@xxIEW{8Cdq%k{#sxit!H3vZ+<imdo0F&Zk9!Je<;!nY?zxeR~6M_E)|3LcD

literal 0
HcmV?d00001

-- 
2.7.4