From 80c7aa473fe952dd608f571de2ad4af7dbcd5acd Mon Sep 17 00:00:00 2001
From: Michael Sharp <misharp@microsoft.com>
Date: Wed, 14 Oct 2020 15:59:40 -0700
Subject: [PATCH 1/9] working on testing

---
 eng/Build.props              |  9 +++++++
 eng/Versions.props           |  7 +++---
 global.json                  |  5 +++-
 test/Directory.Build.targets | 46 ++++++++++++++++++++++++++++++++++--
 4 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/eng/Build.props b/eng/Build.props
index 81e60da2ad..de6a651461 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
+
+  <ItemDefinitionGroup>
+    <ProjectToBuild>
+      <RestoreInParallel>true</RestoreInParallel>
+      <BuildInParallel>false</BuildInParallel>
+    </ProjectToBuild>
+  </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>
+
 </Project>
diff --git a/eng/Versions.props b/eng/Versions.props
index a123c2f13b..0c3e9f6986 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,6 +5,7 @@
     <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
     <VersionPrefix>1.5.3</VersionPrefix>
     <PreReleaseVersionLabel></PreReleaseVersionLabel>
+    <SemanticVersioningV1>true</SemanticVersioningV1>
 
     <!--ML.NET Core dependencies-->
     <NewtonsoftJsonPackageVersion>10.0.3</NewtonsoftJsonPackageVersion>
@@ -37,7 +38,7 @@
     <ReportGeneratorVersion>4.3.6</ReportGeneratorVersion>
     <MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19225.5</MicrosoftDotNetApiCompatPackageVersion>
     <MicrosoftSourceLinkVersion>1.1.0-beta-20206-02</MicrosoftSourceLinkVersion>
-    
+
     <!-- Test-only Dependencies -->
     <BenchmarkDotNetVersion>0.12.0</BenchmarkDotNetVersion>
     <MicrosoftCodeAnalysisTestingVersion>1.0.1-beta1.20080.1</MicrosoftCodeAnalysisTestingVersion>
@@ -103,9 +104,9 @@
     <SystemThreadingTasksExtensionVersion>4.5.2</SystemThreadingTasksExtensionVersion>
     <SystemValueTupleVersion>4.4.0</SystemValueTupleVersion>
     <WindowsAzureStorageVersion>8.5.0</WindowsAzureStorageVersion>
-    <XUnitVersion>2.4.1</XUnitVersion>
+    <XUnitVersion>2.4.0</XUnitVersion>
     <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
-    <XUnitVSRunnerVersion>2.4.1</XUnitVSRunnerVersion>
+    <XUnitVSRunnerVersion>2.4.0</XUnitVSRunnerVersion>
     <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20461.7</MicrosoftDotNetBuildTasksFeedVersion>
     <MicrosoftDotNetSignToolVersion>5.0.0-beta.20461.7</MicrosoftDotNetSignToolVersion>
     <MicrosoftAzureDocumentDBVersion>1.22.0</MicrosoftAzureDocumentDBVersion>
diff --git a/global.json b/global.json
index cd6a8c0ea6..101387c683 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,9 @@
 {
   "tools": {
-    "dotnet": "5.0.100-rc.1.20452.10"
+    "dotnet": "5.0.100-rc.1.20452.10",
+    "runtimes": {
+      "dotnet": [ "2.1.23", "3.1.9" ]
+    }
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20461.7",
diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
index 390295efa9..a57a775988 100644
--- a/test/Directory.Build.targets
+++ b/test/Directory.Build.targets
@@ -3,9 +3,51 @@
   <Import Project="..\Directory.Build.targets" />
 
   <PropertyGroup>
-    <!-- This needs to be in Directory.Build.targets or the default value for AllowedReferenceRelatedFileExtensions will not be applied. 
+    <!-- This needs to be in Directory.Build.targets or the default value for AllowedReferenceRelatedFileExtensions will not be applied.
          This is required in order to have following extension files in the output folder of the projects referencing other projects. -->
-    <AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.runtimeconfig.json;.runtimeconfig.dev.json;.deps.json</AllowedReferenceRelatedFileExtensions>  
+    <AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.runtimeconfig.json;.runtimeconfig.dev.json;.deps.json</AllowedReferenceRelatedFileExtensions>
   </PropertyGroup>
 
+  <Target Name="CopyNativeAssembiles" AfterTargets="CopyFilesToOutputDirectory">
+    <Message Importance="High" Text="CopyNativeAssembiles EVENT" />
+    <PropertyGroup>
+		<LibPrefix Condition="'$(OS)' != 'Windows_NT'">lib</LibPrefix>
+		<LibExtension Condition="'$(OS)' == 'Windows_NT'">.dll</LibExtension>
+		<LibExtension Condition="'$(OS)' != 'Windows_NT'">.so</LibExtension>
+		<LibExtension Condition="$([MSBuild]::IsOSPlatform('osx'))">.dylib</LibExtension>
+
+		<TargetArchitecture Condition="'$(Platform)' == ''">x64</TargetArchitecture>
+		<NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">$(TargetArchitecture)</NativeTargetArchitecture>
+		<BinDir Condition="'$(BinDir)'==''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin'))</BinDir>
+		<NativeOutputPath>$(BinDir)Native\$(NativeTargetArchitecture).$(Configuration)\</NativeOutputPath>
+
+		<Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
+		<PlatformConfig>$(Platform).$(Configuration)</PlatformConfig>
+		<OutputPath Condition="'$(OutputPath)'==''">$(BinDir)$(MSBuildProjectName)\Debug</OutputPath>
+	</PropertyGroup>
+
+
+
+		<ItemGroup>
+		<NativeAssemblyReference>
+			<FullAssemblyPath>$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReference.Identity)$(LibExtension)</FullAssemblyPath>
+		</NativeAssemblyReference>
+		</ItemGroup>
+
+		<Message Importance="High" Text="$(NativeAssemblyReference)"/>
+		<Message Importance="high" Text="here"/>
+
+		<Copy SourceFiles = "@(NativeAssemblyReference->'%(FullAssemblyPath)')"
+			DestinationFolder="$(OutDir)"
+			OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+			Retries="$(CopyRetryCount)"
+			RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
+			UseHardlinksIfPossible="$(CreateHardLinksForPublishFilesIfPossible)"
+			UseSymboliclinksIfPossible="$(CreateSymbolicLinksForPublishFilesIfPossible)">
+		<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
+		</Copy>
+  <!--<Exec Command="call C:\MyFile.bat or call C:\MyFile.bat call C:\MyFile2.bat" />-->
+  </Target>
+
+
 </Project>
\ No newline at end of file

From e7cdb53de5b9424f01d74f55e7318deea971a64f Mon Sep 17 00:00:00 2001
From: Michael Sharp <misharp@microsoft.com>
Date: Mon, 19 Oct 2020 15:57:37 -0700
Subject: [PATCH 2/9] testing updates

---
 Directory.Build.props        | 11 ++++-----
 Directory.Build.targets      | 45 ++++++++++++++++++++++++++++++++++++
 global.json                  |  5 +---
 test/Directory.Build.targets | 41 --------------------------------
 4 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index cc3f1b1c4c..74a1e86fdd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -13,7 +13,6 @@
 
   <PropertyGroup>
     <Copyright>$(CopyrightNetFoundation)</Copyright>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <DebugType>embedded</DebugType>
     <DebugSymbols>true</DebugSymbols>
@@ -31,7 +30,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackageAssetsPath>$(ArtifactsDir)/pkgassets/</PackageAssetsPath>
+    <PackageAssetsPath>$(ArtifactsDir)pkgassets/</PackageAssetsPath>
     <PkgDir>$(RepoRoot)pkg/</PkgDir>
   </PropertyGroup>
 
@@ -49,17 +48,17 @@
   <PropertyGroup>
     <!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
- 
+
     <!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  
+
     <!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
-  
+
   <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
-    <!--    
+    <!--
       When building using source-build the process is:
       - Newtonsoft.Json versions 9.0.1 and 12.0.2 are built by source-build
       - Version 12.0.2 is written to Version.props
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 177d64c47a..465bf7bb23 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,4 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
+
+  <Target Name="CopyNativeAssembiles" AfterTargets="CopyFilesToOutputDirectory">
+    <Message Importance="High" Text="CopyNativeAssembiles EVENT" />
+    <PropertyGroup>
+		<LibPrefix Condition="'$(OS)' != 'Windows_NT'">lib</LibPrefix>
+		<LibExtension Condition="'$(OS)' == 'Windows_NT'">.dll</LibExtension>
+		<LibExtension Condition="'$(OS)' != 'Windows_NT'">.so</LibExtension>
+		<LibExtension Condition="$([MSBuild]::IsOSPlatform('osx'))">.dylib</LibExtension>
+
+		<TargetArchitecture Condition="'$(Platform)' == ''">x64</TargetArchitecture>
+		<NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">$(TargetArchitecture)</NativeTargetArchitecture>
+		<BinDir Condition="'$(BinDir)'==''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin'))</BinDir>
+		<NativeOutputPath>$(BinDir)Native\$(NativeTargetArchitecture).$(Configuration)\</NativeOutputPath>
+
+		<Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
+		<PlatformConfig>$(Platform).$(Configuration)</PlatformConfig>
+		<OutputPath Condition="'$(OutputPath)'==''">$(BinDir)$(MSBuildProjectName)\Debug</OutputPath>
+	</PropertyGroup>
+
+
+
+		<ItemGroup>
+		<NativeAssemblyReference>
+			<FullAssemblyPath>$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReference.Identity)$(LibExtension)</FullAssemblyPath>
+		</NativeAssemblyReference>
+		</ItemGroup>
+
+		<Message Importance="High" Text="$(NativeAssemblyReference)"/>
+		<Message Importance="high" Text="here"/>
+
+		<Copy SourceFiles = "@(NativeAssemblyReference->'%(FullAssemblyPath)')"
+			DestinationFolder="$(OutDir)"
+			OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+			Retries="$(CopyRetryCount)"
+			RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
+			UseHardlinksIfPossible="$(CreateHardLinksForPublishFilesIfPossible)"
+			UseSymboliclinksIfPossible="$(CreateSymbolicLinksForPublishFilesIfPossible)">
+		<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
+		</Copy>
+  <!--<Exec Command="call C:\MyFile.bat or call C:\MyFile.bat call C:\MyFile2.bat" />-->
+  </Target>
+
+
+
 </Project>
