Skip to content

Commit 60acba0

Browse files
abhishekkumamsRubenCerna2079sezal98sezalchugaaronburtle
authored
Update release 1.3 (#2482)
## Why make this change? - updated the below changes from main to release1.3, to complete the missing features. ![image](https://github.com/user-attachments/assets/39fd7b49-0e4a-4cca-b783-9a16245c07bb) --------- Co-authored-by: RubenCerna2079 <[email protected]> Co-authored-by: Ruben Cerna <[email protected]> Co-authored-by: Sezal Chug <[email protected]> Co-authored-by: sezalchug <[email protected]> Co-authored-by: aaronburtle <[email protected]> Co-authored-by: Aaron Burtle <[email protected]> Co-authored-by: Sean Leonard <[email protected]>
1 parent 62f9387 commit 60acba0

File tree

64 files changed

+770
-580
lines changed

Some content is hidden

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

64 files changed

+770
-580
lines changed

.devcontainer/devcontainer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"name": ".NET 8 with .NET 6",
2+
"name": ".NET 8",
33
"image": "mcr.microsoft.com/dotnet/sdk:8.0",
44
"features": {
55
// https://github.com/devcontainers/features/tree/main/src/dotnet
66
"ghcr.io/devcontainers/features/dotnet:2": {
77
"version": "latest",
8-
"dotnetRuntimeVersions": "6.0",
9-
"aspNetCoreRuntimeVersions": "6.0",
10-
"additionalVersions": "6.0"
8+
"dotnetRuntimeVersions": "8.0",
9+
"aspNetCoreRuntimeVersions": "8.0",
10+
"additionalVersions": "8.0"
1111
}
1212
},
1313
"customizations": {

.pipelines/build-pipelines.yml

Lines changed: 0 additions & 238 deletions
This file was deleted.

.pipelines/cosmos-pipelines.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,6 @@ steps:
4848
version: 8.0.x
4949
installationPath: $(Agent.ToolsDirectory)/dotnet
5050

51-
# Preserving .NET 6 for multi-targeting support
52-
- task: UseDotNet@2
53-
displayName: Setup .NET SDK v6.0.x
54-
inputs:
55-
packageType: sdk
56-
version: 6.0.x
57-
5851
- task: NuGetToolInstaller@1
5952

6053
- task: NuGetCommand@2

.pipelines/dwsql-pipelines.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,6 @@ jobs:
4040
packageType: sdk
4141
version: 8.0.x
4242

43-
# Preserving .NET 6 for multi-targeting support
44-
- task: UseDotNet@2
45-
displayName: Setup .NET SDK v6.0.x
46-
inputs:
47-
packageType: sdk
48-
version: 6.0.x
49-
5043
- task: NuGetToolInstaller@1
5144

5245
- task: NuGetCommand@2
@@ -180,13 +173,6 @@ jobs:
180173
packageType: sdk
181174
version: 8.0.x
182175

183-
# Preserving .NET 6 for multi-targeting support
184-
- task: UseDotNet@2
185-
displayName: Setup .NET SDK v6.0.x
186-
inputs:
187-
packageType: sdk
188-
version: 6.0.x
189-
190176
- task: NuGetToolInstaller@1
191177

192178
- task: NuGetCommand@2

.pipelines/mssql-pipelines.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@ jobs:
4141
packageType: sdk
4242
version: 8.0.x
4343

44-
# Preserving .NET 6 for multi-targeting support
45-
- task: UseDotNet@2
46-
displayName: Setup .NET SDK v6.0.x
47-
inputs:
48-
packageType: sdk
49-
version: 6.0.x
50-
5144
- task: NuGetToolInstaller@1
5245

5346
- task: NuGetCommand@2
@@ -184,13 +177,6 @@ jobs:
184177
packageType: sdk
185178
version: 8.0.x
186179

187-
# Preserving .NET 6 for multi-targeting support
188-
- task: UseDotNet@2
189-
displayName: Setup .NET SDK v6.0.x
190-
inputs:
191-
packageType: sdk
192-
version: 6.0.x
193-
194180
- task: NuGetToolInstaller@1
195181

196182
- task: NuGetCommand@2

.pipelines/mysql-pipelines.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@ jobs:
3939
packageType: sdk
4040
version: 8.0.x
4141

42-
# Preserving .NET 6 for multi-targeting support
43-
- task: UseDotNet@2
44-
displayName: Setup .NET SDK v6.0.x
45-
inputs:
46-
packageType: sdk
47-
version: 6.0.x
48-
4942
- task: NuGetToolInstaller@1
5043

5144
- task: NuGetCommand@2

.pipelines/pg-pipelines.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ jobs:
3434
packageType: sdk
3535
version: 8.0.x
3636

37-
# Preserving .NET 6 for multi-targeting support
38-
- task: UseDotNet@2
39-
displayName: Setup .NET SDK v6.0.x
40-
inputs:
41-
packageType: sdk
42-
version: 6.0.x
43-
4437
- task: NuGetToolInstaller@1
4538

4639
- task: NuGetCommand@2

.pipelines/templates/build-pipelines.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,6 @@ steps:
6060
version: 8.0.x
6161
installationPath: $(Agent.ToolsDirectory)/dotnet
6262

63-
# Preserving .NET 6 for multi-targeting support
64-
- task: UseDotNet@2
65-
displayName: Setup .NET SDK v6.0.x
66-
inputs:
67-
packageType: sdk
68-
version: 6.0.x
69-
installationPath: $(Agent.ToolsDirectory)/dotnet
70-
7163
- task: NuGetToolInstaller@1
7264

7365
- task: NuGetCommand@2

.pipelines/templates/static-tools.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
clean: true # if true, execute `execute git clean -ffdx && git reset --hard HEAD` before fetching
2222

2323
- task: UseDotNet@2
24-
displayName: Setup .NET SDK v6.0.x
24+
displayName: Setup .NET SDK v8.0.x
2525
inputs:
2626
packageType: sdk
27-
version: 6.0.x
27+
version: 8.0.x
2828

2929
# Analyze source and build output text files for credentials
3030
- task: CredScan@3

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Version values referenced from https://hub.docker.com/_/microsoft-dotnet-aspnet
22

3-
FROM mcr.microsoft.com/dotnet/sdk:6.0-cbl-mariner2.0. AS build
3+
FROM mcr.microsoft.com/dotnet/sdk:8.0-cbl-mariner2.0. AS build
44

55

66
WORKDIR /src
77
COPY [".", "./"]
88
RUN dotnet build "./src/Service/Azure.DataApiBuilder.Service.csproj" -c Docker -o /out -r linux-x64
99

10-
FROM mcr.microsoft.com/dotnet/aspnet:6.0-cbl-mariner2.0 AS runtime
10+
FROM mcr.microsoft.com/dotnet/aspnet:8.0-cbl-mariner2.0 AS runtime
1111

1212
COPY --from=build /out /App
1313
WORKDIR /App

0 commit comments

Comments
 (0)