From db15f47abd9641f64fe349b4848b7d560ea70d3d Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Thu, 4 Jan 2024 16:01:21 -0800
Subject: [PATCH 01/12] Packaging cleanup

Originally I was just trying to remove mentions of snupkg, but then
things got a bit carried away. :)

This is trying to remove as much duplication and dead code related to
packaging that I can.
---
 Directory.Build.props                         | 16 ++++
 Directory.Build.targets                       |  2 +
 build/publish.proj                            | 40 ---------
 eng/Packaging.targets                         | 46 ++++++++++
 eng/Signing.props                             |  5 --
 eng/pkg/Pack.props                            | 85 -------------------
 global.json                                   |  1 +
 src/Directory.Build.targets                   | 24 ------
 .../Microsoft.Data.Analysis.csproj            |  6 +-
 .../Microsoft.Extensions.ML.csproj            | 13 +--
 .../Microsoft.ML.AutoML.csproj                | 36 ++------
 .../Microsoft.ML.CodeGenerator.csproj         | 11 +--
 .../Microsoft.ML.Core.csproj                  |  1 -
 .../Microsoft.ML.CpuMath.csproj               | 12 +--
 .../Microsoft.ML.Data.csproj                  |  1 -
 .../Microsoft.ML.DataView.csproj              |  4 +-
 ...osoft.ML.DnnImageFeaturizer.AlexNet.csproj | 11 +--
 ...oft.ML.DnnImageFeaturizer.ResNet101.csproj | 11 +--
 ...soft.ML.DnnImageFeaturizer.ResNet18.csproj | 11 +--
 ...soft.ML.DnnImageFeaturizer.ResNet50.csproj | 11 +--
 .../Microsoft.ML.Ensemble.csproj              | 15 +---
 .../Microsoft.ML.EntryPoints.csproj           | 19 ++---
 .../Microsoft.ML.Experimental.csproj          |  7 +-
 .../Microsoft.ML.Fairlearn.csproj             | 18 ++--
 .../Microsoft.ML.FastTree.csproj              | 28 ++----
 .../Microsoft.ML.ImageAnalytics.csproj        | 11 +--
 .../Microsoft.ML.KMeansClustering.csproj      |  1 -
 .../Microsoft.ML.LightGbm.csproj              | 15 +---
 .../Microsoft.ML.Mkl.Components.csproj        | 32 ++-----
 .../Microsoft.ML.Mkl.Redist.csproj            | 20 ++---
 .../Microsoft.ML.OneDal.csproj                | 20 ++---
 .../Microsoft.ML.OnnxConverter.csproj         |  7 +-
 .../Microsoft.ML.OnnxTransformer.csproj       | 11 +--
 src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj  |  1 -
 .../Microsoft.ML.Parquet.csproj               | 11 +--
 .../Microsoft.ML.Recommender.csproj           | 21 +----
 .../Microsoft.ML.SamplesUtils.csproj          | 15 +---
 .../Microsoft.ML.SearchSpace.csproj           |  1 -
 .../Microsoft.ML.StandardTrainers.csproj      |  6 +-
 .../Microsoft.ML.TensorFlow.csproj            | 15 +---
 .../Microsoft.ML.TimeSeries.csproj            | 16 +---
 .../Microsoft.ML.Tokenizers.csproj            |  2 +-
 .../Microsoft.ML.TorchSharp.csproj            |  6 +-
 .../Microsoft.ML.Transforms.csproj            |  1 -
 .../Microsoft.ML.Vision.csproj                | 15 +---
 .../CompatibilitySuppressions.xml             | 11 +++
 src/Microsoft.ML/Microsoft.ML.csproj          | 61 +++----------
 test/TestFrameworkDependency.props            |  4 +-
 ...Microsoft.ML.AutoML.SourceGenerator.csproj |  8 +-
 49 files changed, 198 insertions(+), 547 deletions(-)
 delete mode 100644 build/publish.proj
 create mode 100644 eng/Packaging.targets
 delete mode 100644 eng/pkg/Pack.props
 create mode 100644 src/Microsoft.ML/CompatibilitySuppressions.xml

diff --git a/Directory.Build.props b/Directory.Build.props
index 1fe944cfee..6a839432e6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -37,6 +37,14 @@
   <PropertyGroup>
     <PackageAssetsPath>$(ArtifactsDir)pkgassets/</PackageAssetsPath>
     <PkgDir>$(RepoRoot)pkg/</PkgDir>
+  
+    <Authors>Microsoft</Authors>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://dot.net/ml</PackageProjectUrl>
+    <PackageIcon>mlnetlogo.png</PackageIcon>
+    <PackageReleaseNotes>https://aka.ms/mlnetreleasenotes</PackageReleaseNotes>
+    <!-- space separated -->
+    <PackageTags>ML.NET ML Machine Learning</PackageTags>
   </PropertyGroup>
 
   <!-- Need to explicitly set these properties for the -net6_0 or -netfx configurations becuase they are typically based off 'Debug' or 'Release' configs -->
@@ -60,4 +68,12 @@
     <!-- Optional: Build symbol packages (.symbols.nupkg) to distribute the PDB containing Source Link -->
     <IncludeSymbols>true</IncludeSymbols>
   </PropertyGroup>
+
+  <!-- Work around https://github.com/NuGet/Home/issues/6091 
+       TODO: Determine if this is still needed-->
+  <ItemDefinitionGroup>
+    <PackageReference>
+      <PrivateAssets>None</PrivateAssets>
+    </PackageReference>
+  </ItemDefinitionGroup>
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 0b93f9177a..f310d751cd 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+  
+  <Import Condition="'$(IsPackable)' == 'true'" Project="$(RepositoryEngineeringDir)Packaging.targets"  />
 
   <ItemGroup Condition="'$(IsUnitTestProject)' == 'true'">
     <PackageReference Include="coverlet.msbuild" Version="$(CoverletMsbuildVersion)" PrivateAssets="all" />
diff --git a/build/publish.proj b/build/publish.proj
deleted file mode 100644
index 9391afb0ad..0000000000
--- a/build/publish.proj
+++ /dev/null
@@ -1,40 +0,0 @@
-<Project>
-
-  <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
-
-  <PropertyGroup>
-    <PublishSymbolsPackage>Microsoft.SymbolUploader.Build.Task</PublishSymbolsPackage>
-    <EnablePublishSymbols Condition="'$(EnablePublishSymbols)'==''" >true</EnablePublishSymbols>
-    <NuGetPushTimeoutSeconds Condition="'$(NuGetPushTimeoutSeconds)' == ''">600</NuGetPushTimeoutSeconds>
-  </PropertyGroup>
-
-  <Import Project="$(NuGetPackageRoot)$(PublishSymbolsPackage.ToLower())\$(MicrosoftSymbolUploaderBuildTaskVersion)\build\PublishSymbols.targets" />
-
-  <Target Name="PublishSymbolPackages"
-          Condition="'$(EnablePublishSymbols)'=='true'"
-          DependsOnTargets="SetupPublishSymbols">
-    <Message Text="Attempting to Publish Symbols" />
-    <Error Condition="!Exists('$(ArtifactsDir)packages')" Text="'PackageOutputPath' folder '$(PackageOutputPath)' does not exist."/>
-    <Error Condition="'$(SymbolServerPath)'==''" Text="Missing property SymbolServerPath" />
-    <Error Condition="'$(SymbolServerPAT)'==''" Text="Missing property SymbolServerPAT" />
-    <CallTarget Targets="PublishSymbols" />
-  </Target>
-
-  <Target Name="SetupPublishSymbols">
-    <PropertyGroup>
-      <SymbolExpirationInDays Condition="'$(SymbolExpirationInDays)'=='' and '$(SymbolExpirationDate)'==''">3650</SymbolExpirationInDays>
-      <ConvertPortablePdbsToWindowsPdbs>false</ConvertPortablePdbsToWindowsPdbs>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <SymbolPackagesToPublish Include="$(ArtifactsDir)packages\**\*.snupkg" />
-      <SymbolFilesToPublish Include="$(ArtifactsDir)SymStore\**\*.pdb" />
-    </ItemGroup>
-
-    <Message Importance="High" Text="Publishing @(SymbolPackagesToPublish) to $(SymbolServerPath)"/>
-    <Message Importance="High" Text="Publishing @(SymbolFilesToPublish) to $(SymbolServerPath)"/>
-    <Warning Condition="'@(SymbolPackagesToPublish)'==''" Text="There are no symbol nuget packages to publish" />
-    <Warning Condition="'@(SymbolFilesToPublish)'==''" Text="There are no symbol files to publish" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/eng/Packaging.targets b/eng/Packaging.targets
new file mode 100644
index 0000000000..31ed1af523
--- /dev/null
+++ b/eng/Packaging.targets
@@ -0,0 +1,46 @@
+<Project>
+
+  <ItemGroup>
+    <Content Include="$(RepoRoot)eng\pkg\mlnetlogo.png" Pack="true" PackagePath="" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(IncludeMLNetNotices)' != 'false'">
+    <Content Include="$(RepoRoot)\THIRD-PARTY-NOTICES.TXT" Pack="true" PackagePath="" />
+    <Content Include="$(RepoRoot)\LICENSE" Pack="true" PackagePath=""/>
+  </ItemGroup>
+  
+  <PropertyGroup>    
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludeAdditionalFilesInPackage;</TargetsForTfmSpecificContentInPackage>
+  </PropertyGroup>
+
+  <Target Name="_IncludeProjectReferencesWithPackAttributeInPackage"
+          Condition="'@(ProjectReference)' != '' and @(ProjectReference->AnyHaveMetadataValue('Pack', 'true'))"
+          DependsOnTargets="BuildOnlySettings;ResolveReferences">
+    <ItemGroup>
+      <!-- Add ReferenceCopyLocalPaths for ProjectReferences which are flagged as Pack="true" into the package. -->
+      <_projectReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('Pack', 'true'))" />
+      <TfmSpecificPackageFile Include="@(_projectReferenceCopyLocalPaths)"
+                              PackagePath="$([MSBuild]::ValueOrDefault('%(ReferenceCopyLocalPaths.PackagePath)', '$(BuildOutputTargetFolder)\$(TargetFramework)\'))" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_IncludeRuntimeSpecificAssetsInPackage">
+    <ItemGroup>    
+      <!-- Add runtime specific assets to the package. -->
+      <_runtimeFiles Include="$(PackageAssetsPath)$(PackageId)\runtimes\**\*%(NativeAssemblyReference.Identity)*" />
+      <TfmSpecificPackageFile Include="%(_runtimeFiles.Identity)" PackagePath="runtimes/%(_runtimeFiles.RecursiveDir)" TargetFramework="" />
+    </ItemGroup>    
+  </Target>
+
+  <Target Name="IncludeAdditionalFilesInPackage" DependsOnTargets="_IncludeProjectReferencesWithPackAttributeInPackage;_IncludeRuntimeSpecificAssetsInPackage">
+    <ItemGroup>
+      <!-- PDBs must be specified as TfmSpecificDebugSymbolsFile with TargetPath instead of PackagePath. -->
+      <TfmSpecificDebugSymbolsFile Include="@(TfmSpecificPackageFile->WithMetadataValue('Extension', '.pdb'))"
+                                   TargetPath="/%(TfmSpecificPackageFile.PackagePath)%(Filename)%(Extension)"
+                                   TargetFramework="$(TargetFramework)" />
+      <!-- Remove symbols from the file list. -->
+      <TfmSpecificPackageFile Remove="@(TfmSpecificPackageFile->WithMetadataValue('Extension', '.pdb'))" />
+    </ItemGroup>    
+  </Target>
+
+</Project>
\ No newline at end of file
diff --git a/eng/Signing.props b/eng/Signing.props
index 91b6ee12dd..976ae1ba79 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -1,9 +1,4 @@
 <Project>
-  <ItemGroup>
-    <ItemsToSign Include="$(ArtifactsPackagesDir)**\*.snupkg" />
-    <FileExtensionSignInfo Include="*.snupkg" CertificateName="NuGet" />
-  </ItemGroup>
-
   <PropertyGroup>
     <UseDotNetCertificate>true</UseDotNetCertificate>
   </PropertyGroup>