diff --git a/global.json b/global.json
index 101387c683..cd6a8c0ea6 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,6 @@
 {
   "tools": {
-    "dotnet": "5.0.100-rc.1.20452.10",
-    "runtimes": {
-      "dotnet": [ "2.1.23", "3.1.9" ]
-    }
+    "dotnet": "5.0.100-rc.1.20452.10"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20461.7",
diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
index a57a775988..afae9be487 100644
--- a/test/Directory.Build.targets
+++ b/test/Directory.Build.targets
@@ -8,46 +8,5 @@
     <AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.runtimeconfig.json;.runtimeconfig.dev.json;.deps.json</AllowedReferenceRelatedFileExtensions>
   </PropertyGroup>
 
-  <Target Name="CopyNativeAssembiles" AfterTargets="CopyFilesToOutputDirectory">
-    <Message Importance="High" Text="CopyNativeAssembiles EVENT" />
-    <PropertyGroup>
-		<LibPrefix Condition="'$(OS)' != 'Windows_NT'">lib</LibPrefix>
-		<LibExtension Condition="'$(OS)' == 'Windows_NT'">.dll</LibExtension>
-		<LibExtension Condition="'$(OS)' != 'Windows_NT'">.so</LibExtension>
-		<LibExtension Condition="$([MSBuild]::IsOSPlatform('osx'))">.dylib</LibExtension>
-
-		<TargetArchitecture Condition="'$(Platform)' == ''">x64</TargetArchitecture>
-		<NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">$(TargetArchitecture)</NativeTargetArchitecture>
-		<BinDir Condition="'$(BinDir)'==''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin'))</BinDir>
-		<NativeOutputPath>$(BinDir)Native\$(NativeTargetArchitecture).$(Configuration)\</NativeOutputPath>
-
-		<Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
-		<PlatformConfig>$(Platform).$(Configuration)</PlatformConfig>
-		<OutputPath Condition="'$(OutputPath)'==''">$(BinDir)$(MSBuildProjectName)\Debug</OutputPath>
-	</PropertyGroup>
-
-
-
-		<ItemGroup>
-		<NativeAssemblyReference>
-			<FullAssemblyPath>$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReference.Identity)$(LibExtension)</FullAssemblyPath>
-		</NativeAssemblyReference>
-		</ItemGroup>
-
-		<Message Importance="High" Text="$(NativeAssemblyReference)"/>
-		<Message Importance="high" Text="here"/>
-
-		<Copy SourceFiles = "@(NativeAssemblyReference->'%(FullAssemblyPath)')"
-			DestinationFolder="$(OutDir)"
-			OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
-			Retries="$(CopyRetryCount)"
-			RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
-			UseHardlinksIfPossible="$(CreateHardLinksForPublishFilesIfPossible)"
-			UseSymboliclinksIfPossible="$(CreateSymbolicLinksForPublishFilesIfPossible)">
-		<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
-		</Copy>
-  <!--<Exec Command="call C:\MyFile.bat or call C:\MyFile.bat call C:\MyFile2.bat" />-->
-  </Target>
-
 
 </Project>
\ No newline at end of file

From fb22f398b464b41bed5051f7fabf1cc4b6712675 Mon Sep 17 00:00:00 2001
From: Michael Sharp <misharp@microsoft.com>
Date: Tue, 27 Oct 2020 13:33:15 -0700
Subject: [PATCH 3/9] tests almost working

---
 Directory.Build.props                         |   2 +-
 Directory.Build.targets                       |   3 -
 Microsoft.ML.sln                              | 124 ++++++++++++------
 .../Microsoft.ML.AutoML.Samples.csproj        |   8 ++
 .../Microsoft.ML.Samples.GPU.csproj           |   4 +
 .../Microsoft.ML.Samples.csproj               |   3 +
 eng/Versions.props                            |   3 +-
 pkg/Directory.Build.props                     |  55 +++++---
 .../Microsoft.Extensions.ML.csproj            |  16 ++-
 .../Microsoft.ML.AutoML.csproj                |  18 ++-
 .../Microsoft.ML.CodeGenerator.csproj         |  14 +-
 .../Microsoft.ML.CpuMath.csproj               |   8 +-
 .../netstandard2.0/Microsoft.ML.CpuMath.props |  24 ++++
 .../Microsoft.ML.DataView.csproj              |   6 +-
 .../Microsoft.ML.DnnAnalyzer.csproj           |   1 +
 ...osoft.ML.DnnImageFeaturizer.AlexNet.csproj |  15 ++-
 ...oft.ML.DnnImageFeaturizer.ResNet101.csproj |  16 ++-
 ...soft.ML.DnnImageFeaturizer.ResNet18.csproj |  15 ++-
 ...soft.ML.DnnImageFeaturizer.ResNet50.csproj |  15 ++-
 .../Microsoft.ML.Ensemble.csproj              |  17 ++-
 .../Microsoft.ML.EntryPoints.csproj           |  22 +++-
 .../Microsoft.ML.Experimental.csproj          |  10 +-
 .../Microsoft.ML.FastTree.csproj              |  24 +++-
 .../Microsoft.ML.Featurizers.csproj           |  14 +-
 .../Microsoft.ML.ImageAnalytics.csproj        |  16 ++-
 .../Microsoft.ML.LightGbm.csproj              |  20 ++-
 .../Microsoft.ML.Mkl.Components.csproj        |  25 +++-
 .../Microsoft.ML.Mkl.Redist.csproj            |  24 ++++
 .../Microsoft.ML.OnnxConverter.csproj         |  10 +-
 .../Microsoft.ML.OnnxTransformer.csproj       |  14 +-
 .../Microsoft.ML.Parquet.csproj               |  14 +-
 .../Microsoft.ML.Recommender.csproj           |  19 ++-
 .../Microsoft.ML.SamplesUtils.csproj          |  18 ++-
 .../Microsoft.ML.TensorFlow.csproj            |  18 ++-
 .../Microsoft.ML.TimeSeries.csproj            |  19 ++-
 .../Microsoft.ML.Vision.csproj                |  18 ++-
 src/Microsoft.ML/Microsoft.ML.csproj          |  27 ++++
 .../build/netstandard2.0/Microsoft.ML.targets |  22 ++++
 ...oft.ML.DnnImageFeaturizer.ModelRedist.proj |  12 +-
 .../Microsoft.ML.Functional.Tests.csproj      |   2 +
 .../ModelFiles.cs                             |  10 +-
 .../Microsoft.ML.TestFramework.csproj         |   5 +-
 test/TestFrameworkDependency.props            |   4 +-
 .../Microsoft.ML.StableApi.csproj             |  26 ++--
 44 files changed, 590 insertions(+), 170 deletions(-)
 create mode 100644 src/Microsoft.ML.CpuMath/build/netstandard2.0/Microsoft.ML.CpuMath.props
 create mode 100644 src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
 create mode 100644 src/Microsoft.ML/Microsoft.ML.csproj
 create mode 100644 src/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets

diff --git a/Directory.Build.props b/Directory.Build.props
index 74a1e86fdd..dbe8844455 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -14,7 +14,7 @@
   <PropertyGroup>
     <Copyright>$(CopyrightNetFoundation)</Copyright>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <DebugType>embedded</DebugType>
+    <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 465bf7bb23..be45b57429 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -29,9 +29,6 @@
 		</NativeAssemblyReference>
 		</ItemGroup>
 
-		<Message Importance="High" Text="$(NativeAssemblyReference)"/>
-		<Message Importance="high" Text="here"/>
-
 		<Copy SourceFiles = "@(NativeAssemblyReference->'%(FullAssemblyPath)')"
 			DestinationFolder="$(OutDir)"
 			OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln
index 8c6c84b14c..48df0e8ecc 100644
--- a/Microsoft.ML.sln
+++ b/Microsoft.ML.sln
@@ -48,17 +48,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{D3D38B03-B55
 		pkg\Directory.Build.props = pkg\Directory.Build.props
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML", "Microsoft.ML", "{DEC8F776-49F7-4D87-836C-FE4DC057D08C}"
-	ProjectSection(SolutionItems) = preProject
-		pkg\Microsoft.ML\Microsoft.ML.nupkgproj = pkg\Microsoft.ML\Microsoft.ML.nupkgproj
-		pkg\Microsoft.ML\Microsoft.ML.symbols.nupkgproj = pkg\Microsoft.ML\Microsoft.ML.symbols.nupkgproj
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Parquet", "Microsoft.ML.Parquet", "{6C95FC87-F5F2-4EEF-BB97-567F2F5DD141}"
-	ProjectSection(SolutionItems) = preProject
-		pkg\Microsoft.ML.Parquet\Microsoft.ML.Parquet.nupkgproj = pkg\Microsoft.ML.Parquet\Microsoft.ML.Parquet.nupkgproj
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Benchmarks", "test\Microsoft.ML.Benchmarks\Microsoft.ML.Benchmarks.csproj", "{7A9DB75F-2CA5-4184-9EF5-1F17EB39483F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Maml", "src\Microsoft.ML.Maml\Microsoft.ML.Maml.csproj", "{64F40A0D-D4C2-4AA7-8470-E9CC437827E4}"
@@ -293,9 +282,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Vision", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TestFrameworkCommon", "test\Microsoft.ML.TestFrameworkCommon\Microsoft.ML.TestFrameworkCommon.csproj", "{A22FAD27-77E8-4460-8B92-EC7090B7173A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ML.NightlyBuild.Tests", "test\Microsoft.ML.NightlyBuild.Tests\Microsoft.ML.NightlyBuild.Tests.csproj", "{A1CAC86F-F4BB-4B6D-9D18-E9AE15B3C66E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.NightlyBuild.Tests", "test\Microsoft.ML.NightlyBuild.Tests\Microsoft.ML.NightlyBuild.Tests.csproj", "{A1CAC86F-F4BB-4B6D-9D18-E9AE15B3C66E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ML.NugetPackageVersionUpdater", "test\Microsoft.ML.NugetPackageVersionUpdater\Microsoft.ML.NugetPackageVersionUpdater.csproj", "{C8DB58DC-6434-4431-A81F-263D86E2A5F3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.NugetPackageVersionUpdater", "test\Microsoft.ML.NugetPackageVersionUpdater\Microsoft.ML.NugetPackageVersionUpdater.csproj", "{C8DB58DC-6434-4431-A81F-263D86E2A5F3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{C91F81E3-B900-4968-A6DF-F53B515E97E1}"
 EndProject
@@ -304,6 +293,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netstandard2.0", "netstanda
 		pkg\Microsoft.ML.CpuMath\build\netstandard2.0\Microsoft.ML.CpuMath.props = pkg\Microsoft.ML.CpuMath\build\netstandard2.0\Microsoft.ML.CpuMath.props
 	EndProjectSection
 EndProject
+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.csproj", "{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1639,6 +1632,30 @@ Global
 		{3C8F910B-7F23-4D25-B521-6D5AC9570ADD}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
 		{3C8F910B-7F23-4D25-B521-6D5AC9570ADD}.Release-netfx|x64.ActiveCfg = Release-netfx|Any CPU
 		{3C8F910B-7F23-4D25-B521-6D5AC9570ADD}.Release-netfx|x64.Build.0 = Release-netfx|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug|x64.Build.0 = Debug|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netcoreapp3_1|Any CPU.ActiveCfg = Debug-netcoreapp3_1|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netcoreapp3_1|Any CPU.Build.0 = Debug-netcoreapp3_1|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netcoreapp3_1|x64.ActiveCfg = Debug-netcoreapp3_1|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netcoreapp3_1|x64.Build.0 = Debug-netcoreapp3_1|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netfx|x64.ActiveCfg = Debug-netfx|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netfx|x64.Build.0 = Debug-netfx|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release|x64.ActiveCfg = Release|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release|x64.Build.0 = Release|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netcoreapp3_1|Any CPU.ActiveCfg = Release-netcoreapp3_1|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netcoreapp3_1|Any CPU.Build.0 = Release-netcoreapp3_1|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netcoreapp3_1|x64.ActiveCfg = Release-netcoreapp3_1|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netcoreapp3_1|x64.Build.0 = Release-netcoreapp3_1|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netfx|x64.ActiveCfg = Release-netfx|Any CPU
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netfx|x64.Build.0 = Release-netfx|Any CPU
 		{56CB0850-7341-4D71-9AE4-9EFC472D93DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{56CB0850-7341-4D71-9AE4-9EFC472D93DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{56CB0850-7341-4D71-9AE4-9EFC472D93DD}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1771,30 +1788,54 @@ Global
 		{C8DB58DC-6434-4431-A81F-263D86E2A5F3}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
 		{C8DB58DC-6434-4431-A81F-263D86E2A5F3}.Release-netfx|x64.ActiveCfg = Release-netfx|Any CPU
 		{C8DB58DC-6434-4431-A81F-263D86E2A5F3}.Release-netfx|x64.Build.0 = Release-netfx|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug|x64.Build.0 = Debug|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netcoreapp3_1|Any CPU.ActiveCfg = Debug-netcoreapp3_1|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netcoreapp3_1|Any CPU.Build.0 = Debug-netcoreapp3_1|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netcoreapp3_1|x64.ActiveCfg = Debug-netcoreapp3_1|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netcoreapp3_1|x64.Build.0 = Debug-netcoreapp3_1|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netfx|x64.ActiveCfg = Debug-netfx|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Debug-netfx|x64.Build.0 = Debug-netfx|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release|x64.ActiveCfg = Release|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release|x64.Build.0 = Release|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netcoreapp3_1|Any CPU.ActiveCfg = Release-netcoreapp3_1|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netcoreapp3_1|Any CPU.Build.0 = Release-netcoreapp3_1|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netcoreapp3_1|x64.ActiveCfg = Release-netcoreapp3_1|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netcoreapp3_1|x64.Build.0 = Release-netcoreapp3_1|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netfx|x64.ActiveCfg = Release-netfx|Any CPU
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518}.Release-netfx|x64.Build.0 = Release-netfx|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Debug|x64.Build.0 = Debug|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Debug-netcoreapp3_1|Any CPU.ActiveCfg = Debug-netcoreapp3_1|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Debug-netcoreapp3_1|Any CPU.Build.0 = Debug-netcoreapp3_1|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Debug-netcoreapp3_1|x64.ActiveCfg = Debug-netcoreapp3_1|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Debug-netcoreapp3_1|x64.Build.0 = Debug-netcoreapp3_1|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Debug-netfx|x64.ActiveCfg = Debug-netfx|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Debug-netfx|x64.Build.0 = Debug-netfx|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Release|x64.ActiveCfg = Release|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Release|x64.Build.0 = Release|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Release-netcoreapp3_1|Any CPU.ActiveCfg = Release-netcoreapp3_1|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Release-netcoreapp3_1|Any CPU.Build.0 = Release-netcoreapp3_1|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Release-netcoreapp3_1|x64.ActiveCfg = Release-netcoreapp3_1|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Release-netcoreapp3_1|x64.Build.0 = Release-netcoreapp3_1|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Release-netfx|x64.ActiveCfg = Release-netfx|Any CPU
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96}.Release-netfx|x64.Build.0 = Release-netfx|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Debug|x64.Build.0 = Debug|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Debug-netcoreapp3_1|Any CPU.ActiveCfg = Debug-netcoreapp3_1|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Debug-netcoreapp3_1|Any CPU.Build.0 = Debug-netcoreapp3_1|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Debug-netcoreapp3_1|x64.ActiveCfg = Debug-netcoreapp3_1|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Debug-netcoreapp3_1|x64.Build.0 = Debug-netcoreapp3_1|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Debug-netfx|x64.ActiveCfg = Debug-netfx|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Debug-netfx|x64.Build.0 = Debug-netfx|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Release|x64.ActiveCfg = Release|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Release|x64.Build.0 = Release|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Release-netcoreapp3_1|Any CPU.ActiveCfg = Release-netcoreapp3_1|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Release-netcoreapp3_1|Any CPU.Build.0 = Release-netcoreapp3_1|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Release-netcoreapp3_1|x64.ActiveCfg = Release-netcoreapp3_1|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Release-netcoreapp3_1|x64.Build.0 = Release-netcoreapp3_1|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Release-netfx|x64.ActiveCfg = Release-netfx|Any CPU
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3}.Release-netfx|x64.Build.0 = Release-netfx|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1817,12 +1858,9 @@ Global
 		{B7B593C5-FB8C-4ADA-A638-5B53B47D087E} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 		{16BB1454-2108-40E5-B3A6-594654005303} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 		{55C8122D-79EA-48AB-85D0-EB551FC1C427} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
-		{DEC8F776-49F7-4D87-836C-FE4DC057D08C} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
-		{6C95FC87-F5F2-4EEF-BB97-567F2F5DD141} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
 		{7A9DB75F-2CA5-4184-9EF5-1F17EB39483F} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 		{64F40A0D-D4C2-4AA7-8470-E9CC437827E4} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 		{362A98CF-FBF7-4EBB-A11B-990BBF845B15} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
-		{487213C9-E8A9-4F94-85D7-28A05DBBFE3A} = {DEC8F776-49F7-4D87-836C-FE4DC057D08C}
 		{9252A8EB-ABFB-440C-AB4D-1D562753CE0F} = {487213C9-E8A9-4F94-85D7-28A05DBBFE3A}
 		{3DEB504D-7A07-48CE-91A2-8047461CB3D4} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 		{001F3B4E-FBE4-4001-AFD2-A6A989CD1C25} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
@@ -1880,6 +1918,8 @@ Global
 		{F5D11F71-2D61-4AE9-99D7-0F0B54649B15} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
 		{A6924919-9E37-4023-8B7F-E85C8E3CC9B3} = {DA452A53-2E94-4433-B08C-041EDEC729E6}
 		{3C8F910B-7F23-4D25-B521-6D5AC9570ADD} = {DA452A53-2E94-4433-B08C-041EDEC729E6}
+		{E2DD0721-5B0F-4606-8182-4C7EFB834518} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
+		{1BA5C784-52E8-4A87-8525-26B2452F2882} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
 		{56CB0850-7341-4D71-9AE4-9EFC472D93DD} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 		{46CC5637-3DDF-4100-93FC-44BB87B2DB81} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 		{3817A875-278C-4140-BF66-3C4A8CA55F0D} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
@@ -1889,8 +1929,8 @@ Global
 		{C8DB58DC-6434-4431-A81F-263D86E2A5F3} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 		{C91F81E3-B900-4968-A6DF-F53B515E97E1} = {BF66A305-DF10-47E4-8D81-42049B149D2B}
 		{027DBA48-85B6-46F1-9487-0B49B5057FC0} = {C91F81E3-B900-4968-A6DF-F53B515E97E1}
-		{E2DD0721-5B0F-4606-8182-4C7EFB834518} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
-		{1BA5C784-52E8-4A87-8525-26B2452F2882} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
+		{6CF88209-69DB-4B36-9604-3ECD9F163E96} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
+		{4584326B-C5B3-4CAE-B98A-34C5F5AA16F3} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
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 9d951867e1..4628e6b6e2 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
@@ -7,6 +7,14 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Microsoft.ML.AutoML\Microsoft.ML.AutoML.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
+      <PrivateAssets>all</PrivateAssets>
+    </ProjectReference>
+
+    <ProjectReference Include="..\..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" >
+      <PrivateAssets>all</PrivateAssets>
+    </ProjectReference>
+
     <NativeAssemblyReference Include="MatrixFactorizationNative" />
     <NativeAssemblyReference Include="FastTreeNative" />
   </ItemGroup>
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 e060dfc942..2b54ea24b0 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
@@ -20,9 +20,13 @@
 
   <ItemGroup>
     <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.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" />
+    <ProjectReference Include="..\..\..\src\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
 
     <NativeAssemblyReference Include="CpuMathNative" />
     <NativeAssemblyReference Include="FastTreeNative" />
diff --git a/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj b/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj
index ad9f40bdfb..10f2bf06bc 100644
--- a/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj
+++ b/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj
@@ -30,6 +30,9 @@
     <ProjectReference Include="..\..\..\src\Microsoft.ML.DnnImageFeaturizer.ResNet18\Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj" />
     <ProjectReference Include="..\..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
     <ProjectReference Include="..\..\..\src\Microsoft.ML.OnnxConverter\Microsoft.ML.OnnxConverter.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 
     <NativeAssemblyReference Include="CpuMathNative" />
     <NativeAssemblyReference Include="FastTreeNative" />
diff --git a/eng/Versions.props b/eng/Versions.props
index 0c3e9f6986..18d51fa7c3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,8 +4,7 @@
     <!-- This repo version -->
     <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
     <VersionPrefix>1.5.3</VersionPrefix>
-    <PreReleaseVersionLabel></PreReleaseVersionLabel>
-    <SemanticVersioningV1>true</SemanticVersioningV1>
+    <PreReleaseVersionLabel>dev</PreReleaseVersionLabel>
 
     <!--ML.NET Core dependencies-->
     <NewtonsoftJsonPackageVersion>10.0.3</NewtonsoftJsonPackageVersion>
diff --git a/pkg/Directory.Build.props b/pkg/Directory.Build.props
index 16ad2d7b8d..fc26f66ba7 100644
--- a/pkg/Directory.Build.props
+++ b/pkg/Directory.Build.props
@@ -1,21 +1,14 @@
 <Project>
-  <Import Project="..\Directory.Build.props" />
 
   <PropertyGroup>
-    <NoBuild>true</NoBuild>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <IncludeSymbols>false</IncludeSymbols>
-
-    <IsSymbolsPackage Condition="$(MSBuildProjectName.Contains('.symbols'))">true</IsSymbolsPackage>
+    <PackageAssetsPath>$(ArtifactsDir)pkgassets/</PackageAssetsPath>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <IsSymbolsPackage Condition="$(MSBuildProjectName.Contains('.snupkg'))">true</IsSymbolsPackage>
     <PackageIdFolderName>$(MSBuildProjectName.Replace('.symbols', ''))</PackageIdFolderName>
+    <IncludeBuildOutput>true</IncludeBuildOutput>
+    <IsPackable>true</IsPackable>
 
-    <!--
-    Our .nupkgproj files have conflicting names with src projects, which puts their intermediate
-    output in the same folder (like project.assets.json). Override the intermediate output to
-    make it unique for the .nupkgprojs.
-    -->
-    <IntermediateOutputPath>$(IntermediateOutputRootPath)$(MSBuildProjectName).NupkgProj\</IntermediateOutputPath>
-    <BaseIntermediateOutputPath>$(IntermediateOutputPath)</BaseIntermediateOutputPath>
   </PropertyGroup>
 
   <!-- nuspec properties -->
@@ -27,13 +20,19 @@
     <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>
-    <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\lib\**\*" Pack="true" PackagePath="lib" />
-    <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\analyzers\**\*" Pack="true" PackagePath="analyzers" />
-    <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\**\*" Pack="true" PackagePath="runtimes" />
-    <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\tools\**\*" Pack="true" PackagePath="tools" />
+
+    <!-- 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)\pkg\mlnetlogo.png" Pack="true" PackagePath="" />
   </ItemGroup>
@@ -43,12 +42,32 @@
     <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>
+  </ItemGroup>
+
   <!-- Work around https://github.com/NuGet/Home/issues/6091 -->
   <ItemDefinitionGroup>
     <PackageReference>
diff --git a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
index a27aed8386..8ca74ded90 100644
--- a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
+++ b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.Extensions.ML</IncludeInPackage>
+    <PackageId>Microsoft.Extensions.ML</PackageId>
+    <PackageDescription>An integration package for ML.NET models on scalable web apps and services.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,8 +12,16 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsPackageVersion)" />
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.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\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 a098ab44a0..863a551a99 100644
--- a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
+++ b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
@@ -1,19 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.AutoML</IncludeInPackage>
+    <PackageId>Microsoft.ML.AutoML</PackageId>
+    <PackageDescription>ML.NET AutoML: Optimizes an ML pipeline for your dataset, by automatically locating the best feature engineering, model, and hyperparameters</PackageDescription>
   </PropertyGroup>
 
-
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" >
+      <PrivateAssets>all</PrivateAssets>
+    </ProjectReference>
     <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Vision\Microsoft.ML.Vision.csproj" />
     <ProjectReference Include="..\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
     <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.Transforms\Microsoft.ML.Transforms.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\Microsoft.ML.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj
index 9d823595ca..92fde21bc6 100644
--- a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj
+++ b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.CodeGenerator</IncludeInPackage>
+    <PackageId>Microsoft.ML.CodeGenerator</PackageId>
+    <PackageDescription>ML.NET Code Generator</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,8 +21,16 @@
 
   <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.Transforms\Microsoft.ML.Transforms.csproj" >
+      <PrivateAssets>all</PrivateAssets>
+    </ProjectReference>
+
   </ItemGroup>
-  
+
   <ItemGroup>
     <None Update="Templates\Azure\Console\AzureModelBuilder.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
diff --git a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
index e8185ed817..ca75c00c6b 100644
--- a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
+++ b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props"/>
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
-    <IncludeInPackage>Microsoft.ML.CpuMath</IncludeInPackage>
+    <PackageId>Microsoft.ML.CpuMath</PackageId>
+    <PackageDescription>Microsoft.ML.CpuMath contains optimized math routines for ML.NET.</PackageDescription>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);CPUMATH_INFRASTRUCTURE</DefineConstants>
   </PropertyGroup>
