From 4c25992c7b25c1ab21dc47e8dcba9f491b5fcb80 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marek=20Fi=C5=A1era?= <mara@neptuo.com>
Date: Wed, 1 Feb 2023 09:39:12 +0100
Subject: [PATCH] Drop _SampleProject and _SampleAssembly properties (#81421)

---
 src/mono/sample/wasi/Directory.Build.targets                         | 4 +++-
 src/mono/sample/wasi/console/Wasi.Console.Sample.csproj              | 5 -----
 src/mono/sample/wasm/Directory.Build.targets                         | 5 +++++
 src/mono/sample/wasm/browser-advanced/Wasm.Advanced.Sample.csproj    | 1 -
 .../wasm/browser-bench/Console/Wasm.Console.Bench.Sample.csproj      | 2 --
 src/mono/sample/wasm/browser-bench/Wasm.Browser.Bench.Sample.csproj  | 5 -----
 .../wasm/browser-eventpipe/Wasm.Browser.EventPipe.Sample.csproj      | 5 -----
 .../sample/wasm/browser-threads/Wasm.Browser.Threads.Sample.csproj   | 1 -
 src/mono/sample/wasm/browser/Wasm.Browser.Sample.csproj              | 3 ---
 src/mono/sample/wasm/console-node/Wasm.Console.Node.Sample.csproj    | 5 -----
 src/mono/sample/wasm/console-v8/Wasm.Console.V8.Sample.csproj        | 4 ----
 11 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/src/mono/sample/wasi/Directory.Build.targets b/src/mono/sample/wasi/Directory.Build.targets
index 1e6a5ff..353d73b 100644
--- a/src/mono/sample/wasi/Directory.Build.targets
+++ b/src/mono/sample/wasi/Directory.Build.targets
@@ -10,7 +10,8 @@
   <Target Name="BuildSampleInTree"
       Inputs="
       Program.cs;
-      $(_SampleProject)
+      $(_SampleProject);
+      $(MSBuildProjectFile)
       "
       Outputs="
       bin/publish/runtime/native/dotnet.wasm;
@@ -23,6 +24,7 @@
       <_ScriptExt Condition="'$(OS)' != 'Windows_NT'">.sh</_ScriptExt>
       <_Dotnet>$(RepoRoot)dotnet$(_ScriptExt)</_Dotnet>
       <_AOTFlag Condition="'$(RunAOTCompilation)' != ''">/p:RunAOTCompilation=$(RunAOTCompilation)</_AOTFlag>
+      <_SampleProject Condition="'$(_SampleProject)' == ''">$(MSBuildProjectFile)</_SampleProject>
       <_WasmMainJSFileName>$([System.IO.Path]::GetFileName('$(WasmMainJSPath)'))</_WasmMainJSFileName>
     </PropertyGroup>
     <Exec Command="$(_Dotnet) publish -bl /p:Configuration=$(Configuration) /p:TargetArchitecture=wasm /p:TargetOS=wasi $(_AOTFlag) $(_SampleProject) $(BuildAdditionalArgs)" />
diff --git a/src/mono/sample/wasi/console/Wasi.Console.Sample.csproj b/src/mono/sample/wasi/console/Wasi.Console.Sample.csproj
index da5ab16..6811cc3 100644
--- a/src/mono/sample/wasi/console/Wasi.Console.Sample.csproj
+++ b/src/mono/sample/wasi/console/Wasi.Console.Sample.csproj
@@ -4,10 +4,5 @@
     <UseAppHost>false</UseAppHost>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <_SampleProject>Wasi.Console.Sample.csproj</_SampleProject>
-    <_SampleAssembly>Wasi.Console.Sample.dll</_SampleAssembly>
-  </PropertyGroup>
-
   <Target Name="RunSample" DependsOnTargets="RunSampleWithWasmtime" />
 </Project>
diff --git a/src/mono/sample/wasm/Directory.Build.targets b/src/mono/sample/wasm/Directory.Build.targets
index 9ef8935..6db5674 100644
--- a/src/mono/sample/wasm/Directory.Build.targets
+++ b/src/mono/sample/wasm/Directory.Build.targets
@@ -26,6 +26,9 @@
       Inputs="
       Program.cs;
       $(_WasmMainJSFileName);
+      $(_SampleProject);
+      $(MSBuildProjectFile)
+      $(TargetFileName)
       "
       Outputs="
       bin/$(Configuration)/AppBundle/dotnet.wasm;
@@ -38,6 +41,8 @@
       <_Dotnet>$(RepoRoot)dotnet$(_ScriptExt)</_Dotnet>
       <_AOTFlag Condition="'$(RunAOTCompilation)' != ''">/p:RunAOTCompilation=$(RunAOTCompilation)</_AOTFlag>
       <_WasmMainJSFileName>$([System.IO.Path]::GetFileName('$(WasmMainJSPath)'))</_WasmMainJSFileName>
+      <_SampleProject Condition="'$(_SampleProject)' == ''">$(MSBuildProjectFile)</_SampleProject>
+      <_SampleAssembly Condition="'$(_SampleAssembly)' == ''">$(TargetFileName)</_SampleAssembly>
       <BuildAdditionalArgs Condition="'$(MonoDiagnosticsMock)' != ''">$(BuildAdditionalArgs) /p:MonoDiagnosticsMock=$(MonoDiagnosticsMock) </BuildAdditionalArgs>
     </PropertyGroup>
     <Exec Command="$(_Dotnet) publish -bl /p:Configuration=$(Configuration) /p:TargetArchitecture=wasm /p:TargetOS=browser $(_AOTFlag) $(_SampleProject) $(BuildAdditionalArgs)" />
diff --git a/src/mono/sample/wasm/browser-advanced/Wasm.Advanced.Sample.csproj b/src/mono/sample/wasm/browser-advanced/Wasm.Advanced.Sample.csproj
index ef4c5f2..fe3c5a2 100644
--- a/src/mono/sample/wasm/browser-advanced/Wasm.Advanced.Sample.csproj
+++ b/src/mono/sample/wasm/browser-advanced/Wasm.Advanced.Sample.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\DefaultBrowserSample.targets" />
   <PropertyGroup>
-    <_SampleProject>Wasm.Advanced.Sample.csproj</_SampleProject>
     <EnableAggressiveTrimming>true</EnableAggressiveTrimming>
     <PublishTrimmed>true</PublishTrimmed>
     <!-- add OpenGL emulation -->
diff --git a/src/mono/sample/wasm/browser-bench/Console/Wasm.Console.Bench.Sample.csproj b/src/mono/sample/wasm/browser-bench/Console/Wasm.Console.Bench.Sample.csproj
index a3d7f11..d43314d 100644
--- a/src/mono/sample/wasm/browser-bench/Console/Wasm.Console.Bench.Sample.csproj
+++ b/src/mono/sample/wasm/browser-bench/Console/Wasm.Console.Bench.Sample.csproj
@@ -9,8 +9,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <_SampleProject>Wasm.Console.Bench.Sample.csproj</_SampleProject>
-    <_SampleAssembly>Wasm.Console.Bench.Sample.dll</_SampleAssembly>
     <SignAssembly>False</SignAssembly>
   </PropertyGroup>
 
diff --git a/src/mono/sample/wasm/browser-bench/Wasm.Browser.Bench.Sample.csproj b/src/mono/sample/wasm/browser-bench/Wasm.Browser.Bench.Sample.csproj
index a1209a7..eaeb571 100644
--- a/src/mono/sample/wasm/browser-bench/Wasm.Browser.Bench.Sample.csproj
+++ b/src/mono/sample/wasm/browser-bench/Wasm.Browser.Bench.Sample.csproj
@@ -20,11 +20,6 @@
     <Compile Remove="Console/Console.cs" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <_SampleProject>Wasm.Browser.Bench.Sample.csproj</_SampleProject>
-    <_SampleAssembly> Wasm.Browser.Bench.Sample.dll</_SampleAssembly>
-  </PropertyGroup>
-
   <Target Name="RunSample" DependsOnTargets="RunSampleWithBrowserAndSimpleServer" />
 
 </Project>
diff --git a/src/mono/sample/wasm/browser-eventpipe/Wasm.Browser.EventPipe.Sample.csproj b/src/mono/sample/wasm/browser-eventpipe/Wasm.Browser.EventPipe.Sample.csproj
index 9b8cf06..cb112b3 100644
--- a/src/mono/sample/wasm/browser-eventpipe/Wasm.Browser.EventPipe.Sample.csproj
+++ b/src/mono/sample/wasm/browser-eventpipe/Wasm.Browser.EventPipe.Sample.csproj
@@ -34,11 +34,6 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <_SampleProject>Wasm.Browser.EventPipe.Sample.csproj</_SampleProject>
-  </PropertyGroup>
-
-
-  <PropertyGroup>
     <RunAnalyzers>true</RunAnalyzers>
   </PropertyGroup>
 
diff --git a/src/mono/sample/wasm/browser-threads/Wasm.Browser.Threads.Sample.csproj b/src/mono/sample/wasm/browser-threads/Wasm.Browser.Threads.Sample.csproj
index 5c11649..953a57b 100644
--- a/src/mono/sample/wasm/browser-threads/Wasm.Browser.Threads.Sample.csproj
+++ b/src/mono/sample/wasm/browser-threads/Wasm.Browser.Threads.Sample.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\DefaultBrowserSample.targets" />
   <PropertyGroup>
-    <_SampleProject>Wasm.Browser.Threads.Sample.csproj</_SampleProject>
     <WasmEnableThreads>true</WasmEnableThreads>
   </PropertyGroup>
 
diff --git a/src/mono/sample/wasm/browser/Wasm.Browser.Sample.csproj b/src/mono/sample/wasm/browser/Wasm.Browser.Sample.csproj
index 76ec895..65bd564 100644
--- a/src/mono/sample/wasm/browser/Wasm.Browser.Sample.csproj
+++ b/src/mono/sample/wasm/browser/Wasm.Browser.Sample.csproj
@@ -1,6 +1,3 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\DefaultBrowserSample.targets" />
-  <PropertyGroup>
-    <_SampleProject>Wasm.Browser.Sample.csproj</_SampleProject>
-  </PropertyGroup>
 </Project>
diff --git a/src/mono/sample/wasm/console-node/Wasm.Console.Node.Sample.csproj b/src/mono/sample/wasm/console-node/Wasm.Console.Node.Sample.csproj
index aac67cc..7234698 100644
--- a/src/mono/sample/wasm/console-node/Wasm.Console.Node.Sample.csproj
+++ b/src/mono/sample/wasm/console-node/Wasm.Console.Node.Sample.csproj
@@ -13,10 +13,5 @@
     <WasmExtraFilesToDeploy Include="package.json" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <_SampleProject>Wasm.Console.Node.Sample.csproj</_SampleProject>
-    <_SampleAssembly>Wasm.Console.Node.Sample.dll</_SampleAssembly>
-  </PropertyGroup>
-
   <Target Name="RunSample" DependsOnTargets="RunSampleWithNode" />
 </Project>
diff --git a/src/mono/sample/wasm/console-v8/Wasm.Console.V8.Sample.csproj b/src/mono/sample/wasm/console-v8/Wasm.Console.V8.Sample.csproj
index 5bd8225..7f02fc0 100644
--- a/src/mono/sample/wasm/console-v8/Wasm.Console.V8.Sample.csproj
+++ b/src/mono/sample/wasm/console-v8/Wasm.Console.V8.Sample.csproj
@@ -8,10 +8,6 @@
     <RunScriptCommand>$(ExecXHarnessCmd) wasm test --app=. --engine=V8 --engine-arg=--stack-trace-limit=1000 --engine-arg=--module --js-file=main.mjs --output-directory=$(XHarnessOutput) -- --run $(MSBuildProjectName).dll</RunScriptCommand>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <_SampleProject>Wasm.Console.V8.Sample.csproj</_SampleProject>
-    <_SampleAssembly>Wasm.Console.V8.Sample.dll</_SampleAssembly>
-  </PropertyGroup>
 
   <Target Name="RunSample" DependsOnTargets="RunSampleWithV8" />
 </Project>
-- 
2.7.4