Remove files of VS (#1011)

diff --git a/.gitignore b/.gitignore
index 46608c6335d0fb52389cb5aa764d2bb7bbe7b8f8..bd75f3c08111f5dd8a3f7dad834a7456c6e80364 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -145,7 +145,7 @@ UpgradeLog*.htm
 *.txt~
 *.swp
 *.swo
- 
+
 # svn
 .svn
 
@@ -210,3 +210,6 @@ CompilationErrors-*.txt
 # exceptional allowed binaries
 !tools/bin/
 !packaging/*.nupkg
+
+# external libraries
+externals/libs/

diff --git a/build.sh b/build.sh
index 0c95e7476d42575fbff4e644a9555c9b8b45f7e8..b6d6979bef1c3b9a17d62b352f4ac1aae4397a8c 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 
 SCRIPT_FILE=$(readlink -f $0)
 SCRIPT_DIR=$(dirname $SCRIPT_FILE)

diff --git a/build/build.proj b/build/build.proj
index 64bd08199fc2d524dd19cd0655dadeb8b1e705ff..6cddb7854da8c3032f036163ea2772caea733e54 100644 (file)
--- a/build/build.proj
+++ b/build/build.proj
@@ -6,13 +6,20 @@
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
     <BuildWithAnalyzer Condition="'$(BuildWithAnalyzer)' == ''">False</BuildWithAnalyzer>
+    <BuildDesignAssembly Condition="'$(BuildDesignAssembly)' == ''">False</BuildDesignAssembly>
   </PropertyGroup>
 
   <!-- Projects to build -->
   <ItemGroup>
-    <ProjectToBuild Include="$(ProjectSrcDir)\$(Project)\$(Project).csproj" Condition="'$(Project)' != ''" />
+    <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)' == ''" />
+    <ProjectToBuild Include="$(InternalProjectSrcDir)**\*.csproj" Condition="'$(Project)' == '' " />
+    <DesignProject Include="$(ProjectSrcDir)**\*.Design.csproj" />
+    <DesignProject Include="$(InternalProjectSrcDir)**\*.Design.csproj" />
+    <ProjectToBuild Remove="@(DesignProject)" Condition="'$(BuildDesignAssembly)' != 'True' " />
   </ItemGroup>
 
   <!-- Nuspec files to pack -->

diff --git a/build/directories.props b/build/directories.props
index acc18e968905e3401ee8b367c8c36ecfffc8ab63..d2c2a4fc9c285e8fe3a164b4af982aad4f83bd75 100644 (file)
--- a/build/directories.props
+++ b/build/directories.props
@@ -5,7 +5,7 @@
     <ProjectRootDir>$(MSBuildThisFileDirectory)..\</ProjectRootDir>
 
     <ProjectSrcDir>$(ProjectRootDir)src\</ProjectSrcDir>
-    <InternalProjectSrcDir>$(ProjectRootDir)\internals\src\</InternalProjectSrcDir>
+    <InternalProjectSrcDir>$(ProjectRootDir)internals\src\</InternalProjectSrcDir>
 
     <OutputBaseDir>$(ProjectRootDir)Artifacts\</OutputBaseDir>
     <OutputPublicDir>$(OutputBaseDir)bin\public\</OutputPublicDir>
@@ -13,6 +13,8 @@
     <OutputExternalDir>$(OutputBaseDir)bin\external\</OutputExternalDir>
     <OutputDummyDir>$(OutputBaseDir)bin\dummy\</OutputDummyDir>
 
+    <ExternalLibraryDir>$(ProjectRootDir)externals\libs\</ExternalLibraryDir>
+
   </PropertyGroup>
 
 </Project>

diff --git a/src/Tizen.NUI.Design/Tizen.NUI.Design.csproj b/src/Tizen.NUI.Design/Tizen.NUI.Design.csproj
index 4b9e740f99e4a84d6751e7d68c032511514008b3..ecf1b7f74f61b79528f52eb6e19c0ecbe2ec3a64 100755 (executable)
--- a/src/Tizen.NUI.Design/Tizen.NUI.Design.csproj
+++ b/src/Tizen.NUI.Design/Tizen.NUI.Design.csproj
@@ -9,18 +9,15 @@
     <ProjectReference Include="..\Tizen.NUI\Tizen.NUI.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="lib\" />
-  </ItemGroup>
-
   <ItemGroup>
     <Reference Include="Microsoft.Windows.Design.Extensibility">
-      <HintPath>lib\Microsoft.Windows.Design.Extensibility.dll</HintPath>
+      <HintPath>$(ExternalLibraryDir)Microsoft.Windows.Design.Extensibility.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System.Xaml">
-      <HintPath>lib\System.Xaml.dll</HintPath>
+      <HintPath>$(ExternalLibraryDir)System.Xaml.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
+
 </Project>

diff --git a/src/Tizen.NUI.Design/lib/Microsoft.Windows.Design.Extensibility.dll b/src/Tizen.NUI.Design/lib/Microsoft.Windows.Design.Extensibility.dll
deleted file mode 100755 (executable)
index bef5295..0000000
Binary files a/src/Tizen.NUI.Design/lib/Microsoft.Windows.Design.Extensibility.dll and /dev/null differ

diff --git a/src/Tizen.NUI.Design/lib/System.Xaml.dll b/src/Tizen.NUI.Design/lib/System.Xaml.dll
deleted file mode 100755 (executable)
index 8f54e79..0000000
Binary files a/src/Tizen.NUI.Design/lib/System.Xaml.dll and /dev/null differ