Skip to content

Commit adf1b9b

Browse files
martincostellomartincostello
committed
Support .NET 10
Add support for .NET 10, using .NET 10 preview 6 initially.
1 parent 658037a commit adf1b9b

File tree

21 files changed

+53
-92
lines changed

21 files changed

+53
-92
lines changed

‎GrafanaOpenTelemetry.sln‎

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

‎GrafanaOpenTelemetry.slnx‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Solution>
2+
<Folder Name="/docker/">
3+
<Project Path="docker/docker-compose-aspnetcore/docker-compose-aspnetcore.dcproj">
4+
<Build />
5+
</Project>
6+
</Folder>
7+
<Folder Name="/examples/" />
8+
<Folder Name="/examples/net10.0/">
9+
<Project Path="examples/net10.0/aspnetcore/aspnetcore.csproj" />
10+
</Folder>
11+
<Folder Name="/src/">
12+
<Project Path="src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj" />
13+
<Project Path="src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj" />
14+
</Folder>
15+
<Folder Name="/tests/">
16+
<Project Path="tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj" />
17+
</Folder>
18+
</Solution>

‎docker/docker-compose-aspnetcore/docker-compose.oats.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
image: ${DOCKER_REGISTRY-}aspnetcore
44
build:
55
context: ../..
6-
dockerfile: examples/net8.0/aspnetcore/Dockerfile
6+
dockerfile: examples/net10.0/aspnetcore/Dockerfile
77
args:
88
DOTNET_PUBLISH_ARGS: "/p:BuildDistroFromSource=${BUILD_DISTRO_FROM_SOURCE:-true}"
99
environment:

‎docker/docker-compose-aspnetcore/docker-compose.self-contained.oats.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
image: ${DOCKER_REGISTRY-}aspnetcore
44
build:
55
context: ../..
6-
dockerfile: examples/net8.0/aspnetcore/Dockerfile
6+
dockerfile: examples/net10.0/aspnetcore/Dockerfile
77
args:
88
DOTNET_PUBLISH_ARGS: "--self-contained true /p:PublishSingleFile=true /p:BuildDistroFromSource=${BUILD_DISTRO_FROM_SOURCE:-true}"
99
entrypoint: ./aspnetcore

‎docker/docker-compose-aspnetcore/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
image: ${DOCKER_REGISTRY-}aspnetcore
44
build:
55
context: ../..
6-
dockerfile: examples/net8.0/aspnetcore/Dockerfile
6+
dockerfile: examples/net10.0/aspnetcore/Dockerfile
77
args:
88
DOTNET_PUBLISH_ARGS: "/p:BuildDistroFromSource=${BUILD_DISTRO_FROM_SOURCE:-true}"
99
depends_on:

‎examples/net8.0/aspnetcore/Controllers/AwsController.cs‎ renamed to ‎examples/net10.0/aspnetcore/Controllers/AwsController.cs‎

File renamed without changes.

‎examples/net8.0/aspnetcore/Controllers/HttpClientController.cs‎ renamed to ‎examples/net10.0/aspnetcore/Controllers/HttpClientController.cs‎

File renamed without changes.

‎examples/net8.0/aspnetcore/Controllers/MsSqlController.cs‎ renamed to ‎examples/net10.0/aspnetcore/Controllers/MsSqlController.cs‎

File renamed without changes.

‎examples/net8.0/aspnetcore/Controllers/RedisController.cs‎ renamed to ‎examples/net10.0/aspnetcore/Controllers/RedisController.cs‎

File renamed without changes.

‎examples/net8.0/aspnetcore/Controllers/WeatherForecastController.cs‎ renamed to ‎examples/net10.0/aspnetcore/Controllers/WeatherForecastController.cs‎

File renamed without changes.

0 commit comments

Comments
 (0)