From 6fe50e49ef194b7c8208bd03d21f18b767b94ce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Vel=C3=A1zquez?=
<38739674+antoniovs1029@users.noreply.github.com>
Date: Thu, 17 Dec 2020 02:07:53 -0600
Subject: [PATCH] Fix publishing symbols (#5556)
* Disable Portable PDB conversion
* Push packages to artifacts
* Fix symbols issues
* Added note about Microsoft.ML.dll
* try out just packing
* Return Build=false, but actually use configuration
* Added missing TargetArchitecture
* add back tests
* Added missing flags
---
build/ci/job-template.yml | 4 +-
build/publish.proj | 2 +-
build/vsts-ci.yml | 10 ++++
.../Microsoft.ML.CpuMath.csproj | 19 +++----
.../Microsoft.ML.FastTree.csproj | 16 +++---
.../Microsoft.ML.Mkl.Components.csproj | 17 +++---
.../Microsoft.ML.Mkl.Redist.csproj | 17 +++---
.../Microsoft.ML.Recommender.csproj | 16 +++---
src/Microsoft.ML/Microsoft.ML.csproj | 54 ++++++++++++++++---
9 files changed, 112 insertions(+), 43 deletions(-)
diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml
index d8cbaac732..d1ebf59c6f 100644
--- a/build/ci/job-template.yml
+++ b/build/ci/job-template.yml
@@ -197,5 +197,5 @@ jobs:
artifactName: ${{ parameters.name }} $(_config_short)
artifactType: container
- ${{ if eq(parameters.nightlyBuild, 'false') }}:
- - script: ${{ parameters.buildScript }} /p:Build=false -pack -ci /p:RestorePackagesPath=$(Build.SourcesDirectory)\packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\packages
- displayName: Build Packages
+ - script: ${{ parameters.buildScript }} /p:Build=false -pack -ci -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} /p:RestorePackagesPath=$(Build.SourcesDirectory)\packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\packages
+ displayName: Build Packages
\ No newline at end of file
diff --git a/build/publish.proj b/build/publish.proj
index 47849ca21b..e35ac8f123 100644
--- a/build/publish.proj
+++ b/build/publish.proj
@@ -23,7 +23,7 @@
180
- true
+ false
diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml
index 041cbe5660..83f12746b7 100644
--- a/build/vsts-ci.yml
+++ b/build/vsts-ci.yml
@@ -243,6 +243,16 @@ phases:
displayName: sign packages
continueOnError: false
+ # The generated .nupkgs and .snupkgs packages are published to Azure artifacts,
+ # in case we need to debug them. They're found under Release/Shipping
+ - task: PublishBuildArtifacts@1
+ displayName: Push packages and symbol packages to Azure Artifacts
+ inputs:
+ pathToPublish: $(Build.SourcesDirectory)/artifacts/packages
+ artifactName: PackageAssets
+ artifactType: container
+ continueOnError: true
+
- task: NuGetAuthenticate@0
inputs:
nuGetServiceConnections: machinelearning-dnceng-public-feed # To allow publishing to a feed of another organization
diff --git a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
index 7e39f41e47..a0c141a8da 100644
--- a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
+++ b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
@@ -1,40 +1,41 @@
-
netstandard2.0;netcoreapp3.1
Microsoft.ML.CpuMath
Microsoft.ML.CpuMath contains optimized math routines for ML.NET.
true
$(DefineConstants);CPUMATH_INFRASTRUCTURE
+ $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
index 8b8ca3bcb6..144bee96f6 100644
--- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
+++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
@@ -1,17 +1,15 @@
-
netstandard2.0
Microsoft.ML.FastTree
ML.NET component for FastTree
$(DefineConstants);USE_FASTTREENATIVE;NO_STORE;CORECLR
true
+ $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage
-
-
all
@@ -22,9 +20,15 @@
all
-
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
index 1f931abe55..8f19609e97 100644
--- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
+++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
@@ -1,17 +1,15 @@
-
netstandard2.0
Microsoft.ML.Mkl.Components
true
ML.NET additional learners making use of Intel Mkl.
+ $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage
-
-
all
@@ -22,11 +20,9 @@
all
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
index e281e66258..6d932ff89a 100644
--- a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
+++ b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
@@ -1,23 +1,28 @@
-
Intel
- false
- false
+ true
+ true
netstandard2.0
LICENSE.txt
$(MSBuildProjectName) contains the MKL library redistributed as a NuGet package.
$(PackageTags) MLNET MKL
+ $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage
-
false
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
index 0ad068fc7e..92955776e8 100644
--- a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
+++ b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj
@@ -1,16 +1,14 @@
-
netstandard2.0
Microsoft.ML.Recommender
true
LIBMF, the core computation library for matrix factorization in ML.NET
+ $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage
-
-
all
@@ -18,10 +16,16 @@
all
-
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.ML/Microsoft.ML.csproj b/src/Microsoft.ML/Microsoft.ML.csproj
index 890578d317..763233927b 100644
--- a/src/Microsoft.ML/Microsoft.ML.csproj
+++ b/src/Microsoft.ML/Microsoft.ML.csproj
@@ -1,17 +1,44 @@
-
netstandard2.0
- false
+
+
$(NoWarn);NU5127;NU5128
ML.NET is a cross-platform open-source machine learning framework which makes machine learning accessible to .NET developers.
+ $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage
-
-
+
+ true
+ all
+
+
+ true
+ all
+
+
+ true
+ all
+
+
+ true
+ all
+
+
+ true
+ all
+
+
+ true
+ all
+
+
@@ -19,9 +46,24 @@
-
-
+
+
+ $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file