diff --git a/eng/pkg/Pack.props b/eng/pkg/Pack.props
deleted file mode 100644
index 888000e570..0000000000
--- a/eng/pkg/Pack.props
+++ /dev/null
@@ -1,85 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <PackageAssetsPath>$(ArtifactsDir)pkgassets/</PackageAssetsPath>
-    <IncludeSymbols>true</IncludeSymbols>
-    <IsSymbolsPackage Condition="$(MSBuildProjectName.Contains('.snupkg'))">true</IsSymbolsPackage>
-    <PackageIdFolderName>$(MSBuildProjectName.Replace('.symbols', ''))</PackageIdFolderName>
-    <IncludeBuildOutput>true</IncludeBuildOutput>
-    <IsPackable>true</IsPackable>
-  </PropertyGroup>
-
-  <!-- nuspec properties -->
-  <PropertyGroup>
-    <Authors>Microsoft</Authors>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://dot.net/ml</PackageProjectUrl>
-    <PackageIcon>mlnetlogo.png</PackageIcon>
-    <PackageReleaseNotes>https://aka.ms/mlnetreleasenotes</PackageReleaseNotes>
-    <!-- space separated -->
-    <PackageTags>ML.NET ML Machine Learning</PackageTags>
-
-    <LibExtension Condition="'$(OS)' == 'Windows_NT'">.dll</LibExtension>
-		<LibExtension Condition="'$(OS)' != 'Windows_NT'">.so</LibExtension>
-		<LibExtension Condition="$([MSBuild]::IsOSPlatform('osx'))">.dylib</LibExtension>
-  </PropertyGroup>
-
-  <ItemGroup>
-
-    <!-- Create symbol packages correctly by copying the library and xml to the nuget. Then the pdb is auto put in the symbols package-->
-    <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\lib\**\*" PackagePath="lib" />
-    <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\analyzers\**\*" PackagePath="analyzers" />
-    <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\**\*" PackagePath="runtimes" />
-    <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\tools\**\*" PackagePath="tools" />
-
-    <Content Include="$(RepoRoot)eng\pkg\mlnetlogo.png" Pack="true" PackagePath="" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(IncludeMLNetNotices)' != 'false'">
-    <Content Include="$(RepoRoot)\THIRD-PARTY-NOTICES.TXT" Pack="true" PackagePath="" />
-    <Content Include="$(RepoRoot)\LICENSE" Pack="true" PackagePath=""/>
-  </ItemGroup>
-
-  <!--  This check does not work corectly anymore and also removes the PDB from the symbols packages.
-        Need to figure out the correct way to do this, but since the normal packages are building correctly
-        I am leaving this as is for now. -->
-  <ItemGroup Condition="'$(IsSymbolsPackage)' != 'true'">
-    <Content Remove="$(PackageAssetsPath)$(PackageIdFolderName)\**\*.pdb" />
-    <Content Remove="$(PackageAssetsPath)$(PackageIdFolderName)\**\*.dwarf" />
-    <Content Remove="$(PackageAssetsPath)$(PackageIdFolderName)\**\*.dbg" />
-  </ItemGroup>
-
-  <ItemGroup Condition="Exists('packages.config') OR
-                        Exists('$(MSBuildProjectName).packages.config') OR
-                        Exists('packages.$(MSBuildProjectName).config')">
-    <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\*.dll"
-             Condition="'$(PlatformTarget)' == 'x64'">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>false</Visible>
-      <Link>%(Filename)%(Extension)</Link>
-    </Content>
-
-    <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*.dll"
-             Condition="'$(PlatformTarget)' == 'x86'">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>false</Visible>
-      <Link>%(Filename)%(Extension)</Link>
-    </Content>
-
-    <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-arm64\native\*.dll"
-             Condition="'$(PlatformTarget)' == 'arm64'">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>false</Visible>
-      <Link>%(Filename)%(Extension)</Link>
-    </Content>
-
-  </ItemGroup>
-
-  <!-- Work around https://github.com/NuGet/Home/issues/6091 -->
-  <ItemDefinitionGroup>
-    <PackageReference>
-      <PrivateAssets>None</PrivateAssets>
-    </PackageReference>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/global.json b/global.json
index 40b88952ee..d5987ea752 100644
--- a/global.json
+++ b/global.json
@@ -15,6 +15,7 @@
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23628.1",
     "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23628.1",
+    "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.2.0",
     "Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
     "Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index d755f632d3..fb5c95a6b2 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -2,30 +2,6 @@
 
   <Import Project="..\Directory.Build.targets" />
 
-  <Target Name="PreparePackageAssets" Condition="'$(CopyPackageAssets)' == 'true'"
-          AfterTargets="Build">
-
-    <ItemGroup Condition="'$(IncludeInPackage)' != ''">
-      <PackageAsset Include="$(TargetPath)"
-                    RelativePath="$(IncludeInPackage)\lib\$(TargetFramework)" />
-      <PackageAsset Include="@(DebugSymbolsProjectOutputGroupOutput)"
-                    RelativePath="$(IncludeInPackage)\lib\$(TargetFramework)" />
-      <PackageAsset Include="@(DocumentationProjectOutputGroupOutput)"
-                    RelativePath="$(IncludeInPackage)\lib\$(TargetFramework)" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(IncludeAnalyzerInPackage)' != ''">
-      <PackageAsset Include="$(TargetPath)"
-                    RelativePath="$(IncludeAnalyzerInPackage)\analyzers\dotnet\cs" />
-      <PackageAsset Include="@(DebugSymbolsProjectOutputGroupOutput)"
-                    RelativePath="$(IncludeAnalyzerInPackage)\analyzers\dotnet\cs" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(PackageAsset)"
-          DestinationFolder="$(PackageAssetsPath)%(PackageAsset.RelativePath)" />
-
-  </Target>
-
   <!-- API Compat -->
   <PropertyGroup Condition="'$(IsPackable)' == 'true'">
     <!-- Enable API compat for any packages unless they've set EnablePackageValidation -->
diff --git a/src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj b/src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj
index 4b4fda6652..dea36013f9 100644
--- a/src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj
+++ b/src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <SuppressFinalPackageVersion>false</SuppressFinalPackageVersion>
+    <IsPackable>true</IsPackable>
     <Description>This package contains easy-to-use and high-performance libraries for data analysis and transformation.</Description>
     <PackageReleaseNotes>Initial preview of robust and extensible types and algorithms for manipulating structured data that supports aggregations, statistical funtions, sorting, grouping, joins, merges, handling missing values and more. </PackageReleaseNotes>
     <PackageTags>ML.NET ML Machine Learning Data Science DataFrame Preparation DataView Analytics Exploration</PackageTags>
@@ -16,7 +16,9 @@
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddMDAIToInteractiveExtensionsFolder</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
 
-  <!-- The following properties are set to package M.D.A.Interactive with the M.D.A nuget package. If M.D.A.I undergoes TFM or dependency changes, we need to update the TargetFramework passed in below-->
+  <!-- The following properties are set to package M.D.A.Interactive with the M.D.A nuget package.
+       We cannot include it with a ProjectReference, since that would create a circular dependency.
+       If M.D.A.I undergoes TFM or dependency changes, we need to update the TargetFramework passed in below-->
   <Target Name="AddMDAIToInteractiveExtensionsFolder">
     <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=net6.0">
       <!-- Manually hardcoding the TargetFramework to netcoreapp3.1 as that is the one that MDAI targets -->
diff --git a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
index 2970566af3..037c7adce1 100644
--- a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
+++ b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.Extensions.ML</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>An integration package for ML.NET models on scalable web apps and services.</PackageDescription>
   </PropertyGroup>
 
@@ -13,14 +12,8 @@
     <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsVersion)" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsVersion)" />
 
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
   </ItemGroup>
 
diff --git a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
index 669afe59de..9bb22b66eb 100644
--- a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
+++ b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
@@ -1,12 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.AutoML</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET AutoML: Optimizes an ML pipeline for your dataset, by automatically locating the best feature engineering, model, and hyperparameters</PackageDescription>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
-
     <!--
       1591: Documentation warnings
       NU5100: Warning that gets triggered because a .dll is not placed under lib folder on package. This is by design as we want AutoML Interactive to be under interactive-extensions folder.
@@ -33,19 +30,14 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\tools-local\Microsoft.ML.AutoML.SourceGenerator\Microsoft.ML.AutoML.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
     <ProjectReference Include="..\Microsoft.ML.DnnImageFeaturizer.AlexNet\Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj" />
     <ProjectReference Include="..\Microsoft.ML.DnnImageFeaturizer.ResNet101\Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj" />
     <ProjectReference Include="..\Microsoft.ML.DnnImageFeaturizer.ResNet18\Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj" />
     <ProjectReference Include="..\Microsoft.ML.DnnImageFeaturizer.ResNet50\Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj" />
     <ProjectReference Include="..\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.SearchSpace\Microsoft.ML.SearchSpace.csproj">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeInNuget>true</IncludeInNuget>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.SearchSpace\Microsoft.ML.SearchSpace.csproj" Pack="true" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
     <ProjectReference Include="..\Microsoft.ML.TimeSeries\Microsoft.ML.TimeSeries.csproj" />
@@ -55,12 +47,8 @@
     <ProjectReference Include="..\Microsoft.ML.LightGbm\Microsoft.ML.LightGbm.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Recommender\Microsoft.ML.Recommender.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" Pack="true" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" Pack="true" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
   </ItemGroup>
 
@@ -76,18 +64,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
-    <ItemGroup>
-      <!--Include DLLs of Project References-->
-      <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')-&gt;WithMetadataValue('IncludeInNuget','true'))" />
-      <!--Include PDBs of Project References-->
-      <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')-&gt;WithMetadataValue('IncludeInNuget','true')-&gt;Replace('.dll', '.pdb'))" />
-      <!--Include PDBs for Native binaries-->
-      <!--The path needed to be hardcoded for this to work on our publishing CI-->
-      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\LdaNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\LdaNative.pdb" TargetPath="..\..\runtimes\win-x86\native" />
-      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\LdaNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\LdaNative.pdb" TargetPath="..\..\runtimes\win-x64\native" />
-      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-arm64\native\LdaNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-arm64\native\LdaNative.pdb" TargetPath="..\..\runtimes\win-arm64\native"/>
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj
index 58b6f74f1b..dbcfe5a2bb 100644
--- a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj
+++ b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.CodeGenerator</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET Code Generator</PackageDescription>
     <NoWarn>$(NoWarn)</NoWarn>
 
@@ -24,13 +23,9 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.AutoML\Microsoft.ML.AutoML.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
 
-    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" PrivateAssets="all" />
 
   </ItemGroup>
 
diff --git a/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj b/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
index cc342e96e1..807fa85088 100644
--- a/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
+++ b/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>CORECLR</DefineConstants>
     <RootNamespace>Microsoft.ML</RootNamespace>
diff --git a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
index 699bc4e2f6..1efcad536c 100644
--- a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
+++ b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
-    <IncludeInPackage>Microsoft.ML.CpuMath</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>Microsoft.ML.CpuMath contains optimized math routines for ML.NET.</PackageDescription>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);CPUMATH_INFRASTRUCTURE</DefineConstants>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\Microsoft.ML.Core\Utilities\Contracts.cs" />
@@ -33,12 +31,4 @@
   <ItemGroup>
     <PackageReference Include="System.Numerics.Tensors" Version="$(SystemNumericsTensorsVersion)" />
   </ItemGroup>
-  <Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
-    <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
-      <!--Include native PDBs-->
-      <!--The path needed to be hardcoded for this to work on our publishing CI-->
-      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\nativeassets\netstandard2.0\CpuMathNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\nativeassets\netstandard2.0\CpuMathNative.pdb" TargetPath="..\..\runtimes\win-x86\nativeassets\netstandard2.0" />
-      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\nativeassets\netstandard2.0\CpuMathNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\nativeassets\netstandard2.0\CpuMathNative.pdb" TargetPath="..\..\runtimes\win-x64\nativeassets\netstandard2.0" />
-    </ItemGroup>
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj b/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj
index 0ea1f6e1f9..d212f5e4ee 100644
--- a/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj
+++ b/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>CORECLR</DefineConstants>
   </PropertyGroup>
diff --git a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
index a81ffdaf17..552144183d 100644
--- a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
+++ b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props"/>
-
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.DataView</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>Contains the IDataView system which is a set of interfaces and components that provide efficient, compositional processing of schematized data for machine learning and advanced analytics applications.</PackageDescription>
   </PropertyGroup>
 
diff --git a/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj b/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj
index ec75b23693..1c32e83b72 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj
@@ -1,21 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.DnnImageFeaturizer.AlexNet</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET component for pretrained AlexNet image featurization</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
 
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
index 70dfa08966..0067c6711e 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
@@ -1,21 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.DnnImageFeaturizer.ResNet101</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET component for pretrained ResNet101 image featurization</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
 
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
index db02568be9..092ad2628c 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
@@ -1,21 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.DnnImageFeaturizer.ResNet18</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET component for pretrained ResNet18 image featurization</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
 
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
index 5c6e91aefd..0f5cc2d16f 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
@@ -1,21 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.DnnImageFeaturizer.ResNet50</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET component for pretrained ResNet50 image featurization</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
 
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
index 766107cd6b..4f83132434 100644
--- a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
+++ b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
@@ -1,24 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.Ensemble</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET component for Ensembles</PackageDescription>
     <DefineConstants>CORECLR</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
index a2b946550c..c84a5d5c96 100644
--- a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
+++ b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
@@ -1,27 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.EntryPoints</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>Microsoft.ML.EntryPoints contains the ML.NET entry point API catalog.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
index 1996182a09..6a47692468 100644
--- a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
+++ b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
@@ -1,18 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.Experimental</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>Microsoft.ML.Experimental contains experimental work such extension methods to access internal methods.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj b/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj
index 72b2ad0edb..a1b8d3fec4 100644
--- a/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj
+++ b/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj
@@ -1,27 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.Fairlearn</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Data.Analysis\Microsoft.Data.Analysis.csproj" />
     <ProjectReference Include="..\Microsoft.ML.AutoML\Microsoft.ML.AutoML.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.SearchSpace\Microsoft.ML.SearchSpace.csproj">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeInNuget>true</IncludeInNuget>
-    </ProjectReference>
+    <!-- SearchSpace is part of AutoML -->
+    <ProjectReference Include="..\Microsoft.ML.SearchSpace\Microsoft.ML.SearchSpace.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <!-- Core and Data are part of Microsoft.ML -->
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
 
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
 
   </ItemGroup>
 
diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
index acbef6b851..d3412e48c5 100644
--- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
+++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
@@ -1,37 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.FastTree</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET component for FastTree</PackageDescription>
     <DefineConstants>$(DefineConstants);NO_STORE;CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.OneDal\Microsoft.ML.OneDal.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.OneDal\Microsoft.ML.OneDal.csproj" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="$(RepoRoot)eng\pkg\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
   </ItemGroup>
-  <Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
-    <ItemGroup>
-      <!--Include native PDBs-->
-      <!--The path needed to be hardcoded for this to work on our publishing CI-->
-      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\FastTreeNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\FastTreeNative.pdb" TargetPath="..\..\runtimes\win-x86\native"/>
-      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\FastTreeNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\FastTreeNative.pdb" TargetPath="..\..\runtimes\win-x64\native"/>
-    </ItemGroup>
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
index 5edf8ebb14..ad687a0ad0 100644
--- a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
+++ b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.ImageAnalytics</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET component for Image support</PackageDescription>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
@@ -20,12 +19,8 @@
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj b/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj
index f7e24f9457..41a772450c 100644
--- a/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj
+++ b/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML</IncludeInPackage>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
index 4d4c405e01..5b0dfe4ceb 100644
--- a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
+++ b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.LightGbm</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET component for LightGBM</PackageDescription>
   </PropertyGroup>
 
@@ -12,15 +11,9 @@
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
     <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
