Imported Upstream version 2.0.0.11992upstream/2.0.0.11992

1 files changed, 22 insertions, 26 deletions

diff --git a/config.json b/config.json
index c975171055..5011de3e7f 100644
--- a/config.json
+++ b/config.json
@@ -30,6 +30,12 @@
       "values": [],
       "defaultValue": ""
     },
+    "__BlobNamePrefix": {
+      "description": "Blob Prefix for Azure download.",
+      "valueType": "property",
+      "values": [],
+      "defaultValue": ""
+    },
     "MsBuildFileLogging": {
       "description": "MsBuild logging options.",
       "valueType": "passThrough",
@@ -174,6 +180,12 @@
       "values": [],
       "defaultValue": ""
     },
+    "OverwriteCoreClrPackageVersion": {
+      "description": "Sets the property specifying to overwrite CoreClr Package version using OfficialBuildId",
+      "valueType": "property",
+      "values": [ true, false ],
+      "defaultValue": true
+    },
     "OfficialBuildId": {
       "description": "Official Build Id.",
       "valueType": "property",
@@ -225,8 +237,8 @@
     "PortableBuild": {
       "description": "Indicates if this is a portable build.",
       "valueType": "property",
-      "values": [ "0", "1"],
-      "defaultValue": "0"
+      "values": [ "false", "true"],
+      "defaultValue": "true"
     },
     "Rebuild": {
       "description": "Specifies rebuild target.",
@@ -270,12 +282,6 @@
       "values": [],
       "defaultValue": ""
     },
-    "IlasmRoundTrip": {
-      "description": "Sets ilasm round trip property.",
-      "valueType": "property",
-      "values": [ true, false ],
-      "defaultValue": true
-    },
     "CreateTestOverlay": {
       "description": "Runs CreateTestOverlay target.",
       "valueType": "target",
@@ -354,12 +360,6 @@
       "values": [ "debian.8-x64", "fedora.24-x64", "fedora.25-x64", "opensuse.42.1-x64", "osx.10.12-x64", "rhel.7-x64", "ubuntu.14.04-x64", "ubuntu.16.04-x64", "ubuntu.16.10-x64" ],
       "defaultValue": "${__RuntimeId}"
     },
-    "UpdateDependencies": {
-      "description": "MsBuild target that updates project.json dependencies.",
-      "valueType": "target",
-      "values": [],
-      "defaultValue": ""
-    },
     "BatchRestorePackages": {
       "description": "MsBuild target that restores the packages.",
       "valueType": "target",
@@ -474,12 +474,6 @@
             "RestoreDuringBuild": false
           }
         },
-        "portable": {
-          "description": "Triggers a portable build.",
-          "settings": {
-            "PortableBuild": "1"
-          }
-        },
         "BuildTarget": {
           "description": "Runs the build target.",
           "settings": {
@@ -495,6 +489,7 @@
           "MsBuildErr": "default",
           "MsBuildEventLogging": "default",
           "RestoreDefaultOptimizationDataPackage": "false",
+          "PortableBuild": "true",
           "UsePartialNGENOptimization": "false"
         }
       }
@@ -548,6 +543,12 @@
             "__Container": "default"
           }
         },
+        "blobNamePrefix": {
+          "description": "Blob Prefix to download from in Azure container.",
+          "settings": {
+            "__BlobNamePrefix": "default"
+          }
+        },
         "runtimeId": {
           "description": "Runtime ID of the binaries in the specified container.",
           "settings": {
@@ -647,12 +648,6 @@
             "__BuildArch": "default"
           }
         },
-        "portable": {
-          "description": "Triggers a portable build.",
-          "settings": {
-            "PortableBuild": "1"
-          }
-        },
         "buildType": {
           "description": "Specifies configuration to publish, can be Release, Debug or Checked.",
           "settings": {
@@ -672,6 +667,7 @@
           "__BuildOS": "default",
           "MsBuildFileLogging": "/flp:v=detailed;Append;LogFile=build-packages.log",
           "MsBuildEventLogging": "default",
+          "PortableBuild": "true",
           "Project": "src/.nuget/packages.builds"
         }
       }