From 282053c4d527fbe3e43d1d0d9ffe8f7080eaa874 Mon Sep 17 00:00:00 2001
From: Maddy Koripalli <makoripa@microsoft.com>
Date: Tue, 18 Apr 2023 11:12:11 -0700
Subject: [PATCH 1/5] sql attribute not needed

---
 .../InputBindingSamples/GetAndAddProducts/run.csx             | 3 +--
 .../OutputBindingSamples/AddProduct/run.csx                   | 3 +--
 .../OutputBindingSamples/AddProductParams/run.csx             | 3 +--
 .../OutputBindingSamples/AddProductWithDefaultPK/run.csx      | 3 +--
 .../OutputBindingSamples/AddProductWithIdentityColumn/run.csx | 3 +--
 .../AddProductWithIdentityColumnIncluded/run.csx              | 3 +--
 .../AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx   | 3 +--
 .../OutputBindingSamples/AddProductsArray/run.csx             | 3 +--
 .../OutputBindingSamples/AddProductsCollector/run.csx         | 3 +--
 .../AddProductsWithIdentityColumnArray/run.csx                | 3 +--
 .../OutputBindingSamples/QueueTriggerProducts/run.csx         | 4 +---
 .../OutputBindingSamples/TimerTriggerProducts/run.csx         | 3 +--
 12 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/samples/samples-csharpscript/InputBindingSamples/GetAndAddProducts/run.csx b/samples/samples-csharpscript/InputBindingSamples/GetAndAddProducts/run.csx
index 505744667..f2a791899 100644
--- a/samples/samples-csharpscript/InputBindingSamples/GetAndAddProducts/run.csx
+++ b/samples/samples-csharpscript/InputBindingSamples/GetAndAddProducts/run.csx
@@ -3,7 +3,6 @@
 
 #load "../../Common/product.csx"
 #r "Newtonsoft.Json"
-#r "Microsoft.Azure.WebJobs.Extensions.Sql"
 
 using System.Net;
 using Microsoft.AspNetCore.Mvc;
@@ -11,7 +10,7 @@ using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json;
 using System.Collections.Generic;
 
