Skip to content

Commit 350b264

Browse files
Charles-GagnonCharles-Gagnon
committed
Merge branch 'main' into release/LogicApps
# Conflicts: # builds/azure-pipelines/build-pr.yml # builds/azure-pipelines/build-release.yml # test/Integration/SqlTriggerBindingIntegrationTests.cs
1 parent 1c90ef2 commit 350b264

File tree

253 files changed

+13042
-3166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+13042
-3166
lines changed

‎.gitignore‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,4 +358,11 @@ __queuestorage__
358358
__azurite_db*__.json
359359

360360
# Python virtual environment
361-
.venv
361+
.venv
362+
363+
# Mac OS X
364+
.DS_Store
365+
366+
# Java build files
367+
repo/
368+
target/

‎.vscode/launch.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
"request": "attach",
1414
"port": 9229,
1515
"preLaunchTask": "func: host start"
16+
},
17+
{
18+
"name": "Attach to Function Host",
19+
"type": "coreclr",
20+
"request": "attach",
21+
"processName": "func.exe"
1622
}
1723
]
1824
}

‎.vscode/settings.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
22
"azureFunctions.projectSubpath": "samples/samples-csharp",
3-
"azureFunctions.deploySubpath": "samples/samples-csharp/bin/Release/netcoreapp3.1/publish",
3+
"azureFunctions.deploySubpath": "samples/samples-csharp/bin/Release/net6/publish",
44
"azureFunctions.projectLanguage": "C#",
5-
"azureFunctions.projectRuntime": "~3",
5+
"azureFunctions.projectRuntime": "~4",
66
"debug.internalConsoleOptions": "neverOpen",
77
"azureFunctions.preDeployTask": "publish (functions)",
88
"omnisharp.enableEditorConfigSupport": true,
9-
"omnisharp.enableRoslynAnalyzers": true
10-
}
9+
"omnisharp.enableRoslynAnalyzers": true,
10+
"yaml.schemas": {
11+
"https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/master/service-schema.json": "builds/azure-pipelines/**/*.yml"
12+
},
13+
}

‎.vscode/tasks.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"type": "func",
7272
"dependsOn": "build (functions)",
7373
"options": {
74-
"cwd": "${workspaceFolder}/samples/samples-csharp/bin/Debug/netcoreapp3.1"
74+
"cwd": "${workspaceFolder}/samples/samples-csharp/bin/Debug/net6"
7575
},
7676
"command": "host start",
7777
"isBackground": true,

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This project has adopted the Microsoft Open Source Code of Conduct. For more inf
1212

1313
### SQL Setup
1414

15-
In order to test changes it is suggested that you have a SQL server set up to connect to and run queries against. Instructions to set this up can be found in the [Quick Start Guide](./README.md#quick-start)
15+
In order to test changes it is suggested that you have a SQL server set up to connect to and run queries against. Instructions to set this up can be found in the [Quick Start Guide](./docs/GeneralSetup.md)
1616

1717
### Set Up Development Environment
1818

@@ -28,6 +28,6 @@ code .
2828
3. Install extensions when prompted after VS Code opens
2929
- Note: This includes the Azure Functions, C#, and editorconfig extensions
3030

31-
4. Configure the Function App located in the [samples](./samples) folder by following the instructions [here](./README.md#configure-function-app)
31+
4. Configure the Function App located in the [samples](./samples) folder by following the instructions [here](./docs/GeneralSetup.md#configure-function-app)
3232

3333
5. Press F5 to run SQL bindings samples that are included in this repo. The output window should display startup information as well as the function endpoints that were started.

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
3+
<TargetFramework>net6</TargetFramework>
44
<EnableNETAnalyzers>true</EnableNETAnalyzers>
55
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎Directory.Packages.props‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
11
<Project>
22
<ItemGroup>
3-
<PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="5.0.0" />
4-
<PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="3.1.1" />
5-
<PackageVersion Include="Microsoft.ApplicationInsights" Version="2.14.0" />
6-
<PackageVersion Include="Microsoft.Azure.WebJobs" Version="3.0.31" />
7-
<PackageVersion Include="Microsoft.Data.SqlClient" Version="3.0.1" />
3+
<PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="5.0.1" />
4+
<PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
5+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Abstractions" Version="1.1.0" />
6+
<PackageVersion Include="Microsoft.ApplicationInsights" Version="2.21.0" />
7+
<PackageVersion Include="Microsoft.Azure.WebJobs" Version="3.0.33" />
8+
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.0.1" />
89
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
910
<PackageVersion Include="morelinq" Version="3.3.2" />
10-
<PackageVersion Include="System.Runtime.Caching" Version="4.7.0" />
11-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
12-
<PackageVersion Include="Moq" Version="4.14.3" />
13-
<PackageVersion Include="xunit" Version="2.4.0" />
14-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.0" />
15-
<PackageVersion Include="Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator" Version="1.2.3" />
16-
<PackageVersion Include="Newtonsoft.Json" Version="11.0.2" />
17-
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.1.22" />
18-
<PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
11+
<PackageVersion Include="System.Drawing.Common" Version="5.0.3" />
12+
<PackageVersion Include="System.Runtime.Caching" Version="5.0.0" />
13+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
14+
<PackageVersion Include="Moq" Version="4.18.2" />
15+
<PackageVersion Include="xunit" Version="2.4.2" />
16+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
17+
<PackageVersion Include="Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator" Version="4.0.1" />
18+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
19+
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
20+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.2" />
21+
<PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="1.10.0" />
22+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.7.0" />
23+
<PackageVersion Include="System.Net.NameResolution" Version="4.3.0" />
24+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13" />
25+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.1.0" />
26+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Storage.Queues" Version="5.0.0" />
27+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
1928
</ItemGroup>
2029
</Project>

0 commit comments

Comments
 (0)