@@ -31,4 +33,8 @@
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="build\**\*" Pack="true" PackagePath="build" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.ML.CpuMath/build/netstandard2.0/Microsoft.ML.CpuMath.props b/src/Microsoft.ML.CpuMath/build/netstandard2.0/Microsoft.ML.CpuMath.props
new file mode 100644
index 0000000000..ce379e2f00
--- /dev/null
+++ b/src/Microsoft.ML.CpuMath/build/netstandard2.0/Microsoft.ML.CpuMath.props
@@ -0,0 +1,24 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+  NuGet packages.config doesn't support native assemblies automatically,
+  so copy the native assemblies to the output directory.
+  -->
+  <ItemGroup Condition="Exists('packages.config') OR
+                        Exists('$(MSBuildProjectName).packages.config') OR
+                        Exists('packages.$(MSBuildProjectName).config')">
+    <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\nativeassets\netstandard2.0\*.dll"
+             Condition="'$(PlatformTarget)' == 'x64'">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+      <Link>%(Filename)%(Extension)</Link>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\nativeassets\netstandard2.0\*.dll"
+             Condition="'$(PlatformTarget)' == 'x86'">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+      <Link>%(Filename)%(Extension)</Link>
+    </Content>
+  </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 718deb356e..3a15993b32 100644
--- a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
+++ b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props"/>
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.DataView</IncludeInPackage>
+    <PackageId>Microsoft.ML.DataView</PackageId>
+    <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>
 
   <ItemGroup>
@@ -13,5 +15,5 @@
   <ItemGroup>
     <Compile Include="..\Microsoft.ML.Core\Utilities\ArrayUtils.cs" />
   </ItemGroup>
-  
+
 </Project>
diff --git a/src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj b/src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj
index 07aa31d837..2810104dd4 100644
--- a/src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj
+++ b/src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
+    <ProjectReference Include="..\..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
     <ProjectReference Include="..\..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
   </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 9ea6161799..66fa209d2e 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj
@@ -1,12 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.DnnImageFeaturizer.AlexNet</IncludeInPackage>
+    <PackageId>Microsoft.ML.DnnImageFeaturizer.AlexNet</PackageId>
+    <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>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="$(RepoRoot)pkg\common\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
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 348ca6d4a9..369a247d03 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
@@ -1,12 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.DnnImageFeaturizer.ResNet101</IncludeInPackage>
+    <PackageId>Microsoft.ML.DnnImageFeaturizer.ResNet101</PackageId>
+    <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>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="$(RepoRoot)pkg\common\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
   </ItemGroup>
-  
 </Project>
\ No newline at end of file
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 c415ff06cc..fe0e6f9061 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
@@ -1,12 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.DnnImageFeaturizer.ResNet18</IncludeInPackage>
+    <PackageId>Microsoft.ML.DnnImageFeaturizer.ResNet18</PackageId>
+    <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>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="$(RepoRoot)pkg\common\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
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 fce0a26b21..e6f45e1e5e 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
@@ -1,12 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.DnnImageFeaturizer.ResNet50</IncludeInPackage>
+    <PackageId>Microsoft.ML.DnnImageFeaturizer.ResNet50</PackageId>
+    <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>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="$(RepoRoot)pkg\common\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
index cb69ad7a63..ab6a2257d1 100644
--- a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
+++ b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
@@ -1,15 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.Ensemble</IncludeInPackage>
+    <PackageId>Microsoft.ML.Ensemble</PackageId>
+    <PackageDescription>ML.NET component for Ensembles</PackageDescription>
     <DefineConstants>CORECLR</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
+    <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>
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
index 2dd542e4c5..fdda171cb5 100644
--- a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
+++ b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
@@ -1,15 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.EntryPoints</IncludeInPackage>
+    <PackageId>Microsoft.ML.EntryPoints</PackageId>
+    <PackageDescription>Microsoft.ML.EntryPoints contains the ML.NET entry point API catalog.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
+    <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>
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
index 4c1b189a5b..0e372b8edd 100644
--- a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
+++ b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
@@ -1,12 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.Experimental</IncludeInPackage>
+    <PackageId>Microsoft.ML.Experimental</PackageId>
+    <PackageDescription>Microsoft.ML.Experimental contains experimental work such extension methods to access internal methods.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
+      <PrivateAssets>all</PrivateAssets>
+    </ProjectReference>
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
index 9ba56bf8f6..e12bb82658 100644
--- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
+++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
@@ -1,16 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.FastTree</IncludeInPackage>
+    <PackageId>Microsoft.ML.FastTree</PackageId>
+    <PackageDescription>ML.NET component for FastTree</PackageDescription>
     <DefineConstants>$(DefineConstants);USE_FASTTREENATIVE;NO_STORE;CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>
-    <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\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>
   </ItemGroup>
-  
+
+  <ItemGroup>
+    <Content Include="$(RepoRoot)pkg\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj b/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj
index c40c34682f..67926bb77b 100644
--- a/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj
+++ b/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj
@@ -1,9 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks>
-    <IncludeInPackage>Microsoft.ML.Featurizers</IncludeInPackage>
+    <PackageId>Microsoft.ML.Featurizers</PackageId>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PackageDescription>ML.NET featurizers with native code implementation</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,8 +13,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
+    <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>
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
index e32f0db25e..630e1f6c97 100644
--- a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
+++ b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.ImageAnalytics</IncludeInPackage>
+    <PackageId>Microsoft.ML.ImageAnalytics</PackageId>
+    <PackageDescription>ML.NET component for Image support</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,8 +13,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
+    <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>
   </ItemGroup>
-  
+
 </Project>
diff --git a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
index 46e628fd26..53d14833e9 100644
--- a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
+++ b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
@@ -1,16 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.LightGbm</IncludeInPackage>
+    <PackageId>Microsoft.ML.LightGbm</PackageId>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PackageDescription>ML.NET component for LightGBM</PackageDescription>
   </PropertyGroup>
-  
+
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
     <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.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>
   </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 907b75e11f..921f2ab1e4 100644
--- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
+++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
@@ -1,15 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
+    <PackageId>Microsoft.ML.Mkl.Components</PackageId>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <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.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>
+  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" />
+    <Content Include="$(RepoRoot)pkg\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
new file mode 100644
index 0000000000..9a3394f90e
--- /dev/null
+++ b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+
+  <PropertyGroup>
+    <Authors>Intel</Authors>
+    <IncludeSymbols>false</IncludeSymbols>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <PackageId>Microsoft.ML.Mkl.Redist</PackageId>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <PackageDescription>$(MSBuildProjectName) contains the MKL library redistributed as a NuGet package.</PackageDescription>
+    <PackageTags>$(PackageTags) MLNET MKL</PackageTags>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IncludeMLNetNotices>false</IncludeMLNetNotices>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="$(RepoRoot)pkg\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+    <Content Include="$(PkgDir)_._" Pack="true" PackagePath="lib\netstandard2.0\" />
+    <Content Include="$(NUGET_PACKAGES)\mlnetmkldeps\$(MlNetMklDepsPackageVersion)\LICENSE.txt" Pack="true" PackagePath="" />
+  </ItemGroup>
+</Project>
diff --git a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
index b1f49811f7..56dd7fbdc1 100644
--- a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
+++ b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
@@ -1,9 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.OnnxConverter</IncludeInPackage>
+    <PackageId>Microsoft.ML.OnnxConverter</PackageId>
     <RootNamespace>Microsoft.ML.Model.Onnx</RootNamespace>
+    <PackageDescription>ML.NET component for exporting ONNX Models</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,7 +13,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
+    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
+
+    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" >
+      <PrivateAssets>all</PrivateAssets>
+    </ProjectReference>
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
index 7612f974ea..4d440e17ac 100644
--- a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
+++ b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
@@ -1,14 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.OnnxTransformer</IncludeInPackage>
+    <PackageId>Microsoft.ML.OnnxTransformer</PackageId>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PackageDescription>ML.NET component for Microsoft.ML.Scoring library</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
+    <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>
     <PackageReference Include="Microsoft.ML.OnnxRuntime.Managed" Version="$(MicrosoftMLOnnxRuntimePackageVersion)" />
     <PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
   </ItemGroup>
