From b927a0f20009e0a271a9c74f086bb8290aa94bdb Mon Sep 17 00:00:00 2001
From: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Tue, 8 Dec 2020 11:41:07 -0800
Subject: [PATCH] Fix warnings from CI Build (#5541)

* fix warnings

* also add conditional copy asset to native.proj

* test fix warnings

* supress nuget warning 5118

* supress other warning

* remove unnecessary change

* put skip warning at Directory.Buil.props
---
 build/ci/job-template.yml            | 10 ----------
 build/vsts-ci.yml                    | 14 +++++++-------
 src/Directory.Build.props            |  2 +-
 src/Directory.Build.targets          |  2 +-
 src/Microsoft.ML/Microsoft.ML.csproj |  1 +
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml
index af7645b1a2..f4e0bcd57a 100644
--- a/build/ci/job-template.yml
+++ b/build/ci/job-template.yml
@@ -148,16 +148,6 @@ jobs:
     - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
       displayName: Upload coverage to codecov.io
       condition: and(succeeded(), eq(${{ parameters.codeCoverage }}, True))
-    - task: PublishTestResults@2
-      displayName: Publish Test Results
-      condition: succeededOrFailed()
-      inputs:
-        testRunner: 'vSTest'
-        searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults'
-        testResultsFiles: '**/*.trx'
-        testRunTitle: Machinelearning_Tests_${{ parameters.name }}_$(_configuration)_$(Build.BuildNumber)
-        configuration: $(_configuration)
-        mergeTestResults: true
     - task: CopyFiles@2
       displayName: Stage build logs
       condition: not(succeeded())
diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml
index c4d22c5c28..d956247b14 100644
--- a/build/vsts-ci.yml
+++ b/build/vsts-ci.yml
@@ -25,10 +25,10 @@ phases:
   steps:
   - script: ./restore.sh
     displayName: restore all projects
-  - script: ./build.sh -configuration $(BuildConfig) /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
+  - script: ./build.sh -configuration $(BuildConfig) /p:CopyPackageAssets=true /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
     displayName: build redist
   # Only build native assets to avoid conflicts.
-  - script: ./build.sh -configuration $(BuildConfig) -projects $(Build.SourcesDirectory)/src/Native/Native.proj /p:TargetArchitecture=x64
+  - script: ./build.sh -configuration $(BuildConfig) -projects $(Build.SourcesDirectory)/src/Native/Native.proj /p:TargetArchitecture=x64 /p:CopyPackageAssets=true
     displayName: Build
 
   - task: PublishBuildArtifacts@1
@@ -60,10 +60,10 @@ phases:
     displayName: Install build dependencies
   - script: ./restore.sh
     displayName: restore all projects
-  - script: ./build.sh -configuration $(BuildConfig) /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
+  - script: ./build.sh -configuration $(BuildConfig) /p:CopyPackageAssets=true /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
     displayName: build redist
   # Only build native assets to avoid conflicts.
-  - script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x64
+  - script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x64 /p:CopyPackageAssets=true
     displayName: Build
 
   - task: PublishBuildArtifacts@1
@@ -104,10 +104,10 @@ phases:
 
   - script: ./restore.cmd
     displayName: restore all projects
-  - script: ./build.cmd -configuration $(BuildConfig) /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
+  - script: ./build.cmd -configuration $(BuildConfig) /p:CopyPackageAssets=true /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
     displayName: build redist
   # Only build native assets to avoid conflicts.
-  - script: ./build.cmd -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x86
+  - script: ./build.cmd -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x86 /p:CopyPackageAssets=true
     displayName: Build
 
   - script: ./sign.cmd -configuration $(BuildConfig) /p:TargetArchitecture=x86 /p:SignBinaries=true
@@ -154,7 +154,7 @@ phases:
     condition: and(succeeded(), in(variables._SignType, 'real', 'test'))
 
   # Build both native and managed assets.
-  - script: ./build.cmd -configuration $(BuildConfig) /p:TargetArchitecture=x64
+  - script: ./build.cmd -configuration $(BuildConfig) /p:TargetArchitecture=x64 /p:CopyPackageAssets=true
     displayName: Build
 
   - task: ComponentGovernanceComponentDetection@0
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 93be5b7b88..71c462977b 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -8,7 +8,7 @@
          When you are ready to tackle adding them, remove <NoWarn>
          below, and when you get clean, also remove <WarningsNotAsErrors>
     -->
-    <NoWarn>$(NoWarn);1591</NoWarn>
+    <NoWarn>$(NoWarn);1591;NU5118</NoWarn>
     <WarningsNotAsErrors>$(WarningsNotAsErrors);1591</WarningsNotAsErrors>
 
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\Source.ruleset</CodeAnalysisRuleSet>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 28c54362df..90294e332c 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -2,7 +2,7 @@
 
   <Import Project="..\Directory.Build.targets" />
 
-  <Target Name="PreparePackageAssets"
+  <Target Name="PreparePackageAssets" Condition="'$(CopyPackageAssets)' == 'true'"
           AfterTargets="Build">
 
     <ItemGroup Condition="'$(IncludeInPackage)' != ''">
diff --git a/src/Microsoft.ML/Microsoft.ML.csproj b/src/Microsoft.ML/Microsoft.ML.csproj
index 7d67abd7d3..890578d317 100644
--- a/src/Microsoft.ML/Microsoft.ML.csproj
+++ b/src/Microsoft.ML/Microsoft.ML.csproj
@@ -4,6 +4,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NoWarn>$(NoWarn);NU5127;NU5128</NoWarn>
     <PackageDescription>ML.NET is a cross-platform open-source machine learning framework which makes machine learning accessible to .NET developers.</PackageDescription>
   </PropertyGroup>