diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml
index d0171921ac..ab77d0ed4a 100644
--- a/build/vsts-ci.yml
+++ b/build/vsts-ci.yml
@@ -24,7 +24,7 @@ phases:
container: LinuxContainer
steps:
# Only build native assets to avoid conflicts.
- - script: ./build.sh -buildNative -$(BuildConfig)
+ - script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets
displayName: Build
- task: PublishBuildArtifacts@1
@@ -49,7 +49,7 @@ phases:
- agent.os -equals Darwin
steps:
# Only build native assets to avoid conflicts.
- - script: ./build.sh -buildNative -$(BuildConfig)
+ - script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets
displayName: Build
- task: PublishBuildArtifacts@1
@@ -89,7 +89,7 @@ phases:
condition: and(succeeded(), in(variables._SignType, 'real', 'test'))
# Only build native assets to avoid conflicts.
- - script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86
+ - script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86 -skipRIDAgnosticAssets
displayName: Build
- task: MSBuild@1
diff --git a/config.json b/config.json
index 54e56ddeb1..99f72f7051 100644
--- a/config.json
+++ b/config.json
@@ -30,6 +30,12 @@
"values": [],
"defaultValue": ""
},
+ "SkipRIDAgnosticAssets": {
+ "description": "Prevents RID agnostic assets in redist from being built.",
+ "valueType": "property",
+ "values": [],
+ "defaultValue": ""
+ },
"MsBuildLogging": {
"description": "MsBuild logging options.",
"valueType": "passThrough",
@@ -118,6 +124,12 @@
"BuildNative": "default"
}
},
+ "skipRIDAgnosticAssets": {
+ "description": "Avoid building RID agnostic assets in redist.",
+ "settings": {
+ "SkipRIDAgnosticAssets": "default"
+ }
+ },
"buildPackages": {
"description": "Builds the NuGet packages.",
"settings": {
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 2c99b80db6..2401de0df0 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
@@ -106,6 +106,7 @@
DependsOnTargets="DownloadDnnModelFiles">