Merge remote-tracking branch 'origin/main' into user/yeelam/RandomBuildBreak

Update target name
Test for Precreation of generated folder for any csproj
2025-12-29 16:36:40 +01:00 · 2025-04-22 16:42:01 -05:00 · 2025-04-22 09:20:19 +08:00 · 2025-04-22 09:20:19 +08:00
3 changed files with 18 additions and 5 deletions
--- a/src/Common.Dotnet.CsWinRT.props
+++ b/src/Common.Dotnet.CsWinRT.props
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Some items may be set in Directory.Build.props in root -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />
+
  <PropertyGroup>
    <WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
--- a/src/Common.Dotnet.PrepareGeneratedFolder.targets
+++ b/src/Common.Dotnet.PrepareGeneratedFolder.targets
@@ -0,0 +1,16 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Target Name="EnsureGeneratedBaseFolder" BeforeTargets="XamlPreCompile">
+    <PropertyGroup>
+      <!-- Only create the base 'generated' folder -->
+      <CompilerGeneratedFilesOutputPath>$(ProjectDir)obj\g</CompilerGeneratedFilesOutputPath>
+    </PropertyGroup>
+
+    <!-- Create 'generated' folder if missing -->
+    <MakeDir Directories="$(CompilerGeneratedFilesOutputPath)" />
+
+    <!-- Optional logging for debugging -->
+    <Message Text="Ensured: $(GeneratedBasePath)" Importance="Low" />
+  </Target>
+
+</Project>
--- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj
+++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj
@@ -15,8 +15,6 @@
    <ProjectPriFileName>PowerToys.EnvironmentVariablesUILib.pri</ProjectPriFileName>
    <GenerateLibraryLayout>true</GenerateLibraryLayout>
    <IsPackable>true</IsPackable>
-    <!-- The default generated file path exceeds the length limit 260 on the build agent. Using a shorter path as a workaround. -->
-    <CompilerGeneratedFilesOutputPath>$(ProjectDir)obj\g</CompilerGeneratedFilesOutputPath>
  </PropertyGroup>

  <PropertyGroup>
@@ -56,7 +54,4 @@
    <Manifest Include="$(ApplicationManifest)" />
  </ItemGroup>

-  <Target Name="EnsureCompilerGeneratedFilesOutputPathExists" BeforeTargets="XamlPreCompile">
-    <MakeDir Directories="$(CompilerGeneratedFilesOutputPath)" />
-  </Target>
 </Project>
Author	SHA1	Message	Date
Dustin L. Howett	60a0c9134d	Merge remote-tracking branch 'origin/main' into user/yeelam/RandomBuildBreak	2025-04-22 16:42:01 -05:00
Gordon Lam (SH)	4979d39489	Update target name	2025-04-22 09:20:19 +08:00
Gordon Lam (SH)	8bf342cc46	Test for Precreation of generated folder for any csproj	2025-04-22 09:20:19 +08:00