From b207da074d9735770a074ebd6f711ae97bb3640a Mon Sep 17 00:00:00 2001
From: arsunda <31108915+arsunda@users.noreply.github.com>
Date: Tue, 14 Aug 2018 09:49:21 -0700
Subject: [PATCH 1/4] Update Pipeline.json

Adding folders to pipeline definition
---
 .../stable/2018-06-01/entityTypes/Pipeline.json      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
index 34a97ad47185..a4e5c9eac7f5 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
@@ -36,7 +36,17 @@
           "items": {
             "type": "object"
           }
-        } 
+        },
+        "folder": {
+          "description": "The folder that this Pipeline is in.",
+          "type": "object",
+          "properties": {
+            "name": {
+              "description": "The name of the folder that this Pipeline is in.",
+              "type": "string"
+            }
+          }
+        }
       }
     },
     "Activity": {

From 89afa6ac13c9d99503cc21f4ac43988a6fe89bef Mon Sep 17 00:00:00 2001
From: arsunda <31108915+arsunda@users.noreply.github.com>
Date: Tue, 14 Aug 2018 09:50:22 -0700
Subject: [PATCH 2/4] Update Dataset.json

Adding folders to Dataset definition
---
 .../stable/2018-06-01/entityTypes/Dataset.json         | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
index 331467ae7d5c..dfb40743a17a 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
@@ -37,6 +37,16 @@
           "items": {
             "type": "object"
           }
+        },
+        "folder": {
+          "description": "The folder that this Dataset is in.",
+          "type": "object",
+          "properties": {
+            "name": {
+              "description": "The name of the folder that this Dataset is in.",
+              "type": "string"
+            }
+          }
         }
       },
       "additionalProperties": {

From e4a6b76aa9a0d415872493dd8b045b62b92f0a8c Mon Sep 17 00:00:00 2001
From: arsunda <31108915+arsunda@users.noreply.github.com>
Date: Tue, 14 Aug 2018 11:38:23 -0700
Subject: [PATCH 3/4] Update Pipeline.json

---
 .../stable/2018-06-01/entityTypes/Pipeline.json                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
index a4e5c9eac7f5..7354f25bf994 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
@@ -38,7 +38,7 @@
           }
         },
         "folder": {
-          "description": "The folder that this Pipeline is in.",
+          "description": "The folder that this Pipeline is in. If not specified, Pipeline will appear at the root level.",
           "type": "object",
           "properties": {
             "name": {

From c0f87ba44c116462174353c59ac1339902d21a0d Mon Sep 17 00:00:00 2001
From: arsunda <31108915+arsunda@users.noreply.github.com>
Date: Tue, 14 Aug 2018 11:38:46 -0700
Subject: [PATCH 4/4] Update Dataset.json

---
 .../stable/2018-06-01/entityTypes/Dataset.json                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
index dfb40743a17a..34c24a46d8e0 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
@@ -39,7 +39,7 @@
           }
         },
         "folder": {
-          "description": "The folder that this Dataset is in.",
+          "description": "The folder that this Dataset is in. If not specified, Dataset will appear at the root level.",
           "type": "object",
           "properties": {
             "name": {