index 56566d43df..c0d092bd53 100644
--- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
+++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
@@ -1,27 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET additional learners making use of Intel Mkl.</PackageDescription>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Mkl.Redist\Microsoft.ML.Mkl.Redist.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.OneDal\Microsoft.ML.OneDal.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.OneDal\Microsoft.ML.OneDal.csproj" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="$(RepoRoot)eng\pkg\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
@@ -30,16 +20,6 @@
     <!-- The package reference is in there, so that the build can download the MlNetMklDeps package at build time.
     The binaries of this package, are extraceted, and repackaged in the Microsoft.ML.Mkl.Redist; that is the one that has a true
     dependancy on MlNetMklDeps. From the users prospective, the Microsoft.ML.Mkl.Components package depends on Microsoft.ML.Mkl.Redist. -->
-    <PackageReference Include="MlNetMklDeps" Version="$(MlNetMklDepsVersion)" >
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="MlNetMklDeps" Version="$(MlNetMklDepsVersion)" PrivateAssets="all" />
   </ItemGroup>
-  <Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
-    <ItemGroup>
-      <!--Include native PDBs-->
-      <!--The path needed to be hardcoded for this to work on our publishing CI-->
-      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\SymSgdNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\SymSgdNative.pdb" TargetPath="..\..\runtimes\win-x86\native"/>
-      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\SymSgdNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\SymSgdNative.pdb" TargetPath="..\..\runtimes\win-x64\native"/>
-    </ItemGroup>
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
index 440caa98d1..0c81dbb563 100644
--- a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
+++ b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
+<Project Sdk="Microsoft.Build.NoTargets">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <IncludeBuildOutput Condition="'$(TargetFramework)' == 'netstandard2.0'">false</IncludeBuildOutput>
+    <IsPackable>true</IsPackable>
+    <IncludeBuildOutput>true</IncludeBuildOutput>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageLicenseExpression></PackageLicenseExpression>
     <PackageDescription>$(MSBuildProjectName) contains the MKL library redistributed as a NuGet package.</PackageDescription>
@@ -10,8 +11,7 @@
     <!-- No native dependencies on arm so causes nuget package failure -->
     <IsPackable Condition="'$(TargetArchitecture)' == 'arm64' Or '$(TargetArchitecture)' == 'arm'">false</IsPackable>
      <!-- Empty package with no managed dependencies, only native, so no need to warn for empty lib folder/dependencies -->
-    <NoWarn>$(NoWarn);NU5127;NU5128</NoWarn>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
+    <NoWarn>$(NoWarn);NU5127;NU5128;NU5109</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -25,14 +25,4 @@
     <Content Include="$(RepoRoot)eng\pkg\_._" Pack="true" PackagePath="lib\netstandard2.0\" />
     <Content Include="$(NuGetPackageRoot)mlnetmkldeps\$(MlNetMklDepsVersion)\LICENSE.txt" Pack="true" PackagePath="" />
   </ItemGroup>
-
-  <Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
-    <ItemGroup>
-      <!--Include native PDBs-->
-      <TfmSpecificDebugSymbolsFile Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\MklProxyNative.pdb')" TargetFramework="netstandard2.0" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\MklProxyNative.pdb" TargetPath="/runtimes/win-x86/native"/>
-      <TfmSpecificDebugSymbolsFile Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\MklProxyNative.pdb')" TargetFramework="netstandard2.0" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\MklProxyNative.pdb" TargetPath="/runtimes/win-x64/native"/>
-      <TfmSpecificDebugSymbolsFile Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\MklImports.pdb')" TargetFramework="netstandard2.0" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\MklImports.pdb" TargetPath="/runtimes/win-x86/native/MklImports.pdb"/>
-      <TfmSpecificDebugSymbolsFile Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\MklImports.pdb')" TargetFramework="netstandard2.0" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\MklImports.pdb" TargetPath="/runtimes/win-x64/native/MklImports.pdb"/>
-    </ItemGroup>
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj b/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj
index ab1cc7a4cb..22228c6e3c 100644
--- a/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj
+++ b/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj
@@ -1,26 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.OneDal</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET additional learners making use of Intel® oneAPI Data Analytics Library (oneDAL).</PackageDescription>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput)</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" PrivateAssets="all" />
   </ItemGroup>
   <PropertyGroup>
     <TargetSystem Condition="'$(OS)' == 'Windows_NT'">win</TargetSystem>
diff --git a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
index 56fefc841f..6182288560 100644
--- a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
+++ b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.OnnxConverter</IncludeInPackage>
     <RootNamespace>Microsoft.ML.Model.Onnx</RootNamespace>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET component for exporting ONNX Models</PackageDescription>
   </PropertyGroup>
 
@@ -15,9 +14,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
index 54517aebaa..8cc669e666 100644
--- a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
+++ b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
@@ -1,22 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.OnnxTransformer</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET component for Microsoft.ML.OnnxRuntime.Managed library</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
     <PackageReference Include="Microsoft.ML.OnnxRuntime.Managed" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
     <PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufVersion)" />
   </ItemGroup>
diff --git a/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj b/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj
index f7e24f9457..41a772450c 100644
--- a/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj
+++ b/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML</IncludeInPackage>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
index f41344c124..df7c11bb8b 100644
--- a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
+++ b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.Parquet</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET components for Apache Parquet support.</PackageDescription>
   </PropertyGroup>
 
@@ -14,12 +13,8 @@
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
index 980e5719da..52e96bb9ec 100644
--- a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
+++ b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
@@ -1,32 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.Recommender</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <IsPackable>true</IsPackable>
     <PackageDescription>LIBMF, the core computation library for matrix factorization in ML.NET</PackageDescription>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="$(RepoRoot)eng\pkg\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
     <Content Include="$(RepoRoot)src\Native\MatrixFactorizationNative\libmf\COPYRIGHT" Pack="true" PackagePath="" />
   </ItemGroup>
-  <Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
-    <ItemGroup>
-      <!--Include native PDBs-->
-      <!--The path needed to be hardcoded for this to work on our publishing CI-->
-      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\MatrixFactorizationNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\MatrixFactorizationNative.pdb" TargetPath="..\..\runtimes\win-x86\native"/>
-      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\MatrixFactorizationNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\MatrixFactorizationNative.pdb" TargetPath="..\..\runtimes\win-x64\native"/>
-      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-arm64\native\MatrixFactorizationNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-arm64\native\MatrixFactorizationNative.pdb" TargetPath="..\..\runtimes\win-arm64\native"/>
-    </ItemGroup>
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
index db62720cdd..1698d12a23 100644
--- a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
+++ b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.SampleUtils</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>Sample utils for Microsoft.ML.Samples</PackageDescription>
 
     <!--The nuget we publish is named SampleUtils, so this is necessary.
@@ -19,15 +18,9 @@
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.SearchSpace/Microsoft.ML.SearchSpace.csproj b/src/Microsoft.ML.SearchSpace/Microsoft.ML.SearchSpace.csproj
index 155feb6f84..02170c83fe 100644
--- a/src/Microsoft.ML.SearchSpace/Microsoft.ML.SearchSpace.csproj
+++ b/src/Microsoft.ML.SearchSpace/Microsoft.ML.SearchSpace.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.Core</IncludeInPackage>
     <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
     <NoWarn>MSML_ContractsCheckMessageNotLiteralOrIdentifier</NoWarn>
     <LangVersion>9.0</LangVersion>
diff --git a/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj b/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj
index d3a7a06c3c..a450db0d37 100644
--- a/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj
+++ b/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
@@ -10,10 +9,7 @@
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
     <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.SearchSpace\Microsoft.ML.SearchSpace.csproj">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeInNuget>true</IncludeInNuget>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.SearchSpace\Microsoft.ML.SearchSpace.csproj" Pack="true" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
index 112045bc80..d267d32217 100644
--- a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
+++ b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.TensorFlow</IncludeInPackage>
     <DefineConstants>CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <IsPackable>true</IsPackable>
     <PackageDescription>Microsoft.ML.TensorFlow contains ML.NET integration of TensorFlow.</PackageDescription>
   </PropertyGroup>
 
@@ -19,15 +18,9 @@
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
index b5aa12d56a..1ad57eb04c 100644
--- a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
+++ b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props"/>
-
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.TimeSeries</IncludeInPackage>
+    <IsPackable>true</IsPackable>
     <PackageDescription>Microsoft.ML.TimeSeries contains ML.NET Time Series prediction algorithms. Uses Intel Mkl.</PackageDescription>
   </PropertyGroup>
 
@@ -11,14 +9,8 @@
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Mkl.Redist\Microsoft.ML.Mkl.Redist.csproj" />
 
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" >
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj b/src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj
index 78b6d7f49b..9253084d23 100644
--- a/src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj
+++ b/src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <IsPackable>true</IsPackable>
     <PackageDescription>Microsoft.ML.Tokenizers contains the implmentation of the tokenization used in the NLP transforms.</PackageDescription>
   </PropertyGroup>
 
diff --git a/src/Microsoft.ML.TorchSharp/Microsoft.ML.TorchSharp.csproj b/src/Microsoft.ML.TorchSharp/Microsoft.ML.TorchSharp.csproj
index d55779e964..698dbfd623 100644
--- a/src/Microsoft.ML.TorchSharp/Microsoft.ML.TorchSharp.csproj
+++ b/src/Microsoft.ML.TorchSharp/Microsoft.ML.TorchSharp.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <NoWarn>$(NoWarn);CS8002</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <IsPackable>true</IsPackable>
     <PackageDescription>Microsoft.ML.TorchSharp contains ML.NET integration of TorchSharp.</PackageDescription>
     <PlatformTarget>AnyCPU</PlatformTarget>
 
@@ -26,9 +26,7 @@
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Tokenizers\Microsoft.ML.Tokenizers.csproj" />
 
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj b/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj
index 8f6378ad93..09fb537c0e 100644
--- a/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj
+++ b/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML</IncludeInPackage>
     <DefineConstants>CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj b/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj
index 08a74bc8d1..65ffcaa5fc 100644
--- a/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj
+++ b/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.Vision</IncludeInPackage>
     <DefineConstants>CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <IsPackable>true</IsPackable>
     <PackageDescription>Microsoft.ML.Vision contains high level APIs for vision tasks like image classification.</PackageDescription>
   </PropertyGroup>
 
@@ -15,15 +14,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
   </ItemGroup>
 
diff --git a/src/Microsoft.ML/CompatibilitySuppressions.xml b/src/Microsoft.ML/CompatibilitySuppressions.xml
new file mode 100644
index 0000000000..265ec0fb2b
--- /dev/null
+++ b/src/Microsoft.ML/CompatibilitySuppressions.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0004</DiagnosticId>
+    <Target>Microsoft.ML, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51</Target>
+    <Left>lib/netstandard2.0/Microsoft.ML.dll</Left>
+    <Right>right</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+</Suppressions>
\ No newline at end of file
diff --git a/src/Microsoft.ML/Microsoft.ML.csproj b/src/Microsoft.ML/Microsoft.ML.csproj
index 9b8fdf7538..b5a7e0c06f 100644
--- a/src/Microsoft.ML/Microsoft.ML.csproj
+++ b/src/Microsoft.ML/Microsoft.ML.csproj
@@ -1,44 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)eng/pkg/Pack.props"/>
+<Project Sdk="Microsoft.Build.NoTargets">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <!-- To include the DLL and PDBs of the underlying projects
-    We need to remove the IncludeBuildOutput=false. This also generates a
-    Microsoft.ML.dll in the nuget package, and a Microsoft.ML.pdb in the .snupkg
-    But these are to be ignored, as they don't contain anything meaningful-->
-    <!-- <IncludeBuildOutput>false</IncludeBuildOutput> -->
+    <NoTargetsDoNotReferenceOutputAssemblies>false</NoTargetsDoNotReferenceOutputAssemblies>
+    <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
+    <IncludeBuildOutput>true</IncludeBuildOutput>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);NU5127;NU5128</NoWarn>
+    <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET is a cross-platform open-source machine learning framework which makes machine learning accessible to .NET developers.</PackageDescription>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="../Microsoft.ML.DataView/Microsoft.ML.DataView.csproj" />
     <ProjectReference Include="../Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj" />
-    <ProjectReference Include="../Microsoft.ML.Core/Microsoft.ML.Core.csproj">
-      <IncludeInNuget>true</IncludeInNuget>
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="../Microsoft.ML.Data/Microsoft.ML.Data.csproj">
-      <IncludeInNuget>true</IncludeInNuget>
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="../Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj">
-      <IncludeInNuget>true</IncludeInNuget>
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="../Microsoft.ML.PCA/Microsoft.ML.PCA.csproj">
-      <IncludeInNuget>true</IncludeInNuget>
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="../Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj">
-      <IncludeInNuget>true</IncludeInNuget>
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="../Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj">
-      <IncludeInNuget>true</IncludeInNuget>
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="../Microsoft.ML.Core/Microsoft.ML.Core.csproj" Pack="true" PrivateAssets="all" />
+    <ProjectReference Include="../Microsoft.ML.Data/Microsoft.ML.Data.csproj" Pack="true" PrivateAssets="all" />
+    <ProjectReference Include="../Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj" Pack="true" PrivateAssets="all" />
+    <ProjectReference Include="../Microsoft.ML.PCA/Microsoft.ML.PCA.csproj" Pack="true" PrivateAssets="all" />
+    <ProjectReference Include="../Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj" Pack="true" PrivateAssets="all" />
+    <ProjectReference Include="../Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj" Pack="true" PrivateAssets="all" />
     <NativeAssemblyReference Include="LdaNative" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightVersion)" />
@@ -52,21 +32,4 @@
     <Content Include="build\**\*" Pack="true" PackagePath="build" />
     <None Include="README.md" Pack="true" PackagePath="\"/> <!--NuGet PackageReadmeFile-->
   </ItemGroup>
-<PropertyGroup>
-  <!--Include Project References output-->
-  <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
-</PropertyGroup>
-  <Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
-    <ItemGroup>
-      <!--Include DLLs of Project References-->
-      <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('IncludeInNuget','true'))"/>
-      <!--Include PDBs of Project References-->
-      <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('IncludeInNuget','true')->Replace('.dll', '.pdb'))"/>
-      <!--Include PDBs for Native binaries-->
-      <!--The path needed to be hardcoded for this to work on our publishing CI-->
-      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\LdaNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x86\native\LdaNative.pdb" TargetPath="..\..\runtimes\win-x86\native"/>
-      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\LdaNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-x64\native\LdaNative.pdb" TargetPath="..\..\runtimes\win-x64\native"/>
-      <BuildOutputInPackage Condition="Exists('$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-arm64\native\LdaNative.pdb')" Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\win-arm64\native\LdaNative.pdb" TargetPath="..\..\runtimes\win-arm64\native"/>
-    </ItemGroup>
-  </Target>
 </Project>