diff --git a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
index 9ae9b08662..904a213f50 100644
--- a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
+++ b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.Parquet</IncludeInPackage>
+    <PackageId>Microsoft.ML.Parquet</PackageId>
+    <PackageDescription>ML.NET components for Apache Parquet support.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,8 +12,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
+    <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>
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
index d78a44e669..2bc2bf4f3e 100644
--- a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
+++ b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
@@ -1,14 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.Recommender</IncludeInPackage>
+    <PackageId>Microsoft.ML.Recommender</PackageId>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PackageDescription>LIBMF, the core computation library for matrix factorization in ML.NET</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
+    <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>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="$(RepoRoot)pkg\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+    <Content Include="$(RepoRoot)src\Native\MatrixFactorizationNative\libmf\COPYRIGHT" Pack="true" PackagePath="" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
index 3fb71a6442..ee23c5e72e 100644
--- a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
+++ b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.SampleUtils</IncludeInPackage>
+    <PackageId>Microsoft.ML.SampleUtils</PackageId>
+    <PackageDescription>Sample utils for Microsoft.ML.Samples</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,9 +12,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
+    <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>
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
index 7e018a4c03..9584847c80 100644
--- a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
+++ b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.TensorFlow</IncludeInPackage>
+    <PackageId>Microsoft.ML.TensorFlow</PackageId>
     <DefineConstants>CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PackageDescription>Microsoft.ML.TensorFlow contains ML.NET integration of TensorFlow.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,9 +16,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
+    <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>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
index c5b4550c51..77d7d8db7f 100644
--- a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
+++ b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
@@ -1,13 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props"/>
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.TimeSeries</IncludeInPackage>
+    <PackageId>Microsoft.ML.TimeSeries</PackageId>
+    <PackageDescription>Microsoft.ML.TimeSeries contains ML.NET Time Series prediction algorithms. Uses Intel Mkl.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
+    <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>
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj b/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj
index a1e2ef0068..b638ca0dcf 100644
--- a/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj
+++ b/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.Vision</IncludeInPackage>
+    <PackageId>Microsoft.ML.Vision</PackageId>
     <DefineConstants>CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PackageDescription>Microsoft.ML.Vision contains high level APIs for vision tasks like image classification.</PackageDescription>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -13,9 +15,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
-    <ProjectReference Include="..\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.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.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
   </ItemGroup>
 
@@ -26,5 +34,5 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  
+
 </Project>
diff --git a/src/Microsoft.ML/Microsoft.ML.csproj b/src/Microsoft.ML/Microsoft.ML.csproj
new file mode 100644
index 0000000000..5d96be5a31
--- /dev/null
+++ b/src/Microsoft.ML/Microsoft.ML.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
+  <Import Project="$(RepoRoot)pkg/Directory.Build.props"/>
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageId>Microsoft.ML</PackageId>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <PackageDescription>ML.NET is a cross-platform open-source machine learning framework which makes machine learning accessible to .NET developers.</PackageDescription>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../Microsoft.ML.DataView/Microsoft.ML.DataView.csproj" />
+    <ProjectReference Include="../Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj" />
+
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
+    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPackageVersion)" />
+    <PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
+    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
+    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
+    <PackageReference Include="System.Threading.Channels" Version="$(SystemThreadingChannelsPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="$(RepoRoot)pkg\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+    <Content Include="build\**\*" Pack="true" PackagePath="build" />
+  </ItemGroup>
+</Project>
diff --git a/src/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets b/src/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets
new file mode 100644
index 0000000000..df03944a1c
--- /dev/null
+++ b/src/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets
@@ -0,0 +1,22 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <EnableMLUnsupportedPlatformTargetCheck Condition="'$(EnableMLUnsupportedPlatformTargetCheck)' == ''">true</EnableMLUnsupportedPlatformTargetCheck>
+  </PropertyGroup>
+
+  <Target Name="_CheckForUnsupportedPlatformTarget"
+          Condition="'$(EnableMLUnsupportedPlatformTargetCheck)' == 'true'"
+          AfterTargets="_CheckForInvalidConfigurationAndPlatform">
+
+    <!--
+    Special case .NET Core portable applications.  When building a portable .NET Core app,
+    the PlatformTarget is empty, and you don't know until runtime (i.e. which dotnet.exe)
+    what processor architecture will be used.
+    -->
+    <Error Condition="('$(PlatformTarget)' != 'x64' AND '$(PlatformTarget)' != 'x86') AND
+                      ('$(OutputType)' == 'Exe' OR '$(OutputType)'=='WinExe') AND
+                      !('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(PlatformTarget)' == '')"
+           Text="Microsoft.ML currently supports 'x64' and 'x86' processor architectures. Please ensure your application is targeting 'x64' or 'x86'." />
+  </Target>
+  
+</Project>
\ No newline at end of file
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 6acbb993b5..73e591b2f8 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
@@ -65,7 +65,7 @@
     <ModelFileCopy Include="$(ModelPlacementDir)\ResNet18Onnx\ResNet18.onnx"
     TargetPath="$(PackageAssetsPath)\Microsoft.ML.DnnImageFeaturizer.ResNet18\tools\DnnImageModels\ResNet18Onnx\ResNet18.onnx" />
   </ItemGroup>
-    
+
   <ItemGroup>
     <ModelFileCopy Include="$(ModelPlacementDir)\ResNetPrepOnnx\ResNetPreprocess.onnx"
     TargetPath="$(PackageAssetsPath)\Microsoft.ML.DnnImageFeaturizer.ResNet18\tools\DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx" />
@@ -75,7 +75,7 @@
     <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" />
@@ -85,13 +85,13 @@
     <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" />
   </ItemGroup>
 
-  <Target Name="DownloadDnnModelFiles" 
+  <Target Name="DownloadDnnModelFiles"
           Inputs="@(ModelFiles)" Outputs="@(ModelFiles->'%(DestinationFile)')">
     <Message Importance="High" Text="Downloading external model files... @(ModelFiles->'%(DestinationFile)')" />
     <MakeDir Directories="$(ModelPlacementDir)" />
@@ -118,7 +118,9 @@
 
   <Target Name="Build"
           DependsOnTargets="CopyDnnModelFiles" />
-  
+
   <Target Name="Pack" />
 
+  <Target Name="Test" />
+
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj b/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj
index 624384d9b5..29caed1c00 100644
--- a/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj
+++ b/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj
@@ -25,6 +25,8 @@
     <ProjectReference Include="..\..\src\Microsoft.ML.OnnxConverter\Microsoft.ML.OnnxConverter.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.ML.TimeSeries\Microsoft.ML.TimeSeries.csproj" />
     <ProjectReference Include="..\Microsoft.ML.TestFrameworkCommon\Microsoft.ML.TestFrameworkCommon.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.ML.Functional.Tests/ModelFiles.cs b/test/Microsoft.ML.Functional.Tests/ModelFiles.cs
index 64c86a08cd..53a95c0089 100644
--- a/test/Microsoft.ML.Functional.Tests/ModelFiles.cs
+++ b/test/Microsoft.ML.Functional.Tests/ModelFiles.cs
@@ -68,7 +68,7 @@ public void DetermineNugetVersionFromModel()
                 {
                     // The only line in the file is the version of the model.
                     var line = reader.ReadLine();
-                    Assert.Matches(new Regex(@"(\d+).(\d+)\.(\d+)\.(\d+) \@BuiltBy:(.)* \@SrcCode:(.)*"), line);
+                    Assert.Matches(new Regex(@"(\d+)\.(\d+)\.(\d+)-(dev|ci)\.(\d+)\.(\d+)\+[0-9a-f]+"), line);
                 }
             }
         }
@@ -79,8 +79,8 @@ public void DetermineNugetVersionFromModel()
         /// <remarks>
         /// Serves two scenarios:
         ///  1. I can train a model and save it to a file, including transforms.
-        ///  2. Training and prediction happen in different processes (or even different machines). 
-        ///     The actual test will not run in different processes, but will simulate the idea that the 
+        ///  2. Training and prediction happen in different processes (or even different machines).
+        ///     The actual test will not run in different processes, but will simulate the idea that the
         ///     "communication pipe" is just a serialized model of some form.
         /// </remarks>
         [Fact]
@@ -110,7 +110,7 @@ public void FitPipelineSaveModelAndPredict()
                 serializedModel = mlContext.Model.Load(file, out var serializedSchema);
                 TestCommon.CheckSameSchemas(data.Schema, serializedSchema);
             }
-            
+
             // Create prediction engine and test predictions.
             var originalPredictionEngine = mlContext.Model.CreatePredictionEngine<HousingRegression, ScoreColumn>(model);
             var serializedPredictionEngine = mlContext.Model.CreatePredictionEngine<HousingRegression, ScoreColumn>(serializedModel);
@@ -395,7 +395,7 @@ public void SaveCompositeLoaderAndLoad()
                 out var loadedWithLoader, out var loadedLoaderWithTransformer);
             // Because we saved the transform model as part of the composite loader, with no transforms,
             // the transform that should be loaded should be an empty transformer chain, since the "model,"
-            // such as it is, has been combined with the loader. 
+            // such as it is, has been combined with the loader.
             Assert.Empty(Assert.IsType<TransformerChain<ITransformer>>(loadedWithSchema));
             Assert.Empty(Assert.IsType<TransformerChain<ITransformer>>(loadedWithLoader));
 
diff --git a/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj b/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj
index 557c4a8ec0..c96155f76d 100644
--- a/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj
+++ b/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj
@@ -12,10 +12,11 @@
     <ProjectReference Include="..\..\src\Microsoft.ML.Recommender\Microsoft.ML.Recommender.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.ML.ResultProcessor\Microsoft.ML.ResultProcessor.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
     <ProjectReference Include="..\Microsoft.ML.TestFrameworkCommon\Microsoft.ML.TestFrameworkCommon.csproj" />
     <ProjectReference Include="..\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <NativeAssemblyReference Include="LdaNative" />
     <NativeAssemblyReference Include="FastTreeNative" />
@@ -25,7 +26,7 @@
     <NativeAssemblyReference Include="MklImports" />
     <NativeAssemblyReference Condition="'$(OS)' == 'Windows_NT'" Include="libiomp5md" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <None Update="xunit.runner.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/test/TestFrameworkDependency.props b/test/TestFrameworkDependency.props
index d71ebf2628..c815dd3166 100644
--- a/test/TestFrameworkDependency.props
+++ b/test/TestFrameworkDependency.props
@@ -1,6 +1,8 @@
 <Project>
   <ItemGroup Condition="'$(ReferenceTypeForTestFramework)' == '' OR '$(ReferenceTypeForTestFramework)' == 'Project'">
-    <ProjectReference Include="..\..\src\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.ML.Data\Microsoft.ML.Data.csproj">
+      <PrivateAssets>All</PrivateAssets>
+    </ProjectReference>
   </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.StableApi/Microsoft.ML.StableApi.csproj b/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
index 45060cb11e..d0e312ae00 100644
--- a/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
+++ b/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
@@ -6,23 +6,23 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.ML" Version="1.4.0" />
-    <PackageReference Include="Microsoft.ML" Version="1.4.0" />
-    <PackageReference Include="Microsoft.ML.DataView" Version="1.4.0" />
-    <PackageReference Include="Microsoft.ML.CpuMath" Version="1.4.0" />
-    <PackageReference Include="Microsoft.ML.FastTree" Version="1.4.0" />
-    <PackageReference Include="Microsoft.ML.LightGbm" Version="1.4.0" />
-    <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.4.0" />
-    <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.4.0" />
-    <PackageReference Include="Microsoft.ML.TimeSeries" Version="1.4.0" />
-    <PackageReference Include="Microsoft.ML.TensorFlow" Version="1.4.0" />
-    <PackageReference Include="Microsoft.ML.OnnxTransformer" Version="1.4.0" />
-    <PackageReference Include="Microsoft.ML.Vision" Version="1.4.0" />
+    <PackageReference Include="Microsoft.Extensions.ML" Version="1.5.2" />
+    <PackageReference Include="Microsoft.ML" Version="1.5.2" />
+    <PackageReference Include="Microsoft.ML.DataView" Version="1.5.2" />
+    <PackageReference Include="Microsoft.ML.CpuMath" Version="1.5.2" />
+    <PackageReference Include="Microsoft.ML.FastTree" Version="1.5.2" />
+    <PackageReference Include="Microsoft.ML.LightGbm" Version="1.5.2" />
+    <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.5.2" />
+    <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.5.2" />
+    <PackageReference Include="Microsoft.ML.TimeSeries" Version="1.5.2" />
+    <PackageReference Include="Microsoft.ML.TensorFlow" Version="1.5.2" />
+    <PackageReference Include="Microsoft.ML.OnnxTransformer" Version="1.5.2" />
+    <PackageReference Include="Microsoft.ML.Vision" Version="1.5.2" />
   </ItemGroup>
 
   <!-- The purpose of this target is to return a path from a referenced
        package / project -->
-  <Target Name="GetContract" DependsOnTargets="ResolveReferences" Returns="@(_contractReferencePath)">
+  <Target Name="GetContract" DependsOnTargets="ResolveReferences" Returns="@(_contractReferencePath)" Condition="'$(ContractName)' != 'Microsoft.ML' And '$(ContractName)' != 'Microsoft.ML.Mkl.Redist'">
     <Error Condition="'$(ContractName)' == ''" Text="ContractName must be specified" />
     <ItemGroup>
       <_contractReferencePath Include="@(ReferencePath)" Condition="'%(FileName)' == '$(ContractName)'" />

From cafeb3f4e0d8fa4338bbd909b7fa15c73cbe144c Mon Sep 17 00:00:00 2001
From: Michael Sharp <misharp@microsoft.com>
Date: Tue, 27 Oct 2020 15:21:54 -0700
Subject: [PATCH 4/9] build changes

---
 build.sh           |  2 +-
 eng/Versions.props |  2 +-
 global.json        | 23 +++++++++++++----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/build.sh b/build.sh
index 9cfcdfa797..fa63e891e3 100755
--- a/build.sh
+++ b/build.sh
@@ -10,4 +10,4 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
 done
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
-"$DIR/eng/common/build.sh" --restore --build --pack --warnAsError false
+"$DIR/eng/common/build.sh" --restore --build --pack --warnAsError false "$@"
diff --git a/eng/Versions.props b/eng/Versions.props
index 18d51fa7c3..6923dbe3ad 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <!-- This repo version -->
-    <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
+    <DotNetUseShippingVersions>false</DotNetUseShippingVersions>
     <VersionPrefix>1.5.3</VersionPrefix>
     <PreReleaseVersionLabel>dev</PreReleaseVersionLabel>
 
