Fix winforms private package TFM and set NetCurrent for scenario-tests

dotnet · ViktorHofer · Dec 19, 2024 · Sep 24, 2024 · Oct 2, 2024 · Oct 17, 2024
commit e3adb5140136bbf59ca2cc9986293b1b9dab4106
@@ -8,6 +8,10 @@
     <ScenarioTestsResultsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsTestResultsDir)', 'scenario-tests'))</ScenarioTestsResultsDir>
     <NuGetConfigInputForScenarioTests>$([MSBuild]::NormalizePath('$(SrcDir)', 'sdk', 'NuGet.config'))</NuGetConfigInputForScenarioTests>
     <NuGetConfigOutputForScenarioTests>$(ScenarioTestsArtifactsDir)NuGet.config</NuGetConfigOutputForScenarioTests>
+
+    <!-- TODO: Remove when source-build uses an Arcade SDK with an updated NetCurrent property. -->
+    <BuildArgs>$(BuildArgs) /p:NetCurrent=$(NetCurrent)</BuildArgs>
+    <TestCommand>$(TestCommand) /p:NetCurrent=$(NetCurrent)</TestCommand>
   </PropertyGroup>
 
   <ItemGroup>
@@ -53,7 +57,6 @@
         TestSdkVersion=$(SourceBuiltSdkVersion);
         AdditionalTestArgs=$(_ScenarioTestsAdditionalArgs);
         DotNetTool=$(_DotNetTool);
-        NetCurrent=$(NetCurrent);
         _InitializeDotNetCli=$(DotNetSdkExtractDir.TrimEnd('/\'))" />
     </ItemGroup>
   </Target>

@@ -0,0 +1,23 @@
+From 0a9987a2d861e38b3d4505ea62ea634616ad1c29 Mon Sep 17 00:00:00 2001
+From: Viktor Hofer <viktor.hofer@microsoft.com>
+Date: Thu, 19 Dec 2024 22:48:00 +0100
+Subject: [PATCH] Fix winforms TFM when building inside the VMR
+
+Backport: https://github.com/dotnet/wpf/pull/10197
+
+---
+ eng/WpfArcadeSdk/tools/SdkReferences.targets | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/eng/WpfArcadeSdk/tools/SdkReferences.targets b/eng/WpfArcadeSdk/tools/SdkReferences.targets
+index 6bbded2bc..64777d4d4 100644
+--- a/eng/WpfArcadeSdk/tools/SdkReferences.targets
++++ b/eng/WpfArcadeSdk/tools/SdkReferences.targets
+@@ -125,6 +125,7 @@
+                  And $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '3.0')) ">
+     <PropertyGroup>
+       <!-- Use the current TargetFramework if not otherwise specified for WinForms private package -->
++      <_WinFormsTargetFrameworkVersion Condition="'$(_WinFormsTargetFrameworkVersion)' == '' and '$(DotNetBuildOrchestrator)' == 'true'">$(NetCurrent)</_WinFormsTargetFrameworkVersion>
+       <_WinFormsTargetFrameworkVersion Condition="'$(_WinFormsTargetFrameworkVersion)' == ''">$(_targetFrameworkRoot)</_WinFormsTargetFrameworkVersion>
+     </PropertyGroup>
+     <ItemGroup>