Merge branch 'master' into users/t-abaskar/yaml-validator-filepathchange

microsoft · Jun 28, 2024 · 0544113 · 0544113
2 parents e41d0de + 521ab79
commit 0544113
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/PAModel/Microsoft.PowerPlatform.Formulas.Tools.csproj b/src/PAModel/Microsoft.PowerPlatform.Formulas.Tools.csproj
@@ -7,6 +7,13 @@
     <RootNamespace>Microsoft.PowerPlatform.Formulas.Tools</RootNamespace>
   </PropertyGroup>
 
+  <PropertyGroup Label="Override Directory.Build.props Settings">
+    <!-- Clear the singular TargetFramework set by Directory.Build.props, so that it doesn't take precedence over the plural TargetFrameworks set above. -->
+    <TargetFramework></TargetFramework> 
+    <!-- Directory.Build.props sets paths assuming a single Target Framework.  Add the framework to the path to prevent overwriting one with the other -->
+    <OutDir>$(OutDir)\$(TargetFramework)</OutDir>
+  </PropertyGroup>
+
   <!-- Nuget Properties -->
   <PropertyGroup>
     <PackageId>Microsoft.PowerPlatform.Formulas.Tools</PackageId>