diff --git a/global.json b/global.json
index cd6a8c0ea6..537e0c1aae 100644
--- a/global.json
+++ b/global.json
@@ -1,12 +1,15 @@
 {
-  "tools": {
-    "dotnet": "5.0.100-rc.1.20452.10"
-  },
-  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20461.7",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20461.7",
-    "Microsoft.Build.Traversal": "2.1.1",
-    "Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
-    "Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"
+	"tools": {
+	  "dotnet": "5.0.100-rc.1.20452.10",
+	  "runtimes": {
+		"dotnet/x64": ["$(MicrosoftNETCorePlatformsVersion)" ]
+	  }
+	},
+	"msbuild-sdks": {
+	  "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20461.7",
+	  "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20461.7",
+	  "Microsoft.Build.Traversal": "2.1.1",
+	  "Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
+	  "Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"
+	}
   }
-}

From c844c49a7f1382bde5abfc51558183f625e4694a Mon Sep 17 00:00:00 2001
From: Michael Sharp <misharp@microsoft.com>
Date: Tue, 27 Oct 2020 16:29:45 -0700
Subject: [PATCH 5/9] all tests should be working

---
 .../ComponentModel/ComponentCatalog.cs                 | 10 +++++-----
 test/Microsoft.ML.Functional.Tests/ModelFiles.cs       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs b/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs
index f5bd505ce0..b4aaef3c84 100644
--- a/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs
+++ b/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs
@@ -1110,11 +1110,11 @@ private void LoadExtensions(Assembly assembly, bool throwOnError)
         /// </remarks>
         private static bool CanContainExtensions(Assembly assembly)
         {
-            if (assembly.FullName.StartsWith("Microsoft.ML.", StringComparison.Ordinal)
-                && HasMLNetPublicKey(assembly))
-            {
-                return false;
-            }
+            //if (assembly.FullName.StartsWith("Microsoft.ML.", StringComparison.Ordinal)
+            //    && HasMLNetPublicKey(assembly))
+            //{
+            //    return false;
+            //}
 
             return true;
         }
diff --git a/test/Microsoft.ML.Functional.Tests/ModelFiles.cs b/test/Microsoft.ML.Functional.Tests/ModelFiles.cs
index 53a95c0089..6312073c49 100644
--- a/test/Microsoft.ML.Functional.Tests/ModelFiles.cs
+++ b/test/Microsoft.ML.Functional.Tests/ModelFiles.cs
@@ -68,7 +68,7 @@ public void DetermineNugetVersionFromModel()
                 {
                     // The only line in the file is the version of the model.
                     var line = reader.ReadLine();
-                    Assert.Matches(new Regex(@"(\d+)\.(\d+)\.(\d+)-(dev|ci)\.(\d+)\.(\d+)\+[0-9a-f]+"), line);
+                    Assert.Matches(new Regex(@"(\d+)\.(\d+)\.(\d+)(-[dev|ci|preview\.(\d+)\.(\d+)\.(\d+)]){0,1}"), line);
                 }
             }
         }

From d037ee8a55a3bfef5f524a551945098b3e60acea Mon Sep 17 00:00:00 2001
From: Michael Sharp <misharp@microsoft.com>
Date: Wed, 28 Oct 2020 11:38:44 -0700
Subject: [PATCH 6/9] changes from PR comments

---
 Directory.Build.targets                       |  1 -
 test/Directory.Build.targets                  |  1 -
 .../Microsoft.ML.StableApi.csproj             | 24 +++++++++----------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index be45b57429..590e6ea73c 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -38,7 +38,6 @@
 			UseSymboliclinksIfPossible="$(CreateSymbolicLinksForPublishFilesIfPossible)">
 		<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
 		</Copy>
-  <!--<Exec Command="call C:\MyFile.bat or call C:\MyFile.bat call C:\MyFile2.bat" />-->
   </Target>
 
 
diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
index afae9be487..ec3be4f3f6 100644
--- a/test/Directory.Build.targets
+++ b/test/Directory.Build.targets
@@ -8,5 +8,4 @@
     <AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.runtimeconfig.json;.runtimeconfig.dev.json;.deps.json</AllowedReferenceRelatedFileExtensions>
   </PropertyGroup>
 
-
 </Project>
\ No newline at end of file
diff --git a/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj b/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
index d0e312ae00..ee9d346159 100644
--- a/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
+++ b/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
@@ -6,18 +6,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.ML" Version="1.5.2" />
-    <PackageReference Include="Microsoft.ML" Version="1.5.2" />
-    <PackageReference Include="Microsoft.ML.DataView" Version="1.5.2" />
-    <PackageReference Include="Microsoft.ML.CpuMath" Version="1.5.2" />
-    <PackageReference Include="Microsoft.ML.FastTree" Version="1.5.2" />
-    <PackageReference Include="Microsoft.ML.LightGbm" Version="1.5.2" />
-    <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.5.2" />
-    <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.5.2" />
-    <PackageReference Include="Microsoft.ML.TimeSeries" Version="1.5.2" />
-    <PackageReference Include="Microsoft.ML.TensorFlow" Version="1.5.2" />
-    <PackageReference Include="Microsoft.ML.OnnxTransformer" Version="1.5.2" />
-    <PackageReference Include="Microsoft.ML.Vision" Version="1.5.2" />
+    <PackageReference Include="Microsoft.Extensions.ML" Version="1.5.0" />
+    <PackageReference Include="Microsoft.ML" Version="1.5.0" />
+    <PackageReference Include="Microsoft.ML.DataView" Version="1.5.0" />
+    <PackageReference Include="Microsoft.ML.CpuMath" Version="1.5.0" />
+    <PackageReference Include="Microsoft.ML.FastTree" Version="1.5.0" />
+    <PackageReference Include="Microsoft.ML.LightGbm" Version="1.5.0" />
+    <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.5.0" />
+    <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.5.0" />
+    <PackageReference Include="Microsoft.ML.TimeSeries" Version="1.5.0" />
+    <PackageReference Include="Microsoft.ML.TensorFlow" Version="1.5.0" />
+    <PackageReference Include="Microsoft.ML.OnnxTransformer" Version="1.5.0" />
+    <PackageReference Include="Microsoft.ML.Vision" Version="1.5.0" />
   </ItemGroup>
 
   <!-- The purpose of this target is to return a path from a referenced

From 39f1c4351cc979e79de0c17f85b36f34d8479f6f Mon Sep 17 00:00:00 2001
From: Michael Sharp <misharp@microsoft.com>
Date: Wed, 28 Oct 2020 14:53:39 -0700
Subject: [PATCH 7/9] fixes for .net 3.1

---
 eng/Versions.props | 1 +
 global.json        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 6923dbe3ad..2da6012f43 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -77,6 +77,7 @@
     <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
     <MicrosoftExtensionsFileSystemGlobbingVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
     <MicrosoftNETCorePlatformsVersion>2.1.0</MicrosoftNETCorePlatformsVersion>
+    <MicrosoftNETCore3PlatformsVersion>3.1.0</MicrosoftNETCore3PlatformsVersion>
     <MicrosoftNetCompilersToolsetVersion>3.8.0-3.20460.2</MicrosoftNetCompilersToolsetVersion>
     <MoqVersion>4.8.3</MoqVersion>
     <MonoOptionsVersion>5.3.0.1</MonoOptionsVersion>
diff --git a/global.json b/global.json
index 537e0c1aae..e301a744d5 100644
--- a/global.json
+++ b/global.json
@@ -2,7 +2,7 @@
 	"tools": {
 	  "dotnet": "5.0.100-rc.1.20452.10",
 	  "runtimes": {
-		"dotnet/x64": ["$(MicrosoftNETCorePlatformsVersion)" ]
+		"dotnet/x64": ["$(MicrosoftNETCorePlatformsVersion)", "$(MicrosoftNETCore3PlatformsVersion)" ]
 	  }
 	},
 	"msbuild-sdks": {

From e0beb3aefcd0b35b056e06d29a165732ecf52f7e Mon Sep 17 00:00:00 2001
From: Michael Sharp <misharp@microsoft.com>
Date: Tue, 3 Nov 2020 09:50:07 -0800
Subject: [PATCH 8/9] Fixed extension check. Removed <PackageId> where not
 needed

---
 Directory.Build.targets                       |  6 -----
 .../Microsoft.Extensions.ML.csproj            |  1 -
 .../Microsoft.ML.AutoML.csproj                |  1 -
 .../Microsoft.ML.CodeGenerator.csproj         |  1 -
 .../ComponentModel/ComponentCatalog.cs        | 11 +++++----
 .../Microsoft.ML.CpuMath.csproj               |  1 -
 .../Microsoft.ML.DataView.csproj              |  1 -
 ...osoft.ML.DnnImageFeaturizer.AlexNet.csproj |  1 -
 ...oft.ML.DnnImageFeaturizer.ResNet101.csproj |  1 -
 ...soft.ML.DnnImageFeaturizer.ResNet18.csproj |  1 -
 ...soft.ML.DnnImageFeaturizer.ResNet50.csproj |  1 -
 .../Microsoft.ML.Ensemble.csproj              |  1 -
 .../Microsoft.ML.EntryPoints.csproj           |  1 -
 .../Microsoft.ML.Experimental.csproj          |  1 -
 .../Microsoft.ML.FastTree.csproj              |  1 -
 .../Microsoft.ML.Featurizers.csproj           |  1 -
 .../Microsoft.ML.ImageAnalytics.csproj        |  1 -
 .../Microsoft.ML.LightGbm.csproj              |  1 -
 .../Microsoft.ML.Mkl.Components.csproj        |  1 -
 .../Microsoft.ML.Mkl.Redist.csproj            |  1 -
 .../Microsoft.ML.OnnxConverter.csproj         |  1 -
 .../Microsoft.ML.OnnxTransformer.csproj       |  1 -
 .../Microsoft.ML.Parquet.csproj               |  1 -
 .../Microsoft.ML.Recommender.csproj           |  1 -
 .../Microsoft.ML.SamplesUtils.csproj          |  1 -
 .../Microsoft.ML.TensorFlow.csproj            |  1 -
 .../Microsoft.ML.TimeSeries.csproj            |  1 -
 .../Microsoft.ML.Vision.csproj                |  1 -
 src/Microsoft.ML/Microsoft.ML.csproj          |  1 -
 .../Microsoft.ML.StableApi.csproj             | 24 +++++++++----------
 30 files changed, 18 insertions(+), 50 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 590e6ea73c..e11804c23b 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -2,9 +2,7 @@
 <Project>
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
-
   <Target Name="CopyNativeAssembiles" AfterTargets="CopyFilesToOutputDirectory">
-    <Message Importance="High" Text="CopyNativeAssembiles EVENT" />
     <PropertyGroup>
 		<LibPrefix Condition="'$(OS)' != 'Windows_NT'">lib</LibPrefix>
 		<LibExtension Condition="'$(OS)' == 'Windows_NT'">.dll</LibExtension>
@@ -21,8 +19,6 @@
 		<OutputPath Condition="'$(OutputPath)'==''">$(BinDir)$(MSBuildProjectName)\Debug</OutputPath>
 	</PropertyGroup>
 
-
-
 		<ItemGroup>
 		<NativeAssemblyReference>
 			<FullAssemblyPath>$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReference.Identity)$(LibExtension)</FullAssemblyPath>
@@ -40,6 +36,4 @@
 		</Copy>
   </Target>
 
-
-
 </Project>
diff --git a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
index 8ca74ded90..354d371da9 100644
--- a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
+++ b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.Extensions.ML</PackageId>
     <PackageDescription>An integration package for ML.NET models on scalable web apps and services.</PackageDescription>
   </PropertyGroup>
 
diff --git a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
index 863a551a99..70c01cf274 100644
--- a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
+++ b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.AutoML</PackageId>
     <PackageDescription>ML.NET AutoML: Optimizes an ML pipeline for your dataset, by automatically locating the best feature engineering, model, and hyperparameters</PackageDescription>
   </PropertyGroup>
 
diff --git a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj
index 92fde21bc6..6571ee6274 100644
--- a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj
+++ b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.CodeGenerator</PackageId>
     <PackageDescription>ML.NET Code Generator</PackageDescription>
   </PropertyGroup>
 
diff --git a/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs b/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs
index b4aaef3c84..955a52f9c1 100644
--- a/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs
+++ b/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs
@@ -1110,11 +1110,12 @@ private void LoadExtensions(Assembly assembly, bool throwOnError)
         /// </remarks>
         private static bool CanContainExtensions(Assembly assembly)
         {
-            //if (assembly.FullName.StartsWith("Microsoft.ML.", StringComparison.Ordinal)
-            //    && HasMLNetPublicKey(assembly))
-            //{
-            //    return false;
-            //}
+            if (assembly.FullName.StartsWith("Microsoft.ML.", StringComparison.Ordinal)
+               && !Regex.IsMatch(assembly.FullName, @"Microsoft\.ML.*\.Tests.*")
+               && HasMLNetPublicKey(assembly))
+            {
+               return false;
+            }
 
             return true;
         }
diff --git a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
index ca75c00c6b..e6a70f0af1 100644
--- a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
+++ b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
-    <PackageId>Microsoft.ML.CpuMath</PackageId>
     <PackageDescription>Microsoft.ML.CpuMath contains optimized math routines for ML.NET.</PackageDescription>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);CPUMATH_INFRASTRUCTURE</DefineConstants>
diff --git a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
index 3a15993b32..6243a90a51 100644
--- a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
+++ b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.DataView</PackageId>
     <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 66fa209d2e..b57c907e2e 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.DnnImageFeaturizer.AlexNet</PackageId>
     <PackageDescription>ML.NET component for pretrained AlexNet image featurization</PackageDescription>
   </PropertyGroup>
 
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 369a247d03..62872cebc2 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.DnnImageFeaturizer.ResNet101</PackageId>
     <PackageDescription>ML.NET component for pretrained ResNet101 image featurization</PackageDescription>
   </PropertyGroup>
 
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 fe0e6f9061..f05f75464b 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.DnnImageFeaturizer.ResNet18</PackageId>
     <PackageDescription>ML.NET component for pretrained ResNet18 image featurization</PackageDescription>
   </PropertyGroup>
 
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 e6f45e1e5e..f3e059a50c 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.DnnImageFeaturizer.ResNet50</PackageId>
     <PackageDescription>ML.NET component for pretrained ResNet50 image featurization</PackageDescription>
   </PropertyGroup>
 
diff --git a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
index ab6a2257d1..51606dda7b 100644
--- a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
+++ b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.Ensemble</PackageId>
     <PackageDescription>ML.NET component for Ensembles</PackageDescription>
     <DefineConstants>CORECLR</DefineConstants>
   </PropertyGroup>
