Skip to content
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.

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

Update to .net9 sdk #10635

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions eng/ci/templates/install-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ steps:
packageType: sdk
version: 6.x

- task: UseDotNet@2 # Needed by our projects and CI steps
displayName: Install .NET 8
inputs:
packageType: sdk
version: 8.x

- task: UseDotNet@2 # The pinned SDK we use to build
displayName: Install .NET SDK from global.json
inputs:
Expand Down
3 changes: 1 addition & 2 deletions eng/ci/templates/steps/build-site-ext.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ parameters:
default: src/WebJobs.Script.SiteExtension/WebJobs.Script.SiteExtension.csproj

steps:
# Restore must be a separate step so we can pass in 'PublishReadyToRun=true'
- task: DotNetCoreCLI@2
displayName: Restore site extension
inputs:
command: custom
custom: restore
projects: ${{ parameters.project }}
arguments: '-v m -p:PublishReadyToRun=true -bl:$(log_dir)/site_ext.restore.binlog'
arguments: '-v m -bl:$(log_dir)/site_ext.restore.binlog'

- task: DotNetCoreCLI@2
displayName: Build site extension
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.101",
"version": "9.0.100",
"rollForward": "latestFeature"
},
"msbuild-sdks": {
Expand Down
2 changes: 1 addition & 1 deletion src/WebJobs.Script.SiteExtension/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Like any MSBuild project, this can be restored, build, and published separately
dotnet publish -c {config}

# Separately
dotnet restore -p:PublishReadyToRun=true # needs to be set to true (fixed in .net9 SDK)
dotnet restore
dotnet build -c {config} --no-restore
dotnet publish -c {config} --no-build
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "8.0.1",
"Microsoft.Azure.AppService.Middleware.Functions": "1.5.5",
"Microsoft.Azure.AppService.Proxy.Client": "2.3.20240307.67",
"Microsoft.Azure.Functions.DotNetIsolatedNativeHost": "1.0.11",
"Microsoft.Azure.Functions.JavaWorker": "2.17.0",
"Microsoft.Azure.Functions.NodeJsWorker": "3.10.1",
"Microsoft.Azure.Functions.PowerShellWorker.PS7.0": "4.0.3148",
"Microsoft.Azure.Functions.PowerShellWorker.PS7.2": "4.0.4025",
"Microsoft.Azure.Functions.PowerShellWorker.PS7.4": "4.0.4026",
"Microsoft.Azure.Functions.PythonWorker": "4.34.0",
"Microsoft.Azure.Storage.File": "11.1.7",
"Microsoft.Azure.WebJobs": "3.0.41",
Expand All @@ -37,7 +43,6 @@
"System.IdentityModel.Tokens.Jwt": "6.35.0",
"System.Memory.Data": "8.0.1",
"System.Net.NameResolution": "4.3.0",
"System.Text.Json": "8.0.5",
"Microsoft.Azure.WebJobs.Script.Reference": "4.1037.0.0",
"Microsoft.Azure.WebJobs.Script.Grpc.Reference": "4.1037.0.0"
},
Expand Down Expand Up @@ -1030,7 +1035,7 @@
"runtime": {
"lib/netstandard2.0/Microsoft.Azure.WebJobs.Script.Abstractions.dll": {
"assemblyVersion": "1.0.0.0",
"fileVersion": "1.0.22000.0"
"fileVersion": "1.0.19706.0"
}
}
},
Expand Down Expand Up @@ -2751,14 +2756,7 @@
}
},
"System.Text.Encodings.Web/8.0.0": {},
"System.Text.Json/8.0.5": {
"runtime": {
"lib/net8.0/System.Text.Json.dll": {
"assemblyVersion": "8.0.0.0",
"fileVersion": "8.0.1024.46610"
}
}
},
"System.Text.Json/8.0.5": {},
"System.Text.RegularExpressions/4.3.1": {
"dependencies": {
"System.Runtime": "4.3.1"
Expand Down Expand Up @@ -2883,12 +2881,6 @@
"Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.0",
"Microsoft.AspNetCore.Mvc.WebApiCompatShim": "2.2.0",
"Microsoft.Azure.AppService.Proxy.Client": "2.3.20240307.67",
"Microsoft.Azure.Functions.DotNetIsolatedNativeHost": "1.0.11",
"Microsoft.Azure.Functions.JavaWorker": "2.17.0",
"Microsoft.Azure.Functions.NodeJsWorker": "3.10.1",
"Microsoft.Azure.Functions.PowerShellWorker.PS7.0": "4.0.3148",
"Microsoft.Azure.Functions.PowerShellWorker.PS7.2": "4.0.4025",
"Microsoft.Azure.Functions.PowerShellWorker.PS7.4": "4.0.4026",
"Microsoft.Azure.WebJobs": "3.0.41",
"Microsoft.Azure.WebJobs.Extensions": "5.1.0-12067",
"Microsoft.Azure.WebJobs.Extensions.Http": "3.2.0",
Expand Down Expand Up @@ -3607,14 +3599,14 @@
"Microsoft.Azure.WebJobs/3.0.41": {
"type": "package",
"serviceable": true,
"sha512": "sha512-nprqeSOAkhFrpIW1KVkXQb6BZCbnS8d1ytq0nUzIYnpkmbvmfkcQlJE9zp3Dbo26Q/0h0JdPSQ3BaVVBNPOUZg==",
"sha512": "sha512-EOigHt+kjrpbg53s8SYn4dlTpZG9IgWPNrdmcdSG8c7U8qKZvcF4BwZtF7ETy3KGir2NtIpJaIc7dUm2+k9/GA==",
"path": "microsoft.azure.webjobs/3.0.41",
"hashPath": "microsoft.azure.webjobs.3.0.41.nupkg.sha512"
},
"Microsoft.Azure.WebJobs.Core/3.0.41": {
"type": "package",
"serviceable": true,
"sha512": "sha512-VtmzMUEMhhY7+lxhXxphPbn/1du+QFKU+VtH3UHzmn/sS2JwXJNtQNk/SiC+wad69GSGzgKH5x1aN2qTnEXh+Q==",
"sha512": "sha512-nNW4I8m5GEhOxxD/NVZGjT6ZARGSy7wi8q+ihvKDin4IY4zYLpTy/GakZeGgbi7vPxcPHL5Z65n9DAV+goasqA==",
"path": "microsoft.azure.webjobs.core/3.0.41",
"hashPath": "microsoft.azure.webjobs.core.3.0.41.nupkg.sha512"
},
Expand Down Expand Up @@ -3642,7 +3634,7 @@
"Microsoft.Azure.WebJobs.Host.Storage/5.0.1": {
"type": "package",
"serviceable": true,
"sha512": "sha512-eO/sX41oaGkDiXHpT7y/F1F5Wvzm7e1QqFmd4GGMJOMdLOHGvwOvZR82AfR7rjvpqQZWyKjRHqxAVcntq+ZYwQ==",
"sha512": "sha512-5fF88jDYdxUs4EdYZw3MqK7ghG4mZ5MsCt8MhKk38CiTK90VmoWtXbBYURohil+WJ8vB/i0UwQGg64y6TdvliA==",
"path": "microsoft.azure.webjobs.host.storage/5.0.1",
"hashPath": "microsoft.azure.webjobs.host.storage.5.0.1.nupkg.sha512"
},
Expand All @@ -3663,7 +3655,7 @@
"Microsoft.Azure.WebJobs.Script.Abstractions/1.0.4-preview": {
"type": "package",
"serviceable": true,
"sha512": "sha512-U/aVn/i0P9MdPsca9TrLmTlKuGOJ8okTdifrBeNviwd80Xbv/+dIM/GGReQXaVVtUM5/SlbUHRAhvA9w0yuEyA==",
"sha512": "sha512-mvgXnFKwh4/Gw8BXc99ZJd2iQ8DQJTCotvY9PZ9Y2UHa4KiOsYaEW4kuZ5RFBD9KqGO2vXG56w3wMFVyxmaA2g==",
"path": "microsoft.azure.webjobs.script.abstractions/1.0.4-preview",
"hashPath": "microsoft.azure.webjobs.script.abstractions.1.0.4-preview.nupkg.sha512"
},
Expand Down