Skip to content

Commit

Permalink
Fix warnings from CI Build (#5541)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
frank-dong-ms-zz authored Dec 8, 2020
1 parent 50f5b42 commit b927a0f
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 19 deletions.
10 changes: 0 additions & 10 deletions build/ci/job-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
14 changes: 7 additions & 7 deletions build/vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Import Project="..\Directory.Build.targets" />

<Target Name="PreparePackageAssets"
<Target Name="PreparePackageAssets" Condition="'$(CopyPackageAssets)' == 'true'"
AfterTargets="Build">

<ItemGroup Condition="'$(IncludeInPackage)' != ''">
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.ML/Microsoft.ML.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

0 comments on commit b927a0f

Please sign in to comment.