diff --git a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
index fdda171cb5..d56d1ed242 100644
--- a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
+++ b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.EntryPoints</PackageId>
     <PackageDescription>Microsoft.ML.EntryPoints contains the ML.NET entry point API catalog.</PackageDescription>
   </PropertyGroup>
 
diff --git a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
index 0e372b8edd..a54da82d8d 100644
--- a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
+++ b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.Experimental</PackageId>
     <PackageDescription>Microsoft.ML.Experimental contains experimental work such extension methods to access internal methods.</PackageDescription>
   </PropertyGroup>
 
diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
index e12bb82658..2f1b52a052 100644
--- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
+++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.FastTree</PackageId>
     <PackageDescription>ML.NET component for FastTree</PackageDescription>
     <DefineConstants>$(DefineConstants);USE_FASTTREENATIVE;NO_STORE;CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj b/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj
index 67926bb77b..85295e3be0 100644
--- a/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj
+++ b/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks>
-    <PackageId>Microsoft.ML.Featurizers</PackageId>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageDescription>ML.NET featurizers with native code implementation</PackageDescription>
   </PropertyGroup>
diff --git a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
index 630e1f6c97..3a2776af38 100644
--- a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
+++ b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.ImageAnalytics</PackageId>
     <PackageDescription>ML.NET component for Image support</PackageDescription>
   </PropertyGroup>
 
diff --git a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
index 53d14833e9..09e425cd48 100644
--- a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
+++ b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.LightGbm</PackageId>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageDescription>ML.NET component for LightGBM</PackageDescription>
   </PropertyGroup>
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 921f2ab1e4..52cc47b503 100644
--- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
+++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.Mkl.Components</PackageId>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageDescription>ML.NET additional learners making use of Intel Mkl.</PackageDescription>
   </PropertyGroup>
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 9a3394f90e..954915ecae 100644
--- a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
+++ b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
@@ -5,7 +5,6 @@
     <Authors>Intel</Authors>
     <IncludeSymbols>false</IncludeSymbols>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <PackageId>Microsoft.ML.Mkl.Redist</PackageId>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageDescription>$(MSBuildProjectName) contains the MKL library redistributed as a NuGet package.</PackageDescription>
diff --git a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
index 56dd7fbdc1..0f48443cae 100644
--- a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
+++ b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.OnnxConverter</PackageId>
     <RootNamespace>Microsoft.ML.Model.Onnx</RootNamespace>
     <PackageDescription>ML.NET component for exporting ONNX Models</PackageDescription>
   </PropertyGroup>
diff --git a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
index 4d440e17ac..e06ffa9974 100644
--- a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
+++ b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.OnnxTransformer</PackageId>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageDescription>ML.NET component for Microsoft.ML.Scoring library</PackageDescription>
   </PropertyGroup>
diff --git a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
index 904a213f50..51c367eb69 100644
--- a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
+++ b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.Parquet</PackageId>
     <PackageDescription>ML.NET components for Apache Parquet support.</PackageDescription>
   </PropertyGroup>
 
diff --git a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
index 2bc2bf4f3e..a78d5846db 100644
--- a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
+++ b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.Recommender</PackageId>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageDescription>LIBMF, the core computation library for matrix factorization in ML.NET</PackageDescription>
   </PropertyGroup>
diff --git a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
index ee23c5e72e..6b543c5cdf 100644
--- a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
+++ b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.SampleUtils</PackageId>
     <PackageDescription>Sample utils for Microsoft.ML.Samples</PackageDescription>
   </PropertyGroup>
 
diff --git a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
index 9584847c80..695210a1b8 100644
--- a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
+++ b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.TensorFlow</PackageId>
     <DefineConstants>CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageDescription>Microsoft.ML.TensorFlow contains ML.NET integration of TensorFlow.</PackageDescription>
diff --git a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
index 77d7d8db7f..5c3d412fb6 100644
--- a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
+++ b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.TimeSeries</PackageId>
     <PackageDescription>Microsoft.ML.TimeSeries contains ML.NET Time Series prediction algorithms. Uses Intel Mkl.</PackageDescription>
   </PropertyGroup>
 
diff --git a/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj b/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj
index b638ca0dcf..bfce8f9167 100644
--- a/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj
+++ b/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML.Vision</PackageId>
     <DefineConstants>CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageDescription>Microsoft.ML.Vision contains high level APIs for vision tasks like image classification.</PackageDescription>
diff --git a/src/Microsoft.ML/Microsoft.ML.csproj b/src/Microsoft.ML/Microsoft.ML.csproj
index 5d96be5a31..283b08b04e 100644
--- a/src/Microsoft.ML/Microsoft.ML.csproj
+++ b/src/Microsoft.ML/Microsoft.ML.csproj
@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Microsoft.ML</PackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <PackageDescription>ML.NET is a cross-platform open-source machine learning framework which makes machine learning accessible to .NET developers.</PackageDescription>
   </PropertyGroup>
diff --git a/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj b/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
index ee9d346159..4e3c5b7b31 100644
--- a/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
+++ b/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
@@ -6,18 +6,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.ML" Version="1.5.0" />
-    <PackageReference Include="Microsoft.ML" Version="1.5.0" />
-    <PackageReference Include="Microsoft.ML.DataView" Version="1.5.0" />
-    <PackageReference Include="Microsoft.ML.CpuMath" Version="1.5.0" />
-    <PackageReference Include="Microsoft.ML.FastTree" Version="1.5.0" />
-    <PackageReference Include="Microsoft.ML.LightGbm" Version="1.5.0" />
-    <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.5.0" />
-    <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.5.0" />
-    <PackageReference Include="Microsoft.ML.TimeSeries" Version="1.5.0" />
-    <PackageReference Include="Microsoft.ML.TensorFlow" Version="1.5.0" />
-    <PackageReference Include="Microsoft.ML.OnnxTransformer" Version="1.5.0" />
-    <PackageReference Include="Microsoft.ML.Vision" Version="1.5.0" />
+    <PackageReference Include="Microsoft.Extensions.ML" Version="1.4.0" />
+    <PackageReference Include="Microsoft.ML" Version="1.4.0" />
+    <PackageReference Include="Microsoft.ML.DataView" Version="1.4.0" />
+    <PackageReference Include="Microsoft.ML.CpuMath" Version="1.4.0" />
+    <PackageReference Include="Microsoft.ML.FastTree" Version="1.4.0" />
+    <PackageReference Include="Microsoft.ML.LightGbm" Version="1.4.0" />
+    <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.4.0" />
+    <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.4.0" />
+    <PackageReference Include="Microsoft.ML.TimeSeries" Version="1.4.0" />
+    <PackageReference Include="Microsoft.ML.TensorFlow" Version="1.4.0" />
+    <PackageReference Include="Microsoft.ML.OnnxTransformer" Version="1.4.0" />
+    <PackageReference Include="Microsoft.ML.Vision" Version="1.4.0" />
   </ItemGroup>
 
   <!-- The purpose of this target is to return a path from a referenced

From 3fdaeec56161ed8c9b54f6b4d4b578aaee12b09f Mon Sep 17 00:00:00 2001
From: Michael Sharp <misharp@microsoft.com>
Date: Tue, 3 Nov 2020 12:49:19 -0800
Subject: [PATCH 9/9] Removed pkg folder and updated paths.

---
 Microsoft.ML.sln                              |   4 +--
 {pkg/common => eng/pkg}/CommonPackage.props   |   0
 .../pkg}/DnnImageFeaturizer.props             |   0
 .../pkg/Pack.props                            |   2 +-
 {pkg => eng/pkg}/_._                          |   0
 {pkg => eng/pkg}/mlnetlogo.png                | Bin
 .../Microsoft.Extensions.ML.nupkgproj         |  16 ------------
 .../Microsoft.Extensions.ML.symbols.nupkgproj |   5 ----
 .../Microsoft.ML.AutoML.nupkgproj             |  17 -------------
 .../Microsoft.ML.AutoML.symbols.nupkgproj     |   3 ---
 .../Microsoft.ML.CodeGenerator.nupkgproj      |  17 -------------
 ...crosoft.ML.CodeGenerator.symbols.nupkgproj |   3 ---
 .../Microsoft.ML.CpuMath.nupkgproj            |  16 ------------
 .../Microsoft.ML.CpuMath.symbols.nupkgproj    |  13 ----------
 .../netstandard2.0/Microsoft.ML.CpuMath.props |  24 ------------------
 .../Microsoft.ML.DataView.nupkgproj           |  13 ----------
 .../Microsoft.ML.DataView.symbols.nupkgproj   |   5 ----
 ...ft.ML.DnnImageFeaturizer.AlexNet.nupkgproj |  17 -------------
 ...nImageFeaturizer.AlexNet.symbols.nupkgproj |   5 ----
 ....ML.DnnImageFeaturizer.ResNet101.nupkgproj |  16 ------------
 ...mageFeaturizer.ResNet101.symbols.nupkgproj |   5 ----
 ...t.ML.DnnImageFeaturizer.ResNet18.nupkgproj |  16 ------------
 ...ImageFeaturizer.ResNet18.symbols.nupkgproj |   5 ----
 ...t.ML.DnnImageFeaturizer.ResNet50.nupkgproj |  16 ------------
 ...ImageFeaturizer.ResNet50.symbols.nupkgproj |   5 ----
 .../Microsoft.ML.Ensemble.nupkgproj           |  12 ---------
 .../Microsoft.ML.Ensemble.symbols.nupkgproj   |   3 ---
 .../Microsoft.ML.EntryPoints.nupkgproj        |  12 ---------
 ...Microsoft.ML.EntryPoints.symbols.nupkgproj |   5 ----
 .../Microsoft.ML.Experimental.nupkgproj       |  12 ---------
 ...icrosoft.ML.Experimental.symbols.nupkgproj |   5 ----
 .../Microsoft.ML.FastTree.nupkgproj           |  16 ------------
 .../Microsoft.ML.FastTree.symbols.nupkgproj   |   5 ----
 .../Microsoft.ML.Featurizers.nupkgproj        |  14 ----------
 ...Microsoft.ML.Featurizers.symbols.nupkgproj |   5 ----
 .../Microsoft.ML.ImageAnalytics.nupkgproj     |  13 ----------
 ...rosoft.ML.ImageAnalytics.symbols.nupkgproj |   5 ----
 .../Microsoft.ML.LightGbm.nupkgproj           |  14 ----------
 .../Microsoft.ML.LightGbm.symbols.nupkgproj   |   5 ----
 .../Microsoft.ML.Mkl.Components.nupkgproj     |  17 -------------
 ...rosoft.ML.Mkl.Components.symbols.nupkgproj |   5 ----
 .../Microsoft.ML.Mkl.Redist.nupkgproj         |  20 ---------------
 .../Microsoft.ML.OnnxConverter.nupkgproj      |  13 ----------
 ...crosoft.ML.OnnxConverter.symbols.nupkgproj |   5 ----
 .../Microsoft.ML.OnnxTransformer.nupkgproj    |  14 ----------
 ...osoft.ML.OnnxTransformer.symbols.nupkgproj |   5 ----
 .../Microsoft.ML.Parquet.nupkgproj            |  13 ----------
 .../Microsoft.ML.Parquet.symbols.nupkgproj    |   5 ----
 .../Microsoft.ML.Recommender.nupkgproj        |  14 ----------
 ...Microsoft.ML.Recommender.symbols.nupkgproj |   5 ----
 .../Microsoft.ML.SampleUtils.nupkgproj        |  12 ---------
 ...Microsoft.ML.SampleUtils.symbols.nupkgproj |   5 ----
 .../Microsoft.ML.TensorFlow.nupkgproj         |  15 -----------
 .../Microsoft.ML.TensorFlow.symbols.nupkgproj |   5 ----
 .../Microsoft.ML.TimeSeries.nupkgproj         |  13 ----------
 .../Microsoft.ML.TimeSeries.symbols.nupkgproj |   5 ----
 .../Microsoft.ML.Vision.nupkgproj             |  12 ---------
 .../Microsoft.ML.Vision.symbols.nupkgproj     |   5 ----
 pkg/Microsoft.ML/Microsoft.ML.nupkgproj       |  24 ------------------
 .../Microsoft.ML.symbols.nupkgproj            |  13 ----------
 .../build/netstandard2.0/Microsoft.ML.targets |  22 ----------------
 .../Microsoft.Extensions.ML.csproj            |   2 +-
 .../Microsoft.ML.AutoML.csproj                |   2 +-
 .../Microsoft.ML.CodeGenerator.csproj         |   2 +-
 .../ComponentModel/ComponentCatalog.cs        |   4 +++
 .../Microsoft.ML.CpuMath.csproj               |   2 +-
 .../Microsoft.ML.DataView.csproj              |   2 +-
 ...osoft.ML.DnnImageFeaturizer.AlexNet.csproj |   4 +--
 ...oft.ML.DnnImageFeaturizer.ResNet101.csproj |   4 +--
 ...soft.ML.DnnImageFeaturizer.ResNet18.csproj |   4 +--
 ...soft.ML.DnnImageFeaturizer.ResNet50.csproj |   4 +--
 .../Microsoft.ML.Ensemble.csproj              |   2 +-
 .../Microsoft.ML.EntryPoints.csproj           |   2 +-
 .../Microsoft.ML.Experimental.csproj          |   2 +-
 .../Microsoft.ML.FastTree.csproj              |   4 +--
 .../Microsoft.ML.Featurizers.csproj           |   2 +-
 .../Microsoft.ML.ImageAnalytics.csproj        |   2 +-
 .../Microsoft.ML.LightGbm.csproj              |   2 +-
 .../Microsoft.ML.Mkl.Components.csproj        |   4 +--
 .../Microsoft.ML.Mkl.Redist.csproj            |   6 ++---
 .../Microsoft.ML.OnnxConverter.csproj         |   2 +-
 .../Microsoft.ML.OnnxTransformer.csproj       |   2 +-
 .../Microsoft.ML.Parquet.csproj               |   2 +-
 .../Microsoft.ML.Recommender.csproj           |   4 +--
 .../Microsoft.ML.SamplesUtils.csproj          |   2 +-
 .../Microsoft.ML.TensorFlow.csproj            |   2 +-
 .../Microsoft.ML.TimeSeries.csproj            |   2 +-
 .../Microsoft.ML.Vision.csproj                |   2 +-
 src/Microsoft.ML/Microsoft.ML.csproj          |   4 +--
 src/Native/Native.proj                        |   8 +++---
 90 files changed, 48 insertions(+), 634 deletions(-)
 rename {pkg/common => eng/pkg}/CommonPackage.props (100%)
 rename {pkg/common => eng/pkg}/DnnImageFeaturizer.props (100%)
 rename pkg/Directory.Build.props => eng/pkg/Pack.props (97%)
 rename {pkg => eng/pkg}/_._ (100%)
 rename {pkg => eng/pkg}/mlnetlogo.png (100%)
 delete mode 100644 pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.nupkgproj
 delete mode 100644 pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.CpuMath/build/netstandard2.0/Microsoft.ML.CpuMath.props
 delete mode 100644 pkg/Microsoft.ML.DataView/Microsoft.ML.DataView.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.DataView/Microsoft.ML.DataView.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.Experimental/Microsoft.ML.Experimental.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.Experimental/Microsoft.ML.Experimental.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.Recommender/Microsoft.ML.Recommender.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.Recommender/Microsoft.ML.Recommender.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.SampleUtils/Microsoft.ML.SampleUtils.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.SampleUtils/Microsoft.ML.SampleUtils.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.Vision/Microsoft.ML.Vision.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.Vision/Microsoft.ML.Vision.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML/Microsoft.ML.nupkgproj
 delete mode 100644 pkg/Microsoft.ML/Microsoft.ML.symbols.nupkgproj
 delete mode 100644 pkg/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets

diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln
index 48df0e8ecc..4978dd67c7 100644
--- a/Microsoft.ML.sln
+++ b/Microsoft.ML.sln
@@ -206,8 +206,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.EntryPoints",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{A84717CB-F11A-41C5-A74D-C0F1D47B7431}"
 	ProjectSection(SolutionItems) = preProject
-		pkg\common\CommonPackage.props = pkg\common\CommonPackage.props
-		pkg\common\DnnImageFeaturizer.props = pkg\common\DnnImageFeaturizer.props
+		eng\pkg\CommonPackage.props = eng\pkg\CommonPackage.props
+		eng\pkg\DnnImageFeaturizer.props = eng\pkg\DnnImageFeaturizer.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.DataView", "src\Microsoft.ML.DataView\Microsoft.ML.DataView.csproj", "{85D0CAFD-2FE8-496A-88C7-585D35B94243}"
diff --git a/pkg/common/CommonPackage.props b/eng/pkg/CommonPackage.props
similarity index 100%
rename from pkg/common/CommonPackage.props
rename to eng/pkg/CommonPackage.props
diff --git a/pkg/common/DnnImageFeaturizer.props b/eng/pkg/DnnImageFeaturizer.props
similarity index 100%
rename from pkg/common/DnnImageFeaturizer.props
rename to eng/pkg/DnnImageFeaturizer.props
diff --git a/pkg/Directory.Build.props b/eng/pkg/Pack.props
similarity index 97%
rename from pkg/Directory.Build.props
rename to eng/pkg/Pack.props
index fc26f66ba7..496cb2d50e 100644
--- a/pkg/Directory.Build.props
+++ b/eng/pkg/Pack.props
@@ -34,7 +34,7 @@
     <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\**\*" PackagePath="runtimes" />
     <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\tools\**\*" PackagePath="tools" />
 
