Windows ML: Miscellaneous build fixes to support automated builds / tests (#556)

* Setting up intermediate / output directories and consolidating props files

* Fix warnings in csproj file

* Add fixes for debug builds and for hooking SqueezeNet targets file during command-line build

* Revert "Fix warnings in csproj file"

This reverts commit 5928575.

* Using a more appropriate macro to cover cpp / cs scenarios

* Using self-contained for C# desktop sample since test environments might not have the right runtime already installed

---------

Co-authored-by: Aditya Rastogi <[email protected]>

Author: adrastogi

Samples/WindowsML/Resources/SqueezeNetModel.targets

@@ -24,6 +24,11 @@
     <SqueezeNetModelCatalogFile>$(MSBuildThisFileDirectory)SqueezeNetModelCatalog.json</SqueezeNetModelCatalogFile>
   </PropertyGroup>
 
+  <!-- Ensure copy target participates in Build for managed and native projects -->
+  <PropertyGroup>
+    <BuildDependsOn>CopySqueezeNetModelToOutput;$(BuildDependsOn)</BuildDependsOn>
+  </PropertyGroup>
+
   <!-- Create temp directory for downloaded model -->
   <Target Name="CreateSqueezeNetModelDirectory" BeforeTargets="Build">
     <MakeDir Directories="$(SqueezeNetModelTempDir)" Condition="!Exists('$(SqueezeNetModelTempDir)')" />
@@ -69,22 +74,23 @@
   <!-- Copy downloaded files to output directory -->
   <Target Name="CopySqueezeNetModelToOutput" BeforeTargets="Build" DependsOnTargets="DownloadSqueezeNetModel">
     <!-- Copy FP32 model to output directory with retry for antivirus interference -->
-    <Copy SourceFiles="$(SqueezeNetModelFileFP32)" DestinationFiles="$(OutputPath)\SqueezeNet.fp32.onnx" SkipUnchangedFiles="true" Retries="5" RetryDelayMilliseconds="1000" />
+    <Copy SourceFiles="$(SqueezeNetModelFileFP32)" DestinationFiles="$(TargetDir)SqueezeNet.fp32.onnx" SkipUnchangedFiles="true" Retries="5" RetryDelayMilliseconds="1000" />
 
     <!-- Copy default quantized model from Resources folder -->
-    <Copy SourceFiles="$(SqueezeNetModelFileDefault)" DestinationFiles="$(OutputPath)\SqueezeNet.onnx" SkipUnchangedFiles="true" Retries="5" RetryDelayMilliseconds="1000" />
+    <Copy SourceFiles="$(SqueezeNetModelFileDefault)" DestinationFiles="$(TargetDir)SqueezeNet.onnx" SkipUnchangedFiles="true" Retries="5" RetryDelayMilliseconds="1000" />
 
     <!-- Copy license file from Resources folder -->
-    <Copy SourceFiles="$(SqueezeNetLicenseFile)" DestinationFiles="$(OutputPath)\SqueezeNet.LICENSE.txt" SkipUnchangedFiles="true" Retries="5" RetryDelayMilliseconds="1000" />
-    
+    <Copy SourceFiles="$(SqueezeNetLicenseFile)" DestinationFiles="$(TargetDir)SqueezeNet.LICENSE.txt" SkipUnchangedFiles="true" Retries="5" RetryDelayMilliseconds="1000" />
+
     <!-- Copy labels file -->
-    <Copy SourceFiles="$(SqueezeNetLabelsFile)" DestinationFiles="$(OutputPath)\SqueezeNet.Labels.txt" SkipUnchangedFiles="true" Retries="5" RetryDelayMilliseconds="1000" />
-    
-    <!-- Copy image file -->
-    <Copy SourceFiles="$(SqueezeNetImageFile)" DestinationFiles="$(OutputPath)\image.png" SkipUnchangedFiles="true" Retries="5" RetryDelayMilliseconds="1000" />
+    <Copy SourceFiles="$(SqueezeNetLabelsFile)" DestinationFiles="$(TargetDir)SqueezeNet.Labels.txt" SkipUnchangedFiles="true" Retries="5" RetryDelayMilliseconds="1000" />
 
+    <!-- Copy image file -->
+    <Copy SourceFiles="$(SqueezeNetImageFile)" DestinationFiles="$(TargetDir)image.png" SkipUnchangedFiles="true" Retries="5" RetryDelayMilliseconds="1000" />
+    
     <!-- Copy sample catalog file from Resources folder -->
-    <Copy SourceFiles="$(SqueezeNetModelCatalogFile)" DestinationFiles="$(OutputPath)\SqueezeNetModelCatalog.json" SkipUnchangedFiles="true" Retries="5" RetryDelayMilliseconds="1000" />
+    <Copy SourceFiles="$(SqueezeNetModelCatalogFile)" DestinationFiles="$(TargetDir)SqueezeNetModelCatalog.json" SkipUnchangedFiles="true" Retries="5" RetryDelayMilliseconds="1000" />
+
   </Target>
 
-</Project>
+</Project>

Samples/WindowsML/cpp/CppConsoleDesktop.GenAI/Directory.Build.props

@@ -6,5 +6,46 @@
 
     <!-- Disable central package management for C++ projects -->
     <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
+    
+    <!-- Namespace output directories to prevent conflicts -->
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\obj\</IntDir>
   </PropertyGroup>
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
 </Project>

Samples/WindowsML/cpp/CppConsoleDesktop/Directory.Build.props

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <WindowsPackageType>None</WindowsPackageType>
+    <SelfContained>True</SelfContained>
   </PropertyGroup>
 
   <ItemGroup>