diff --git a/test/TestFrameworkDependency.props b/test/TestFrameworkDependency.props
index c815dd3166..eec1c9c73b 100644
--- a/test/TestFrameworkDependency.props
+++ b/test/TestFrameworkDependency.props
@@ -1,8 +1,6 @@
 <Project>
   <ItemGroup Condition="'$(ReferenceTypeForTestFramework)' == '' OR '$(ReferenceTypeForTestFramework)' == 'Project'">
-    <ProjectReference Include="..\..\src\Microsoft.ML.Data\Microsoft.ML.Data.csproj">
-      <PrivateAssets>All</PrivateAssets>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup Condition="'$(ReferenceTypeForTestFramework)' == 'NuGet'">
     <!-- Versions below are just placeholder, will be updated during nighly build pipeline to latest package version
diff --git a/tools-local/Microsoft.ML.AutoML.SourceGenerator/Microsoft.ML.AutoML.SourceGenerator.csproj b/tools-local/Microsoft.ML.AutoML.SourceGenerator/Microsoft.ML.AutoML.SourceGenerator.csproj
index 5d59e4820c..252d5fad4d 100644
--- a/tools-local/Microsoft.ML.AutoML.SourceGenerator/Microsoft.ML.AutoML.SourceGenerator.csproj
+++ b/tools-local/Microsoft.ML.AutoML.SourceGenerator/Microsoft.ML.AutoML.SourceGenerator.csproj
@@ -11,10 +11,10 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" PrivateAssets="all" />
     <PackageReference Include="System.CodeDom" Version="$(SystemCodeDomVersion)" />
-    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" PrivateAssets="All" GeneratePathProperty="true" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" PrivateAssets="All" GeneratePathProperty="true" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="All" GeneratePathProperty="true" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" PrivateAssets="All" GeneratePathProperty="true" />
+    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" PrivateAssets="all" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" PrivateAssets="all" GeneratePathProperty="true" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" GeneratePathProperty="true" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" PrivateAssets="all" GeneratePathProperty="true" />
   </ItemGroup>
 
   <Target Name="GetDependencyTargetPaths">

From ca66f2b01753b7d22f6aa10968c61738fbfbb31d Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Mon, 8 Jan 2024 14:07:17 -0800
Subject: [PATCH 02/12] Apply code review feedback

---
 .../Microsoft.ML.AutoML.Samples.csproj                    | 1 +
 eng/Packaging.targets                                     | 1 +
 eng/common/internal/Tools.csproj                          | 2 ++
 .../Microsoft.Data.Analysis.csproj                        | 4 +++-
 .../Microsoft.ML.CodeGenerator.csproj                     | 1 +
 src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj      | 2 ++
 src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj    | 1 +
 .../Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj      | 1 +
 src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj    | 2 ++
 .../Microsoft.ML.Mkl.Components.csproj                    | 2 ++
 .../Microsoft.ML.Mkl.Redist.csproj                        | 2 ++
 src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj        | 2 ++
 .../Microsoft.ML.OnnxTransformer.csproj                   | 1 +
 .../Microsoft.ML.Recommender.csproj                       | 2 ++
 .../Microsoft.ML.SearchSpace.csproj                       | 1 +
 .../Microsoft.ML.TimeSeries.csproj                        | 2 ++
 .../Microsoft.ML.Tokenizers.csproj                        | 1 +
 src/Microsoft.ML/CompatibilitySuppressions.xml            | 1 +
 src/Microsoft.ML/Microsoft.ML.csproj                      | 8 ++++++++
 .../Microsoft.Data.Analysis.Interactive.Tests.csproj      | 1 +
 .../Microsoft.Data.Analysis.Tests.csproj                  | 1 +
 .../Microsoft.Extensions.ML.Tests.csproj                  | 1 +
 .../Microsoft.ML.AutoML.Tests.csproj                      | 1 +
 .../Microsoft.ML.Core.Tests.csproj                        | 1 +
 .../Microsoft.ML.Fairlearn.Tests.csproj                   | 1 +
 .../Microsoft.ML.OnnxTransformerTest.csproj               | 1 +
 .../Microsoft.ML.PerformanceTests.csproj                  | 2 ++
 .../Microsoft.ML.Predictor.Tests.csproj                   | 1 +
 .../Microsoft.ML.SearchSpace.Tests.csproj                 | 1 +
 .../Microsoft.ML.Sweeper.Tests.csproj                     | 1 +
 .../Microsoft.ML.TestFramework.csproj                     | 1 +
 test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj         | 1 +
 .../Microsoft.ML.TimeSeries.Tests.csproj                  | 2 ++
 .../Microsoft.ML.Tokenizers.Tests.csproj                  | 1 +
 .../RemoteExecutorConsoleApp.csproj                       | 1 +
 35 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj b/docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj
index e753ee59f6..628cbe5293 100644
--- a/docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj
+++ b/docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj
@@ -23,4 +23,5 @@
   <ItemGroup>
     <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
   </ItemGroup>
+
 </Project>
diff --git a/eng/Packaging.targets b/eng/Packaging.targets
index 31ed1af523..f1b9cb2800 100644
--- a/eng/Packaging.targets
+++ b/eng/Packaging.targets
@@ -17,6 +17,7 @@
           Condition="'@(ProjectReference)' != '' and @(ProjectReference->AnyHaveMetadataValue('Pack', 'true'))"
           DependsOnTargets="BuildOnlySettings;ResolveReferences">
     <ItemGroup>
+      <!-- Implements workaround for https://github.com/NuGet/Home/issues/3891 -->
       <!-- Add ReferenceCopyLocalPaths for ProjectReferences which are flagged as Pack="true" into the package. -->
       <_projectReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('Pack', 'true'))" />
       <TfmSpecificPackageFile Include="@(_projectReferenceCopyLocalPaths)"
diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj
index 7f5ce6d608..8fa77e5b18 100644
--- a/eng/common/internal/Tools.csproj
+++ b/eng/common/internal/Tools.csproj
@@ -1,5 +1,6 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
@@ -27,4 +28,5 @@
 
   <!-- Repository extensibility point -->
   <Import Project="$(RepositoryEngineeringDir)InternalTools.props" Condition="Exists('$(RepositoryEngineeringDir)InternalTools.props')" />
+
 </Project>
diff --git a/src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj b/src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj
index dea36013f9..1badcdef5c 100644
--- a/src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj
+++ b/src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -18,7 +19,7 @@
 
   <!-- The following properties are set to package M.D.A.Interactive with the M.D.A nuget package.
        We cannot include it with a ProjectReference, since that would create a circular dependency.
-       If M.D.A.I undergoes TFM or dependency changes, we need to update the TargetFramework passed in below-->
+       If M.D.A.I undergoes TFM or dependency changes, we need to update the TargetFramework passed in below. -->
   <Target Name="AddMDAIToInteractiveExtensionsFolder">
     <MSBuild Projects="./../Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj" Targets="_GetBuildOutputFilesWithTfm" Properties="TargetFramework=net6.0">
       <!-- Manually hardcoding the TargetFramework to netcoreapp3.1 as that is the one that MDAI targets -->
@@ -239,4 +240,5 @@
       <CustomToolNamespace>Microsoft.Data</CustomToolNamespace>
     </EmbeddedResource>
   </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj
index dbcfe5a2bb..a468b72fde 100644
--- a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj
+++ b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj
@@ -140,4 +140,5 @@
       <DependentUpon>PredictProject.tt</DependentUpon>
     </Compile>
   </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
index 1efcad536c..f6f7abb7da 100644
--- a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
+++ b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
@@ -31,4 +32,5 @@
   <ItemGroup>
     <PackageReference Include="System.Numerics.Tensors" Version="$(SystemNumericsTensorsVersion)" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
index 552144183d..59ac30649e 100644
--- a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
+++ b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>true</IsPackable>
diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
index 0067c6711e..d99e4b0022 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
@@ -16,4 +16,5 @@
   <ItemGroup>
     <Content Include="$(RepoRoot)eng\pkg\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
index d3412e48c5..80d0aab011 100644
--- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
+++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>true</IsPackable>
@@ -16,4 +17,5 @@
   <ItemGroup>
     <Content Include="$(RepoRoot)eng\pkg\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
index c0d092bd53..ae356239ac 100644
--- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
+++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -22,4 +23,5 @@
     dependancy on MlNetMklDeps. From the users prospective, the Microsoft.ML.Mkl.Components package depends on Microsoft.ML.Mkl.Redist. -->
     <PackageReference Include="MlNetMklDeps" Version="$(MlNetMklDepsVersion)" PrivateAssets="all" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
index 0c81dbb563..d8a9e9b04f 100644
--- a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
+++ b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.Build.NoTargets">
+
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
@@ -25,4 +26,5 @@
     <Content Include="$(RepoRoot)eng\pkg\_._" Pack="true" PackagePath="lib\netstandard2.0\" />
     <Content Include="$(NuGetPackageRoot)mlnetmkldeps\$(MlNetMklDepsVersion)\LICENSE.txt" Pack="true" PackagePath="" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj b/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj
index 22228c6e3c..b38ffb379a 100644
--- a/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj
+++ b/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -20,4 +21,5 @@
   <ItemGroup>
     <Content Include="$(RepoRoot)eng\pkg\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
index 8cc669e666..f684d01ed9 100644
--- a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
+++ b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
@@ -21,4 +21,5 @@
       <Link>OnnxMl.cs</Link>
     </Compile>
   </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
index 52e96bb9ec..080bda9500 100644
--- a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
+++ b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -14,4 +15,5 @@
     <Content Include="$(RepoRoot)eng\pkg\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
     <Content Include="$(RepoRoot)src\Native\MatrixFactorizationNative\libmf\COPYRIGHT" Pack="true" PackagePath="" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.ML.SearchSpace/Microsoft.ML.SearchSpace.csproj b/src/Microsoft.ML.SearchSpace/Microsoft.ML.SearchSpace.csproj
index 02170c83fe..6a66b0f280 100644
--- a/src/Microsoft.ML.SearchSpace/Microsoft.ML.SearchSpace.csproj
+++ b/src/Microsoft.ML.SearchSpace/Microsoft.ML.SearchSpace.csproj
@@ -10,4 +10,5 @@
   <ItemGroup>
     <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
index 1ad57eb04c..2f539a5099 100644
--- a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
+++ b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>true</IsPackable>
@@ -13,4 +14,5 @@
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" PrivateAssets="all" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj b/src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj
index 9253084d23..0a82db7a41 100644
--- a/src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj
+++ b/src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj
@@ -10,4 +10,5 @@
   <ItemGroup>
     <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.ML/CompatibilitySuppressions.xml b/src/Microsoft.ML/CompatibilitySuppressions.xml
index 265ec0fb2b..0c101d6947 100644
--- a/src/Microsoft.ML/CompatibilitySuppressions.xml
+++ b/src/Microsoft.ML/CompatibilitySuppressions.xml
@@ -2,6 +2,7 @@
 <!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Suppression>
+    <!-- We no longer ship Microsoft.ML.dll since it was an empty assembly -->
     <DiagnosticId>CP0004</DiagnosticId>
     <Target>Microsoft.ML, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51</Target>
     <Left>lib/netstandard2.0/Microsoft.ML.dll</Left>
diff --git a/src/Microsoft.ML/Microsoft.ML.csproj b/src/Microsoft.ML/Microsoft.ML.csproj
index b5a7e0c06f..004d1c7ba5 100644
--- a/src/Microsoft.ML/Microsoft.ML.csproj
+++ b/src/Microsoft.ML/Microsoft.ML.csproj
@@ -1,9 +1,15 @@
 <Project Sdk="Microsoft.Build.NoTargets">
+
   <PropertyGroup>
+    <!-- bundle dependencies resolved for these frameworks -->
     <TargetFramework>netstandard2.0</TargetFramework>
+    <!-- We need ProjectReferences to provide output since we're bundling the output -->
     <NoTargetsDoNotReferenceOutputAssemblies>false</NoTargetsDoNotReferenceOutputAssemblies>
+    <!-- Framwork references are reuquired for APICompat -->
     <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
+    <!-- This must be set to include any PDBs -->
     <IncludeBuildOutput>true</IncludeBuildOutput>
+    <!-- Don't produce nor include xml docs -->
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);NU5127;NU5128</NoWarn>
     <IsPackable>true</IsPackable>
@@ -32,4 +38,6 @@
     <Content Include="build\**\*" Pack="true" PackagePath="build" />
     <None Include="README.md" Pack="true" PackagePath="\"/> <!--NuGet PackageReadmeFile-->
   </ItemGroup>
+
 </Project>
+ 
\ No newline at end of file
diff --git a/test/Microsoft.Data.Analysis.Interactive.Tests/Microsoft.Data.Analysis.Interactive.Tests.csproj b/test/Microsoft.Data.Analysis.Interactive.Tests/Microsoft.Data.Analysis.Interactive.Tests.csproj
index bf2bf806e4..6dd6a7538d 100644
--- a/test/Microsoft.Data.Analysis.Interactive.Tests/Microsoft.Data.Analysis.Interactive.Tests.csproj
+++ b/test/Microsoft.Data.Analysis.Interactive.Tests/Microsoft.Data.Analysis.Interactive.Tests.csproj
@@ -12,4 +12,5 @@
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
+
 </Project>
diff --git a/test/Microsoft.Data.Analysis.Tests/Microsoft.Data.Analysis.Tests.csproj b/test/Microsoft.Data.Analysis.Tests/Microsoft.Data.Analysis.Tests.csproj
index 6827d6120a..39fd3edc47 100644
--- a/test/Microsoft.Data.Analysis.Tests/Microsoft.Data.Analysis.Tests.csproj
+++ b/test/Microsoft.Data.Analysis.Tests/Microsoft.Data.Analysis.Tests.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
     <PropertyGroup>
         <NoWarn>$(NoWarn);MSML_ParameterLocalVarName;MSML_PrivateFieldName;MSML_ExtendBaseTestClass;MSML_GeneralName</NoWarn>
         <LangVersion>preview</LangVersion>