-    <Content Include="$(RepoRoot)\pkg\mlnetlogo.png" Pack="true" PackagePath="" />
+    <Content Include="$(RepoRoot)eng\pkg\mlnetlogo.png" Pack="true" PackagePath="" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(IncludeMLNetNotices)' != 'false'">
diff --git a/pkg/_._ b/eng/pkg/_._
similarity index 100%
rename from pkg/_._
rename to eng/pkg/_._
diff --git a/pkg/mlnetlogo.png b/eng/pkg/mlnetlogo.png
similarity index 100%
rename from pkg/mlnetlogo.png
rename to eng/pkg/mlnetlogo.png
diff --git a/pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.nupkgproj b/pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.nupkgproj
deleted file mode 100644
index 4dbb257b8f..0000000000
--- a/pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.nupkgproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>An integration package for ML.NET models on scalable web apps and services.</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsPackageVersion)" />
-    <ProjectReference Include="..\Microsoft.ML\Microsoft.ML.nupkgproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.symbols.nupkgproj b/pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.symbols.nupkgproj
deleted file mode 100644
index 0b7af4d817..0000000000
--- a/pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.Extensions.ML.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.nupkgproj b/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.nupkgproj
deleted file mode 100644
index 8a9fc5db71..0000000000
--- a/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.nupkgproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET AutoML: Optimizes an ML pipeline for your dataset, by automatically locating the best feature engineering, model, and hyperparameters</PackageDescription>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-    <ProjectReference Include="../Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.nupkgproj" />
-    <ProjectReference Include="../Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.nupkgproj" />
-    <ProjectReference Include="../Microsoft.ML.Recommender/Microsoft.ML.Recommender.nupkgproj" />
-    <ProjectReference Include="../Microsoft.ML.Vision/Microsoft.ML.Vision.nupkgproj" />
-    <ProjectReference Include="../Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.nupkgproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.symbols.nupkgproj b/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.symbols.nupkgproj
deleted file mode 100644
index a648ab1d59..0000000000
--- a/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.symbols.nupkgproj
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project DefaultTargets="Pack">
-  <Import Project="Microsoft.ML.AutoML.nupkgproj" />
-</Project>
diff --git a/pkg/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.nupkgproj b/pkg/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.nupkgproj
deleted file mode 100644
index 48c288fb6b..0000000000
--- a/pkg/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.nupkgproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET Code Generator</PackageDescription>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML.AutoML/Microsoft.ML.AutoML.nupkgproj"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.symbols.nupkgproj b/pkg/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.symbols.nupkgproj
deleted file mode 100644
index cc330b9cbb..0000000000
--- a/pkg/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.symbols.nupkgproj
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project DefaultTargets="Pack">
-  <Import Project="Microsoft.ML.CodeGenerator.nupkgproj" />
-</Project>
diff --git a/pkg/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.nupkgproj b/pkg/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.nupkgproj
deleted file mode 100644
index e60e2b232d..0000000000
--- a/pkg/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.nupkgproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
-    <PackageDescription>Microsoft.ML.CpuMath contains optimized math routines for ML.NET.</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="build\**\*" Pack="true" PackagePath="build" />
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.symbols.nupkgproj b/pkg/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.symbols.nupkgproj
deleted file mode 100644
index 8b44c50d7f..0000000000
--- a/pkg/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.symbols.nupkgproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.CpuMath.nupkgproj" />
-
-  <PropertyGroup>
-    <!--
-      NU5129 is getting raised because the Microsoft.ML.CpuMath package contains a Microsoft.ML.CpuMath.props file.
-      But this package is named Microsoft.ML.CpuMath.symbols, so NuGet complains. However, we can ignore the warning.
-    -->
-    <NoWarn>$(NoWarn);NU5129</NoWarn>
-  </PropertyGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.CpuMath/build/netstandard2.0/Microsoft.ML.CpuMath.props b/pkg/Microsoft.ML.CpuMath/build/netstandard2.0/Microsoft.ML.CpuMath.props
deleted file mode 100644
index ce379e2f00..0000000000
--- a/pkg/Microsoft.ML.CpuMath/build/netstandard2.0/Microsoft.ML.CpuMath.props
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!--
-  NuGet packages.config doesn't support native assemblies automatically,
-  so copy the native assemblies to the output directory.
-  -->
-  <ItemGroup Condition="Exists('packages.config') OR
-                        Exists('$(MSBuildProjectName).packages.config') OR
-                        Exists('packages.$(MSBuildProjectName).config')">
-    <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\nativeassets\netstandard2.0\*.dll"
-             Condition="'$(PlatformTarget)' == 'x64'">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>false</Visible>
-      <Link>%(Filename)%(Extension)</Link>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\nativeassets\netstandard2.0\*.dll"
-             Condition="'$(PlatformTarget)' == 'x86'">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>false</Visible>
-      <Link>%(Filename)%(Extension)</Link>
-    </Content>
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/pkg/Microsoft.ML.DataView/Microsoft.ML.DataView.nupkgproj b/pkg/Microsoft.ML.DataView/Microsoft.ML.DataView.nupkgproj
deleted file mode 100644
index ab500b904e..0000000000
--- a/pkg/Microsoft.ML.DataView/Microsoft.ML.DataView.nupkgproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <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>
-
-  <ItemGroup>
-    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
-    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.DataView/Microsoft.ML.DataView.symbols.nupkgproj b/pkg/Microsoft.ML.DataView/Microsoft.ML.DataView.symbols.nupkgproj
deleted file mode 100644
index 988c4c5f72..0000000000
--- a/pkg/Microsoft.ML.DataView/Microsoft.ML.DataView.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.DataView.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.nupkgproj
deleted file mode 100644
index 4fb4e52d0a..0000000000
--- a/pkg/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.nupkgproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET component for pretrained AlexNet image featurization</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.nupkgproj" />
-  </ItemGroup>
-
-  <ItemGroup>  
-    <Content Include="..\common\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" /> 
-  </ItemGroup>  
-
-</Project>
-
diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.symbols.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.symbols.nupkgproj
deleted file mode 100644
index 8c6a7fcc4c..0000000000
--- a/pkg/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.DnnImageFeaturizer.AlexNet.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.nupkgproj
deleted file mode 100644
index 3d667604cd..0000000000
--- a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.nupkgproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET component for pretrained ResNet101 image featurization</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.nupkgproj" />
-  </ItemGroup>
-
-  <ItemGroup>  
-    <Content Include="..\common\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" /> 
-  </ItemGroup>  
-
-</Project>
diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.symbols.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.symbols.nupkgproj
deleted file mode 100644
index 7035bef747..0000000000
--- a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.DnnImageFeaturizer.ResNet101.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.nupkgproj
deleted file mode 100644
index 1055b4cbbe..0000000000
--- a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.nupkgproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET component for pretrained ResNet18 image featurization</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.nupkgproj" />
-  </ItemGroup>
-
-  <ItemGroup>  
-    <Content Include="..\common\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" /> 
-  </ItemGroup>  
-
-</Project>
diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.symbols.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.symbols.nupkgproj
deleted file mode 100644
index 9fb3f5ca75..0000000000
--- a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.DnnImageFeaturizer.ResNet18.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.nupkgproj
deleted file mode 100644
index 2c33df9ff8..0000000000
--- a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.nupkgproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET component for pretrained ResNet50 image featurization</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.nupkgproj" />
-  </ItemGroup>
-
-  <ItemGroup>  
-    <Content Include="..\common\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" /> 
-  </ItemGroup>  
-
-</Project>
diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.symbols.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.symbols.nupkgproj
deleted file mode 100644
index 2b04e494f9..0000000000
--- a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.DnnImageFeaturizer.ResNet50.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.nupkgproj b/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.nupkgproj
deleted file mode 100644
index f8b8082047..0000000000
--- a/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.nupkgproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET component for Ensembles</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.symbols.nupkgproj b/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.symbols.nupkgproj
deleted file mode 100644
index bb48a51cab..0000000000
--- a/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.symbols.nupkgproj
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project DefaultTargets="Pack">
-  <Import Project="Microsoft.ML.Ensemble.nupkgproj" />
-</Project>
diff --git a/pkg/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.nupkgproj b/pkg/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.nupkgproj
deleted file mode 100644
index b845fdeb45..0000000000
--- a/pkg/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.nupkgproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>Microsoft.ML.EntryPoints contains the ML.NET entry point API catalog.</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.symbols.nupkgproj b/pkg/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.symbols.nupkgproj
deleted file mode 100644
index 3fa0255960..0000000000
--- a/pkg/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.EntryPoints.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.Experimental/Microsoft.ML.Experimental.nupkgproj b/pkg/Microsoft.ML.Experimental/Microsoft.ML.Experimental.nupkgproj
deleted file mode 100644
index edf80ad475..0000000000
--- a/pkg/Microsoft.ML.Experimental/Microsoft.ML.Experimental.nupkgproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>Microsoft.ML.Experimental contains experimental work such extension methods to access internal methods.</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.Experimental/Microsoft.ML.Experimental.symbols.nupkgproj b/pkg/Microsoft.ML.Experimental/Microsoft.ML.Experimental.symbols.nupkgproj
deleted file mode 100644
index c869da5d2b..0000000000
--- a/pkg/Microsoft.ML.Experimental/Microsoft.ML.Experimental.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.Experimental.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj b/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj
deleted file mode 100644
index ac6f2452ad..0000000000
--- a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET component for FastTree</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="..\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj b/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj
deleted file mode 100644
index 9f4c5712ff..0000000000
--- a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.FastTree.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.nupkgproj b/pkg/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.nupkgproj
deleted file mode 100644
index ea35d7d019..0000000000
--- a/pkg/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.nupkgproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks>
-    <PackageDescription>ML.NET featurizers with native code implementation</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-
-    <PackageReference Include="Microsoft.MLFeaturizers" Version="0.4.1" />
-  </ItemGroup>
-  
-</Project>
diff --git a/pkg/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.symbols.nupkgproj b/pkg/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.symbols.nupkgproj
deleted file mode 100644
index 483e51c61a..0000000000
--- a/pkg/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.Featurizers.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.nupkgproj b/pkg/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.nupkgproj
deleted file mode 100644
index bb59e06653..0000000000
--- a/pkg/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.nupkgproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET component for Image support</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-    <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
-    <PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" />
-  </ItemGroup>  
-</Project>
diff --git a/pkg/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.symbols.nupkgproj b/pkg/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.symbols.nupkgproj
deleted file mode 100644
index b36800ea0b..0000000000
--- a/pkg/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.ImageAnalytics.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.nupkgproj b/pkg/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.nupkgproj
deleted file mode 100644
index d4e48e8dd0..0000000000
--- a/pkg/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.nupkgproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET component for LightGBM</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-    <ProjectReference Include="../Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj" />
-    <PackageReference Include="LightGBM" Version="$(LightGBMPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.symbols.nupkgproj b/pkg/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.symbols.nupkgproj
deleted file mode 100644
index 91a20f3ed8..0000000000
--- a/pkg/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.LightGbm.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.nupkgproj b/pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.nupkgproj
deleted file mode 100644
index 1bd16d235d..0000000000
--- a/pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.nupkgproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET additional learners making use of Intel Mkl.</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-    <ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
-  </ItemGroup>
-
-  <ItemGroup> 
-    <Content Include="..\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
-  </ItemGroup> 
-  
-</Project>
diff --git a/pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj b/pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj
deleted file mode 100644
index 0eaabcdd6e..0000000000
--- a/pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.Mkl.Components.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj b/pkg/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj
deleted file mode 100644
index bda6fb1277..0000000000
--- a/pkg/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <Authors>Intel</Authors>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-    <PackageDescription>$(MSBuildProjectName) contains the MKL library redistributed as a NuGet package.</PackageDescription>
-    <PackageTags>$(PackageTags) MLNET MKL</PackageTags>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <IncludeMLNetNotices>false</IncludeMLNetNotices>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="..\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
-    <Content Include="$(PkgDir)_._" Pack="true" PackagePath="lib\netstandard2.0\" />
-    <Content Include="$(PackagesDir)\mlnetmkldeps\$(MlNetMklDepsPackageVersion)\LICENSE.txt" Pack="true" PackagePath="" />
-  </ItemGroup>
-</Project>
diff --git a/pkg/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.nupkgproj b/pkg/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.nupkgproj
deleted file mode 100644
index bcc86939e2..0000000000
--- a/pkg/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.nupkgproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET component for exporting ONNX Models</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-    <PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.symbols.nupkgproj b/pkg/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.symbols.nupkgproj
deleted file mode 100644
index ccc3e94770..0000000000
--- a/pkg/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.OnnxConverter.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.nupkgproj b/pkg/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.nupkgproj
deleted file mode 100644
index 3c7d9f2ccd..0000000000
--- a/pkg/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.nupkgproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET component for Microsoft.ML.Scoring library</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-    <PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
-    <PackageReference Include="Microsoft.ML.OnnxRuntime.Managed" Version="$(MicrosoftMLOnnxRuntimePackageVersion)"/>
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.symbols.nupkgproj b/pkg/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.symbols.nupkgproj
deleted file mode 100644
index 6358a82311..0000000000
--- a/pkg/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.OnnxTransformer.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj b/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj
deleted file mode 100644
index 750926db34..0000000000
--- a/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET components for Apache Parquet support.</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-    <PackageReference Include="Parquet.Net" Version="$(ParquetDotNetPackageVersion)" />
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.symbols.nupkgproj b/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.symbols.nupkgproj
deleted file mode 100644
index bc14894823..0000000000
--- a/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.Parquet.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.Recommender/Microsoft.ML.Recommender.nupkgproj b/pkg/Microsoft.ML.Recommender/Microsoft.ML.Recommender.nupkgproj
deleted file mode 100644
index bc0e57f8c0..0000000000
--- a/pkg/Microsoft.ML.Recommender/Microsoft.ML.Recommender.nupkgproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>LIBMF, the core computation library for matrix factorization in ML.NET</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup> 
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-    <Content Include="..\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
-    <Content Include="$(SourceDir)Native\MatrixFactorizationNative\libmf\COPYRIGHT" Pack="true" PackagePath="" />
-  </ItemGroup> 
-  
-</Project>
diff --git a/pkg/Microsoft.ML.Recommender/Microsoft.ML.Recommender.symbols.nupkgproj b/pkg/Microsoft.ML.Recommender/Microsoft.ML.Recommender.symbols.nupkgproj
deleted file mode 100644
index d82f31ad89..0000000000
--- a/pkg/Microsoft.ML.Recommender/Microsoft.ML.Recommender.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.Recommender.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.SampleUtils/Microsoft.ML.SampleUtils.nupkgproj b/pkg/Microsoft.ML.SampleUtils/Microsoft.ML.SampleUtils.nupkgproj
deleted file mode 100644
index e2b85df502..0000000000
--- a/pkg/Microsoft.ML.SampleUtils/Microsoft.ML.SampleUtils.nupkgproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>Sample utils for Microsoft.ML.Samples</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.SampleUtils/Microsoft.ML.SampleUtils.symbols.nupkgproj b/pkg/Microsoft.ML.SampleUtils/Microsoft.ML.SampleUtils.symbols.nupkgproj
deleted file mode 100644
index 2a2228e6af..0000000000
--- a/pkg/Microsoft.ML.SampleUtils/Microsoft.ML.SampleUtils.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.SampleUtils.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.nupkgproj b/pkg/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.nupkgproj
deleted file mode 100644
index ac054f6136..0000000000
--- a/pkg/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.nupkgproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>Microsoft.ML.TensorFlow contains ML.NET integration of TensorFlow.</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="$(SystemIOFileSystemAccessControl)" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindows)" />
-    <PackageReference Include="TensorFlow.NET" Version="$(TensorflowDotNETVersion)" />
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.symbols.nupkgproj b/pkg/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.symbols.nupkgproj
deleted file mode 100644
index a2a2a153f7..0000000000
--- a/pkg/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.TensorFlow.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.nupkgproj b/pkg/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.nupkgproj
deleted file mode 100644
index d0325da023..0000000000
--- a/pkg/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.nupkgproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>Microsoft.ML.TimeSeries contains ML.NET Time Series prediction algorithms. Uses Intel Mkl.</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-    <ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.symbols.nupkgproj b/pkg/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.symbols.nupkgproj
deleted file mode 100644
index 05f361fa6c..0000000000
--- a/pkg/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.TimeSeries.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML.Vision/Microsoft.ML.Vision.nupkgproj b/pkg/Microsoft.ML.Vision/Microsoft.ML.Vision.nupkgproj
deleted file mode 100644
index f3f00e368c..0000000000
--- a/pkg/Microsoft.ML.Vision/Microsoft.ML.Vision.nupkgproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>Microsoft.ML.Vision contains high level APIs for vision tasks like image classification.</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.nupkgproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML.Vision/Microsoft.ML.Vision.symbols.nupkgproj b/pkg/Microsoft.ML.Vision/Microsoft.ML.Vision.symbols.nupkgproj
deleted file mode 100644
index 1ba48a28b9..0000000000
--- a/pkg/Microsoft.ML.Vision/Microsoft.ML.Vision.symbols.nupkgproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.Vision.nupkgproj" />
-
-</Project>
diff --git a/pkg/Microsoft.ML/Microsoft.ML.nupkgproj b/pkg/Microsoft.ML/Microsoft.ML.nupkgproj
deleted file mode 100644
index 43ad73f248..0000000000
--- a/pkg/Microsoft.ML/Microsoft.ML.nupkgproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET is a cross-platform open-source machine learning framework which makes machine learning accessible to .NET developers.</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML.DataView/Microsoft.ML.DataView.nupkgproj" />
-    <ProjectReference Include="../Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.nupkgproj" />
-
-    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
-    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPackageVersion)" />
-    <PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
-    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
-    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
-    <PackageReference Include="System.Threading.Channels" Version="$(SystemThreadingChannelsPackageVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="..\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
-    <Content Include="build\**\*" Pack="true" PackagePath="build" />
-  </ItemGroup>
-</Project>
diff --git a/pkg/Microsoft.ML/Microsoft.ML.symbols.nupkgproj b/pkg/Microsoft.ML/Microsoft.ML.symbols.nupkgproj
deleted file mode 100644
index fc08dc12dc..0000000000
--- a/pkg/Microsoft.ML/Microsoft.ML.symbols.nupkgproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project DefaultTargets="Pack">
-
-  <Import Project="Microsoft.ML.nupkgproj" />
-
-  <PropertyGroup>
-    <!--
-      NU5129 is getting raised because the Microsoft.ML package contains a Microsoft.ML.targets file.
-      But this package is named Microsoft.ML.symbols, so NuGet complains. However, we can ignore the warning.
-    -->
-    <NoWarn>$(NoWarn);NU5129</NoWarn>
-  </PropertyGroup>
-
-</Project>
diff --git a/pkg/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets b/pkg/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets
deleted file mode 100644
index df03944a1c..0000000000
--- a/pkg/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <EnableMLUnsupportedPlatformTargetCheck Condition="'$(EnableMLUnsupportedPlatformTargetCheck)' == ''">true</EnableMLUnsupportedPlatformTargetCheck>
-  </PropertyGroup>
-
-  <Target Name="_CheckForUnsupportedPlatformTarget"
-          Condition="'$(EnableMLUnsupportedPlatformTargetCheck)' == 'true'"
-          AfterTargets="_CheckForInvalidConfigurationAndPlatform">
-
-    <!--
-    Special case .NET Core portable applications.  When building a portable .NET Core app,
-    the PlatformTarget is empty, and you don't know until runtime (i.e. which dotnet.exe)
-    what processor architecture will be used.
-    -->
-    <Error Condition="('$(PlatformTarget)' != 'x64' AND '$(PlatformTarget)' != 'x86') AND
-                      ('$(OutputType)' == 'Exe' OR '$(OutputType)'=='WinExe') AND
-                      !('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(PlatformTarget)' == '')"
-           Text="Microsoft.ML currently supports 'x64' and 'x86' processor architectures. Please ensure your application is targeting 'x64' or 'x86'." />
-  </Target>
-  
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
index 354d371da9..fa7367e855 100644
--- a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
+++ b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
index 70c01cf274..dc086ff8ff 100644
--- a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
+++ b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj
index 6571ee6274..0358bb3623 100644
--- a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj
+++ b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs b/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs
index 955a52f9c1..afc6fad704 100644
--- a/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs
+++ b/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs
@@ -1110,6 +1110,10 @@ private void LoadExtensions(Assembly assembly, bool throwOnError)
         /// </remarks>
         private static bool CanContainExtensions(Assembly assembly)
         {
+            // We used to have two separate strong name keys for product and test binaries and Arcade
+            // does not support that anymore (and that did not accept our PR for adding the additional
+            // signed key and using two strong name keys without the PR). If they ever decide to support
+            // this scenario we can remove the regex and go back to checking just the public key and startswith.
             if (assembly.FullName.StartsWith("Microsoft.ML.", StringComparison.Ordinal)
                && !Regex.IsMatch(assembly.FullName, @"Microsoft\.ML.*\.Tests.*")
                && HasMLNetPublicKey(assembly))
diff --git a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
index e6a70f0af1..0bd0cf6add 100644
--- a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
+++ b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props"/>
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props"/>
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
diff --git a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
index 6243a90a51..cc5dccfcd0 100644
--- a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
+++ b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props"/>
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props"/>
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
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 b57c907e2e..a162f54621 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(RepoRoot)pkg\common\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+    <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.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
index 62872cebc2..c5f51fb8f5 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -18,6 +18,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(RepoRoot)pkg\common\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+    <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.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
index f05f75464b..370bd0b400 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(RepoRoot)pkg\common\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+    <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.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
index f3e059a50c..550ce557f6 100644
--- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
+++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(RepoRoot)pkg\common\DnnImageFeaturizer.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+    <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.Ensemble/Microsoft.ML.Ensemble.csproj b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
index 51606dda7b..288b0c818c 100644
--- a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
+++ b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
index d56d1ed242..33a05659e0 100644
--- a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
+++ b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
index a54da82d8d..e768c7298c 100644
--- a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
+++ b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
index 2f1b52a052..6832cdf22a 100644
--- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
+++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(RepoRoot)pkg\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+    <Content Include="$(RepoRoot)eng\pkg\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj b/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj
index 85295e3be0..02eba201b6 100644
--- a/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj
+++ b/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks>
diff --git a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
index 3a2776af38..ecb4944c8b 100644
--- a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
+++ b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
index 09e425cd48..45f6563c37 100644
--- a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
+++ b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
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 52cc47b503..6b92224b30 100644
--- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
+++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(RepoRoot)pkg\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+    <Content Include="$(RepoRoot)eng\pkg\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
   </ItemGroup>
 
   <ItemGroup>
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 954915ecae..e281e66258 100644
--- a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
+++ b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <Authors>Intel</Authors>
@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="$(RepoRoot)pkg\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
-    <Content Include="$(PkgDir)_._" Pack="true" PackagePath="lib\netstandard2.0\" />
+    <Content Include="$(RepoRoot)eng\pkg\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+    <Content Include="$(RepoRoot)eng\pkg\_._" Pack="true" PackagePath="lib\netstandard2.0\" />
     <Content Include="$(NUGET_PACKAGES)\mlnetmkldeps\$(MlNetMklDepsPackageVersion)\LICENSE.txt" Pack="true" PackagePath="" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
index 0f48443cae..a8cdaa4b57 100644
--- a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
+++ b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
index e06ffa9974..b6f6bb84f2 100644
--- a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
+++ b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
index 51c367eb69..25a6c5342d 100644
--- a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
+++ b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
index a78d5846db..55c1d0fb8e 100644
--- a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
+++ b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(RepoRoot)pkg\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+    <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>
 
diff --git a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
index 6b543c5cdf..c33cb3441d 100644
--- a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
+++ b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
index 695210a1b8..6b9c8a7f1d 100644
--- a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
+++ b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
index 5c3d412fb6..c06d000668 100644
--- a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
+++ b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props"/>
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props"/>
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj b/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj
index bfce8f9167..67d9285b42 100644
--- a/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj
+++ b/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props" />
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/Microsoft.ML/Microsoft.ML.csproj b/src/Microsoft.ML/Microsoft.ML.csproj
index 283b08b04e..7d67abd7d3 100644
--- a/src/Microsoft.ML/Microsoft.ML.csproj
+++ b/src/Microsoft.ML/Microsoft.ML.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-  <Import Project="$(RepoRoot)pkg/Directory.Build.props"/>
+  <Import Project="$(RepoRoot)eng/pkg/Pack.props"/>
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(RepoRoot)pkg\common\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
+    <Content Include="$(RepoRoot)eng\pkg\CommonPackage.props" Pack="true" PackagePath="build\netstandard2.0\$(MSBuildProjectName).props" />
     <Content Include="build\**\*" Pack="true" PackagePath="build" />
   </ItemGroup>
 </Project>
diff --git a/src/Native/Native.proj b/src/Native/Native.proj
index f86d06ca8b..d355476946 100644
--- a/src/Native/Native.proj
+++ b/src/Native/Native.proj
@@ -1,10 +1,10 @@
 <Project>
 
   <Import Project="Sdk.props" Sdk="Microsoft.Build.Traversal" />
-  <!-- 
-    Typically Sdk.Targets are imported at the end. But if we do that here, 
+  <!--
+    Typically Sdk.Targets are imported at the end. But if we do that here,
     we won't be able to override the Build target and call build.cmd
-    to run CMake builds 
+    to run CMake builds
   -->
   <Import Project="Sdk.targets" Sdk="Microsoft.Build.Traversal" />
 
@@ -22,7 +22,7 @@
   <Target Name="Build" DependsOnTargets="BuildNativeUnix;BuildNativeWindows;PreparePackageAssets" />
 
   <PropertyGroup>
-    <PlaceholderFile>$(PkgDir)_._</PlaceholderFile>
+    <PlaceholderFile>$(RepoRoot)eng\pkg\_._</PlaceholderFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">