-public static Product[] Run(HttpRequest req, ILogger log, IEnumerable<Product> products, [Sql("dbo.ProductsWithIdentity", "SqlConnectionString")] out Product[] productsWithIdentity)
+public static Product[] Run(HttpRequest req, ILogger log, IEnumerable<Product> products, out Product[] productsWithIdentity)
 {
     log.LogInformation("C# HTTP trigger function processed a request.");
     productsWithIdentity = products.ToArray<Product>();
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProduct/run.csx b/samples/samples-csharpscript/OutputBindingSamples/AddProduct/run.csx
index 95e2adaad..34d4ca84c 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProduct/run.csx
+++ b/samples/samples-csharpscript/OutputBindingSamples/AddProduct/run.csx
@@ -3,14 +3,13 @@
 
 #load "../../Common/product.csx"
 #r "Newtonsoft.Json"
-#r "Microsoft.Azure.WebJobs.Extensions.Sql"
 
 using System.Net;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json;
 
-public static Product Run(HttpRequest req, ILogger log, [Sql("dbo.Products", "SqlConnectionString")] out Product product)
+public static Product Run(HttpRequest req, ILogger log, out Product product)
 {
     log.LogInformation("C# HTTP trigger function processed a request.");
 
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductParams/run.csx b/samples/samples-csharpscript/OutputBindingSamples/AddProductParams/run.csx
index 32246f2fb..98383db12 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductParams/run.csx
+++ b/samples/samples-csharpscript/OutputBindingSamples/AddProductParams/run.csx
@@ -3,14 +3,13 @@
 
 #load "../../Common/product.csx"
 #r "Newtonsoft.Json"
-#r "Microsoft.Azure.WebJobs.Extensions.Sql"
 
 using System.Net;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json;
 
-public static Product Run(HttpRequest req, ILogger log, [Sql("dbo.Products", "SqlConnectionString")] out Product product)
+public static Product Run(HttpRequest req, ILogger log, out Product product)
 {
     log.LogInformation("C# HTTP trigger function processed a request.");
 
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithDefaultPK/run.csx b/samples/samples-csharpscript/OutputBindingSamples/AddProductWithDefaultPK/run.csx
index 01c0d3aad..61920aa24 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithDefaultPK/run.csx
+++ b/samples/samples-csharpscript/OutputBindingSamples/AddProductWithDefaultPK/run.csx
@@ -3,14 +3,13 @@
 
 #load "../../Common/product.csx"
 #r "Newtonsoft.Json"
-#r "Microsoft.Azure.WebJobs.Extensions.Sql"
 
 using System.Net;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json;
 
-public static ProductWithDefaultPK Run(HttpRequest req, ILogger log, [Sql("dbo.ProductsWithDefaultPK", "SqlConnectionString")] out ProductWithDefaultPK product)
+public static ProductWithDefaultPK Run(HttpRequest req, ILogger log, out ProductWithDefaultPK product)
 {
     log.LogInformation("C# HTTP trigger function processed a request.");
 
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumn/run.csx b/samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumn/run.csx
index 60e73f317..343e2e426 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumn/run.csx
+++ b/samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumn/run.csx
@@ -3,14 +3,13 @@
 
 #load "../../Common/product.csx"
 #r "Newtonsoft.Json"
-#r "Microsoft.Azure.WebJobs.Extensions.Sql"
 
 using System.Net;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json;
 
-public static ProductWithoutId Run(HttpRequest req, ILogger log, [Sql("dbo.Products", "SqlConnectionString")] out ProductWithoutId product)
+public static ProductWithoutId Run(HttpRequest req, ILogger log, out ProductWithoutId product)
 {
     log.LogInformation("C# HTTP trigger function processed a request.");
 
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumnIncluded/run.csx b/samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumnIncluded/run.csx
index 7da049f2f..ef21f8f6e 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumnIncluded/run.csx
+++ b/samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumnIncluded/run.csx
@@ -3,14 +3,13 @@
 
 #load "../../Common/product.csx"
 #r "Newtonsoft.Json"
-#r "Microsoft.Azure.WebJobs.Extensions.Sql"
 
 using System.Net;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json;
 
-public static ProductWithOptionalId Run(HttpRequest req, ILogger log, [Sql("dbo.ProductsWithIdentity", "SqlConnectionString")] out ProductWithOptionalId product)
+public static ProductWithOptionalId Run(HttpRequest req, ILogger log, out ProductWithOptionalId product)
 {
     log.LogInformation("C# HTTP trigger function processed a request.");
 
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx b/samples/samples-csharpscript/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx
index 41f076f45..20514511f 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx
+++ b/samples/samples-csharpscript/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx
@@ -3,14 +3,13 @@
 
 #load "../../Common/product.csx"
 #r "Newtonsoft.Json"
-#r "Microsoft.Azure.WebJobs.Extensions.Sql"
 
 using System.Net;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json;
 
-public static MultiplePrimaryKeyProductWithoutId Run(HttpRequest req, ILogger log, [Sql("dbo.ProductsWithMultiplePrimaryColumnsAndIdentity", "SqlConnectionString")] out MultiplePrimaryKeyProductWithoutId product)
+public static MultiplePrimaryKeyProductWithoutId Run(HttpRequest req, ILogger log, out MultiplePrimaryKeyProductWithoutId product)
 {
     log.LogInformation("C# HTTP trigger function processed a request.");
 
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductsArray/run.csx b/samples/samples-csharpscript/OutputBindingSamples/AddProductsArray/run.csx
index 96a0120ac..3fefd2d8d 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductsArray/run.csx
+++ b/samples/samples-csharpscript/OutputBindingSamples/AddProductsArray/run.csx
@@ -3,14 +3,13 @@
 
 #load "../../Common/product.csx"
 #r "Newtonsoft.Json"
-#r "Microsoft.Azure.WebJobs.Extensions.Sql"
 
 using System.Net;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json;
 
-public static Product[] Run(HttpRequest req, ILogger log, [Sql("dbo.Products", "SqlConnectionString")] out Product[] products)
+public static Product[] Run(HttpRequest req, ILogger log, out Product[] products)
 {
     log.LogInformation("C# HTTP trigger function processed a request.");
 
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductsCollector/run.csx b/samples/samples-csharpscript/OutputBindingSamples/AddProductsCollector/run.csx
index 7e516484b..bc922eabf 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductsCollector/run.csx
+++ b/samples/samples-csharpscript/OutputBindingSamples/AddProductsCollector/run.csx
@@ -3,13 +3,12 @@
 
 #load "../../Common/product.csx"
 #r "Newtonsoft.Json"
-#r "Microsoft.Azure.WebJobs.Extensions.Sql"
 
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
-public static ICollector<Product> Run(HttpRequest req, ILogger log, [Sql("dbo.Products", "SqlConnectionString")] ICollector<Product> products)
+public static ICollector<Product> Run(HttpRequest req, ILogger log, ICollector<Product> products)
 {
     log.LogInformation("C# HTTP trigger function processed a request.");
 
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductsWithIdentityColumnArray/run.csx b/samples/samples-csharpscript/OutputBindingSamples/AddProductsWithIdentityColumnArray/run.csx
index 303f19d14..e4ed8aeff 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductsWithIdentityColumnArray/run.csx
+++ b/samples/samples-csharpscript/OutputBindingSamples/AddProductsWithIdentityColumnArray/run.csx
@@ -3,14 +3,13 @@
 
 #load "../../Common/product.csx"
 #r "Newtonsoft.Json"
-#r "Microsoft.Azure.WebJobs.Extensions.Sql"
 
 using System.Net;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json;
 
-public static ProductWithoutId[] Run(HttpRequest req, ILogger log, [Sql("dbo.Products", "SqlConnectionString")] out ProductWithoutId[] products)
+public static ProductWithoutId[] Run(HttpRequest req, ILogger log, out ProductWithoutId[] products)
 {
     log.LogInformation("C# HTTP trigger function processed a request.");
 
diff --git a/samples/samples-csharpscript/OutputBindingSamples/QueueTriggerProducts/run.csx b/samples/samples-csharpscript/OutputBindingSamples/QueueTriggerProducts/run.csx
index 42f7f0ee3..2af1506b7 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/QueueTriggerProducts/run.csx
+++ b/samples/samples-csharpscript/OutputBindingSamples/QueueTriggerProducts/run.csx
@@ -1,14 +1,12 @@
 #load "../../Common/product.csx"
 #r "Newtonsoft.Json"
-#r "Microsoft.Azure.WebJobs.Extensions.Sql"
 
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using Newtonsoft.Json;
 
-public static void Run(string queueMessage, ILogger log,
-            [Sql("[dbo].[Products]", "SqlConnectionString")] ICollector<Product> products)
+public static void Run(string queueMessage, ILogger log, ICollector<Product> products)
 {
     int totalUpserts = 100;
     log.LogInformation($"[QueueTrigger]: {DateTime.Now} starting execution {queueMessage}. Rows to generate={totalUpserts}.");
diff --git a/samples/samples-csharpscript/OutputBindingSamples/TimerTriggerProducts/run.csx b/samples/samples-csharpscript/OutputBindingSamples/TimerTriggerProducts/run.csx
index 4f040acf3..8e626075f 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/TimerTriggerProducts/run.csx
+++ b/samples/samples-csharpscript/OutputBindingSamples/TimerTriggerProducts/run.csx
@@ -8,8 +8,7 @@ using System.Diagnostics;
 using Newtonsoft.Json;
 
 private static int _executionNumber = 0;
-public static void Run(TimerInfo myTimer, ILogger log,
-            [Sql("Products", "SqlConnectionString")] ICollector<Product> products)
+public static void Run(TimerInfo myTimer, ILogger log, ICollector<Product> products)
 {
     int totalUpserts = 1000;
     log.LogInformation($"{DateTime.Now} starting execution #{_executionNumber}. Rows to generate={totalUpserts}.");

From 53976067fea5522f0b2eed84559565a5d87b1600 Mon Sep 17 00:00:00 2001
From: Maddy Koripalli <makoripa@microsoft.com>
Date: Tue, 18 Apr 2023 11:48:02 -0700
Subject: [PATCH 2/5] simplify the folder structure for csx

---
 .../AddProduct/function.json                    |  0
 .../AddProduct/run.csx                          |  2 +-
 .../AddProductParams/function.json              |  0
 .../AddProductParams/run.csx                    |  2 +-
 .../AddProductWithDefaultPK/function.json       |  0
 .../AddProductWithDefaultPK/run.csx             |  2 +-
 .../AddProductWithIdentityColumn/function.json  |  0
 .../AddProductWithIdentityColumn/run.csx        |  2 +-
 .../function.json                               |  0
 .../run.csx                                     |  2 +-
 .../function.json                               |  0
 .../run.csx                                     |  2 +-
 .../AddProductsArray/function.json              |  0
 .../AddProductsArray/run.csx                    |  2 +-
 .../AddProductsCollector/function.json          |  0
 .../AddProductsCollector/run.csx                |  2 +-
 .../function.json                               |  0
 .../AddProductsWithIdentityColumnArray/run.csx  |  2 +-
 .../GetAndAddProducts/function.json             |  0
 .../GetAndAddProducts/run.csx                   |  2 +-
 .../GetProductNamesView/function.json           |  0
 .../GetProductNamesView/run.csx                 |  2 +-
 .../GetProducts/function.json                   |  0
 .../run.csx                                     |  2 +-
 .../GetProductsAsyncEnumerable/function.json    |  0
 .../GetProductsAsyncEnumerable/run.csx          |  2 +-
 .../GetProductsNameEmpty/function.json          |  0
 .../run.csx                                     |  2 +-
 .../GetProductsNameNull/function.json           |  0
 .../run.csx                                     |  2 +-
 .../GetProductsStoredProcedure/function.json    |  0
 .../run.csx                                     |  2 +-
 .../function.json                               |  0
 .../run.csx                                     | 17 +++++++++++++++++
 .../InputBindingSamples/.vscode/extensions.json |  5 -----
 .../run.csx                                     | 17 -----------------
 .../InputBindingSamples/local.settings.json     | 10 ----------
 .../.vscode/extensions.json                     |  5 -----
 .../OutputBindingSamples/host.json              | 15 ---------------
 .../QueueTriggerProducts/function.json          |  0
 .../QueueTriggerProducts/run.csx                |  2 +-
 .../TimerTriggerProducts/function.json          |  0
 .../TimerTriggerProducts/run.csx                |  2 +-
 .../{InputBindingSamples => }/host.json         |  0
 ...ft.Azure.WebJobs.Extensions.Sql.Tests.csproj |  7 +------
 45 files changed, 36 insertions(+), 76 deletions(-)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProduct/function.json (100%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProduct/run.csx (96%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductParams/function.json (100%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductParams/run.csx (96%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductWithDefaultPK/function.json (100%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductWithDefaultPK/run.csx (96%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductWithIdentityColumn/function.json (100%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductWithIdentityColumn/run.csx (96%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductWithIdentityColumnIncluded/function.json (100%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductWithIdentityColumnIncluded/run.csx (96%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductWithMultiplePrimaryColumnsAndIdentity/function.json (100%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx (96%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductsArray/function.json (100%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductsArray/run.csx (96%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductsCollector/function.json (100%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductsCollector/run.csx (95%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductsWithIdentityColumnArray/function.json (100%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/AddProductsWithIdentityColumnArray/run.csx (97%)
 rename samples/samples-csharpscript/{InputBindingSamples => }/GetAndAddProducts/function.json (100%)
 rename samples/samples-csharpscript/{InputBindingSamples => }/GetAndAddProducts/run.csx (94%)
 rename samples/samples-csharpscript/{InputBindingSamples => }/GetProductNamesView/function.json (100%)
 rename samples/samples-csharpscript/{InputBindingSamples => }/GetProductNamesView/run.csx (94%)
 rename samples/samples-csharpscript/{InputBindingSamples => }/GetProducts/function.json (100%)
 rename samples/samples-csharpscript/{InputBindingSamples/GetProductsNameEmpty => GetProducts}/run.csx (94%)
 rename samples/samples-csharpscript/{InputBindingSamples => }/GetProductsAsyncEnumerable/function.json (100%)
 rename samples/samples-csharpscript/{InputBindingSamples => }/GetProductsAsyncEnumerable/run.csx (95%)
 rename samples/samples-csharpscript/{InputBindingSamples => }/GetProductsNameEmpty/function.json (100%)
 rename samples/samples-csharpscript/{InputBindingSamples/GetProductsNameNull => GetProductsNameEmpty}/run.csx (94%)
 rename samples/samples-csharpscript/{InputBindingSamples => }/GetProductsNameNull/function.json (100%)
 rename samples/samples-csharpscript/{InputBindingSamples/GetProductsStoredProcedure => GetProductsNameNull}/run.csx (94%)
 rename samples/samples-csharpscript/{InputBindingSamples => }/GetProductsStoredProcedure/function.json (100%)
 rename samples/samples-csharpscript/{InputBindingSamples/GetProducts => GetProductsStoredProcedure}/run.csx (94%)
 rename samples/samples-csharpscript/{InputBindingSamples => }/GetProductsStoredProcedureFromAppSetting/function.json (100%)
 create mode 100644 samples/samples-csharpscript/GetProductsStoredProcedureFromAppSetting/run.csx
 delete mode 100644 samples/samples-csharpscript/InputBindingSamples/.vscode/extensions.json
 delete mode 100644 samples/samples-csharpscript/InputBindingSamples/GetProductsStoredProcedureFromAppSetting/run.csx
 delete mode 100644 samples/samples-csharpscript/InputBindingSamples/local.settings.json
 delete mode 100644 samples/samples-csharpscript/OutputBindingSamples/.vscode/extensions.json
 delete mode 100644 samples/samples-csharpscript/OutputBindingSamples/host.json
 rename samples/samples-csharpscript/{OutputBindingSamples => }/QueueTriggerProducts/function.json (100%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/QueueTriggerProducts/run.csx (95%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/TimerTriggerProducts/function.json (100%)
 rename samples/samples-csharpscript/{OutputBindingSamples => }/TimerTriggerProducts/run.csx (96%)
 rename samples/samples-csharpscript/{InputBindingSamples => }/host.json (100%)

diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProduct/function.json b/samples/samples-csharpscript/AddProduct/function.json
similarity index 100%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProduct/function.json
rename to samples/samples-csharpscript/AddProduct/function.json
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProduct/run.csx b/samples/samples-csharpscript/AddProduct/run.csx
similarity index 96%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProduct/run.csx
rename to samples/samples-csharpscript/AddProduct/run.csx
index 34d4ca84c..60a786c7b 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProduct/run.csx
+++ b/samples/samples-csharpscript/AddProduct/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Net;
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductParams/function.json b/samples/samples-csharpscript/AddProductParams/function.json
similarity index 100%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductParams/function.json
rename to samples/samples-csharpscript/AddProductParams/function.json
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductParams/run.csx b/samples/samples-csharpscript/AddProductParams/run.csx
similarity index 96%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductParams/run.csx
rename to samples/samples-csharpscript/AddProductParams/run.csx
index 98383db12..0f56577bf 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductParams/run.csx
+++ b/samples/samples-csharpscript/AddProductParams/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Net;
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithDefaultPK/function.json b/samples/samples-csharpscript/AddProductWithDefaultPK/function.json
similarity index 100%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductWithDefaultPK/function.json
rename to samples/samples-csharpscript/AddProductWithDefaultPK/function.json
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithDefaultPK/run.csx b/samples/samples-csharpscript/AddProductWithDefaultPK/run.csx
similarity index 96%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductWithDefaultPK/run.csx
rename to samples/samples-csharpscript/AddProductWithDefaultPK/run.csx
index 61920aa24..0760e7658 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithDefaultPK/run.csx
+++ b/samples/samples-csharpscript/AddProductWithDefaultPK/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Net;
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumn/function.json b/samples/samples-csharpscript/AddProductWithIdentityColumn/function.json
similarity index 100%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumn/function.json
rename to samples/samples-csharpscript/AddProductWithIdentityColumn/function.json
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumn/run.csx b/samples/samples-csharpscript/AddProductWithIdentityColumn/run.csx
similarity index 96%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumn/run.csx
rename to samples/samples-csharpscript/AddProductWithIdentityColumn/run.csx
index 343e2e426..9a9d35fd0 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumn/run.csx
+++ b/samples/samples-csharpscript/AddProductWithIdentityColumn/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Net;
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumnIncluded/function.json b/samples/samples-csharpscript/AddProductWithIdentityColumnIncluded/function.json
similarity index 100%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumnIncluded/function.json
rename to samples/samples-csharpscript/AddProductWithIdentityColumnIncluded/function.json
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumnIncluded/run.csx b/samples/samples-csharpscript/AddProductWithIdentityColumnIncluded/run.csx
similarity index 96%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumnIncluded/run.csx
rename to samples/samples-csharpscript/AddProductWithIdentityColumnIncluded/run.csx
index ef21f8f6e..366ae3e3d 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithIdentityColumnIncluded/run.csx
+++ b/samples/samples-csharpscript/AddProductWithIdentityColumnIncluded/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Net;
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/function.json b/samples/samples-csharpscript/AddProductWithMultiplePrimaryColumnsAndIdentity/function.json
similarity index 100%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/function.json
rename to samples/samples-csharpscript/AddProductWithMultiplePrimaryColumnsAndIdentity/function.json
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx b/samples/samples-csharpscript/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx
similarity index 96%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx
rename to samples/samples-csharpscript/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx
index 20514511f..2fae0190b 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx
+++ b/samples/samples-csharpscript/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Net;
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductsArray/function.json b/samples/samples-csharpscript/AddProductsArray/function.json
similarity index 100%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductsArray/function.json
rename to samples/samples-csharpscript/AddProductsArray/function.json
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductsArray/run.csx b/samples/samples-csharpscript/AddProductsArray/run.csx
similarity index 96%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductsArray/run.csx
rename to samples/samples-csharpscript/AddProductsArray/run.csx
index 3fefd2d8d..f2d81e074 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductsArray/run.csx
+++ b/samples/samples-csharpscript/AddProductsArray/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Net;
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductsCollector/function.json b/samples/samples-csharpscript/AddProductsCollector/function.json
similarity index 100%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductsCollector/function.json
rename to samples/samples-csharpscript/AddProductsCollector/function.json
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductsCollector/run.csx b/samples/samples-csharpscript/AddProductsCollector/run.csx
similarity index 95%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductsCollector/run.csx
rename to samples/samples-csharpscript/AddProductsCollector/run.csx
index bc922eabf..51274f7e3 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductsCollector/run.csx
+++ b/samples/samples-csharpscript/AddProductsCollector/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Collections.Generic;
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductsWithIdentityColumnArray/function.json b/samples/samples-csharpscript/AddProductsWithIdentityColumnArray/function.json
similarity index 100%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductsWithIdentityColumnArray/function.json
rename to samples/samples-csharpscript/AddProductsWithIdentityColumnArray/function.json
diff --git a/samples/samples-csharpscript/OutputBindingSamples/AddProductsWithIdentityColumnArray/run.csx b/samples/samples-csharpscript/AddProductsWithIdentityColumnArray/run.csx
similarity index 97%
rename from samples/samples-csharpscript/OutputBindingSamples/AddProductsWithIdentityColumnArray/run.csx
rename to samples/samples-csharpscript/AddProductsWithIdentityColumnArray/run.csx
index e4ed8aeff..0b8fd7af6 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/AddProductsWithIdentityColumnArray/run.csx
+++ b/samples/samples-csharpscript/AddProductsWithIdentityColumnArray/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Net;
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetAndAddProducts/function.json b/samples/samples-csharpscript/GetAndAddProducts/function.json
similarity index 100%
rename from samples/samples-csharpscript/InputBindingSamples/GetAndAddProducts/function.json
rename to samples/samples-csharpscript/GetAndAddProducts/function.json
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetAndAddProducts/run.csx b/samples/samples-csharpscript/GetAndAddProducts/run.csx
similarity index 94%
rename from samples/samples-csharpscript/InputBindingSamples/GetAndAddProducts/run.csx
rename to samples/samples-csharpscript/GetAndAddProducts/run.csx
index f2a791899..d11dd263c 100644
--- a/samples/samples-csharpscript/InputBindingSamples/GetAndAddProducts/run.csx
+++ b/samples/samples-csharpscript/GetAndAddProducts/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Net;
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetProductNamesView/function.json b/samples/samples-csharpscript/GetProductNamesView/function.json
similarity index 100%
rename from samples/samples-csharpscript/InputBindingSamples/GetProductNamesView/function.json
rename to samples/samples-csharpscript/GetProductNamesView/function.json
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetProductNamesView/run.csx b/samples/samples-csharpscript/GetProductNamesView/run.csx
similarity index 94%
rename from samples/samples-csharpscript/InputBindingSamples/GetProductNamesView/run.csx
rename to samples/samples-csharpscript/GetProductNamesView/run.csx
index b6a8bc62a..99a2a9347 100644
--- a/samples/samples-csharpscript/InputBindingSamples/GetProductNamesView/run.csx
+++ b/samples/samples-csharpscript/GetProductNamesView/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Net;
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetProducts/function.json b/samples/samples-csharpscript/GetProducts/function.json
similarity index 100%
rename from samples/samples-csharpscript/InputBindingSamples/GetProducts/function.json
rename to samples/samples-csharpscript/GetProducts/function.json
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetProductsNameEmpty/run.csx b/samples/samples-csharpscript/GetProducts/run.csx
similarity index 94%
rename from samples/samples-csharpscript/InputBindingSamples/GetProductsNameEmpty/run.csx
rename to samples/samples-csharpscript/GetProducts/run.csx
index b00a86fcb..616bf61c8 100644
--- a/samples/samples-csharpscript/InputBindingSamples/GetProductsNameEmpty/run.csx
+++ b/samples/samples-csharpscript/GetProducts/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Net;
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetProductsAsyncEnumerable/function.json b/samples/samples-csharpscript/GetProductsAsyncEnumerable/function.json
similarity index 100%
rename from samples/samples-csharpscript/InputBindingSamples/GetProductsAsyncEnumerable/function.json
rename to samples/samples-csharpscript/GetProductsAsyncEnumerable/function.json
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetProductsAsyncEnumerable/run.csx b/samples/samples-csharpscript/GetProductsAsyncEnumerable/run.csx
similarity index 95%
rename from samples/samples-csharpscript/InputBindingSamples/GetProductsAsyncEnumerable/run.csx
rename to samples/samples-csharpscript/GetProductsAsyncEnumerable/run.csx
index c041161f0..f7f3eb489 100644
--- a/samples/samples-csharpscript/InputBindingSamples/GetProductsAsyncEnumerable/run.csx
+++ b/samples/samples-csharpscript/GetProductsAsyncEnumerable/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Net;
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetProductsNameEmpty/function.json b/samples/samples-csharpscript/GetProductsNameEmpty/function.json
similarity index 100%
rename from samples/samples-csharpscript/InputBindingSamples/GetProductsNameEmpty/function.json
rename to samples/samples-csharpscript/GetProductsNameEmpty/function.json
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetProductsNameNull/run.csx b/samples/samples-csharpscript/GetProductsNameEmpty/run.csx
similarity index 94%
rename from samples/samples-csharpscript/InputBindingSamples/GetProductsNameNull/run.csx
rename to samples/samples-csharpscript/GetProductsNameEmpty/run.csx
index b00a86fcb..616bf61c8 100644
--- a/samples/samples-csharpscript/InputBindingSamples/GetProductsNameNull/run.csx
+++ b/samples/samples-csharpscript/GetProductsNameEmpty/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Net;
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetProductsNameNull/function.json b/samples/samples-csharpscript/GetProductsNameNull/function.json
similarity index 100%
rename from samples/samples-csharpscript/InputBindingSamples/GetProductsNameNull/function.json
rename to samples/samples-csharpscript/GetProductsNameNull/function.json
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetProductsStoredProcedure/run.csx b/samples/samples-csharpscript/GetProductsNameNull/run.csx
similarity index 94%
rename from samples/samples-csharpscript/InputBindingSamples/GetProductsStoredProcedure/run.csx
rename to samples/samples-csharpscript/GetProductsNameNull/run.csx
index b00a86fcb..616bf61c8 100644
--- a/samples/samples-csharpscript/InputBindingSamples/GetProductsStoredProcedure/run.csx
+++ b/samples/samples-csharpscript/GetProductsNameNull/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Net;
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetProductsStoredProcedure/function.json b/samples/samples-csharpscript/GetProductsStoredProcedure/function.json
similarity index 100%
rename from samples/samples-csharpscript/InputBindingSamples/GetProductsStoredProcedure/function.json
rename to samples/samples-csharpscript/GetProductsStoredProcedure/function.json
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetProducts/run.csx b/samples/samples-csharpscript/GetProductsStoredProcedure/run.csx
similarity index 94%
rename from samples/samples-csharpscript/InputBindingSamples/GetProducts/run.csx
rename to samples/samples-csharpscript/GetProductsStoredProcedure/run.csx
index b00a86fcb..616bf61c8 100644
--- a/samples/samples-csharpscript/InputBindingSamples/GetProducts/run.csx
+++ b/samples/samples-csharpscript/GetProductsStoredProcedure/run.csx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System.Net;
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetProductsStoredProcedureFromAppSetting/function.json b/samples/samples-csharpscript/GetProductsStoredProcedureFromAppSetting/function.json
similarity index 100%
rename from samples/samples-csharpscript/InputBindingSamples/GetProductsStoredProcedureFromAppSetting/function.json
rename to samples/samples-csharpscript/GetProductsStoredProcedureFromAppSetting/function.json
diff --git a/samples/samples-csharpscript/GetProductsStoredProcedureFromAppSetting/run.csx b/samples/samples-csharpscript/GetProductsStoredProcedureFromAppSetting/run.csx
new file mode 100644
index 000000000..616bf61c8
--- /dev/null
+++ b/samples/samples-csharpscript/GetProductsStoredProcedureFromAppSetting/run.csx
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+#load "../Common/product.csx"
+#r "Newtonsoft.Json"
+
+using System.Net;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Primitives;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+public static IActionResult Run(HttpRequest req, ILogger log, IEnumerable<Product> products)
+{
+    log.LogInformation("C# HTTP trigger function processed a request.");
+    return new OkObjectResult(products);
+}
diff --git a/samples/samples-csharpscript/InputBindingSamples/.vscode/extensions.json b/samples/samples-csharpscript/InputBindingSamples/.vscode/extensions.json
deleted file mode 100644
index dde673dcd..000000000
--- a/samples/samples-csharpscript/InputBindingSamples/.vscode/extensions.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "ms-azuretools.vscode-azurefunctions"
-    ]
-}
\ No newline at end of file
diff --git a/samples/samples-csharpscript/InputBindingSamples/GetProductsStoredProcedureFromAppSetting/run.csx b/samples/samples-csharpscript/InputBindingSamples/GetProductsStoredProcedureFromAppSetting/run.csx
deleted file mode 100644
index b00a86fcb..000000000
--- a/samples/samples-csharpscript/InputBindingSamples/GetProductsStoredProcedureFromAppSetting/run.csx
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-
-public static IActionResult Run(HttpRequest req, ILogger log, IEnumerable<Product> products)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-    return new OkObjectResult(products);
-}
diff --git a/samples/samples-csharpscript/InputBindingSamples/local.settings.json b/samples/samples-csharpscript/InputBindingSamples/local.settings.json
deleted file mode 100644
index 2ee8fdfec..000000000
--- a/samples/samples-csharpscript/InputBindingSamples/local.settings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "IsEncrypted": false,
-  "Values": {
-    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
-    "FUNCTIONS_WORKER_RUNTIME": "dotnet",
-    "SqlConnectionString": "",
-    "Sp_SelectCost": "SelectProductsCost",
-    "ProductCost": 100
-  }
-}
\ No newline at end of file
diff --git a/samples/samples-csharpscript/OutputBindingSamples/.vscode/extensions.json b/samples/samples-csharpscript/OutputBindingSamples/.vscode/extensions.json
deleted file mode 100644
index dde673dcd..000000000
--- a/samples/samples-csharpscript/OutputBindingSamples/.vscode/extensions.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "ms-azuretools.vscode-azurefunctions"
-    ]
-}
\ No newline at end of file
diff --git a/samples/samples-csharpscript/OutputBindingSamples/host.json b/samples/samples-csharpscript/OutputBindingSamples/host.json
deleted file mode 100644
index 22c599f81..000000000
--- a/samples/samples-csharpscript/OutputBindingSamples/host.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "version": "2.0",
-  "logging": {
-    "applicationInsights": {
-      "samplingSettings": {
-        "isEnabled": true,
-        "excludedTypes": "Request"
-      }
-    }
-  },
-  "extensionBundle": {
-   "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
-      "version": "[4.*, 5.0.0)"
-  }
-}
\ No newline at end of file
diff --git a/samples/samples-csharpscript/OutputBindingSamples/QueueTriggerProducts/function.json b/samples/samples-csharpscript/QueueTriggerProducts/function.json
similarity index 100%
rename from samples/samples-csharpscript/OutputBindingSamples/QueueTriggerProducts/function.json
rename to samples/samples-csharpscript/QueueTriggerProducts/function.json
diff --git a/samples/samples-csharpscript/OutputBindingSamples/QueueTriggerProducts/run.csx b/samples/samples-csharpscript/QueueTriggerProducts/run.csx
similarity index 95%
rename from samples/samples-csharpscript/OutputBindingSamples/QueueTriggerProducts/run.csx
rename to samples/samples-csharpscript/QueueTriggerProducts/run.csx
index 2af1506b7..a2be84e50 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/QueueTriggerProducts/run.csx
+++ b/samples/samples-csharpscript/QueueTriggerProducts/run.csx
@@ -1,4 +1,4 @@
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 
 using System;
diff --git a/samples/samples-csharpscript/OutputBindingSamples/TimerTriggerProducts/function.json b/samples/samples-csharpscript/TimerTriggerProducts/function.json
similarity index 100%
rename from samples/samples-csharpscript/OutputBindingSamples/TimerTriggerProducts/function.json
rename to samples/samples-csharpscript/TimerTriggerProducts/function.json
diff --git a/samples/samples-csharpscript/OutputBindingSamples/TimerTriggerProducts/run.csx b/samples/samples-csharpscript/TimerTriggerProducts/run.csx
similarity index 96%
rename from samples/samples-csharpscript/OutputBindingSamples/TimerTriggerProducts/run.csx
rename to samples/samples-csharpscript/TimerTriggerProducts/run.csx
index 8e626075f..c8c17d682 100644
--- a/samples/samples-csharpscript/OutputBindingSamples/TimerTriggerProducts/run.csx
+++ b/samples/samples-csharpscript/TimerTriggerProducts/run.csx
@@ -1,4 +1,4 @@
-#load "../../Common/product.csx"
+#load "../Common/product.csx"
 #r "Newtonsoft.Json"
 #r "Microsoft.Azure.WebJobs.Extensions.Sql"
 
diff --git a/samples/samples-csharpscript/InputBindingSamples/host.json b/samples/samples-csharpscript/host.json
similarity index 100%
rename from samples/samples-csharpscript/InputBindingSamples/host.json
rename to samples/samples-csharpscript/host.json
diff --git a/test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj b/test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj
index 5c8d1d3fb..ea6d63c86 100644
--- a/test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj
+++ b/test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj
@@ -67,15 +67,10 @@
     <Copy SourceFiles="@(_PythonCopyItems)" DestinationFolder="$(OutDir)\SqlExtensionSamples\Python\%(RecursiveDir)" />
     <Message Text="Copied Python Samples output to $(OutDir)\SqlExtensionSamples\Python" Importance="high" />
     <ItemGroup>
-      <_CSharpScriptCopyItems Include="..\samples\samples-csharpscript\InputBindingSamples\**\*.*" />
-      <_CSharpScriptCopyItems Include="..\samples\samples-csharpscript\OutputBindingSamples\**\*.*" />
+      <_CSharpScriptCopyItems Include="..\samples\samples-csharpscript\**\*.*" />
       <_CSharpScriptCopyItems Include="Integration\test-csx\**\*.*" />
     </ItemGroup>
     <Copy SourceFiles="@(_CSharpScriptCopyItems)" DestinationFolder="$(OutDir)\SqlExtensionSamples\CSharpscript\%(RecursiveDir)" />
-    <ItemGroup>
-      <_CommonCopyItems Include="..\samples\samples-csharpscript\Common\**\*.*" />
-    </ItemGroup>
-    <Copy SourceFiles="@(_CommonCopyItems)" DestinationFolder="$(OutDir)\SqlExtensionSamples\Common\%(RecursiveDir)" />
     <Message Text="Copied CSX Samples output to $(OutDir)\SqlExtensionSamples\CSharpscript" Importance="high" />
   </Target>
 </Project>

From 6d9912951cabc396daba7e56145e3ce2ce5d4819 Mon Sep 17 00:00:00 2001
From: maddydev <makoripa@microsoft.com>
Date: Tue, 18 Apr 2023 14:54:18 -0700
Subject: [PATCH 3/5] add local.settings.json

---
 samples/samples-csharpscript/local.settings.json | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 samples/samples-csharpscript/local.settings.json

diff --git a/samples/samples-csharpscript/local.settings.json b/samples/samples-csharpscript/local.settings.json
new file mode 100644
index 000000000..2ee8fdfec
--- /dev/null
+++ b/samples/samples-csharpscript/local.settings.json
@@ -0,0 +1,10 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet",
+    "SqlConnectionString": "",
+    "Sp_SelectCost": "SelectProductsCost",
+    "ProductCost": 100
+  }
+}
\ No newline at end of file

From e7305fa15d46d792d2c63707f773484f01f8784a Mon Sep 17 00:00:00 2001
From: Maddy Koripalli <makoripa@microsoft.com>
Date: Tue, 25 Apr 2023 10:41:03 -0700
Subject: [PATCH 4/5] rename folders in proj file

---
 test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj b/test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj
index ea6d63c86..859618576 100644
--- a/test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj
+++ b/test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj
@@ -67,10 +67,10 @@
     <Copy SourceFiles="@(_PythonCopyItems)" DestinationFolder="$(OutDir)\SqlExtensionSamples\Python\%(RecursiveDir)" />
     <Message Text="Copied Python Samples output to $(OutDir)\SqlExtensionSamples\Python" Importance="high" />
     <ItemGroup>
-      <_CSharpScriptCopyItems Include="..\samples\samples-csharpscript\**\*.*" />
+      <_CSharpScriptCopyItems Include="..\samples\samples-csx\**\*.*" />
       <_CSharpScriptCopyItems Include="Integration\test-csx\**\*.*" />
     </ItemGroup>
-    <Copy SourceFiles="@(_CSharpScriptCopyItems)" DestinationFolder="$(OutDir)\SqlExtensionSamples\CSharpscript\%(RecursiveDir)" />
+    <Copy SourceFiles="@(_CSharpScriptCopyItems)" DestinationFolder="$(OutDir)\SqlExtensionSamples\Csx\%(RecursiveDir)" />
     <Message Text="Copied CSX Samples output to $(OutDir)\SqlExtensionSamples\CSharpscript" Importance="high" />
   </Target>
 </Project>

From 4d5bff6c5db5b7251232a98c6577540c5c8b7a44 Mon Sep 17 00:00:00 2001
From: Maddy Koripalli <makoripa@microsoft.com>
Date: Tue, 25 Apr 2023 14:05:36 -0700
Subject: [PATCH 5/5] clean up logs and unused

---
 samples/samples-csx/AddProduct/run.csx        |  7 ----
 samples/samples-csx/AddProductParams/run.csx  |  6 ----
 .../AddProductWithDefaultPK/run.csx           |  7 ----
 .../AddProductWithIdentityColumn/run.csx      |  6 ----
 .../run.csx                                   |  6 ----
 .../run.csx                                   |  6 ----
 samples/samples-csx/AddProductsArray/run.csx  |  7 ----
 .../samples-csx/AddProductsCollector/run.csx  |  2 --
 .../run.csx                                   |  6 ----
 samples/samples-csx/GetAndAddProducts/run.csx |  1 -
 .../samples-csx/GetProductNamesView/run.csx   |  1 -
 samples/samples-csx/GetProducts/run.csx       |  1 -
 .../samples-csx/GetProductsNameEmpty/run.csx  |  1 -
 .../samples-csx/GetProductsNameNull/run.csx   |  1 -
 .../GetProductsStoredProcedure/run.csx        |  1 -
 .../run.csx                                   |  1 -
 .../GetAndAddProducts/function.json           | 36 -------------------
 .../GetAndAddProducts/run.csx                 | 18 ----------
 .../GetProductNamesView/function.json         | 28 ---------------
 .../GetProductNamesView/run.csx               | 17 ---------
 .../GetProducts/function.json                 | 28 ---------------
 .../InputBindingSamples/GetProducts/run.csx   | 17 ---------
 .../GetProductsAsyncEnumerable/function.json  | 28 ---------------
 .../GetProductsAsyncEnumerable/run.csx        | 23 ------------
 .../GetProductsNameEmpty/function.json        | 29 ---------------
 .../GetProductsNameEmpty/run.csx              | 17 ---------
 .../GetProductsNameNull/function.json         | 29 ---------------
 .../GetProductsNameNull/run.csx               | 17 ---------
 .../GetProductsStoredProcedure/function.json  | 29 ---------------
 .../GetProductsStoredProcedure/run.csx        | 17 ---------
 .../function.json                             | 29 ---------------
 .../run.csx                                   | 17 ---------
 .../samples-csx/InputBindingSamples/host.json | 18 ----------
 .../InputBindingSamples/local.settings.json   | 10 ------
 .../AddProduct/function.json                  | 27 --------------
 .../OutputBindingSamples/AddProduct/run.csx   | 25 -------------
 .../AddProductParams/function.json            | 27 --------------
 .../AddProductParams/run.csx                  | 28 ---------------
 .../AddProductWithDefaultPK/function.json     | 27 --------------
 .../AddProductWithDefaultPK/run.csx           | 25 -------------
 .../function.json                             | 27 --------------
 .../AddProductWithIdentityColumn/run.csx      | 27 --------------
 .../function.json                             | 27 --------------
 .../run.csx                                   | 28 ---------------
 .../function.json                             | 27 --------------
 .../run.csx                                   | 28 ---------------
 .../AddProductsArray/function.json            | 27 --------------
 .../AddProductsArray/run.csx                  | 25 -------------
 .../AddProductsCollector/function.json        | 27 --------------
 .../AddProductsCollector/run.csx              | 22 ------------
 .../function.json                             | 27 --------------
 .../run.csx                                   | 35 ------------------
 .../QueueTriggerProducts/function.json        | 23 ------------
 .../QueueTriggerProducts/run.csx              | 25 -------------
 .../TimerTriggerProducts/function.json        | 23 ------------
 .../TimerTriggerProducts/run.csx              | 31 ----------------
 ....Azure.WebJobs.Extensions.Sql.Tests.csproj |  8 ++---
 57 files changed, 4 insertions(+), 1059 deletions(-)
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetAndAddProducts/function.json
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetAndAddProducts/run.csx
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetProductNamesView/function.json
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetProductNamesView/run.csx
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetProducts/function.json
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetProducts/run.csx
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetProductsAsyncEnumerable/function.json
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetProductsAsyncEnumerable/run.csx
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetProductsNameEmpty/function.json
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetProductsNameEmpty/run.csx
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetProductsNameNull/function.json
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetProductsNameNull/run.csx
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetProductsStoredProcedure/function.json
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetProductsStoredProcedure/run.csx
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetProductsStoredProcedureFromAppSetting/function.json
 delete mode 100644 samples/samples-csx/InputBindingSamples/GetProductsStoredProcedureFromAppSetting/run.csx
 delete mode 100644 samples/samples-csx/InputBindingSamples/host.json
 delete mode 100644 samples/samples-csx/InputBindingSamples/local.settings.json
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProduct/function.json
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProduct/run.csx
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductParams/function.json
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductParams/run.csx
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductWithDefaultPK/function.json
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductWithDefaultPK/run.csx
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumn/function.json
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumn/run.csx
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumnIncluded/function.json
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumnIncluded/run.csx
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/function.json
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductsArray/function.json
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductsArray/run.csx
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductsCollector/function.json
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductsCollector/run.csx
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductsWithIdentityColumnArray/function.json
 delete mode 100644 samples/samples-csx/OutputBindingSamples/AddProductsWithIdentityColumnArray/run.csx
 delete mode 100644 samples/samples-csx/OutputBindingSamples/QueueTriggerProducts/function.json
 delete mode 100644 samples/samples-csx/OutputBindingSamples/QueueTriggerProducts/run.csx
 delete mode 100644 samples/samples-csx/OutputBindingSamples/TimerTriggerProducts/function.json
 delete mode 100644 samples/samples-csx/OutputBindingSamples/TimerTriggerProducts/run.csx

diff --git a/samples/samples-csx/AddProduct/run.csx b/samples/samples-csx/AddProduct/run.csx
index 60a786c7b..e4c5c5c6b 100644
--- a/samples/samples-csx/AddProduct/run.csx
+++ b/samples/samples-csx/AddProduct/run.csx
@@ -11,15 +11,8 @@ using Newtonsoft.Json;
 
 public static Product Run(HttpRequest req, ILogger log, out Product product)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
-
     string requestBody = new StreamReader(req.Body).ReadToEnd();
     product = JsonConvert.DeserializeObject<Product>(requestBody);
 
-    string responseMessage = string.IsNullOrEmpty(product.Name)
-        ? "This HTTP triggered function executed successfully. Pass a name in the query string or in the request body for a personalized response."
-                : $"Hello, {product.Name}. This HTTP triggered function executed successfully.";
-
     return product;
 }
\ No newline at end of file
diff --git a/samples/samples-csx/AddProductParams/run.csx b/samples/samples-csx/AddProductParams/run.csx
index 0f56577bf..901893e2f 100644
--- a/samples/samples-csx/AddProductParams/run.csx
+++ b/samples/samples-csx/AddProductParams/run.csx
@@ -11,8 +11,6 @@ using Newtonsoft.Json;
 
 public static Product Run(HttpRequest req, ILogger log, out Product product)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
     product = new Product
     {
         Name = req.Query["name"],
@@ -20,9 +18,5 @@ public static Product Run(HttpRequest req, ILogger log, out Product product)
         Cost = int.Parse(req.Query["cost"])
     };
 
-    string responseMessage = string.IsNullOrEmpty(product.Name)
-        ? "This HTTP triggered function executed successfully. Pass a name in the query string or in the request body for a personalized response."
-                : $"Hello, {product.Name}. This HTTP triggered function executed successfully.";
-
     return product;
 }
\ No newline at end of file
diff --git a/samples/samples-csx/AddProductWithDefaultPK/run.csx b/samples/samples-csx/AddProductWithDefaultPK/run.csx
index 0760e7658..da5a38bf4 100644
--- a/samples/samples-csx/AddProductWithDefaultPK/run.csx
+++ b/samples/samples-csx/AddProductWithDefaultPK/run.csx
@@ -11,15 +11,8 @@ using Newtonsoft.Json;
 
 public static ProductWithDefaultPK Run(HttpRequest req, ILogger log, out ProductWithDefaultPK product)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
-
     string requestBody = new StreamReader(req.Body).ReadToEnd();
     product = JsonConvert.DeserializeObject<ProductWithDefaultPK>(requestBody);
 
-    string responseMessage = string.IsNullOrEmpty(product.Name)
-        ? "This HTTP triggered function executed successfully. Pass a name in the query string or in the request body for a personalized response."
-                : $"Hello, {product.Name}. This HTTP triggered function executed successfully.";
-
     return product;
 }
\ No newline at end of file
diff --git a/samples/samples-csx/AddProductWithIdentityColumn/run.csx b/samples/samples-csx/AddProductWithIdentityColumn/run.csx
index 9a9d35fd0..f04f04dcf 100644
--- a/samples/samples-csx/AddProductWithIdentityColumn/run.csx
+++ b/samples/samples-csx/AddProductWithIdentityColumn/run.csx
@@ -11,17 +11,11 @@ using Newtonsoft.Json;
 
 public static ProductWithoutId Run(HttpRequest req, ILogger log, out ProductWithoutId product)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
     product = new ProductWithoutId
             {
                 Name = req.Query["name"],
                 Cost = int.Parse(req.Query["cost"])
             };
 
-    string responseMessage = string.IsNullOrEmpty(product.Name)
-        ? "This HTTP triggered function executed successfully. Pass a name in the query string or in the request body for a personalized response."
-                : $"Hello, {product.Name}. This HTTP triggered function executed successfully.";
-
     return product;
 }
\ No newline at end of file
diff --git a/samples/samples-csx/AddProductWithIdentityColumnIncluded/run.csx b/samples/samples-csx/AddProductWithIdentityColumnIncluded/run.csx
index 366ae3e3d..b3c0c4d43 100644
--- a/samples/samples-csx/AddProductWithIdentityColumnIncluded/run.csx
+++ b/samples/samples-csx/AddProductWithIdentityColumnIncluded/run.csx
@@ -11,8 +11,6 @@ using Newtonsoft.Json;
 
 public static ProductWithOptionalId Run(HttpRequest req, ILogger log, out ProductWithOptionalId product)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
     product = product = new ProductWithOptionalId
     {
         Name = req.Query["name"],
@@ -20,9 +18,5 @@ public static ProductWithOptionalId Run(HttpRequest req, ILogger log, out Produc
         Cost = int.Parse(req.Query["cost"])
     };
 
-    string responseMessage = string.IsNullOrEmpty(product.Name)
-        ? "This HTTP triggered function executed successfully. Pass a name in the query string or in the request body for a personalized response."
-                : $"Hello, {product.Name}. This HTTP triggered function executed successfully.";
-
     return product;
 }
\ No newline at end of file
diff --git a/samples/samples-csx/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx b/samples/samples-csx/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx
index 2fae0190b..34acece3e 100644
--- a/samples/samples-csx/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx
+++ b/samples/samples-csx/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx
@@ -11,8 +11,6 @@ using Newtonsoft.Json;
 
 public static MultiplePrimaryKeyProductWithoutId Run(HttpRequest req, ILogger log, out MultiplePrimaryKeyProductWithoutId product)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
     product = product = new MultiplePrimaryKeyProductWithoutId
     {
         ExternalId = int.Parse(req.Query["externalId"]),
@@ -20,9 +18,5 @@ public static MultiplePrimaryKeyProductWithoutId Run(HttpRequest req, ILogger lo
         Cost = int.Parse(req.Query["cost"])
     };
 
-    string responseMessage = string.IsNullOrEmpty(product.Name)
-        ? "This HTTP triggered function executed successfully. Pass a name in the query string or in the request body for a personalized response."
-                : $"Hello, {product.Name}. This HTTP triggered function executed successfully.";
-
     return product;
 }
\ No newline at end of file
diff --git a/samples/samples-csx/AddProductsArray/run.csx b/samples/samples-csx/AddProductsArray/run.csx
index f2d81e074..a4431d153 100644
--- a/samples/samples-csx/AddProductsArray/run.csx
+++ b/samples/samples-csx/AddProductsArray/run.csx
@@ -11,15 +11,8 @@ using Newtonsoft.Json;
 
 public static Product[] Run(HttpRequest req, ILogger log, out Product[] products)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
-
     string requestBody = new StreamReader(req.Body).ReadToEnd();
     products = JsonConvert.DeserializeObject<Product[]>(requestBody);
 
-    string responseMessage = products.Length > 0
-        ? "This HTTP triggered function executed successfully."
-                : "No data passed, Please pass the objects to upsert in the request body.";
-
     return products;
 }
\ No newline at end of file
diff --git a/samples/samples-csx/AddProductsCollector/run.csx b/samples/samples-csx/AddProductsCollector/run.csx
index 51274f7e3..fb7e878de 100644
--- a/samples/samples-csx/AddProductsCollector/run.csx
+++ b/samples/samples-csx/AddProductsCollector/run.csx
@@ -10,8 +10,6 @@ using Microsoft.AspNetCore.Mvc;
 
 public static ICollector<Product> Run(HttpRequest req, ILogger log, ICollector<Product> products)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
     List<Product> newProducts = ProductUtilities.GetNewProducts(5000);
     foreach (Product product in newProducts)
     {
diff --git a/samples/samples-csx/AddProductsWithIdentityColumnArray/run.csx b/samples/samples-csx/AddProductsWithIdentityColumnArray/run.csx
index 0b8fd7af6..0e9f9dca8 100644
--- a/samples/samples-csx/AddProductsWithIdentityColumnArray/run.csx
+++ b/samples/samples-csx/AddProductsWithIdentityColumnArray/run.csx
@@ -11,8 +11,6 @@ using Newtonsoft.Json;
 
 public static ProductWithoutId[] Run(HttpRequest req, ILogger log, out ProductWithoutId[] products)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
     products = new[]
             {
                 new ProductWithoutId
@@ -27,9 +25,5 @@ public static ProductWithoutId[] Run(HttpRequest req, ILogger log, out ProductWi
                 }
             };
 
-    string responseMessage = products.Length > 0
-        ? "This HTTP triggered function executed successfully. Pass a name in the query string or in the request body for a personalized response."
-                : "No data passed, Please pass the objects to upsert in the request body.";
-
     return products;
 }
\ No newline at end of file
diff --git a/samples/samples-csx/GetAndAddProducts/run.csx b/samples/samples-csx/GetAndAddProducts/run.csx
index d11dd263c..8a16a707c 100644
--- a/samples/samples-csx/GetAndAddProducts/run.csx
+++ b/samples/samples-csx/GetAndAddProducts/run.csx
@@ -12,7 +12,6 @@ using System.Collections.Generic;
 
 public static Product[] Run(HttpRequest req, ILogger log, IEnumerable<Product> products, out Product[] productsWithIdentity)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
     productsWithIdentity = products.ToArray<Product>();
     return productsWithIdentity;
 }
diff --git a/samples/samples-csx/GetProductNamesView/run.csx b/samples/samples-csx/GetProductNamesView/run.csx
index 99a2a9347..da0129fd0 100644
--- a/samples/samples-csx/GetProductNamesView/run.csx
+++ b/samples/samples-csx/GetProductNamesView/run.csx
@@ -12,6 +12,5 @@ using System.Collections.Generic;
 
 public static IActionResult Run(HttpRequest req, ILogger log, IEnumerable<ProductName> products)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
     return new OkObjectResult(products);
 }
diff --git a/samples/samples-csx/GetProducts/run.csx b/samples/samples-csx/GetProducts/run.csx
index 616bf61c8..bac16e698 100644
--- a/samples/samples-csx/GetProducts/run.csx
+++ b/samples/samples-csx/GetProducts/run.csx
@@ -12,6 +12,5 @@ using System.Collections.Generic;
 
 public static IActionResult Run(HttpRequest req, ILogger log, IEnumerable<Product> products)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
     return new OkObjectResult(products);
 }
diff --git a/samples/samples-csx/GetProductsNameEmpty/run.csx b/samples/samples-csx/GetProductsNameEmpty/run.csx
index 616bf61c8..bac16e698 100644
--- a/samples/samples-csx/GetProductsNameEmpty/run.csx
+++ b/samples/samples-csx/GetProductsNameEmpty/run.csx
@@ -12,6 +12,5 @@ using System.Collections.Generic;
 
 public static IActionResult Run(HttpRequest req, ILogger log, IEnumerable<Product> products)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
     return new OkObjectResult(products);
 }
diff --git a/samples/samples-csx/GetProductsNameNull/run.csx b/samples/samples-csx/GetProductsNameNull/run.csx
index 616bf61c8..bac16e698 100644
--- a/samples/samples-csx/GetProductsNameNull/run.csx
+++ b/samples/samples-csx/GetProductsNameNull/run.csx
@@ -12,6 +12,5 @@ using System.Collections.Generic;
 
 public static IActionResult Run(HttpRequest req, ILogger log, IEnumerable<Product> products)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
     return new OkObjectResult(products);
 }
diff --git a/samples/samples-csx/GetProductsStoredProcedure/run.csx b/samples/samples-csx/GetProductsStoredProcedure/run.csx
index 616bf61c8..bac16e698 100644
--- a/samples/samples-csx/GetProductsStoredProcedure/run.csx
+++ b/samples/samples-csx/GetProductsStoredProcedure/run.csx
@@ -12,6 +12,5 @@ using System.Collections.Generic;
 
 public static IActionResult Run(HttpRequest req, ILogger log, IEnumerable<Product> products)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
     return new OkObjectResult(products);
 }
diff --git a/samples/samples-csx/GetProductsStoredProcedureFromAppSetting/run.csx b/samples/samples-csx/GetProductsStoredProcedureFromAppSetting/run.csx
index 616bf61c8..bac16e698 100644
--- a/samples/samples-csx/GetProductsStoredProcedureFromAppSetting/run.csx
+++ b/samples/samples-csx/GetProductsStoredProcedureFromAppSetting/run.csx
@@ -12,6 +12,5 @@ using System.Collections.Generic;
 
 public static IActionResult Run(HttpRequest req, ILogger log, IEnumerable<Product> products)
 {
-    log.LogInformation("C# HTTP trigger function processed a request.");
     return new OkObjectResult(products);
 }
diff --git a/samples/samples-csx/InputBindingSamples/GetAndAddProducts/function.json b/samples/samples-csx/InputBindingSamples/GetAndAddProducts/function.json
deleted file mode 100644
index 801efaf67..000000000
--- a/samples/samples-csx/InputBindingSamples/GetAndAddProducts/function.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "type": "httpTrigger",
-      "direction": "in",
-      "methods": [
-        "get"
-      ],
-      "route": "getandaddproducts/{cost}"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "products",
-      "type": "sql",
-      "direction": "in",
-      "commandText": "select * from Products where Cost = @Cost",
-      "commandType": "Text",
-      "parameters": "@Cost={cost}",
-      "connectionStringSetting": "SqlConnectionString"
-    },
-    {
-      "name": "productsWithIdentity",
-      "type": "sql",
-      "direction": "out",
-      "commandText": "[dbo].[ProductsWithIdentity]",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ],
-  "disabled": false
-}
\ No newline at end of file
diff --git a/samples/samples-csx/InputBindingSamples/GetAndAddProducts/run.csx b/samples/samples-csx/InputBindingSamples/GetAndAddProducts/run.csx
deleted file mode 100644
index d11dd263c..000000000
--- a/samples/samples-csx/InputBindingSamples/GetAndAddProducts/run.csx
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-
-public static Product[] Run(HttpRequest req, ILogger log, IEnumerable<Product> products, out Product[] productsWithIdentity)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-    productsWithIdentity = products.ToArray<Product>();
-    return productsWithIdentity;
-}
diff --git a/samples/samples-csx/InputBindingSamples/GetProductNamesView/function.json b/samples/samples-csx/InputBindingSamples/GetProductNamesView/function.json
deleted file mode 100644
index 0abb4dade..000000000
--- a/samples/samples-csx/InputBindingSamples/GetProductNamesView/function.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "type": "httpTrigger",
-      "direction": "in",
-      "methods": [
-        "get"
-      ],
-      "route":"getproduct-namesview"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "products",
-      "type": "sql",
-      "direction": "in",
-      "commandText": "SELECT * FROM ProductNames",
-      "commandType": "Text",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ],
-  "disabled": false
-}
\ No newline at end of file
diff --git a/samples/samples-csx/InputBindingSamples/GetProductNamesView/run.csx b/samples/samples-csx/InputBindingSamples/GetProductNamesView/run.csx
deleted file mode 100644
index 99a2a9347..000000000
--- a/samples/samples-csx/InputBindingSamples/GetProductNamesView/run.csx
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-
-public static IActionResult Run(HttpRequest req, ILogger log, IEnumerable<ProductName> products)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-    return new OkObjectResult(products);
-}
diff --git a/samples/samples-csx/InputBindingSamples/GetProducts/function.json b/samples/samples-csx/InputBindingSamples/GetProducts/function.json
deleted file mode 100644
index a37c243da..000000000
--- a/samples/samples-csx/InputBindingSamples/GetProducts/function.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "type": "httpTrigger",
-      "direction": "in",
-      "methods": [
-        "get"
-      ],
-      "route": "getproducts/{cost}"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "products",
-      "type": "sql",
-      "direction": "in",
-      "commandText": "select * from Products where Cost = @Cost",
-      "commandType": "Text",
-      "parameters": "@Cost={cost}",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/samples/samples-csx/InputBindingSamples/GetProducts/run.csx b/samples/samples-csx/InputBindingSamples/GetProducts/run.csx
deleted file mode 100644
index 616bf61c8..000000000
--- a/samples/samples-csx/InputBindingSamples/GetProducts/run.csx
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-
-public static IActionResult Run(HttpRequest req, ILogger log, IEnumerable<Product> products)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-    return new OkObjectResult(products);
-}
diff --git a/samples/samples-csx/InputBindingSamples/GetProductsAsyncEnumerable/function.json b/samples/samples-csx/InputBindingSamples/GetProductsAsyncEnumerable/function.json
deleted file mode 100644
index ca68318de..000000000
--- a/samples/samples-csx/InputBindingSamples/GetProductsAsyncEnumerable/function.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "type": "httpTrigger",
-      "direction": "in",
-      "methods": [
-        "get"
-      ],
-      "route": "getproducts-async/{cost}"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "products",
-      "type": "sql",
-      "direction": "in",
-      "commandText": "select * from Products where Cost = @Cost",
-      "commandType": "Text",
-      "parameters": "@Cost={cost}",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/samples/samples-csx/InputBindingSamples/GetProductsAsyncEnumerable/run.csx b/samples/samples-csx/InputBindingSamples/GetProductsAsyncEnumerable/run.csx
deleted file mode 100644
index f7f3eb489..000000000
--- a/samples/samples-csx/InputBindingSamples/GetProductsAsyncEnumerable/run.csx
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-
-public static async Task<IActionResult> Run(HttpRequest req, ILogger log, IAsyncEnumerable<Product> products)
-{
-    IAsyncEnumerator<Product> enumerator = products.GetAsyncEnumerator();
-    var productList = new List<Product>();
-    while (await enumerator.MoveNextAsync())
-    {
-        productList.Add(enumerator.Current);
-    }
-    await enumerator.DisposeAsync();
-    return new OkObjectResult(productList);
-}
diff --git a/samples/samples-csx/InputBindingSamples/GetProductsNameEmpty/function.json b/samples/samples-csx/InputBindingSamples/GetProductsNameEmpty/function.json
deleted file mode 100644
index b16f84cc3..000000000
--- a/samples/samples-csx/InputBindingSamples/GetProductsNameEmpty/function.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "type": "httpTrigger",
-      "direction": "in",
-      "methods": [
-        "get"
-      ],
-      "route":"getproducts-nameempty/{cost}"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "products",
-      "type": "sql",
-      "direction": "in",
-      "commandText": "select * from Products where Cost = @Cost and Name = @Name",
-      "commandType": "Text",
-      "parameters": "@Cost={cost},@Name=",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ],
-  "disabled": false
-}
\ No newline at end of file
diff --git a/samples/samples-csx/InputBindingSamples/GetProductsNameEmpty/run.csx b/samples/samples-csx/InputBindingSamples/GetProductsNameEmpty/run.csx
deleted file mode 100644
index 616bf61c8..000000000
--- a/samples/samples-csx/InputBindingSamples/GetProductsNameEmpty/run.csx
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-
-public static IActionResult Run(HttpRequest req, ILogger log, IEnumerable<Product> products)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-    return new OkObjectResult(products);
-}
diff --git a/samples/samples-csx/InputBindingSamples/GetProductsNameNull/function.json b/samples/samples-csx/InputBindingSamples/GetProductsNameNull/function.json
deleted file mode 100644
index e4319d985..000000000
--- a/samples/samples-csx/InputBindingSamples/GetProductsNameNull/function.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "type": "httpTrigger",
-      "direction": "in",
-      "methods": [
-        "get"
-      ],
-      "route":"getproducts-namenull/{name}"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "products",
-      "type": "sql",
-      "direction": "in",
-      "commandText": "if @Name is null select * from Products where Name is null else select * from Products where @Name = name",
-      "commandType": "Text",
-      "parameters": "@Name={name}",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ],
-  "disabled": false
-}
\ No newline at end of file
diff --git a/samples/samples-csx/InputBindingSamples/GetProductsNameNull/run.csx b/samples/samples-csx/InputBindingSamples/GetProductsNameNull/run.csx
deleted file mode 100644
index 616bf61c8..000000000
--- a/samples/samples-csx/InputBindingSamples/GetProductsNameNull/run.csx
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-
-public static IActionResult Run(HttpRequest req, ILogger log, IEnumerable<Product> products)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-    return new OkObjectResult(products);
-}
diff --git a/samples/samples-csx/InputBindingSamples/GetProductsStoredProcedure/function.json b/samples/samples-csx/InputBindingSamples/GetProductsStoredProcedure/function.json
deleted file mode 100644
index e6fa92a3e..000000000
--- a/samples/samples-csx/InputBindingSamples/GetProductsStoredProcedure/function.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "type": "httpTrigger",
-      "direction": "in",
-      "methods": [
-        "get"
-      ],
-      "route": "getproducts-storedprocedure/{cost}"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "products",
-      "type": "sql",
-      "direction": "in",
-      "commandText": "SelectProductsCost",
-      "commandType": "StoredProcedure",
-      "parameters": "@Cost={cost}",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ],
-  "disabled": false
-}
\ No newline at end of file
diff --git a/samples/samples-csx/InputBindingSamples/GetProductsStoredProcedure/run.csx b/samples/samples-csx/InputBindingSamples/GetProductsStoredProcedure/run.csx
deleted file mode 100644
index 616bf61c8..000000000
--- a/samples/samples-csx/InputBindingSamples/GetProductsStoredProcedure/run.csx
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-
-public static IActionResult Run(HttpRequest req, ILogger log, IEnumerable<Product> products)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-    return new OkObjectResult(products);
-}
diff --git a/samples/samples-csx/InputBindingSamples/GetProductsStoredProcedureFromAppSetting/function.json b/samples/samples-csx/InputBindingSamples/GetProductsStoredProcedureFromAppSetting/function.json
deleted file mode 100644
index e879bff91..000000000
--- a/samples/samples-csx/InputBindingSamples/GetProductsStoredProcedureFromAppSetting/function.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "type": "httpTrigger",
-      "direction": "in",
-      "methods": [
-        "get"
-      ],
-      "route": "getproductsbycost"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "products",
-      "type": "sql",
-      "direction": "in",
-      "commandText": "%Sp_SelectCost%",
-      "commandType": "StoredProcedure",
-      "parameters": "@Cost=%ProductCost%",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ],
-  "disabled": false
-}
\ No newline at end of file
diff --git a/samples/samples-csx/InputBindingSamples/GetProductsStoredProcedureFromAppSetting/run.csx b/samples/samples-csx/InputBindingSamples/GetProductsStoredProcedureFromAppSetting/run.csx
deleted file mode 100644
index 616bf61c8..000000000
--- a/samples/samples-csx/InputBindingSamples/GetProductsStoredProcedureFromAppSetting/run.csx
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-
-public static IActionResult Run(HttpRequest req, ILogger log, IEnumerable<Product> products)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-    return new OkObjectResult(products);
-}
diff --git a/samples/samples-csx/InputBindingSamples/host.json b/samples/samples-csx/InputBindingSamples/host.json
deleted file mode 100644
index b402e0789..000000000
--- a/samples/samples-csx/InputBindingSamples/host.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": "2.0",
-  "logging": {
-    "applicationInsights": {
-      "samplingSettings": {
-        "isEnabled": true,
-        "excludedTypes": "Request"
-      }
-    },
-    "logLevel": {
-      "default": "Trace"
-    }
-  },
-  "extensionBundle": {
-   "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
-      "version": "[4.*, 5.0.0)"
-  }
-}
diff --git a/samples/samples-csx/InputBindingSamples/local.settings.json b/samples/samples-csx/InputBindingSamples/local.settings.json
deleted file mode 100644
index 2ee8fdfec..000000000
--- a/samples/samples-csx/InputBindingSamples/local.settings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "IsEncrypted": false,
-  "Values": {
-    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
-    "FUNCTIONS_WORKER_RUNTIME": "dotnet",
-    "SqlConnectionString": "",
-    "Sp_SelectCost": "SelectProductsCost",
-    "ProductCost": 100
-  }
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProduct/function.json b/samples/samples-csx/OutputBindingSamples/AddProduct/function.json
deleted file mode 100644
index 58eedb04f..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProduct/function.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "direction": "in",
-      "type": "httpTrigger",
-      "methods": [
-        "post"
-      ],
-      "route": "addproduct"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "product",
-      "type": "sql",
-      "direction": "out",
-      "commandText": "[dbo].[Products]",
-      "commandType": "Text",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProduct/run.csx b/samples/samples-csx/OutputBindingSamples/AddProduct/run.csx
deleted file mode 100644
index 60a786c7b..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProduct/run.csx
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-
-public static Product Run(HttpRequest req, ILogger log, out Product product)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
-
-    string requestBody = new StreamReader(req.Body).ReadToEnd();
-    product = JsonConvert.DeserializeObject<Product>(requestBody);
-
-    string responseMessage = string.IsNullOrEmpty(product.Name)
-        ? "This HTTP triggered function executed successfully. Pass a name in the query string or in the request body for a personalized response."
-                : $"Hello, {product.Name}. This HTTP triggered function executed successfully.";
-
-    return product;
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductParams/function.json b/samples/samples-csx/OutputBindingSamples/AddProductParams/function.json
deleted file mode 100644
index b35685874..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductParams/function.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "direction": "in",
-      "type": "httpTrigger",
-      "methods": [
-        "get"
-      ],
-      "route": "addproduct-params"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "product",
-      "type": "sql",
-      "direction": "out",
-      "commandText": "[dbo].[Products]",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ],
-  "disabled": false
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductParams/run.csx b/samples/samples-csx/OutputBindingSamples/AddProductParams/run.csx
deleted file mode 100644
index 0f56577bf..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductParams/run.csx
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-
-public static Product Run(HttpRequest req, ILogger log, out Product product)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
-    product = new Product
-    {
-        Name = req.Query["name"],
-        ProductId = int.Parse(req.Query["productId"]),
-        Cost = int.Parse(req.Query["cost"])
-    };
-
-    string responseMessage = string.IsNullOrEmpty(product.Name)
-        ? "This HTTP triggered function executed successfully. Pass a name in the query string or in the request body for a personalized response."
-                : $"Hello, {product.Name}. This HTTP triggered function executed successfully.";
-
-    return product;
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductWithDefaultPK/function.json b/samples/samples-csx/OutputBindingSamples/AddProductWithDefaultPK/function.json
deleted file mode 100644
index e51cd132b..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductWithDefaultPK/function.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "bindings": [
-      {
-        "authLevel": "function",
-        "name": "req",
-        "direction": "in",
-        "type": "httpTrigger",
-        "methods": [
-          "post"
-        ],
-        "route": "addproductwithdefaultpk"
-      },
-      {
-        "name": "$return",
-        "type": "http",
-        "direction": "out"
-      },
-      {
-        "name": "product",
-        "type": "sql",
-        "direction": "out",
-        "commandText": "[dbo].[ProductsWithDefaultPK]",
-        "connectionStringSetting": "SqlConnectionString"
-      }
-    ],
-    "disabled": false
-  }
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductWithDefaultPK/run.csx b/samples/samples-csx/OutputBindingSamples/AddProductWithDefaultPK/run.csx
deleted file mode 100644
index 0760e7658..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductWithDefaultPK/run.csx
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-
-public static ProductWithDefaultPK Run(HttpRequest req, ILogger log, out ProductWithDefaultPK product)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
-
-    string requestBody = new StreamReader(req.Body).ReadToEnd();
-    product = JsonConvert.DeserializeObject<ProductWithDefaultPK>(requestBody);
-
-    string responseMessage = string.IsNullOrEmpty(product.Name)
-        ? "This HTTP triggered function executed successfully. Pass a name in the query string or in the request body for a personalized response."
-                : $"Hello, {product.Name}. This HTTP triggered function executed successfully.";
-
-    return product;
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumn/function.json b/samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumn/function.json
deleted file mode 100644
index 64184a2ef..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumn/function.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "direction": "in",
-      "type": "httpTrigger",
-      "methods": [
-        "get"
-      ],
-      "route": "addproductwithidentitycolumn"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "product",
-      "type": "sql",
-      "direction": "out",
-      "commandText": "[dbo].[ProductsWithIdentity]",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ],
-  "disabled": false
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumn/run.csx b/samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumn/run.csx
deleted file mode 100644
index 9a9d35fd0..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumn/run.csx
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-
-public static ProductWithoutId Run(HttpRequest req, ILogger log, out ProductWithoutId product)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
-    product = new ProductWithoutId
-            {
-                Name = req.Query["name"],
-                Cost = int.Parse(req.Query["cost"])
-            };
-
-    string responseMessage = string.IsNullOrEmpty(product.Name)
-        ? "This HTTP triggered function executed successfully. Pass a name in the query string or in the request body for a personalized response."
-                : $"Hello, {product.Name}. This HTTP triggered function executed successfully.";
-
-    return product;
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumnIncluded/function.json b/samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumnIncluded/function.json
deleted file mode 100644
index 58d605abe..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumnIncluded/function.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "direction": "in",
-      "type": "httpTrigger",
-      "methods": [
-        "get"
-      ],
-      "route": "addproductwithidentitycolumnincluded"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "product",
-      "type": "sql",
-      "direction": "out",
-      "commandText": "[dbo].[ProductsWithIdentity]",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ],
-  "disabled": false
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumnIncluded/run.csx b/samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumnIncluded/run.csx
deleted file mode 100644
index 366ae3e3d..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductWithIdentityColumnIncluded/run.csx
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-
-public static ProductWithOptionalId Run(HttpRequest req, ILogger log, out ProductWithOptionalId product)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
-    product = product = new ProductWithOptionalId
-    {
-        Name = req.Query["name"],
-        ProductId = string.IsNullOrEmpty(req.Query["productId"]) ? (int?)null : int.Parse(req.Query["productId"]),
-        Cost = int.Parse(req.Query["cost"])
-    };
-
-    string responseMessage = string.IsNullOrEmpty(product.Name)
-        ? "This HTTP triggered function executed successfully. Pass a name in the query string or in the request body for a personalized response."
-                : $"Hello, {product.Name}. This HTTP triggered function executed successfully.";
-
-    return product;
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/function.json b/samples/samples-csx/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/function.json
deleted file mode 100644
index 6e5e2ef85..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/function.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "direction": "in",
-      "type": "httpTrigger",
-      "methods": [
-        "get"
-      ],
-      "route": "addproductwithmultipleprimarycolumnsandidentity"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "product",
-      "type": "sql",
-      "direction": "out",
-      "commandText": "[dbo].[ProductsWithMultiplePrimaryColumnsAndIdentity]",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ],
-  "disabled": false
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx b/samples/samples-csx/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx
deleted file mode 100644
index 2fae0190b..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductWithMultiplePrimaryColumnsAndIdentity/run.csx
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-
-public static MultiplePrimaryKeyProductWithoutId Run(HttpRequest req, ILogger log, out MultiplePrimaryKeyProductWithoutId product)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
-    product = product = new MultiplePrimaryKeyProductWithoutId
-    {
-        ExternalId = int.Parse(req.Query["externalId"]),
-        Name = req.Query["name"],
-        Cost = int.Parse(req.Query["cost"])
-    };
-
-    string responseMessage = string.IsNullOrEmpty(product.Name)
-        ? "This HTTP triggered function executed successfully. Pass a name in the query string or in the request body for a personalized response."
-                : $"Hello, {product.Name}. This HTTP triggered function executed successfully.";
-
-    return product;
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductsArray/function.json b/samples/samples-csx/OutputBindingSamples/AddProductsArray/function.json
deleted file mode 100644
index 5353eabd4..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductsArray/function.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "direction": "in",
-      "type": "httpTrigger",
-      "methods": [
-        "post"
-      ],
-      "route": "addproducts-array"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "products",
-      "type": "sql",
-      "direction": "out",
-      "commandText": "[dbo].[Products]",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ],
-  "disabled": false
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductsArray/run.csx b/samples/samples-csx/OutputBindingSamples/AddProductsArray/run.csx
deleted file mode 100644
index f2d81e074..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductsArray/run.csx
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-
-public static Product[] Run(HttpRequest req, ILogger log, out Product[] products)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
-
-    string requestBody = new StreamReader(req.Body).ReadToEnd();
-    products = JsonConvert.DeserializeObject<Product[]>(requestBody);
-
-    string responseMessage = products.Length > 0
-        ? "This HTTP triggered function executed successfully."
-                : "No data passed, Please pass the objects to upsert in the request body.";
-
-    return products;
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductsCollector/function.json b/samples/samples-csx/OutputBindingSamples/AddProductsCollector/function.json
deleted file mode 100644
index fe8fb680a..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductsCollector/function.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "direction": "in",
-      "type": "httpTrigger",
-      "methods": [
-        "get"
-      ],
-      "route": "addproducts-collector"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "products",
-      "type": "sql",
-      "direction": "out",
-      "commandText": "[dbo].[Products]",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ],
-  "disabled": false
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductsCollector/run.csx b/samples/samples-csx/OutputBindingSamples/AddProductsCollector/run.csx
deleted file mode 100644
index 51274f7e3..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductsCollector/run.csx
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-
-public static ICollector<Product> Run(HttpRequest req, ILogger log, ICollector<Product> products)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
-    List<Product> newProducts = ProductUtilities.GetNewProducts(5000);
-    foreach (Product product in newProducts)
-    {
-        products?.Add(product);
-    }
-
-    return products;
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductsWithIdentityColumnArray/function.json b/samples/samples-csx/OutputBindingSamples/AddProductsWithIdentityColumnArray/function.json
deleted file mode 100644
index aec42a7b1..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductsWithIdentityColumnArray/function.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "bindings": [
-    {
-      "authLevel": "function",
-      "name": "req",
-      "direction": "in",
-      "type": "httpTrigger",
-      "methods": [
-        "get"
-      ],
-      "route": "addproductswithidentitycolumnarray"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "products",
-      "type": "sql",
-      "direction": "out",
-      "commandText": "[dbo].[ProductsWithIdentity]",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ],
-  "disabled": false
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/AddProductsWithIdentityColumnArray/run.csx b/samples/samples-csx/OutputBindingSamples/AddProductsWithIdentityColumnArray/run.csx
deleted file mode 100644
index 0b8fd7af6..000000000
--- a/samples/samples-csx/OutputBindingSamples/AddProductsWithIdentityColumnArray/run.csx
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using Newtonsoft.Json;
-
-public static ProductWithoutId[] Run(HttpRequest req, ILogger log, out ProductWithoutId[] products)
-{
-    log.LogInformation("C# HTTP trigger function processed a request.");
-
-    products = new[]
-            {
-                new ProductWithoutId
-                {
-                    Name = "Cup",
-                    Cost = 2
-                },
-                new ProductWithoutId
-                {
-                    Name = "Glasses",
-                    Cost = 12
-                }
-            };
-
-    string responseMessage = products.Length > 0
-        ? "This HTTP triggered function executed successfully. Pass a name in the query string or in the request body for a personalized response."
-                : "No data passed, Please pass the objects to upsert in the request body.";
-
-    return products;
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/QueueTriggerProducts/function.json b/samples/samples-csx/OutputBindingSamples/QueueTriggerProducts/function.json
deleted file mode 100644
index b07ab7916..000000000
--- a/samples/samples-csx/OutputBindingSamples/QueueTriggerProducts/function.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "bindings": [
-    {
-      "type": "queueTrigger",
-      "direction": "in",
-      "name": "queueMessage",
-      "queueName": "testqueue"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "products",
-      "type": "sql",
-      "direction": "out",
-      "commandText": "[dbo].[Products]",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ],
-  "disabled": false
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/QueueTriggerProducts/run.csx b/samples/samples-csx/OutputBindingSamples/QueueTriggerProducts/run.csx
deleted file mode 100644
index a2be84e50..000000000
--- a/samples/samples-csx/OutputBindingSamples/QueueTriggerProducts/run.csx
+++ /dev/null
@@ -1,25 +0,0 @@
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using Newtonsoft.Json;
-
-public static void Run(string queueMessage, ILogger log, ICollector<Product> products)
-{
-    int totalUpserts = 100;
-    log.LogInformation($"[QueueTrigger]: {DateTime.Now} starting execution {queueMessage}. Rows to generate={totalUpserts}.");
-
-    var sw = new Stopwatch();
-    sw.Start();
-
-    List<Product> newProducts = ProductUtilities.GetNewProducts(totalUpserts);
-    foreach (Product product in newProducts)
-    {
-        products.Add(product);
-    }
-
-    string line = $"[QueueTrigger]: {DateTime.Now} finished execution {queueMessage}. Total time to create {totalUpserts} rows={sw.ElapsedMilliseconds}.";
-    log.LogInformation(line);
-}
diff --git a/samples/samples-csx/OutputBindingSamples/TimerTriggerProducts/function.json b/samples/samples-csx/OutputBindingSamples/TimerTriggerProducts/function.json
deleted file mode 100644
index 9da51af73..000000000
--- a/samples/samples-csx/OutputBindingSamples/TimerTriggerProducts/function.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "bindings": [
-    {
-      "schedule": "*/5 * * * * *",
-      "name": "myTimer",
-      "type": "timerTrigger",
-      "direction": "in"
-    },
-    {
-      "name": "$return",
-      "type": "http",
-      "direction": "out"
-    },
-    {
-      "name": "products",
-      "type": "sql",
-      "direction": "out",
-      "commandText": "[dbo].[Products]",
-      "connectionStringSetting": "SqlConnectionString"
-    }
-  ],
-  "disabled": false
-}
\ No newline at end of file
diff --git a/samples/samples-csx/OutputBindingSamples/TimerTriggerProducts/run.csx b/samples/samples-csx/OutputBindingSamples/TimerTriggerProducts/run.csx
deleted file mode 100644
index c8c17d682..000000000
--- a/samples/samples-csx/OutputBindingSamples/TimerTriggerProducts/run.csx
+++ /dev/null
@@ -1,31 +0,0 @@
-#load "../Common/product.csx"
-#r "Newtonsoft.Json"
-#r "Microsoft.Azure.WebJobs.Extensions.Sql"
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using Newtonsoft.Json;
-
-private static int _executionNumber = 0;
-public static void Run(TimerInfo myTimer, ILogger log, ICollector<Product> products)
-{
-    int totalUpserts = 1000;
-    log.LogInformation($"{DateTime.Now} starting execution #{_executionNumber}. Rows to generate={totalUpserts}.");
-
-    var sw = new Stopwatch();
-    sw.Start();
-
-    List<Product> newProducts = ProductUtilities.GetNewProducts(totalUpserts);
-    foreach (Product product in newProducts)
-    {
-        products.Add(product);
-    }
-
-    sw.Stop();
-
-    string line = $"{DateTime.Now} finished execution #{_executionNumber}. Total time to create {totalUpserts} rows={sw.ElapsedMilliseconds}.";
-    log.LogInformation(line);
-
-    _executionNumber++;
-}
diff --git a/test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj b/test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj
index 859618576..ef533f160 100644
--- a/test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj
+++ b/test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj
@@ -67,10 +67,10 @@
     <Copy SourceFiles="@(_PythonCopyItems)" DestinationFolder="$(OutDir)\SqlExtensionSamples\Python\%(RecursiveDir)" />
     <Message Text="Copied Python Samples output to $(OutDir)\SqlExtensionSamples\Python" Importance="high" />
     <ItemGroup>
-      <_CSharpScriptCopyItems Include="..\samples\samples-csx\**\*.*" />
-      <_CSharpScriptCopyItems Include="Integration\test-csx\**\*.*" />
+      <_CsxCopyItems Include="..\samples\samples-csx\**\*.*" />
+      <_CsxCopyItems Include="Integration\test-csx\**\*.*" />
     </ItemGroup>
-    <Copy SourceFiles="@(_CSharpScriptCopyItems)" DestinationFolder="$(OutDir)\SqlExtensionSamples\Csx\%(RecursiveDir)" />
-    <Message Text="Copied CSX Samples output to $(OutDir)\SqlExtensionSamples\CSharpscript" Importance="high" />
+    <Copy SourceFiles="@(_CsxCopyItems)" DestinationFolder="$(OutDir)\SqlExtensionSamples\Csx\%(RecursiveDir)" />
+    <Message Text="Copied CSX Samples to $(OutDir)\SqlExtensionSamples\Csx" Importance="high" />
   </Target>
 </Project>