Skip to content

Commit b927a0f

Browse files
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
1 parent 50f5b42 commit b927a0f

File tree

5 files changed

+10
-19
lines changed

5 files changed

+10
-19
lines changed

build/ci/job-template.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,6 @@ jobs:
148148
- script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
149149
displayName: Upload coverage to codecov.io
150150
condition: and(succeeded(), eq(${{ parameters.codeCoverage }}, True))
151-
- task: PublishTestResults@2
152-
displayName: Publish Test Results
153-
condition: succeededOrFailed()
154-
inputs:
155-
testRunner: 'vSTest'
156-
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults'
157-
testResultsFiles: '**/*.trx'
158-
testRunTitle: Machinelearning_Tests_${{ parameters.name }}_$(_configuration)_$(Build.BuildNumber)
159-
configuration: $(_configuration)
160-
mergeTestResults: true
161151
- task: CopyFiles@2
162152
displayName: Stage build logs
163153
condition: not(succeeded())

build/vsts-ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ phases:
2525
steps:
2626
- script: ./restore.sh
2727
displayName: restore all projects
28-
- script: ./build.sh -configuration $(BuildConfig) /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
28+
- 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
2929
displayName: build redist
3030
# Only build native assets to avoid conflicts.
31-
- script: ./build.sh -configuration $(BuildConfig) -projects $(Build.SourcesDirectory)/src/Native/Native.proj /p:TargetArchitecture=x64
31+
- script: ./build.sh -configuration $(BuildConfig) -projects $(Build.SourcesDirectory)/src/Native/Native.proj /p:TargetArchitecture=x64 /p:CopyPackageAssets=true
3232
displayName: Build
3333

3434
- task: PublishBuildArtifacts@1
@@ -60,10 +60,10 @@ phases:
6060
displayName: Install build dependencies
6161
- script: ./restore.sh
6262
displayName: restore all projects
63-
- script: ./build.sh -configuration $(BuildConfig) /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
63+
- 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
6464
displayName: build redist
6565
# Only build native assets to avoid conflicts.
66-
- script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x64
66+
- script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x64 /p:CopyPackageAssets=true
6767
displayName: Build
6868

6969
- task: PublishBuildArtifacts@1
@@ -104,10 +104,10 @@ phases:
104104

105105
- script: ./restore.cmd
106106
displayName: restore all projects
107-
- script: ./build.cmd -configuration $(BuildConfig) /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
107+
- 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
108108
displayName: build redist
109109
# Only build native assets to avoid conflicts.
110-
- script: ./build.cmd -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x86
110+
- script: ./build.cmd -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x86 /p:CopyPackageAssets=true
111111
displayName: Build
112112

113113
- script: ./sign.cmd -configuration $(BuildConfig) /p:TargetArchitecture=x86 /p:SignBinaries=true
@@ -154,7 +154,7 @@ phases:
154154
condition: and(succeeded(), in(variables._SignType, 'real', 'test'))
155155

156156
# Build both native and managed assets.
157-
- script: ./build.cmd -configuration $(BuildConfig) /p:TargetArchitecture=x64
157+
- script: ./build.cmd -configuration $(BuildConfig) /p:TargetArchitecture=x64 /p:CopyPackageAssets=true
158158
displayName: Build
159159

160160
- task: ComponentGovernanceComponentDetection@0

src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
When you are ready to tackle adding them, remove <NoWarn>
99
below, and when you get clean, also remove <WarningsNotAsErrors>
1010
-->
11-
<NoWarn>$(NoWarn);1591</NoWarn>
11+
<NoWarn>$(NoWarn);1591;NU5118</NoWarn>
1212
<WarningsNotAsErrors>$(WarningsNotAsErrors);1591</WarningsNotAsErrors>
1313

1414
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\Source.ruleset</CodeAnalysisRuleSet>

src/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

5-
<Target Name="PreparePackageAssets"
5+
<Target Name="PreparePackageAssets" Condition="'$(CopyPackageAssets)' == 'true'"
66
AfterTargets="Build">
77

88
<ItemGroup Condition="'$(IncludeInPackage)' != ''">

src/Microsoft.ML/Microsoft.ML.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<PropertyGroup>
55
<TargetFramework>netstandard2.0</TargetFramework>
66
<IncludeBuildOutput>false</IncludeBuildOutput>
7+
<NoWarn>$(NoWarn);NU5127;NU5128</NoWarn>
78
<PackageDescription>ML.NET is a cross-platform open-source machine learning framework which makes machine learning accessible to .NET developers.</PackageDescription>
89
</PropertyGroup>
910

0 commit comments

Comments
 (0)