[release/9.0.1xx] Use PortableRid config value for self-contained publish test (#43244)

github-actions[bot] · web-flow · commit 6584704a4a7d · 2024-10-14T14:36:23.000Z
diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs
@@ -59,11 +59,11 @@ internal void Execute(DotNetHelper dotNetHelper)
         {
             dotNetHelper.ExecutePublish(projectName, Template, selfContained: false);
             dotNetHelper.ExecutePublish(projectName, Template, selfContained: true, rid: Config.TargetRid);
-            dotNetHelper.ExecutePublish(projectName, Template, selfContained: true, rid: $"linux-{Config.TargetArchitecture}");
+            dotNetHelper.ExecutePublish(projectName, Template, selfContained: true, rid: Config.PortableRid);
         }
         if (Commands.HasFlag(DotNetActions.PublishR2R))
         {
-            dotNetHelper.ExecutePublish(projectName, Template, selfContained: true, rid: $"linux-{Config.TargetArchitecture}", trimmed: true, readyToRun: true);
+            dotNetHelper.ExecutePublish(projectName, Template, selfContained: true, rid: Config.PortableRid, trimmed: true, readyToRun: true);
         }
         if (Commands.HasFlag(DotNetActions.Test))
         {

Original file line number	Diff line number	Diff line change
`@@ -59,11 +59,11 @@ internal void Execute(DotNetHelper dotNetHelper)`
`59`	`59`	`{`
`60`	`60`	`dotNetHelper.ExecutePublish(projectName, Template, selfContained: false);`
`61`	`61`	`dotNetHelper.ExecutePublish(projectName, Template, selfContained: true, rid: Config.TargetRid);`
`62`		`- dotNetHelper.ExecutePublish(projectName, Template, selfContained: true, rid: $"linux-{Config.TargetArchitecture}");`
	`62`	`+ dotNetHelper.ExecutePublish(projectName, Template, selfContained: true, rid: Config.PortableRid);`
`63`	`63`	`}`
`64`	`64`	`if (Commands.HasFlag(DotNetActions.PublishR2R))`
`65`	`65`	`{`
`66`		`- dotNetHelper.ExecutePublish(projectName, Template, selfContained: true, rid: $"linux-{Config.TargetArchitecture}", trimmed: true, readyToRun: true);`
	`66`	`+ dotNetHelper.ExecutePublish(projectName, Template, selfContained: true, rid: Config.PortableRid, trimmed: true, readyToRun: true);`
`67`	`67`	`}`
`68`	`68`	`if (Commands.HasFlag(DotNetActions.Test))`
`69`	`69`	`{`