From 0bfaa5da81401c0ef2fe989f4effb1bbd06d6c72 Mon Sep 17 00:00:00 2001
From: vaeksare <42353187+vaeksare@users.noreply.github.com>
Date: Wed, 28 Nov 2018 15:54:21 -0800
Subject: [PATCH 1/4] Prevent models from copying from each leg

---
 build/vsts-ci.yml                                           | 6 +++---
 config.json                                                 | 6 ++++++
 .../Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj        | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

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..3d528da014 100644
--- a/config.json
+++ b/config.json
@@ -118,6 +118,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..63757888c9 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
@@ -110,6 +110,7 @@
   </Target>
 
   <Target Name="Build"
+          Condition="'$(SkipRIDAgnosticAssets)' == ''"
           DependsOnTargets="CopyDnnModelFiles" />
 
 </Project>
\ No newline at end of file

From f03a4cdfd02a2c0ea24a1a7d179a5745de852a77 Mon Sep 17 00:00:00 2001
From: vaeksare <42353187+vaeksare@users.noreply.github.com>
Date: Wed, 28 Nov 2018 16:30:17 -0800
Subject: [PATCH 2/4] Copying now checks for condition

---
 .../Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 63757888c9..f425a8ddf6 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,11 +106,11 @@
           DependsOnTargets="DownloadDnnModelFiles">
     <Message Importance="High" Text="Copying external model files... @(ModelFileCopy->'%(TargetPath)')" />
     <Copy SourceFiles="@(ModelFileCopy)"
+          Condition="'$(SkipRIDAgnosticAssets)' == ''"
           DestinationFiles="@(ModelFileCopy->'%(TargetPath)')" />
   </Target>
 
   <Target Name="Build"
-          Condition="'$(SkipRIDAgnosticAssets)' == ''"
           DependsOnTargets="CopyDnnModelFiles" />
 
 </Project>
\ No newline at end of file

From c1428cef3601ac9e7379694d92191507929059a1 Mon Sep 17 00:00:00 2001
From: vaeksare <42353187+vaeksare@users.noreply.github.com>
Date: Wed, 28 Nov 2018 17:25:42 -0800
Subject: [PATCH 3/4] Add correct property

---
 config.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config.json b/config.json
index 3d528da014..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",

From b0ccde352c750e95b987d30ed071c08774f72a18 Mon Sep 17 00:00:00 2001
From: vaeksare <42353187+vaeksare@users.noreply.github.com>
Date: Thu, 29 Nov 2018 09:57:16 -0800
Subject: [PATCH 4/4] Minor change to condition logic

---
 .../Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f425a8ddf6..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,7 +106,7 @@
           DependsOnTargets="DownloadDnnModelFiles">
     <Message Importance="High" Text="Copying external model files... @(ModelFileCopy->'%(TargetPath)')" />
     <Copy SourceFiles="@(ModelFileCopy)"
-          Condition="'$(SkipRIDAgnosticAssets)' == ''"
+          Condition="'$(SkipRIDAgnosticAssets)' != 'true'"
           DestinationFiles="@(ModelFileCopy->'%(TargetPath)')" />
   </Target>