diff --git a/test/Microsoft.Extensions.ML.Tests/Microsoft.Extensions.ML.Tests.csproj b/test/Microsoft.Extensions.ML.Tests/Microsoft.Extensions.ML.Tests.csproj
index 6d9ada6a47..d63b42a637 100644
--- a/test/Microsoft.Extensions.ML.Tests/Microsoft.Extensions.ML.Tests.csproj
+++ b/test/Microsoft.Extensions.ML.Tests/Microsoft.Extensions.ML.Tests.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <ItemGroup>
     <PackageReference Include="Microsoft.ML.TestModels" Version="$(MicrosoftMLTestModelsVersion)" />
   </ItemGroup>
diff --git a/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj b/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj
index 39073412f3..0d6e7c13f3 100644
--- a/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj
+++ b/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <NoWarn>$(NoWarn)</NoWarn>
 
diff --git a/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj b/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj
index 475eb5dbb1..3e4f0fac84 100644
--- a/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj
+++ b/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <DefineConstants>CORECLR</DefineConstants>
     <StrongNameKeyId>Test</StrongNameKeyId>
diff --git a/test/Microsoft.ML.Fairlearn.Tests/Microsoft.ML.Fairlearn.Tests.csproj b/test/Microsoft.ML.Fairlearn.Tests/Microsoft.ML.Fairlearn.Tests.csproj
index b950086278..bb1a2c0c45 100644
--- a/test/Microsoft.ML.Fairlearn.Tests/Microsoft.ML.Fairlearn.Tests.csproj
+++ b/test/Microsoft.ML.Fairlearn.Tests/Microsoft.ML.Fairlearn.Tests.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     <NoWarn>$(NoWarn);MSML_ParameterLocalVarName;MSML_PrivateFieldName;MSML_ExtendBaseTestClass;MSML_GeneralName</NoWarn>
diff --git a/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj b/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj
index a941888134..288c9c2049 100644
--- a/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj
+++ b/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <IsUnitTestProject>true</IsUnitTestProject>
     <IsTestProject>true</IsTestProject>
diff --git a/test/Microsoft.ML.PerformanceTests/Microsoft.ML.PerformanceTests.csproj b/test/Microsoft.ML.PerformanceTests/Microsoft.ML.PerformanceTests.csproj
index a0afea5164..55b9b7c6d4 100644
--- a/test/Microsoft.ML.PerformanceTests/Microsoft.ML.PerformanceTests.csproj
+++ b/test/Microsoft.ML.PerformanceTests/Microsoft.ML.PerformanceTests.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <GenerateProgramFile>false</GenerateProgramFile>
@@ -32,4 +33,5 @@
     <NativeAssemblyReference Include="MklImports" />
     <NativeAssemblyReference Condition="'$(OS)' == 'Windows_NT'" Include="libiomp5md" />
   </ItemGroup>
+
 </Project>
diff --git a/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj b/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj
index 603a87f629..d5a1586073 100644
--- a/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj
+++ b/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <DefineConstants>CORECLR</DefineConstants>
   </PropertyGroup>
diff --git a/test/Microsoft.ML.SearchSpace.Tests/Microsoft.ML.SearchSpace.Tests.csproj b/test/Microsoft.ML.SearchSpace.Tests/Microsoft.ML.SearchSpace.Tests.csproj
index 0d8b3f5424..a27583f1dc 100644
--- a/test/Microsoft.ML.SearchSpace.Tests/Microsoft.ML.SearchSpace.Tests.csproj
+++ b/test/Microsoft.ML.SearchSpace.Tests/Microsoft.ML.SearchSpace.Tests.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <NoWarn>$(NoWarn);MSML_ParameterLocalVarName;MSML_PrivateFieldName;MSML_ExtendBaseTestClass;MSML_GeneralName</NoWarn>
   </PropertyGroup>
diff --git a/test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj b/test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj
index 54a35dfa4e..47437a5fcd 100644
--- a/test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj
+++ b/test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj
@@ -12,4 +12,5 @@
     <NativeAssemblyReference Include="MklImports" />
     <NativeAssemblyReference Condition="'$(OS)' == 'Windows_NT'" Include="libiomp5md" />
   </ItemGroup>
+
 </Project>
diff --git a/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj b/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj
index 7abfb1b17c..6eb00d4fcb 100644
--- a/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj
+++ b/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <IsUnitTestProject>true</IsUnitTestProject>
     <IsTestProject>true</IsTestProject>
diff --git a/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj b/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj
index b74a92f484..8fdff30e96 100644
--- a/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj
+++ b/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj
@@ -96,4 +96,5 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
+
 </Project>
diff --git a/test/Microsoft.ML.TimeSeries.Tests/Microsoft.ML.TimeSeries.Tests.csproj b/test/Microsoft.ML.TimeSeries.Tests/Microsoft.ML.TimeSeries.Tests.csproj
index 4ced31bcb9..6a4cd3ec9b 100644
--- a/test/Microsoft.ML.TimeSeries.Tests/Microsoft.ML.TimeSeries.Tests.csproj
+++ b/test/Microsoft.ML.TimeSeries.Tests/Microsoft.ML.TimeSeries.Tests.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <DefineConstants>CORECLR</DefineConstants>
   </PropertyGroup>
@@ -14,4 +15,5 @@
     <NativeAssemblyReference Include="MklImports" />
     <NativeAssemblyReference Condition="'$(OS)' == 'Windows_NT'" Include="libiomp5md" />
   </ItemGroup>
+
 </Project>
diff --git a/test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj b/test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj
index 65fedd6de1..0c22bcfc64 100644
--- a/test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj
+++ b/test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <AssemblyName>Microsoft.ML.Tokenizers.Tests</AssemblyName>
     <StrongNameKeyId>Test</StrongNameKeyId>
diff --git a/test/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj b/test/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj
index 4aee4bc458..580d921f67 100644
--- a/test/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj
+++ b/test/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj
@@ -4,4 +4,5 @@
     <OutputType>Exe</OutputType>
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
+
 </Project>

From 9a9b26b67a3bfc4aba1c6509a3253744faf09f17 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Mon, 8 Jan 2024 20:21:07 -0800
Subject: [PATCH 03/12] Suppress copying indirect references

---
 src/Microsoft.ML/Microsoft.ML.csproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.ML/Microsoft.ML.csproj b/src/Microsoft.ML/Microsoft.ML.csproj
index 004d1c7ba5..fdf18aa640 100644
--- a/src/Microsoft.ML/Microsoft.ML.csproj
+++ b/src/Microsoft.ML/Microsoft.ML.csproj
@@ -5,7 +5,9 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <!-- We need ProjectReferences to provide output since we're bundling the output -->
     <NoTargetsDoNotReferenceOutputAssemblies>false</NoTargetsDoNotReferenceOutputAssemblies>
-    <!-- Framwork references are reuquired for APICompat -->
+    <!-- Only include directly referenced projects -->
+    <_FindDependencies >false</_FindDependencies >
+    <!-- Framework references are required for APICompat -->
     <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
     <!-- This must be set to include any PDBs -->
     <IncludeBuildOutput>true</IncludeBuildOutput>

From 7828ea73b95e092b78563c6f8a4cf4041efb4b13 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Tue, 9 Jan 2024 18:14:28 -0800
Subject: [PATCH 04/12] Remove unwanted bundled files from AutoML

---
 src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
index 9bb22b66eb..4c060f0999 100644
--- a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
+++ b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
@@ -47,8 +47,8 @@
     <ProjectReference Include="..\Microsoft.ML.LightGbm\Microsoft.ML.LightGbm.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Recommender\Microsoft.ML.Recommender.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" Pack="true" PrivateAssets="all" />
-    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" Pack="true" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
   </ItemGroup>
 

From 86ff6b5b952d423a6506800f15ca2373e846d32d Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Tue, 9 Jan 2024 18:14:46 -0800
Subject: [PATCH 05/12] Remove leading slash

---
 eng/Packaging.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Packaging.targets b/eng/Packaging.targets
index f1b9cb2800..45774911dd 100644
--- a/eng/Packaging.targets
+++ b/eng/Packaging.targets
@@ -37,7 +37,7 @@
     <ItemGroup>
       <!-- PDBs must be specified as TfmSpecificDebugSymbolsFile with TargetPath instead of PackagePath. -->
       <TfmSpecificDebugSymbolsFile Include="@(TfmSpecificPackageFile->WithMetadataValue('Extension', '.pdb'))"
-                                   TargetPath="/%(TfmSpecificPackageFile.PackagePath)%(Filename)%(Extension)"
+                                   TargetPath="%(TfmSpecificPackageFile.PackagePath)%(Filename)%(Extension)"
                                    TargetFramework="$(TargetFramework)" />
       <!-- Remove symbols from the file list. -->
       <TfmSpecificPackageFile Remove="@(TfmSpecificPackageFile->WithMetadataValue('Extension', '.pdb'))" />

From 1ca51b3fec203ac7511df33036383ea1eadbfbeb Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Tue, 9 Jan 2024 18:25:43 -0800
Subject: [PATCH 06/12] Refactor model download

---
 Directory.Build.props                         |   1 +
 ...osoft.ML.DnnImageFeaturizer.AlexNet.csproj |   2 +
 ...oft.ML.DnnImageFeaturizer.ResNet101.csproj |   2 +
 ...soft.ML.DnnImageFeaturizer.ResNet18.csproj |   2 +
 ...soft.ML.DnnImageFeaturizer.ResNet50.csproj |   2 +
 ...oft.ML.DnnImageFeaturizer.ModelRedist.proj | 124 +++---------------
 6 files changed, 30 insertions(+), 103 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 6a839432e6..123afe717e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -35,6 +35,7 @@
     </PropertyGroup>
 
   <PropertyGroup>
+    <ModelDownloadPath>$(ArtifactsDir)models/</ModelDownloadPath>
     <PackageAssetsPath>$(ArtifactsDir)pkgassets/</PackageAssetsPath>
     <PkgDir>$(RepoRoot)pkg/</PkgDir>
   
diff --git a/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj b/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj
index 1c32e83b72..2a1b6dd4ef 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj
@@ -14,6 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Content Include="$(ModelDownloadPath)AlexNetPrepOnnx\AlexNetPreprocess.onnx" PackagePath="tools\DnnImageModels\AlexNetPrepOnnx\AlexNetPreprocess.onnx" />
+    <Content Include="$(ModelDownloadPath)AlexNetOnnx\AlexNet.onnx" PackagePath="tools\DnnImageModels\AlexNetOnnx\AlexNet.onnx" />
     <Content Include="$(RepoRoot)eng\pkg\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
   </ItemGroup>
 
diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
index d99e4b0022..93812ff46a 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
@@ -14,6 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Content Include="$(ModelDownloadPath)ResNet101Onnx\ResNet101.onnx" PackagePath="tools\DnnImageModels\ResNet101Onnx\ResNet101.onnx" />
+    <Content Include="$(ModelDownloadPath)ResNetPrepOnnx\ResNetPreprocess.onnx" PackagePath="tools\DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx" />
     <Content Include="$(RepoRoot)eng\pkg\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
   </ItemGroup>
 
diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
index 092ad2628c..2502b04a70 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
@@ -14,6 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Content Include="$(ModelDownloadPath)ResNet18Onnx\ResNet18.onnx" PackagePath="tools\DnnImageModels\ResNet18Onnx\ResNet18.onnx" />
+    <Content Include="$(ModelDownloadPath)ResNetPrepOnnx\ResNetPreprocess.onnx" PackagePath="tools\DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx" />
     <Content Include="$(RepoRoot)eng\pkg\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
   </ItemGroup>
 
diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
index 0f5cc2d16f..477a77eeb4 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
@@ -14,6 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Content Include="$(ModelDownloadPath)ResNet50Onnx\ResNet50.onnx" PackagePath="tools\DnnImageModels\ResNet50Onnx\ResNet50.onnx" />
+    <Content Include="$(ModelDownloadPath)ResNetPrepOnnx\ResNetPreprocess.onnx" PackagePath="tools\DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx" />
     <Content Include="$(RepoRoot)eng\pkg\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
   </ItemGroup>
 
diff --git a/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj b/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
index e003f2a5d2..803ab55573 100644
--- a/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
+++ b/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
@@ -1,131 +1,49 @@
-<Project>
+<Project Sdk="Microsoft.Build.NoTargets">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
-  <Import Project="Sdk.props" Sdk="Microsoft.Build.Traversal" />
-
-  <PropertyGroup>
-    <ModelPlacementDir>$(ArtifactsObjDir)DnnImageModels</ModelPlacementDir>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ModelFiles Include="$(ModelPlacementDir)\AlexNetPrepOnnx\AlexNetPreprocess.onnx"
-    Url="https://aka.ms/mlnet-resources/image/AlexNetPrepOnnx/AlexNetPreprocess.onnx"
-    DestinationFile="$(ModelPlacementDir)\AlexNetPrepOnnx\AlexNetPreprocess.onnx"
-    DestinationDir="$(ModelPlacementDir)\AlexNetPrepOnnx" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ModelFiles Include="$(ModelPlacementDir)\ResNetPrepOnnx\ResNetPreprocess.onnx"
-    Url="https://aka.ms/mlnet-resources/image/ResNetPrepOnnx/ResNetPreprocess.onnx"
-    DestinationFile="$(ModelPlacementDir)\ResNetPrepOnnx\ResNetPreprocess.onnx"
-    DestinationDir="$(ModelPlacementDir)\ResNetPrepOnnx" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ModelFiles Include="$(ModelPlacementDir)\AlexNetOnnx\AlexNet.onnx"
-    Url="https://aka.ms/mlnet-resources/image/AlexNetOnnx/AlexNet.onnx"
-    DestinationFile="$(ModelPlacementDir)\AlexNetOnnx\AlexNet.onnx"
-    DestinationDir="$(ModelPlacementDir)\AlexNetOnnx" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ModelFiles Include="$(ModelPlacementDir)\ResNet18Onnx\ResNet18.onnx"
-    Url="https://aka.ms/mlnet-resources/image/ResNet18Onnx/ResNet18.onnx"
-    DestinationFile="$(ModelPlacementDir)\ResNet18Onnx\ResNet18.onnx"
-    DestinationDir="$(ModelPlacementDir)\ResNet18Onnx" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ModelFiles Include="$(ModelPlacementDir)\ResNet50Onnx\ResNet50.onnx"
-    Url="https://aka.ms/mlnet-resources/image/ResNet50Onnx/ResNet50.onnx"
-    DestinationFile="$(ModelPlacementDir)\ResNet50Onnx\ResNet50.onnx"
-    DestinationDir="$(ModelPlacementDir)\ResNet50Onnx" />
-  </ItemGroup>
-
   <ItemGroup>
