Skip to content

Clean csx samples #812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 26, 2023
Merged

Clean csx samples #812

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
282053c
sql attribute not needed
MaddyDev Apr 18, 2023
5397606
simplify the folder structure for csx
MaddyDev Apr 18, 2023
6d99129
add local.settings.json
MaddyDev Apr 18, 2023
c6344ec
Merge branch 'main' into maddy/cleanCsxSamples
MaddyDev Apr 21, 2023
eea2ee8
Merge branch 'main' into maddy/cleanCsxSamples
MaddyDev Apr 25, 2023
e7305fa
rename folders in proj file
MaddyDev Apr 25, 2023
4d5bff6
clean up logs and unused
MaddyDev Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...utBindingSamples/AddProduct/function.json → ...les-csharpscript/AddProduct/function.json
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions ...t/OutputBindingSamples/AddProduct/run.csx → ...s/samples-csharpscript/AddProduct/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
// 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"
#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.");

Expand Down
0 ...ingSamples/AddProductParams/function.json → ...harpscript/AddProductParams/function.json
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions ...utBindingSamples/AddProductParams/run.csx → ...les-csharpscript/AddProductParams/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
// 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"
#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.");

Expand Down
0 ...les/AddProductWithDefaultPK/function.json → ...ipt/AddProductWithDefaultPK/function.json
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions ...ngSamples/AddProductWithDefaultPK/run.csx → ...arpscript/AddProductWithDefaultPK/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
// 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"
#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.");

Expand Down
0 ...ddProductWithIdentityColumn/function.json → ...ddProductWithIdentityColumn/function.json
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions ...ples/AddProductWithIdentityColumn/run.csx → ...ript/AddProductWithIdentityColumn/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
// 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"
#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.");

Expand Down
0 ...tWithIdentityColumnIncluded/function.json → ...tWithIdentityColumnIncluded/function.json
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions ...ProductWithIdentityColumnIncluded/run.csx → ...ProductWithIdentityColumnIncluded/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
// 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"
#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.");

Expand Down
0 ...lePrimaryColumnsAndIdentity/function.json → ...lePrimaryColumnsAndIdentity/function.json
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions ...MultiplePrimaryColumnsAndIdentity/run.csx → ...MultiplePrimaryColumnsAndIdentity/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
// 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"
#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.");

Expand Down
0 ...ingSamples/AddProductsArray/function.json → ...harpscript/AddProductsArray/function.json
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions ...utBindingSamples/AddProductsArray/run.csx → ...les-csharpscript/AddProductsArray/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
// 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"
#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.");

Expand Down
0 ...amples/AddProductsCollector/function.json → ...script/AddProductsCollector/function.json
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions ...ndingSamples/AddProductsCollector/run.csx → ...csharpscript/AddProductsCollector/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
// 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"
#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.");

Expand Down
0 ...uctsWithIdentityColumnArray/function.json → ...uctsWithIdentityColumnArray/function.json
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions ...ddProductsWithIdentityColumnArray/run.csx → ...ddProductsWithIdentityColumnArray/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
// 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"
#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.");

Expand Down
0 ...ngSamples/GetAndAddProducts/function.json → ...arpscript/GetAndAddProducts/function.json
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions ...tBindingSamples/GetAndAddProducts/run.csx → ...es-csharpscript/GetAndAddProducts/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
// 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"
#r "Microsoft.Azure.WebJobs.Extensions.Sql"

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, [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>();
Expand Down
0 ...Samples/GetProductNamesView/function.json → ...pscript/GetProductNamesView/function.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...indingSamples/GetProductNamesView/run.csx → ...-csharpscript/GetProductNamesView/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
0 ...tBindingSamples/GetProducts/function.json → ...es-csharpscript/GetProducts/function.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ndingSamples/GetProductsNameEmpty/run.csx → .../samples-csharpscript/GetProducts/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
0 .../GetProductsAsyncEnumerable/function.json → .../GetProductsAsyncEnumerable/function.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...amples/GetProductsAsyncEnumerable/run.csx → ...script/GetProductsAsyncEnumerable/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
0 ...amples/GetProductsNameEmpty/function.json → ...script/GetProductsNameEmpty/function.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...indingSamples/GetProductsNameNull/run.csx → ...csharpscript/GetProductsNameEmpty/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
0 ...Samples/GetProductsNameNull/function.json → ...pscript/GetProductsNameNull/function.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...amples/GetProductsStoredProcedure/run.csx → ...-csharpscript/GetProductsNameNull/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
0 .../GetProductsStoredProcedure/function.json → .../GetProductsStoredProcedure/function.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...t/InputBindingSamples/GetProducts/run.csx → ...script/GetProductsStoredProcedure/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
0 ...oredProcedureFromAppSetting/function.json → ...oredProcedureFromAppSetting/function.json
View file
Open in desktop
File renamed without changes.
17 changes: 17 additions & 0 deletions samples/samples-csharpscript/GetProductsStoredProcedureFromAppSetting/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
5 changes: 0 additions & 5 deletions samples/samples-csharpscript/InputBindingSamples/.vscode/extensions.json
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions ...samples-csharpscript/InputBindingSamples/GetProductsStoredProcedureFromAppSetting/run.csx
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions samples/samples-csharpscript/OutputBindingSamples/.vscode/extensions.json
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions samples/samples-csharpscript/OutputBindingSamples/host.json
View file
Open in desktop

This file was deleted.

0 ...amples/QueueTriggerProducts/function.json → ...script/QueueTriggerProducts/function.json
View file
Open in desktop
File renamed without changes.
6 changes: 2 additions & 4 deletions ...ndingSamples/QueueTriggerProducts/run.csx → ...csharpscript/QueueTriggerProducts/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
#load "../../Common/product.csx"
#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}.");
Expand Down
0 ...amples/TimerTriggerProducts/function.json → ...script/TimerTriggerProducts/function.json
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions ...ndingSamples/TimerTriggerProducts/run.csx → ...csharpscript/TimerTriggerProducts/run.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#load "../../Common/product.csx"
#load "../Common/product.csx"
#r "Newtonsoft.Json"
#r "Microsoft.Azure.WebJobs.Extensions.Sql"

Expand All @@ -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}.");
Expand Down
0 ...sharpscript/InputBindingSamples/host.json → samples/samples-csharpscript/host.json
View file
Open in desktop
File renamed without changes.
0 ...t/InputBindingSamples/local.settings.json → .../samples-csharpscript/local.settings.json
View file
Open in desktop
File renamed without changes.
7 changes: 1 addition & 6 deletions test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<Message Text="Copied CSX Samples output to $(OutDir)\SqlExtensionSamples\CSharpscript" Importance="high" />
<Message Text="Copied CSX Samples output to $(OutDir)\SqlExtensionSamples\Csx" Importance="high" />

</Target>
</Project>