Get TargetRid from MSBuild

Author: dagood

build.proj

@@ -153,7 +153,9 @@
       This is also a problem when passing CLI feeds: https://github.com/dotnet/source-build/issues/561
     -->
     <Exec Command="$(SmokeTestCommand)"
-          EnvironmentVariables="prodConBlobFeedUrl=$(ProdConBlobFeedUrl)" />
+          EnvironmentVariables="
+            targetRid=$(TargetRid);
+            prodConBlobFeedUrl=$(ProdConBlobFeedUrl)" />
   </Target>
 
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="UploadToAzure" />

smoke-test.sh

@@ -9,7 +9,8 @@ VERSION_PREFIX=5.0
 DEV_CERTS_VERSION_DEFAULT=5.0.0-preview.3
 __ROOT_REPO=$(cat "$SCRIPT_ROOT/artifacts/obj/rootrepo.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive
 executingUserHome=${HOME:-}
-targetRid=$(cat "$SCRIPT_ROOT/artifacts/obj/x64/Release/TargetInfo.props" | grep -i targetrid | sed -E 's|\s*</?TargetRid>\s*||g')
+
+echo "RID to test: ${targetRid?not specified. Use ./build.sh --run-smoke-test to detect RID, or specify manually.}"
 
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1