-    <ModelFiles Include="$(ModelPlacementDir)\ResNet101Onnx\ResNet101.onnx"
-    Url="https://aka.ms/mlnet-resources/image/ResNet101Onnx/ResNet101.onnx"
-    DestinationFile="$(ModelPlacementDir)\ResNet101Onnx\ResNet101.onnx"
-    DestinationDir="$(ModelPlacementDir)\ResNet101Onnx" />
+    <ModelFiles Include="$(ModelDownloadPath)AlexNetPrepOnnx\AlexNetPreprocess.onnx"
+    Url="https://aka.ms/mlnet-resources/image/AlexNetPrepOnnx/AlexNetPreprocess.onnx" />
   </ItemGroup>
 
   <ItemGroup>
-    <ModelFileCopy Include="$(ModelPlacementDir)\AlexNetPrepOnnx\AlexNetPreprocess.onnx"
-    TargetPath="$(PackageAssetsPath)\Microsoft.ML.DnnImageFeaturizer.AlexNet\tools\DnnImageModels\AlexNetPrepOnnx\AlexNetPreprocess.onnx" />
+    <ModelFiles Include="$(ModelDownloadPath)ResNetPrepOnnx\ResNetPreprocess.onnx"
+    Url="https://aka.ms/mlnet-resources/image/ResNetPrepOnnx/ResNetPreprocess.onnx" />
   </ItemGroup>
 
   <ItemGroup>
-    <ModelFileCopy Include="$(ModelPlacementDir)\AlexNetOnnx\AlexNet.onnx"
-    TargetPath="$(PackageAssetsPath)\Microsoft.ML.DnnImageFeaturizer.AlexNet\tools\DnnImageModels\AlexNetOnnx\AlexNet.onnx" />
+    <ModelFiles Include="$(ModelDownloadPath)AlexNetOnnx\AlexNet.onnx"
+    Url="https://aka.ms/mlnet-resources/image/AlexNetOnnx/AlexNet.onnx"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ModelFileCopy Include="$(ModelPlacementDir)\ResNet18Onnx\ResNet18.onnx"
-    TargetPath="$(PackageAssetsPath)\Microsoft.ML.DnnImageFeaturizer.ResNet18\tools\DnnImageModels\ResNet18Onnx\ResNet18.onnx" />
+    <ModelFiles Include="$(ModelDownloadPath)ResNet18Onnx\ResNet18.onnx"
+    Url="https://aka.ms/mlnet-resources/image/ResNet18Onnx/ResNet18.onnx"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ModelFileCopy Include="$(ModelPlacementDir)\ResNetPrepOnnx\ResNetPreprocess.onnx"
-    TargetPath="$(PackageAssetsPath)\Microsoft.ML.DnnImageFeaturizer.ResNet18\tools\DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx" />
+    <ModelFiles Include="$(ModelDownloadPath)ResNet50Onnx\ResNet50.onnx"
+    Url="https://aka.ms/mlnet-resources/image/ResNet50Onnx/ResNet50.onnx" />
   </ItemGroup>
 
   <ItemGroup>
-    <ModelFileCopy Include="$(ModelPlacementDir)\ResNet50Onnx\ResNet50.onnx"
-    TargetPath="$(PackageAssetsPath)\Microsoft.ML.DnnImageFeaturizer.ResNet50\tools\DnnImageModels\ResNet50Onnx\ResNet50.onnx" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ModelFileCopy Include="$(ModelPlacementDir)\ResNetPrepOnnx\ResNetPreprocess.onnx"
-    TargetPath="$(PackageAssetsPath)\Microsoft.ML.DnnImageFeaturizer.ResNet50\tools\DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ModelFileCopy Include="$(ModelPlacementDir)\ResNet101Onnx\ResNet101.onnx"
-    TargetPath="$(PackageAssetsPath)\Microsoft.ML.DnnImageFeaturizer.ResNet101\tools\DnnImageModels\ResNet101Onnx\ResNet101.onnx" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ModelFileCopy Include="$(ModelPlacementDir)\ResNetPrepOnnx\ResNetPreprocess.onnx"
-    TargetPath="$(PackageAssetsPath)\Microsoft.ML.DnnImageFeaturizer.ResNet101\tools\DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx" />
+    <ModelFiles Include="$(ModelDownloadPath)ResNet101Onnx\ResNet101.onnx"
+    Url="https://aka.ms/mlnet-resources/image/ResNet101Onnx/ResNet101.onnx" />
   </ItemGroup>
 
   <Target Name="DownloadDnnModelFiles"
-          Inputs="@(ModelFiles)" Outputs="@(ModelFiles->'%(DestinationFile)')">
-    <Message Importance="High" Text="Downloading external model files... @(ModelFiles->'%(DestinationFile)')" />
-    <MakeDir Directories="$(ModelPlacementDir)" />
-    <MakeDir Directories="@(ModelFiles->'%(DestinationDir)')" />
+          BeforeTargets="Build"
+          Inputs="$(MSBuildProjectFile)" Outputs="@(ModelFiles)">
+    <Message Importance="High" Text="Downloading external model files... @(ModelFiles)" />
+    <MakeDir Directories="$(ModelDownloadPath)" />
+    <MakeDir Directories="@(ModelFiles->'%(RootDir)%(Directory)')" />
     <DownloadFile
             SourceUrl="%(ModelFiles.Url)"
-            DestinationFolder="%(ModelFiles.DestinationDir)"
+            DestinationFileName="%(Filename)%(Extension)"
+            DestinationFolder="%(RootDir)%(Directory)"
             Retries="5"
-            SkipUnchangedFiles="true">
-    </DownloadFile>
+            SkipUnchangedFiles="true" />
   </Target>
-
-  <Target Name="CopyDnnModelFiles"
-          Condition="'$(SkipRIDAgnosticAssets)' != 'true'"
-          Inputs="@(ModelFileCopy)" Outputs="@(ModelFileCopy->'%(TargetPath)')"
-          DependsOnTargets="DownloadDnnModelFiles">
-    <Message Importance="High" Text="Copying external model files... @(ModelFileCopy->'%(TargetPath)')" />
-    <Copy SourceFiles="@(ModelFileCopy)"
-          DestinationFiles="@(ModelFileCopy->'%(TargetPath)')"
-          UseHardlinksIfPossible="$(CreateHardLinksForPublishFilesIfPossible)"
-          UseSymboliclinksIfPossible="$(CreateSymbolicLinksForPublishFilesIfPossible)" />
-  </Target>
-
-  <!-- The targets below are needed for arcade -->
-
-  <Target Name="Build"
-          DependsOnTargets="CopyDnnModelFiles" />
-
-  <Target Name="Pack" />
-
-  <Target Name="Test" />
-
-  <Target Name="PerformanceTest"/>
-
-  <Target Name="IntegrationTest"/>
-
 </Project>
\ No newline at end of file

From fce65343f4d6dfff10e2cdd475f294af2e56024d Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Tue, 9 Jan 2024 18:41:11 -0800
Subject: [PATCH 07/12] Correct the packaging path of native symbols

---
 eng/Packaging.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Packaging.targets b/eng/Packaging.targets
index 45774911dd..dce9148902 100644
--- a/eng/Packaging.targets
+++ b/eng/Packaging.targets
@@ -35,9 +35,9 @@
 
   <Target Name="IncludeAdditionalFilesInPackage" DependsOnTargets="_IncludeProjectReferencesWithPackAttributeInPackage;_IncludeRuntimeSpecificAssetsInPackage">
     <ItemGroup>
-      <!-- PDBs must be specified as TfmSpecificDebugSymbolsFile with TargetPath instead of PackagePath. -->
+      <!-- PDBs must be specified as TfmSpecificDebugSymbolsFile with a *rooted* TargetPath instead of PackagePath. -->
       <TfmSpecificDebugSymbolsFile Include="@(TfmSpecificPackageFile->WithMetadataValue('Extension', '.pdb'))"
-                                   TargetPath="%(TfmSpecificPackageFile.PackagePath)%(Filename)%(Extension)"
+                                   TargetPath="/%(TfmSpecificPackageFile.PackagePath)%(Filename)%(Extension)"
                                    TargetFramework="$(TargetFramework)" />
       <!-- Remove symbols from the file list. -->
       <TfmSpecificPackageFile Remove="@(TfmSpecificPackageFile->WithMetadataValue('Extension', '.pdb'))" />

From 164d3110b81bac43e983e8c0fbb7354a891fbd78 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Fri, 26 Jan 2024 12:15:12 -0800
Subject: [PATCH 08/12] Rename NoTargets projects from csproj to proj

---
 Microsoft.ML.sln                                              | 4 ++--
 src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj    | 2 +-
 src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj            | 2 +-
 src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj        | 2 +-
 src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj  | 2 +-
 .../Microsoft.ML.Experimental.csproj                          | 2 +-
 src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj      | 2 +-
 src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj        | 2 +-
 .../Microsoft.ML.ImageAnalytics.csproj                        | 2 +-
 src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj        | 2 +-
 .../Microsoft.ML.Mkl.Components.csproj                        | 4 ++--
 ...soft.ML.Mkl.Redist.csproj => Microsoft.ML.Mkl.Redist.proj} | 2 +-
 src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj            | 2 +-
 .../Microsoft.ML.OnnxConverter.csproj                         | 2 +-
 .../Microsoft.ML.OnnxTransformer.csproj                       | 2 +-
 src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj          | 2 +-
 src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj  | 2 +-
 .../Microsoft.ML.SamplesUtils.csproj                          | 2 +-
 src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj    | 2 +-
 src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj    | 4 ++--
 src/Microsoft.ML.TorchSharp/Microsoft.ML.TorchSharp.csproj    | 2 +-
 src/Microsoft.ML/{Microsoft.ML.csproj => Microsoft.ML.proj}   | 0
 22 files changed, 24 insertions(+), 24 deletions(-)
 rename src/Microsoft.ML.Mkl.Redist/{Microsoft.ML.Mkl.Redist.csproj => Microsoft.ML.Mkl.Redist.proj} (96%)
 rename src/Microsoft.ML/{Microsoft.ML.csproj => Microsoft.ML.proj} (100%)

diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln
index 2137c9eb15..b731820218 100644
--- a/Microsoft.ML.sln
+++ b/Microsoft.ML.sln
@@ -138,9 +138,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.NightlyBuild.T
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.NugetPackageVersionUpdater", "test\Microsoft.ML.NugetPackageVersionUpdater\Microsoft.ML.NugetPackageVersionUpdater.csproj", "{C8DB58DC-6434-4431-A81F-263D86E2A5F3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML", "src\Microsoft.ML\Microsoft.ML.csproj", "{6CF88209-69DB-4B36-9604-3ECD9F163E96}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML", "src\Microsoft.ML\Microsoft.ML.proj", "{6CF88209-69DB-4B36-9604-3ECD9F163E96}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Mkl.Redist", "src\Microsoft.ML.Mkl.Redist\Microsoft.ML.Mkl.Redist.csproj", "{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Mkl.Redist", "src\Microsoft.ML.Mkl.Redist\Microsoft.ML.Mkl.Redist.proj", "{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Analysis", "src\Microsoft.Data.Analysis\Microsoft.Data.Analysis.csproj", "{84150C22-0627-4A11-81C9-F214762855EA}"
 EndProject
diff --git a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
index 037c7adce1..2235890c35 100644
--- a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
+++ b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
@@ -14,7 +14,7 @@
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
index 4c060f0999..0f8555ed5b 100644
--- a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
+++ b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
@@ -49,7 +49,7 @@
     <ProjectReference Include="..\Microsoft.ML.Recommender\Microsoft.ML.Recommender.csproj" />
     <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
index 4f83132434..62fe880dd1 100644
--- a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
+++ b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
index c84a5d5c96..7e868fd7b7 100644
--- a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
+++ b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
index 6a47692468..55bdf2bb4e 100644
--- a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
+++ b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
 
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
diff --git a/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj b/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj
index a1b8d3fec4..3868ea3167 100644
--- a/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj
+++ b/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj
@@ -11,7 +11,7 @@
     <ProjectReference Include="..\Microsoft.ML.AutoML\Microsoft.ML.AutoML.csproj" />
     <!-- SearchSpace is part of AutoML -->
     <ProjectReference Include="..\Microsoft.ML.SearchSpace\Microsoft.ML.SearchSpace.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
     <!-- Core and Data are part of Microsoft.ML -->
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
index 80d0aab011..5283e0b2ef 100644
--- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
+++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
@@ -8,7 +8,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
index ad687a0ad0..d1bfd16f6a 100644
--- a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
+++ b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
index 5b0dfe4ceb..3e7c927e45 100644
--- a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
+++ b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
     <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
index ae356239ac..978015ed69 100644
--- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
+++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
@@ -7,8 +7,8 @@
     <PackageDescription>ML.NET additional learners making use of Intel Mkl.</PackageDescription>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Mkl.Redist\Microsoft.ML.Mkl.Redist.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML.Mkl.Redist\Microsoft.ML.Mkl.Redist.proj" />
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.proj
similarity index 96%
rename from src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
rename to src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.proj
index d8a9e9b04f..31fbd674d0 100644
--- a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
+++ b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.proj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.Build.NoTargets">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>true</IsPackable>
     <IncludeBuildOutput>true</IncludeBuildOutput>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
diff --git a/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj b/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj
index b38ffb379a..522c0ce06d 100644
--- a/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj
+++ b/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj
@@ -7,7 +7,7 @@
     <PackageDescription>ML.NET additional learners making use of Intel® oneAPI Data Analytics Library (oneDAL).</PackageDescription>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
index 6182288560..935455848a 100644
--- a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
+++ b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
 
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
diff --git a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
index f684d01ed9..f5f2a9e393 100644
--- a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
+++ b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
index df7c11bb8b..186ac429f4 100644
--- a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
+++ b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
index 080bda9500..b805d2fcb1 100644
--- a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
+++ b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
@@ -7,7 +7,7 @@
     <PackageDescription>LIBMF, the core computation library for matrix factorization in ML.NET</PackageDescription>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
diff --git a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
index 1698d12a23..2db86edf1f 100644
--- a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
+++ b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
index d267d32217..56c7738031 100644
--- a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
+++ b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
index 2f539a5099..ba01754106 100644
--- a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
+++ b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Mkl.Redist\Microsoft.ML.Mkl.Redist.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML.Mkl.Redist\Microsoft.ML.Mkl.Redist.proj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.TorchSharp/Microsoft.ML.TorchSharp.csproj b/src/Microsoft.ML.TorchSharp/Microsoft.ML.TorchSharp.csproj
index 698dbfd623..7c4ecf6ab6 100644
--- a/src/Microsoft.ML.TorchSharp/Microsoft.ML.TorchSharp.csproj
+++ b/src/Microsoft.ML.TorchSharp/Microsoft.ML.TorchSharp.csproj
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
     <ProjectReference Include="..\Microsoft.ML.Tokenizers\Microsoft.ML.Tokenizers.csproj" />
 
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML/Microsoft.ML.csproj b/src/Microsoft.ML/Microsoft.ML.proj
similarity index 100%
rename from src/Microsoft.ML/Microsoft.ML.csproj
rename to src/Microsoft.ML/Microsoft.ML.proj

From fe9a773a0948eea2e6580cd0a879a885d746a2b6 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Mon, 29 Jan 2024 10:04:43 -0800
Subject: [PATCH 09/12] Fix build issues around model download and respond to
 feedback

---
 Directory.Build.targets                                    | 7 +++++++
 .../Microsoft.ML.Samples.GPU.csproj                        | 4 ++--
 .../Microsoft.ML.Samples/Microsoft.ML.Samples.csproj       | 4 ++--
 src/Directory.Build.props                                  | 2 +-
 src/Microsoft.ML/Microsoft.ML.proj                         | 4 +---
 .../Microsoft.ML.AutoML.Tests.csproj                       | 4 ++--
 .../Microsoft.ML.OnnxTransformerTest.csproj                | 4 ++--
 7 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index f310d751cd..ca7e3171e2 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -108,4 +108,11 @@
           BeforeTargets="Test"
           DependsOnTargets="GenerateCoverageResult"
           Condition="'$(IsUnitTestProject)' == 'true' AND '$(TargetFramework)' != '' AND '$(CollectCoverage)' == 'true'" />
+
+  <Target Name="ValidateNoTargetsProjectExtension"
+          BeforeTargets="PrepareForBuild"
+          Condition="'$(UsingMicrosoftNoTargetsSdk)' == 'true'">
+    <!-- Make sure any NoTargets projects use the proj extension so that they don't get language specific behavior from other SDKs -->
+    <Error Text="The project file should have a .proj extension since it uses the NoTargets SDK." Condition="'$(MSBuildProjectExtension)' != '.proj'" />
+  </Target>
 </Project>
diff --git a/docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj b/docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj
index 8b40f06dae..55bf7401d6 100644
--- a/docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj
+++ b/docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj
@@ -54,14 +54,14 @@
   </ItemGroup>
 
     <ItemGroup>
-    <Content Include="$(ArtifactsObjDir)DnnImageModels\ResNet18Onnx\ResNet18.onnx">
+    <Content Include="$(ModelDownloadPath)\ResNet18Onnx\ResNet18.onnx">
       <Link>DnnImageModels\ResNet18Onnx\ResNet18.onnx</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 
     <ItemGroup>
-    <Content Include="$(ArtifactsObjDir)DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx">
+    <Content Include="$(ModelDownloadPath)\ResNetPrepOnnx\ResNetPreprocess.onnx">
       <Link>DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj b/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj
index 3fba560fd5..8e168ad456 100644
--- a/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj
+++ b/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj
@@ -981,14 +981,14 @@
   </ItemGroup>
 
     <ItemGroup>
-    <Content Include="$(ArtifactsObjDir)DnnImageModels\ResNet18Onnx\ResNet18.onnx">
+    <Content Include="$(ModelDownloadPath)\ResNet18Onnx\ResNet18.onnx">
       <Link>DnnImageModels\ResNet18Onnx\ResNet18.onnx</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 
     <ItemGroup>
-    <Content Include="$(ArtifactsObjDir)DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx">
+    <Content Include="$(ModelDownloadPath)\ResNetPrepOnnx\ResNetPreprocess.onnx">
       <Link>DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 90b94346bc..5404f0ec97 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,7 +3,7 @@
   <Import Project="..\Directory.Build.props" />
 
   <PropertyGroup>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <GenerateDocumentationFile Condition="'$(UsingMicrosoftNoTargetsSdk)' != 'true'">true</GenerateDocumentationFile>
     <!-- Not all types and members have XML docs yet.
          When you are ready to tackle adding them, remove <NoWarn>
          below, and when you get clean, also remove <WarningsNotAsErrors>
diff --git a/src/Microsoft.ML/Microsoft.ML.proj b/src/Microsoft.ML/Microsoft.ML.proj
index fdf18aa640..e32176d1ad 100644
--- a/src/Microsoft.ML/Microsoft.ML.proj
+++ b/src/Microsoft.ML/Microsoft.ML.proj
@@ -6,13 +6,11 @@
     <!-- We need ProjectReferences to provide output since we're bundling the output -->
     <NoTargetsDoNotReferenceOutputAssemblies>false</NoTargetsDoNotReferenceOutputAssemblies>
     <!-- Only include directly referenced projects -->
-    <_FindDependencies >false</_FindDependencies >
+    <_FindDependencies>false</_FindDependencies>
     <!-- Framework references are required for APICompat -->
     <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
     <!-- This must be set to include any PDBs -->
     <IncludeBuildOutput>true</IncludeBuildOutput>
-    <!-- Don't produce nor include xml docs -->
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);NU5127;NU5128</NoWarn>
     <IsPackable>true</IsPackable>
     <PackageDescription>ML.NET is a cross-platform open-source machine learning framework which makes machine learning accessible to .NET developers.</PackageDescription>
diff --git a/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj b/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj
index 70cce94695..e76ba0417f 100644
--- a/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj
+++ b/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj
@@ -44,11 +44,11 @@
 
 
   <ItemGroup>
-    <Content Include="$(ArtifactsObjDir)DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx">
+    <Content Include="$(ModelDownloadPath)\ResNetPrepOnnx\ResNetPreprocess.onnx">
       <Link>DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="$(ArtifactsObjDir)DnnImageModels\ResNet18Onnx\ResNet18.onnx">
+    <Content Include="$(ModelDownloadPath)\ResNet18Onnx\ResNet18.onnx">
       <Link>DnnImageModels\ResNet18Onnx\ResNet18.onnx</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj b/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj
index 288c9c2049..2f566613c8 100644
--- a/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj
+++ b/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj
@@ -20,14 +20,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(ArtifactsObjDir)DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx">
+    <Content Include="$(ModelDownloadPath)\ResNetPrepOnnx\ResNetPreprocess.onnx">
       <Link>DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(ArtifactsObjDir)DnnImageModels\ResNet18Onnx\ResNet18.onnx">
+    <Content Include="$(ModelDownloadPath)\ResNet18Onnx\ResNet18.onnx">
       <Link>DnnImageModels\ResNet18Onnx\ResNet18.onnx</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

From 8d795f747902ad60412c2ae35ab720752cc7f98f Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Tue, 30 Jan 2024 14:10:11 -0800
Subject: [PATCH 10/12] Remove NoTargets file extension enforcement

---
 Directory.Build.targets    | 7 -------
 src/Directory.Build.props  | 2 +-
 test/Directory.Build.props | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index ca7e3171e2..f310d751cd 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -108,11 +108,4 @@
           BeforeTargets="Test"
           DependsOnTargets="GenerateCoverageResult"
           Condition="'$(IsUnitTestProject)' == 'true' AND '$(TargetFramework)' != '' AND '$(CollectCoverage)' == 'true'" />
-
-  <Target Name="ValidateNoTargetsProjectExtension"
-          BeforeTargets="PrepareForBuild"
-          Condition="'$(UsingMicrosoftNoTargetsSdk)' == 'true'">
-    <!-- Make sure any NoTargets projects use the proj extension so that they don't get language specific behavior from other SDKs -->
-    <Error Text="The project file should have a .proj extension since it uses the NoTargets SDK." Condition="'$(MSBuildProjectExtension)' != '.proj'" />
-  </Target>
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 5404f0ec97..3afbdbedea 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Condition="'$(UseMLCodeAnalyzer)' != 'false' and '$(MSBuildProjectExtension)' == '.csproj'"
+      Condition="'$(UseMLCodeAnalyzer)' != 'false' and '$(MSBuildProjectExtension)' == '.csproj' and '$(UsingMicrosoftNoTargetsSdk)' != 'true'"
       Include="$(MSBuildThisFileDirectory)\..\tools-local\Microsoft.ML.InternalCodeAnalyzer\Microsoft.ML.InternalCodeAnalyzer.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <OutputItemType>Analyzer</OutputItemType>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 196b98eacb..51d5e2eb15 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -44,7 +44,7 @@
 
   <ItemGroup>
     <ProjectReference
-      Condition="'$(UseMLCodeAnalyzer)' != 'false' and '$(MSBuildProjectExtension)' == '.csproj'"
+      Condition="'$(UseMLCodeAnalyzer)' != 'false' and '$(MSBuildProjectExtension)' == '.csproj' and '$(UsingMicrosoftNoTargetsSdk)' != 'true'"
       Include="$(MSBuildThisFileDirectory)\..\tools-local\Microsoft.ML.InternalCodeAnalyzer\Microsoft.ML.InternalCodeAnalyzer.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <OutputItemType>Analyzer</OutputItemType>

From eea5f8341fa5d9d72fcfa4496223dcdb34885165 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Tue, 13 Feb 2024 10:57:17 -0800
Subject: [PATCH 11/12] Rename proj to CSProj, include in SLN

I'd like to ensure all our projects are included in the SLN and don't
rely on separate build steps.

VS prefers *.csproj in the sln so I renamed things back to csproj.
---
 Microsoft.ML.sln                                  | 15 +++++++++++++--
 .../Microsoft.ML.Samples.GPU.csproj               |  1 +
 eng/Build.props                                   |  1 -
 .../Microsoft.Extensions.ML.csproj                |  2 +-
 .../Microsoft.ML.AutoML.csproj                    |  2 +-
 ...Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj |  1 +
 ...soft.ML.DnnImageFeaturizer.ModelRedist.csproj} |  3 ++-
 ...crosoft.ML.DnnImageFeaturizer.ResNet101.csproj |  1 +
 ...icrosoft.ML.DnnImageFeaturizer.ResNet18.csproj |  1 +
 ...icrosoft.ML.DnnImageFeaturizer.ResNet50.csproj |  1 +
 .../Microsoft.ML.Ensemble.csproj                  |  2 +-
 .../Microsoft.ML.EntryPoints.csproj               |  2 +-
 .../Microsoft.ML.Experimental.csproj              |  2 +-
 .../Microsoft.ML.Fairlearn.csproj                 |  2 +-
 .../Microsoft.ML.FastTree.csproj                  |  2 +-
 .../Microsoft.ML.ImageAnalytics.csproj            |  2 +-
 .../Microsoft.ML.LightGbm.csproj                  |  2 +-
 .../Microsoft.ML.Mkl.Components.csproj            |  4 ++--
 ...Redist.proj => Microsoft.ML.Mkl.Redist.csproj} |  0
 .../Microsoft.ML.OneDal.csproj                    |  2 +-
 .../Microsoft.ML.OnnxConverter.csproj             |  2 +-
 .../Microsoft.ML.OnnxTransformer.csproj           |  2 +-
 .../Microsoft.ML.Parquet.csproj                   |  2 +-
 .../Microsoft.ML.Recommender.csproj               |  2 +-
 .../Microsoft.ML.SamplesUtils.csproj              |  2 +-
 .../Microsoft.ML.TensorFlow.csproj                |  2 +-
 .../Microsoft.ML.TimeSeries.csproj                |  4 ++--
 .../Microsoft.ML.TorchSharp.csproj                |  2 +-
 .../{Microsoft.ML.proj => Microsoft.ML.csproj}    |  0
 .../Microsoft.ML.AutoML.Tests.csproj              |  1 +
 30 files changed, 42 insertions(+), 25 deletions(-)
 rename src/{Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj => Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj} (95%)
 rename src/Microsoft.ML.Mkl.Redist/{Microsoft.ML.Mkl.Redist.proj => Microsoft.ML.Mkl.Redist.csproj} (100%)
 rename src/Microsoft.ML/{Microsoft.ML.proj => Microsoft.ML.csproj} (100%)

diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln
index b731820218..5763a903b4 100644
--- a/Microsoft.ML.sln
+++ b/Microsoft.ML.sln
@@ -96,6 +96,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Samples.OneDal
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Recommender", "src\Microsoft.ML.Recommender\Microsoft.ML.Recommender.csproj", "{C8E1772B-DFD9-4A4D-830D-6AAB1C668BB3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.DnnImageFeaturizer.ModelRedist", "src\Microsoft.ML.DnnImageFeaturizer.ModelRedist\Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj", "{39E89702-1A46-4D5B-BA50-530D11309B5E}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.DnnImageFeaturizer.ResNet18", "src\Microsoft.ML.DnnImageFeaturizer.ResNet18\Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj", "{9222FC9D-599A-49A5-B685-08CC9A5C81D7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.DnnImageFeaturizer.AlexNet", "src\Microsoft.ML.DnnImageFeaturizer.AlexNet\Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj", "{6C29AA9B-054B-4762-BEA5-D305B932AA80}"
@@ -138,9 +140,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.NightlyBuild.T
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.NugetPackageVersionUpdater", "test\Microsoft.ML.NugetPackageVersionUpdater\Microsoft.ML.NugetPackageVersionUpdater.csproj", "{C8DB58DC-6434-4431-A81F-263D86E2A5F3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML", "src\Microsoft.ML\Microsoft.ML.proj", "{6CF88209-69DB-4B36-9604-3ECD9F163E96}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML", "src\Microsoft.ML\Microsoft.ML.csproj", "{6CF88209-69DB-4B36-9604-3ECD9F163E96}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Mkl.Redist", "src\Microsoft.ML.Mkl.Redist\Microsoft.ML.Mkl.Redist.proj", "{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Mkl.Redist", "src\Microsoft.ML.Mkl.Redist\Microsoft.ML.Mkl.Redist.csproj", "{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Analysis", "src\Microsoft.Data.Analysis\Microsoft.Data.Analysis.csproj", "{84150C22-0627-4A11-81C9-F214762855EA}"
 EndProject
@@ -818,6 +820,14 @@ Global
 		{763FF013-8309-4680-A769-B54E7BB99612}.Release|Any CPU.Build.0 = Release|Any CPU
 		{763FF013-8309-4680-A769-B54E7BB99612}.Release|x64.ActiveCfg = Release|Any CPU
 		{763FF013-8309-4680-A769-B54E7BB99612}.Release|x64.Build.0 = Release|Any CPU
+		{39E89702-1A46-4D5B-BA50-530D11309B5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39E89702-1A46-4D5B-BA50-530D11309B5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39E89702-1A46-4D5B-BA50-530D11309B5E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{39E89702-1A46-4D5B-BA50-530D11309B5E}.Debug|x64.Build.0 = Debug|Any CPU
+		{39E89702-1A46-4D5B-BA50-530D11309B5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39E89702-1A46-4D5B-BA50-530D11309B5E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39E89702-1A46-4D5B-BA50-530D11309B5E}.Release|x64.ActiveCfg = Release|Any CPU
+		{39E89702-1A46-4D5B-BA50-530D11309B5E}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -903,6 +913,7 @@ Global
 		{FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 		{AB8D68F1-6C3E-41FD-B0EC-A093E009341D} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 		{763FF013-8309-4680-A769-B54E7BB99612} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
+		{39E89702-1A46-4D5B-BA50-530D11309B5E} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
diff --git a/docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj b/docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj
index 55bf7401d6..4c1cb229e4 100644
--- a/docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj
+++ b/docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj
@@ -23,6 +23,7 @@
     <ProjectReference Include="..\..\..\src\Microsoft.ML.Vision\Microsoft.ML.Vision.csproj" />
     <ProjectReference Include="..\..\..\src\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
     <ProjectReference Include="..\..\..\src\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.ML.DnnImageFeaturizer.ModelRedist\Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj" />
     <ProjectReference Include="..\..\..\src\Microsoft.ML.LightGbm\Microsoft.ML.LightGbm.csproj" />
     <ProjectReference Include="..\..\..\src\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
     <ProjectReference Include="..\..\..\src\Microsoft.ML.SamplesUtils\Microsoft.ML.SamplesUtils.csproj" />
diff --git a/eng/Build.props b/eng/Build.props
index de6a651461..ca19b06276 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -9,7 +9,6 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <ProjectToBuild Include="$(RepoRoot)src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj" />
     <ProjectToBuild Include="$(RepoRoot)src/Native/Native.proj" />
     <ProjectToBuild Include="$(RepoRoot)Microsoft.ML.sln" />
   </ItemGroup>
diff --git a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
index 2235890c35..037c7adce1 100644
--- a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
+++ b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
@@ -14,7 +14,7 @@
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
index 0f8555ed5b..4c060f0999 100644
--- a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
+++ b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
@@ -49,7 +49,7 @@
     <ProjectReference Include="..\Microsoft.ML.Recommender\Microsoft.ML.Recommender.csproj" />
     <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj b/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj
index 2a1b6dd4ef..66ded5a388 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj
@@ -11,6 +11,7 @@
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.DnnImageFeaturizer.ModelRedist\Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj b/src/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj
similarity index 95%
rename from src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
rename to src/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj
index 803ab55573..7248fc44ec 100644
--- a/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj
@@ -1,6 +1,7 @@
-<Project Sdk="Microsoft.Build.NoTargets">
+<Project Sdk="Microsoft.Build.NoTargets">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
index 93812ff46a..77edab125f 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
@@ -11,6 +11,7 @@
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.DnnImageFeaturizer.ModelRedist\Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
index 2502b04a70..7fd5310d08 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
@@ -11,6 +11,7 @@
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.DnnImageFeaturizer.ModelRedist\Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
index 477a77eeb4..a19e37f96b 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
@@ -11,6 +11,7 @@
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Microsoft.ML.DnnImageFeaturizer.ModelRedist\Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
index 62fe880dd1..4f83132434 100644
--- a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
+++ b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
index 7e868fd7b7..c84a5d5c96 100644
--- a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
+++ b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
index 55bdf2bb4e..6a47692468 100644
--- a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
+++ b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
diff --git a/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj b/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj
index 3868ea3167..a1b8d3fec4 100644
--- a/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj
+++ b/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj
@@ -11,7 +11,7 @@
     <ProjectReference Include="..\Microsoft.ML.AutoML\Microsoft.ML.AutoML.csproj" />
     <!-- SearchSpace is part of AutoML -->
     <ProjectReference Include="..\Microsoft.ML.SearchSpace\Microsoft.ML.SearchSpace.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
     <!-- Core and Data are part of Microsoft.ML -->
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
index 5283e0b2ef..80d0aab011 100644
--- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
+++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
@@ -8,7 +8,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
index d1bfd16f6a..ad687a0ad0 100644
--- a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
+++ b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
index 3e7c927e45..5b0dfe4ceb 100644
--- a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
+++ b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
     <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
index 978015ed69..ae356239ac 100644
--- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
+++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
@@ -7,8 +7,8 @@
     <PackageDescription>ML.NET additional learners making use of Intel Mkl.</PackageDescription>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
-    <ProjectReference Include="..\Microsoft.ML.Mkl.Redist\Microsoft.ML.Mkl.Redist.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML.Mkl.Redist\Microsoft.ML.Mkl.Redist.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.proj b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
similarity index 100%
rename from src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.proj
rename to src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
diff --git a/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj b/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj
index 522c0ce06d..b38ffb379a 100644
--- a/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj
+++ b/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj
@@ -7,7 +7,7 @@
     <PackageDescription>ML.NET additional learners making use of Intel® oneAPI Data Analytics Library (oneDAL).</PackageDescription>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
index 935455848a..6182288560 100644
--- a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
+++ b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
diff --git a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
index f5f2a9e393..f684d01ed9 100644
--- a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
+++ b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
index 186ac429f4..df7c11bb8b 100644
--- a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
+++ b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
index b805d2fcb1..080bda9500 100644
--- a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
+++ b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
@@ -7,7 +7,7 @@
     <PackageDescription>LIBMF, the core computation library for matrix factorization in ML.NET</PackageDescription>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
   </ItemGroup>
diff --git a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
index 2db86edf1f..1698d12a23 100644
--- a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
+++ b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
index 56c7738031..d267d32217 100644
--- a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
+++ b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
index ba01754106..2f539a5099 100644
--- a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
+++ b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
-    <ProjectReference Include="..\Microsoft.ML.Mkl.Redist\Microsoft.ML.Mkl.Redist.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+    <ProjectReference Include="..\Microsoft.ML.Mkl.Redist\Microsoft.ML.Mkl.Redist.csproj" />
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML.TorchSharp/Microsoft.ML.TorchSharp.csproj b/src/Microsoft.ML.TorchSharp/Microsoft.ML.TorchSharp.csproj
index 7c4ecf6ab6..698dbfd623 100644
--- a/src/Microsoft.ML.TorchSharp/Microsoft.ML.TorchSharp.csproj
+++ b/src/Microsoft.ML.TorchSharp/Microsoft.ML.TorchSharp.csproj
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.proj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Tokenizers\Microsoft.ML.Tokenizers.csproj" />
 
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
diff --git a/src/Microsoft.ML/Microsoft.ML.proj b/src/Microsoft.ML/Microsoft.ML.csproj
similarity index 100%
rename from src/Microsoft.ML/Microsoft.ML.proj
rename to src/Microsoft.ML/Microsoft.ML.csproj
diff --git a/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj b/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj
index e76ba0417f..09076ca009 100644
--- a/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj
+++ b/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj
@@ -9,6 +9,7 @@
     <ProjectReference Include="..\..\src\Microsoft.Data.Analysis\Microsoft.Data.Analysis.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.ML.AutoML\Microsoft.ML.AutoML.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.ML.DnnImageFeaturizer.ModelRedist\Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.ML.Fairlearn\Microsoft.ML.Fairlearn.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.ML.SearchSpace\Microsoft.ML.SearchSpace.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />

From 59f414d916b592ee9858c6b6c9ab1e74ad64825b Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Tue, 27 Feb 2024 09:44:36 -0800
Subject: [PATCH 12/12] Respond to PR feedback

---
 Directory.Build.props                                      | 7 -------
 eng/Packaging.targets                                      | 6 +++---
 .../Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj     | 1 +
 src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj     | 3 ++-
 .../Microsoft.ML.OnnxTransformer.csproj                    | 3 ++-
 .../Microsoft.Data.Analysis.Interactive.Tests.csproj       | 1 +
 .../Microsoft.ML.CpuMath.PerformanceTests.csproj           | 1 +
 .../Microsoft.ML.TensorFlow.Tests.csproj                   | 1 +
 8 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 123afe717e..8e67d0905c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -70,11 +70,4 @@
     <IncludeSymbols>true</IncludeSymbols>
   </PropertyGroup>
 
-  <!-- Work around https://github.com/NuGet/Home/issues/6091 
-       TODO: Determine if this is still needed-->
-  <ItemDefinitionGroup>
-    <PackageReference>
-      <PrivateAssets>None</PrivateAssets>
-    </PackageReference>
-  </ItemDefinitionGroup>
 </Project>
diff --git a/eng/Packaging.targets b/eng/Packaging.targets
index dce9148902..52ac5a667d 100644
--- a/eng/Packaging.targets
+++ b/eng/Packaging.targets
@@ -1,12 +1,12 @@
 <Project>
 
   <ItemGroup>
-    <Content Include="$(RepoRoot)eng\pkg\mlnetlogo.png" Pack="true" PackagePath="" />
+    <Content Include="$(RepositoryEngineeringDir)pkg\mlnetlogo.png" Pack="true" PackagePath="" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(IncludeMLNetNotices)' != 'false'">
-    <Content Include="$(RepoRoot)\THIRD-PARTY-NOTICES.TXT" Pack="true" PackagePath="" />
-    <Content Include="$(RepoRoot)\LICENSE" Pack="true" PackagePath=""/>
+    <Content Include="$(RepoRoot)THIRD-PARTY-NOTICES.TXT" Pack="true" PackagePath="" />
+    <Content Include="$(RepoRoot)LICENSE" Pack="true" PackagePath=""/>
   </ItemGroup>
   
   <PropertyGroup>    
diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj
index 7248fc44ec..f899b4fe13 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.Build.NoTargets">
+
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>false</IsPackable>
diff --git a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
index 5b0dfe4ceb..7b63f306d5 100644
--- a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
+++ b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
@@ -17,7 +17,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LightGBM" Version="$(LightGBMVersion)" />
+    <!-- Include all assets https://github.com/microsoft/LightGBM/issues/6344 -->
+    <PackageReference Include="LightGBM" Version="$(LightGBMVersion)" PrivateAssets="None" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
index f684d01ed9..2b0aefc490 100644
--- a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
+++ b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
@@ -12,7 +12,8 @@
 
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.ML.OnnxRuntime.Managed" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
+    <!-- Include all assets https://github.com/microsoft/LightGBM/issues/6344 -->
+    <PackageReference Include="Microsoft.ML.OnnxRuntime.Managed" Version="$(MicrosoftMLOnnxRuntimeVersion)" PrivateAssets="None" />
     <PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufVersion)" />
   </ItemGroup>
 
diff --git a/test/Microsoft.Data.Analysis.Interactive.Tests/Microsoft.Data.Analysis.Interactive.Tests.csproj b/test/Microsoft.Data.Analysis.Interactive.Tests/Microsoft.Data.Analysis.Interactive.Tests.csproj
index 6dd6a7538d..c49ffd82d1 100644
--- a/test/Microsoft.Data.Analysis.Interactive.Tests/Microsoft.Data.Analysis.Interactive.Tests.csproj
+++ b/test/Microsoft.Data.Analysis.Interactive.Tests/Microsoft.Data.Analysis.Interactive.Tests.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
   <PropertyGroup>
     <TargetFrameworks>net6.0</TargetFrameworks>
     <NoWarn>$(NoWarn);MSML_ExtendBaseTestClass</NoWarn>
diff --git a/test/Microsoft.ML.CpuMath.PerformanceTests/Microsoft.ML.CpuMath.PerformanceTests.csproj b/test/Microsoft.ML.CpuMath.PerformanceTests/Microsoft.ML.CpuMath.PerformanceTests.csproj
index 4a21f79e0c..525256afff 100644
--- a/test/Microsoft.ML.CpuMath.PerformanceTests/Microsoft.ML.CpuMath.PerformanceTests.csproj
+++ b/test/Microsoft.ML.CpuMath.PerformanceTests/Microsoft.ML.CpuMath.PerformanceTests.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <GenerateProgramFile>false</GenerateProgramFile>
diff --git a/test/Microsoft.ML.TensorFlow.Tests/Microsoft.ML.TensorFlow.Tests.csproj b/test/Microsoft.ML.TensorFlow.Tests/Microsoft.ML.TensorFlow.Tests.csproj
index 30b85c955e..78085851c2 100644
--- a/test/Microsoft.ML.TensorFlow.Tests/Microsoft.ML.TensorFlow.Tests.csproj
+++ b/test/Microsoft.ML.TensorFlow.Tests/Microsoft.ML.TensorFlow.Tests.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <AssemblyName>Microsoft.ML.TensorFlow.Tests</AssemblyName>
     <StrongNameKeyId>Test</StrongNameKeyId>