Skip to content

Commit 2097301

Browse files
authored
feat: add support for deploying .NET 10 applications (#928)
1 parent ee68ddd commit 2097301

23 files changed

+180
-30
lines changed

.github/workflows/DetectDocGeneratorChanges.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
1919
with:
2020
fetch-depth: '0'
21-
- name: Setup .NET 8.0
21+
- name: Setup .NET 10.0
2222
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 #v4.3.1
2323
with:
24-
dotnet-version: 8.0.x
24+
dotnet-version: 10.0.x
2525
- name: Restore dependencies
2626
run: dotnet restore
2727
- name: Build

.github/workflows/DetectRestAPIClientChanges.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
1010
with:
1111
fetch-depth: '0'
12-
- name: Setup .NET 8.0
12+
- name: Setup .NET 10.0
1313
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 #v4.3.1
1414
with:
15-
dotnet-version: 8.0.x
15+
dotnet-version: 10.0.x
1616
- name: Restore dependencies
1717
run: dotnet restore
1818
- name: Build

.github/workflows/UploadDockerImage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
with:
2828
fetch-depth: 0
2929

30-
- name: Setup .NET Core 6.0
30+
- name: Setup .NET 8
3131
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 #v4.3.1
3232
with:
33-
dotnet-version: 6.0.x
33+
dotnet-version: 8.0.x
3434

3535
- name: Restore dependencies
3636
run: dotnet restore

.github/workflows/doc-builder.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 #v4.7.1
2727
with:
2828
python-version: 3.x
29-
- name: Setup .NET Core 6.0
29+
- name: Setup .NET 8
3030
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 #v4.3.1
3131
with:
32-
dotnet-version: 6.0.x
32+
dotnet-version: 8.0.x
3333
- run: pip install mkdocs-material==8.2.9
3434
- run: pip install mkdocs-awesome-pages-plugin==2.8.0
3535
- name: Restore dependencies

AWS.Deploy.sln

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebAppArmDeployment", "test
7171
EndProject
7272
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleAppArmDeployment", "testapps\ConsoleAppArmDeployment\ConsoleAppArmDeployment.csproj", "{BA7E7790-8E60-4133-B3BC-BDD50B1D7A76}"
7373
EndProject
74+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiNET10", "testapps\WebApiNET10\WebApiNET10.csproj", "{31EF03BB-F9D0-465D-9D33-96E212A86D91}"
75+
EndProject
7476
Global
7577
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7678
Debug|Any CPU = Debug|Any CPU
@@ -185,6 +187,10 @@ Global
185187
{BA7E7790-8E60-4133-B3BC-BDD50B1D7A76}.Debug|Any CPU.Build.0 = Debug|Any CPU
186188
{BA7E7790-8E60-4133-B3BC-BDD50B1D7A76}.Release|Any CPU.ActiveCfg = Release|Any CPU
187189
{BA7E7790-8E60-4133-B3BC-BDD50B1D7A76}.Release|Any CPU.Build.0 = Release|Any CPU
190+
{31EF03BB-F9D0-465D-9D33-96E212A86D91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
191+
{31EF03BB-F9D0-465D-9D33-96E212A86D91}.Debug|Any CPU.Build.0 = Debug|Any CPU
192+
{31EF03BB-F9D0-465D-9D33-96E212A86D91}.Release|Any CPU.ActiveCfg = Release|Any CPU
193+
{31EF03BB-F9D0-465D-9D33-96E212A86D91}.Release|Any CPU.Build.0 = Release|Any CPU
188194
EndGlobalSection
189195
GlobalSection(SolutionProperties) = preSolution
190196
HideSolutionNode = FALSE
@@ -218,6 +224,7 @@ Global
218224
{49A1C020-F4C8-4B28-A6B2-6AD3C8452E69} = {BD466B5C-D8B0-4069-98A9-6DC8F01FA757}
219225
{303A0323-3FEF-4640-80C2-E33A8BC0F1FC} = {C3A0C716-BDEA-4393-B223-AF8F8531522A}
220226
{BA7E7790-8E60-4133-B3BC-BDD50B1D7A76} = {C3A0C716-BDEA-4393-B223-AF8F8531522A}
227+
{31EF03BB-F9D0-465D-9D33-96E212A86D91} = {C3A0C716-BDEA-4393-B223-AF8F8531522A}
221228
EndGlobalSection
222229
GlobalSection(ExtensibilityGlobals) = postSolution
223230
SolutionGuid = {5A4B2863-1763-4496-B122-651A38A4F5D7}

buildtools/ci.buildspec.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ phases:
55
runtime-versions:
66
nodejs: 22
77
dotnet: 8.x
8+
commands:
9+
# Find and delete the global.json files that were added by CodeBuild. This causes issues when multiple SDKs are installed.
10+
- find / -type f -name 'global.json' -delete
11+
# The tests need .NET 6, 8 and 10. .NET6 is installed by default. .NET8 is added in the runtime-versions. .NET 10 is installed manually.
12+
- curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 10.0
813
pre_build:
914
commands:
1015
- export DOTNET_CLI_TELEMETRY_OPTOUT=1

src/AWS.Deploy.Orchestration/Properties/DockerFileConfig.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
{
33
"SdkType": "Microsoft.NET.Sdk.Web",
44
"ImageMapping": [
5+
{
6+
"TargetFramework": "net10.0",
7+
"BaseImage": "mcr.microsoft.com/dotnet/aspnet:10.0-preview",
8+
"BuildImage": "mcr.microsoft.com/dotnet/sdk:10.0-preview"
9+
},
510
{
611
"TargetFramework": "net9.0",
712
"BaseImage": "mcr.microsoft.com/dotnet/aspnet:9.0",
@@ -37,6 +42,11 @@
3742
{
3843
"SdkType": "Microsoft.NET.Sdk",
3944
"ImageMapping": [
45+
{
46+
"TargetFramework": "net10.0",
47+
"BaseImage": "mcr.microsoft.com/dotnet/runtime:10.0-preview",
48+
"BuildImage": "mcr.microsoft.com/dotnet/sdk:10.0-preview"
49+
},
4050
{
4151
"TargetFramework": "net9.0",
4252
"BaseImage": "mcr.microsoft.com/dotnet/runtime:9.0",

src/AWS.Deploy.Recipes/RecipeDefinitions/ASP.NETAppAppRunner.recipe

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "./aws-deploy-recipe-schema.json",
33
"Id": "AspNetAppAppRunner",
4-
"Version": "1.0.3",
4+
"Version": "1.1.0",
55
"Name": "ASP.NET Core App to AWS App Runner",
66
"DeploymentType": "CdkProject",
77
"DeploymentBundle": "Container",
@@ -34,7 +34,7 @@
3434
"Type": "MSProperty",
3535
"Condition": {
3636
"PropertyName": "TargetFramework",
37-
"AllowedValues": [ "netcoreapp3.1", "net5.0", "net6.0", "net7.0", "net8.0", "net9.0" ]
37+
"AllowedValues": [ "netcoreapp3.1", "net5.0", "net6.0", "net7.0", "net8.0", "net9.0", "net10.0" ]
3838
}
3939
}
4040
]

src/AWS.Deploy.Recipes/RecipeDefinitions/ASP.NETAppECSFargate.recipe

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "./aws-deploy-recipe-schema.json",
33
"Id": "AspNetAppEcsFargate",
4-
"Version": "1.2.0",
4+
"Version": "1.3.0",
55
"Name": "ASP.NET Core App to Amazon ECS using AWS Fargate",
66
"DeploymentType": "CdkProject",
77
"DeploymentBundle": "Container",
@@ -42,7 +42,7 @@
4242
"Type": "MSProperty",
4343
"Condition": {
4444
"PropertyName": "TargetFramework",
45-
"AllowedValues": [ "netcoreapp3.1", "net5.0", "net6.0", "net7.0", "net8.0", "net9.0" ]
45+
"AllowedValues": [ "netcoreapp3.1", "net5.0", "net6.0", "net7.0", "net8.0", "net9.0", "net10.0" ]
4646
}
4747
}
4848
]

src/AWS.Deploy.Recipes/RecipeDefinitions/ASP.NETAppElasticBeanstalkLinux.recipe

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "./aws-deploy-recipe-schema.json",
33
"Id": "AspNetAppElasticBeanstalkLinux",
4-
"Version": "1.1.0",
4+
"Version": "1.2.0",
55
"Name": "ASP.NET Core App to AWS Elastic Beanstalk on Linux",
66
"DeploymentType": "CdkProject",
77
"DeploymentBundle": "DotnetPublishZipFile",
@@ -34,7 +34,7 @@
3434
"Type": "MSProperty",
3535
"Condition": {
3636
"PropertyName": "TargetFramework",
37-
"AllowedValues": [ "netcoreapp3.1", "net5.0", "net6.0", "net7.0", "net8.0", "net9.0" ]
37+
"AllowedValues": [ "netcoreapp3.1", "net5.0", "net6.0", "net7.0", "net8.0", "net9.0", "net10.0" ]
3838
}
3939
}
4040
],

0 commit comments

Comments
 (0)