From 9e2ed947f81e5bf1d4429e773f92bc487d147e63 Mon Sep 17 00:00:00 2001
From: olekarev <o.lekarev@samsung.com>
Date: Fri, 11 Feb 2022 12:33:10 +0300
Subject: [PATCH] [Tizen] Fix gbs build for v6.0

---
 eng/build.sh                                  | 23 ++++++++++---------
 packaging/coreclr-diagnostics.spec            |  4 ++--
 .../SymbolService.cs                          |  1 -
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/eng/build.sh b/eng/build.sh
index 2e9a9b733..5473dfc9e 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -152,15 +152,15 @@ if [ "$__CrossBuild" == true ]; then
     fi
 fi
 
-mkdir -p "$__IntermediatesDir"
-mkdir -p "$__LogDir"
-mkdir -p "$__CMakeBinDir"
-
 build_native()
 {
-    platformArch="$1"
-    intermediatesForBuild="$2"
-    extraCmakeArguments="$3"
+    targetOS="$1"
+    platformArch="$2"
+    cmakeDir="$3"
+    intermediatesForBuild="$4"
+    target="$5"
+    extraCmakeArguments="$6"
+    message="$7"
 
     # All set to commence the build
     echo "Commencing $__DistroRid build for $__BuildOS.$__BuildArch.$__BuildType in $intermediatesForBuild"
@@ -168,11 +168,12 @@ build_native()
     generator=""
     buildFile="Makefile"
     buildTool="make"
-    scriptDir="$__ProjectRoot/eng"
+    scriptDir="$__RepoRootDir/eng"
 
     pushd "$intermediatesForBuild"
-    echo "Invoking \"$scriptDir/gen-buildsys-clang.sh\" \"$__ProjectRoot\" $__ClangMajorVersion \"$__ClangMinorVersion\" $platformArch "$scriptDir" $__BuildType $generator $extraCmakeArguments"
-    "$scriptDir/gen-buildsys-clang.sh" "$__ProjectRoot" $__ClangMajorVersion "$__ClangMinorVersion" $platformArch "$scriptDir" $__BuildType $generator "$extraCmakeArguments"
+    next_command="\"$scriptDir/native/gen-buildsys.sh\" \"$cmakeDir\" \"$intermediatesForBuild\" $platformArch $__Compiler \"$__CompilerMajorVersion\" \"$__CompilerMinorVersion\" $__BuildType \"$generator\" $scan_build $extraCmakeArguments"
+    echo "Invoking $next_command"
+    eval $next_command
     popd
 
     if [ ! -f "$intermediatesForBuild/$buildFile" ]; then
@@ -196,7 +197,7 @@ build_native()
 
 initTargetDistroRid()
 {
-    source "$__ProjectRoot/eng/init-distro-rid.sh"
+    source "$__RepoRootDir/eng/native/init-distro-rid.sh"
 
     local passedRootfsDir=""
 
diff --git a/packaging/coreclr-diagnostics.spec b/packaging/coreclr-diagnostics.spec
index f4259d092..297660835 100755
--- a/packaging/coreclr-diagnostics.spec
+++ b/packaging/coreclr-diagnostics.spec
@@ -152,10 +152,10 @@ export CXXFLAGS+="-fstack-protector-strong"
 %endif
 
 export TIZEN_LOCAL_BUILD=1
-export NUGET_PACKAGES=%{_builddir}/%{name}-%{version}/packages
+export NUGET_PACKAGES=%{_builddir}/%{name}-%{version}/.packages
 export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/libicu-57.1
 
-./build.sh --portablebuild=false --configuration %{_buildtype} --architecture %{_barch} /p:NeedsPublishing=true /p:EnableSourceLink=false /p:EnableSourceControlManagerQueries=false
+./build.sh --portablebuild=false -configuration %{_buildtype} -architecture %{_barch} /p:NeedsPublishing=true /p:EnableSourceLink=false /p:EnableSourceControlManagerQueries=false
 
 %install
 %define netcoreappdir   %{_datadir}/dotnet/shared/Microsoft.NETCore.App/%{dotnet_version}
diff --git a/src/Microsoft.Diagnostics.DebugServices.Implementation/SymbolService.cs b/src/Microsoft.Diagnostics.DebugServices.Implementation/SymbolService.cs
index 474570f37..28fc7bbaf 100644
--- a/src/Microsoft.Diagnostics.DebugServices.Implementation/SymbolService.cs
+++ b/src/Microsoft.Diagnostics.DebugServices.Implementation/SymbolService.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-- 
2.34.1