Merge pull request #842 from unoplatform/dev/eb/sab

fix: Set COEP/COOP headers when platform is not AnyCPU

Author: jeromelaban

src/Uno.Wasm.Bootstrap.Cli/DebuggingProxy/DebugProxyLauncher.cs

@@ -157,6 +157,7 @@ private static void RemoveUnwantedEnvironmentVariables(IDictionary<string, strin
 
 		private static string LocateDebugProxyExecutable(IWebHostEnvironment environment, IConfiguration configuration)
 		{
+			var platform = configuration.GetValue<string>("platform") ?? "";
 			var buildConfiguration = configuration.GetValue<string>("configuration") ?? "";
 			var targetFramework = configuration.GetValue<string>("targetframework") ?? "";
 			var intermediatePath = configuration.GetValue<string>("intermediateoutputpath") ?? "";
@@ -166,7 +167,7 @@ private static string LocateDebugProxyExecutable(IWebHostEnvironment environment
 				// This is defined in when the boostrapper is referenced through nuget
 				? Path.Combine(contentRoot, intermediatePath, "wasm-debugger")
 				// Used as a fallback inside the bootstrapper solution
-				: Path.Combine(contentRoot, "obj", buildConfiguration, targetFramework, "wasm-debugger");
+				: Path.Combine(contentRoot, "obj", platform, buildConfiguration, targetFramework, "wasm-debugger");
 
 			var debuggerInfoFile = Path.Combine(debuggerInfoRoot, ".debuggerinfo");
 			if (!File.Exists(debuggerInfoFile))

src/Uno.Wasm.Bootstrap.Cli/Server/Startup.cs

@@ -156,11 +156,12 @@ private static bool IsDebugBuild(IConfiguration configuration)
 
 		private static bool ShouldUseSecureMode(IWebHostEnvironment environment, IConfiguration configuration)
 		{
+			var platform = configuration.GetValue<string>("platform") ?? "";
 			var buildConfiguration = configuration.GetValue<string>("configuration") ?? "";
 			var targetFramework = configuration.GetValue<string>("targetframework") ?? "";
 
 			var contentRoot = environment.ContentRootPath;
-			var debuggerInfoRoot = Path.Combine(contentRoot, "obj", buildConfiguration, targetFramework);
+			var debuggerInfoRoot = Path.Combine(contentRoot, "obj", platform, buildConfiguration, targetFramework);
 
 			var featuresInfoFile = Path.Combine(debuggerInfoRoot, ".unoappfeatures");
 			if (File.Exists(featuresInfoFile))

src/Uno.Wasm.Bootstrap.DevServer/build/Uno.Wasm.Bootstrap.DevServer.targets

@@ -24,10 +24,17 @@
 		<_UnoRunBasePath Condition="!$(_UnoBootstrapIsDevelopment) and '$(OutputPath)'!='' and $([System.IO.Path]::IsPathRooted($(OutputPath)))">$(OutputPath)</_UnoRunBasePath>
 
 		<!-- Used inside bootstrapper solution -->
-		<_UnoRunBasePath Condition="$(_UnoBootstrapIsDevelopment) and '$(OutputPath)'==''">$(MSBuildProjectDirectory)/bin/$(Configuration)/$(TargetFramework)/</_UnoRunBasePath>
-		<_UnoRunBasePath Condition="$(_UnoBootstrapIsDevelopment) and '$(OutputPath)'!='' and $([System.IO.Path]::IsPathRooted($(OutputPath)))">$(OutputPath)/$(TargetFramework)/</_UnoRunBasePath>
 
-		<RunArguments>$(_unoBinArgs) $(_unoRunArgs) --pathbase &quot;$(_UnoRunBasePath)dist&quot; --configuration &quot;$(Configuration)&quot; --targetframework &quot;$(TargetFramework)&quot; --intermediateoutputpath &quot;$(IntermediateOutputPath)/&quot;  $(AdditionalRunArguments)</RunArguments>
+		<_UnoMaybePlatform></_UnoMaybePlatform>
+		<_UnoMaybePlatform Condition="'$(Platform)' != 'AnyCPU'">$(Platform)</_UnoMaybePlatform>
+
+		<_UnoBasePathMaybePlatform></_UnoBasePathMaybePlatform>
+		<_UnoBasePathMaybePlatform Condition="'$(AppendPlatformToOutputPath)' == 'true' and '$(Platform)' != 'AnyCPU'">$(Platform)/</_UnoBasePathMaybePlatform>
+
+		<_UnoRunBasePath Condition="$(_UnoBootstrapIsDevelopment) and '$(OutputPath)'==''">$(MSBuildProjectDirectory)/bin/$(_UnoBasePathMaybePlatform)$(Configuration)/$(TargetFramework)/</_UnoRunBasePath>
+		<_UnoRunBasePath Condition="$(_UnoBootstrapIsDevelopment) and '$(OutputPath)'!='' and $([System.IO.Path]::IsPathRooted($(OutputPath)))">$(OutputPath)</_UnoRunBasePath>
+
+		<RunArguments>$(_unoBinArgs) $(_unoRunArgs) --pathbase &quot;$(_UnoRunBasePath)dist&quot; --platform &quot;$(_UnoMaybePlatform)&quot; --configuration &quot;$(Configuration)&quot; --targetframework &quot;$(TargetFramework)&quot; --intermediateoutputpath &quot;$(IntermediateOutputPath)/&quot;  $(AdditionalRunArguments)</RunArguments>
 	</PropertyGroup>
 
 </Project>