Fix build-break for project.json style project

Change-Id: I3162c5021917e2fd8252eb0e466ab4b6541f6289

diff --git a/Tools/dotnet-build.sh b/Tools/dotnet-build.sh
index 24f29ae..c053b67 100755 (executable)
--- a/Tools/dotnet-build.sh
+++ b/Tools/dotnet-build.sh
@@ -87,7 +87,7 @@ cmd_build() {
     cmd_restore # restore first
     local OPTS=""
     [ -n "$CONFIGURATION" ] && OPTS="$OPTS -c $CONFIGURATION"
-    run_dotnet build --no-restore $PROJECT $OPTS $@
+    run_dotnet build --no-restore $PROJECT $OPTS $@ /p:UsingRPMMacro=true
   else
     if [[ $PROJECT_TYPE == "dir" ]]; then
       local PROJFILES=$(find $PROJECT -name "*.csproj")
@@ -107,7 +107,7 @@ cmd_pack() {
   if $USE_DOTNET_CLI; then
     [ -n "$CONFIGURATION" ] && OPTS="$OPTS -c $CONFIGURATION"
     [ -n "$VERSION" ] && OPTS="$OPTS /p:Version=$VERSION"
-    run_dotnet pack --no-restore --no-build $PROJECT $OPTS $@
+    run_dotnet pack --no-restore --no-build $PROJECT $OPTS $@ /p:UsingRPMMacro=true
   else
     local NUSPEC=($PROJECT)
     if [ -d $PROJECT ]; then

diff --git a/packaging/dotnet-build-tools.spec b/packaging/dotnet-build-tools.spec
index 87fae55..eb346d7 100644 (file)
--- a/packaging/dotnet-build-tools.spec
+++ b/packaging/dotnet-build-tools.spec
@@ -3,7 +3,7 @@
 
 Name:       dotnet-build-tools
 Summary:    Tools for building C# API projects
-Version:    1.3.2
+Version:    1.3.3
 Release:    1
 Group:      Development/Libraries
 License:    MIT and Apache-2.0

diff --git a/packaging/macros.dotnet-build-tools b/packaging/macros.dotnet-build-tools
index 6e5cd20..ac5ec1d 100644 (file)
--- a/packaging/macros.dotnet-build-tools
+++ b/packaging/macros.dotnet-build-tools
@@ -14,7 +14,7 @@
 %dotnet_assembly_files  %{_dotnet_assembly_path}/*.dll
 %dotnet_nuget_source    %{_dotnet_nuget_source}
 
-%_dotnet_build_conf %{lua:if tonumber(rpm.expand("0%{?tizen_build_devel_mode}")) == 1 then print "Debug" else print "Release" end}
+%_dotnet_build_conf Debug
 
 %dotnet_nuget_package(n:f:)\
 %package %{-n:-n %{-n*}-}nuget\
@@ -46,11 +46,11 @@ dotnet-build -s %{-s:%{-s*}}%{!-s:%{_dotnet_nuget_source}} restore %{1} %{?2} %{
 %{nil}
 
 %dotnet_build(s:) \
-dotnet-build -c %{_dotnet_build_conf} -s %{-s:%{-s*}}%{!-s:%{_dotnet_nuget_source}} build %{1} /p:UsingRPMMacro=true %{?2} %{?3} %{?4} %{?5} %{?6} \
+dotnet-build -c %{_dotnet_build_conf} -s %{-s:%{-s*}}%{!-s:%{_dotnet_nuget_source}} build %{1} %{?2} %{?3} %{?4} %{?5} %{?6} \
 %{nil}
 
 %dotnet_pack() \
-dotnet-build -c %{_dotnet_build_conf} %{?2:-v %{2}} pack %{1} /p:UsingRPMMacro=true %{?3} %{?4} %{?5} %{?6} %{?7} \
+dotnet-build -c %{_dotnet_build_conf} %{?2:-v %{2}} pack %{1} %{?3} %{?4} %{?5} %{?6} %{?7} \
 %{nil}
 
 %dotnet_install_assembly() \