Skip to content

Commit db4c0e0

Browse files
Charles-GagnonMaddyDevchlafreniere
authored
Update build SDK to 9.0.300 (#1190)
* Update SDK to 9.0.300 * build fixes * Upgrade tests and samples to NET9 * Target net8 for in proc * update sdk 9 to 9.0 * update samples project to 9 * remove using .net 8 for inproc * install 8 sdk since powershell needs them * .net 6 * Update lock files after --force-evaluate * Ensure C# in proc samples target .NET 8, tweak C# sample copy logic accordingly * Target .NET 8 instead of .NET 9 * Pin azure functions core tools version to previous * PR feedback --------- Co-authored-by: MaddyDev <madhu.koripalli@gmail.com> Co-authored-by: Chris LaFreniere <chlafren@microsoft.com>
1 parent f837d71 commit db4c0e0

40 files changed

+8052
-8010
lines changed

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"azureFunctions.projectSubpath": "samples/samples-csharp",
3-
"azureFunctions.deploySubpath": "samples/samples-csharp/bin/Release/net6/publish",
3+
"azureFunctions.deploySubpath": "samples/samples-csharp/bin/Release/net8.0/publish",
44
"azureFunctions.projectLanguage": "C#",
55
"azureFunctions.projectRuntime": "~4",
66
"debug.internalConsoleOptions": "neverOpen",

.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/net6"
74+
"cwd": "${workspaceFolder}/samples/samples-csharp/bin/Debug/net8.0"
7575
},
7676
"command": "host start",
7777
"isBackground": true,

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>net6</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<EnableNETAnalyzers>true</EnableNETAnalyzers>
55
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>

Worker.Extensions.Sql/src/Microsoft.Azure.Functions.Worker.Extensions.Sql.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<RootNamespace>Microsoft.Azure.Functions.Worker.Extensions.Sql</RootNamespace>
66
<Description>Sql extension for .NET isolated Azure Functions</Description>
77
<Product>SQL Binding Worker</Product>
8+
<TargetFramework>net6</TargetFramework>
89
<!-- Default Version for dev -->
910
<Version>99.99.99</Version>
1011
<OOPWorkerSupportedExtensionVersion>99.99.99</OOPWorkerSupportedExtensionVersion>
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
{
2-
"version": 2,
3-
"dependencies": {
4-
"net6.0": {
5-
"Microsoft.Azure.Functions.Worker.Extensions.Abstractions": {
6-
"type": "Direct",
7-
"requested": "[1.3.0, )",
8-
"resolved": "1.3.0",
9-
"contentHash": "+6+/Yb/ouWUweaSQhesbbiIVSmwYEzkSfjIHrBnNqIiCYnx2iLeoYyWjN/wHP3Fnn5COtyDXRDwHKr5A/tCL9Q=="
10-
}
11-
}
12-
}
1+
{
2+
"version": 2,
3+
"dependencies": {
4+
"net6.0": {
5+
"Microsoft.Azure.Functions.Worker.Extensions.Abstractions": {
6+
"type": "Direct",
7+
"requested": "[1.3.0, )",
8+
"resolved": "1.3.0",
9+
"contentHash": "+6+/Yb/ouWUweaSQhesbbiIVSmwYEzkSfjIHrBnNqIiCYnx2iLeoYyWjN/wHP3Fnn5COtyDXRDwHKr5A/tCL9Q=="
10+
}
11+
}
12+
}
1313
}

builds/azure-pipelines/template-steps-build-test.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,28 @@ steps:
1313
inputs:
1414
useGlobalJson: true
1515

16-
# Install .Net Core 3.1.0 as PowerShell tests are unable to find 3.1.0 framework to run tests
16+
# Install .Net Core 6.0.0 as PowerShell tests are unable to find 6.0.0 framework to run tests
1717
- task: UseDotNet@2
18-
displayName: 'Install .NET Core 3.1 sdk'
18+
displayName: 'Install .NET Core 6.0 sdk'
1919
inputs:
2020
packageType: sdk
21-
version: '3.1.x'
21+
version: '6.0.x'
22+
23+
# Install .NET 8.0 runtime as it is required to run the tests; .NET 8 runtime is not installed by default on agents
24+
- task: UseDotNet@2
25+
displayName: 'Install .NET 8.0 runtime'
26+
inputs:
27+
packageType: 'runtime'
28+
version: '8.0.x'
2229

2330
- task: npmAuthenticate@0
2431
displayName: 'npm Authenticate for project'
2532
inputs:
2633
workingFile: $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/.npmrc
2734

28-
- script: npm install azure-functions-core-tools --global --globalconfig $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/.npmrc --loglevel verbose
35+
# Temporarily install Azure Functions Core Tools 4.0.7317 as the latest version (4.0.7512) causes 11 Python tests to fail
36+
# Tracking issue: https://github.com/Azure/azure-functions-sql-extension/issues/1193
37+
- script: npm install azure-functions-core-tools@4.0.7317 --global --globalconfig $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/.npmrc --loglevel verbose
2938
displayName: 'Install Azure Functions Core Tools'
3039

3140
- script: npm install azurite --global --globalconfig $(Build.SourcesDirectory)/${{ parameters.sourcesSubdirectory }}/.npmrc --loglevel verbose

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.428",
3+
"version": "9.0.300",
44
"rollForward": "latestFeature"
55
}
66
}

0 commit comments

Comments
 (0)