Skip to content

Commit 22f7b8e

Browse files
martincostelloKielek
martincostello
and
Kielek
authored
[Infra] Update to .NET 10 GA (#6667)
Co-authored-by: Piotr Kiełkowicz <[email protected]>
1 parent 893fb93 commit 22f7b8e

File tree

11 files changed

+50
-25
lines changed

11 files changed

+50
-25
lines changed

‎Directory.Packages.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
-->
1313
<ItemGroup>
1414
<!-- Default to latest versions for all TFMs -->
15-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[9.0.0,)" />
16-
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Abstractions" Version="[9.0.0,)" />
17-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="[9.0.0,)" />
18-
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="[9.0.0,)" />
15+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[10.0.0,)" />
16+
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Abstractions" Version="[10.0.0,)" />
17+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="[10.0.0,)" />
18+
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="[10.0.0,)" />
1919
</ItemGroup>
2020
<!-- Version overrides for specific netX.0 TFMs -->
2121
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
@@ -31,10 +31,10 @@
3131
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[9.0.0,)" />
3232
</ItemGroup>
3333
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
34-
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[10.0.0-rc.2.25502.107,)" />
35-
<PackageVersion Update="Microsoft.Extensions.Diagnostics.Abstractions" Version="[10.0.0-rc.2.25502.107,)" />
36-
<PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="[10.0.0-rc.2.25502.107,)" />
37-
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[10.0.0-rc.2.25502.107,)" />
34+
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[10.0.0,)" />
35+
<PackageVersion Update="Microsoft.Extensions.Diagnostics.Abstractions" Version="[10.0.0,)" />
36+
<PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="[10.0.0,)" />
37+
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[10.0.0,)" />
3838
</ItemGroup>
3939

4040
<!--
@@ -43,7 +43,7 @@
4343
See https://github.com/open-telemetry/opentelemetry-dotnet/issues/5973 for more details.
4444
-->
4545
<ItemGroup>
46-
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="[10.0.0-rc.2.25502.107,)" />
46+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="[10.0.0,)" />
4747
</ItemGroup>
4848

4949
<!--
@@ -102,10 +102,10 @@
102102
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
103103
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
104104
<PackageVersion Include="Microsoft.Coyote" Version="1.7.11" />
105-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25502.107" />
106-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0-rc.2.25502.107" />
107-
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0-rc.2.25502.107" />
108-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-rc.2.25502.107" />
105+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
106+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
107+
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0" />
108+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
109109
<PackageVersion Include="Microsoft.Extensions.Telemetry.Abstractions" Version="9.10.0" />
110110
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
111111
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
@@ -124,15 +124,15 @@
124124
</ItemGroup>
125125

126126
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
127-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.21" />
127+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.22" />
128128
</ItemGroup>
129129

130130
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
131-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.10" />
131+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.11" />
132132
</ItemGroup>
133133

134134
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
135-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-rc.2.25502.107" />
135+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0" />
136136
</ItemGroup>
137137

138138
</Project>

‎examples/MicroserviceExample/WebApi/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG SDK_VERSION=9.0
22
FROM mcr.microsoft.com/dotnet/sdk:8.0.416@sha256:a87db299d259cec53210df406cd5e51f900a0c6d938fe56d5f392629c0505d75 AS dotnet-sdk-8.0
33
FROM mcr.microsoft.com/dotnet/sdk:9.0.307@sha256:1ea5b7f2154cbd1e20a336cb56957dba30a7ce30ef5c1c032a37c42801594713 AS dotnet-sdk-9.0
4-
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2@sha256:ed46c853a4f100ba7aab2394e9fb9f9b8989e93346b04632dbce11e5da7623d8 AS dotnet-sdk-10.0
4+
FROM mcr.microsoft.com/dotnet/sdk:10.0.100@sha256:c7445f141c04f1a6b454181bd098dcfa606c61ba0bd213d0a702489e5bd4cd71 AS dotnet-sdk-10.0
55

66
FROM dotnet-sdk-${SDK_VERSION} AS build
77
ARG PUBLISH_CONFIGURATION=Release
@@ -12,7 +12,7 @@ RUN dotnet publish ./examples/MicroserviceExample/WebApi -c "${PUBLISH_CONFIGURA
1212

1313
FROM mcr.microsoft.com/dotnet/aspnet:8.0.22@sha256:e9684fdc74056bda84e8f5918c7211cac837a979a26b8a56c4e424f1ab94c80b AS dotnet-aspnet-8.0
1414
FROM mcr.microsoft.com/dotnet/aspnet:9.0.11@sha256:1b8d328201297fd5ca40dc1a0788aa9e813f58279c3410fe82dce6744c36d03f AS dotnet-aspnet-9.0
15-
FROM mcr.microsoft.com/dotnet/aspnet:10.0.0-rc.2@sha256:5b201bc57156a9f70d58a86112dc7a8217cf3a885740a8fe914b0782ee09647e AS dotnet-aspnet-10.0
15+
FROM mcr.microsoft.com/dotnet/aspnet:10.0.0@sha256:7c4246c1c384319346d45b3e24a10a21d5b6fc9b36a04790e1588148ff8055b0 AS dotnet-aspnet-10.0
1616

1717
FROM dotnet-aspnet-${SDK_VERSION} AS runtime
1818
WORKDIR /app

‎examples/MicroserviceExample/WorkerService/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG SDK_VERSION=10.0
22

33
FROM mcr.microsoft.com/dotnet/sdk:8.0.416@sha256:a87db299d259cec53210df406cd5e51f900a0c6d938fe56d5f392629c0505d75 AS dotnet-sdk-8.0
44
FROM mcr.microsoft.com/dotnet/sdk:9.0.307@sha256:1ea5b7f2154cbd1e20a336cb56957dba30a7ce30ef5c1c032a37c42801594713 AS dotnet-sdk-9.0
5-
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2@sha256:ed46c853a4f100ba7aab2394e9fb9f9b8989e93346b04632dbce11e5da7623d8 AS dotnet-sdk-10.0
5+
FROM mcr.microsoft.com/dotnet/sdk:10.0.100@sha256:c7445f141c04f1a6b454181bd098dcfa606c61ba0bd213d0a702489e5bd4cd71 AS dotnet-sdk-10.0
66

77
FROM dotnet-sdk-${SDK_VERSION} AS build
88
ARG PUBLISH_CONFIGURATION=Release
@@ -13,7 +13,7 @@ RUN dotnet publish ./examples/MicroserviceExample/WorkerService -c "${PUBLISH_CO
1313

1414
FROM mcr.microsoft.com/dotnet/aspnet:8.0.22@sha256:e9684fdc74056bda84e8f5918c7211cac837a979a26b8a56c4e424f1ab94c80b AS dotnet-aspnet-8.0
1515
FROM mcr.microsoft.com/dotnet/aspnet:9.0.11@sha256:1b8d328201297fd5ca40dc1a0788aa9e813f58279c3410fe82dce6744c36d03f AS dotnet-aspnet-9.0
16-
FROM mcr.microsoft.com/dotnet/aspnet:10.0.0-rc.2@sha256:5b201bc57156a9f70d58a86112dc7a8217cf3a885740a8fe914b0782ee09647e AS dotnet-aspnet-10.0
16+
FROM mcr.microsoft.com/dotnet/aspnet:10.0.0@sha256:7c4246c1c384319346d45b3e24a10a21d5b6fc9b36a04790e1588148ff8055b0 AS dotnet-aspnet-10.0
1717

1818
FROM dotnet-aspnet-${SDK_VERSION} AS runtime
1919
WORKDIR /app

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"sdk": {
33
"rollForward": "latestMajor",
44
"allowPrerelease": false,
5-
"version": "10.0.100-rc.2.25502.107"
5+
"version": "10.0.100"
66
}
77
}

‎src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ Notes](../../RELEASENOTES.md).
1414
section](../../README.md#digital-signing) for updated verification instructions.
1515
([#6623](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6623))
1616

17+
* Update to stable versions for .NET 10.0 NuGet packages.
18+
([#6667](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6667))
19+
20+
* Update `Microsoft.Extensions.*` dependencies to `10.0.0` for .NET Framework
21+
and .NET Standard.
22+
([#6667](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6667))
23+
1724
## 1.14.0-rc.1
1825

1926
Released 2025-Oct-21

‎src/OpenTelemetry.Api/CHANGELOG.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,18 @@ Notes](../../RELEASENOTES.md).
1313
section](../../README.md#digital-signing) for updated verification instructions.
1414
([#6623](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6623))
1515

16+
* Update `System.Diagnostics.DiagnosticSource` dependency to `10.0.0`
17+
for all target frameworks.
18+
([#6667](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6667))
19+
1620
## 1.14.0-rc.1
1721

1822
Released 2025-Oct-21
1923

2024
* Add support for .NET 10.0.
2125
([#6307](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6307))
2226

23-
* Update `System.Diagnostics.DiagnosticSource` dependency to `10.0.0`
27+
* Update `System.Diagnostics.DiagnosticSource` dependency to `10.0.0-rc.2.25502.107`
2428
for all target frameworks.
2529
([#6307](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6307))
2630

‎src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ Notes](../../RELEASENOTES.md).
1313
section](../../README.md#digital-signing) for updated verification instructions.
1414
([#6623](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6623))
1515

16+
* Update to stable versions for .NET 10.0 NuGet packages.
17+
([#6667](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6667))
18+
19+
* Update `Microsoft.Extensions.*` dependencies to `10.0.0` for .NET Framework
20+
and .NET Standard.
21+
([#6667](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6667))
22+
1623
## 1.14.0-rc.1
1724

1825
Released 2025-Oct-21

‎src/OpenTelemetry/CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ Notes](../../RELEASENOTES.md).
1313
section](../../README.md#digital-signing) for updated verification instructions.
1414
([#6623](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6623))
1515

16+
* Update to stable versions for .NET 10.0 NuGet packages.
17+
([#6667](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6667))
18+
19+
* Update `Microsoft.Extensions.*` dependencies to `10.0.0` for .NET Framework
20+
and .NET Standard.
21+
([#6667](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6667))
22+
1623
## 1.14.0-rc.1
1724

1825
Released 2025-Oct-21

‎test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG BUILD_SDK_VERSION=10.0
66
ARG TEST_SDK_VERSION=10.0
77
FROM mcr.microsoft.com/dotnet/sdk:8.0.416@sha256:a87db299d259cec53210df406cd5e51f900a0c6d938fe56d5f392629c0505d75 AS dotnet-sdk-8.0
88
FROM mcr.microsoft.com/dotnet/sdk:9.0.307@sha256:1ea5b7f2154cbd1e20a336cb56957dba30a7ce30ef5c1c032a37c42801594713 AS dotnet-sdk-9.0
9-
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2@sha256:ed46c853a4f100ba7aab2394e9fb9f9b8989e93346b04632dbce11e5da7623d8 AS dotnet-sdk-10.0
9+
FROM mcr.microsoft.com/dotnet/sdk:10.0.100@sha256:c7445f141c04f1a6b454181bd098dcfa606c61ba0bd213d0a702489e5bd4cd71 AS dotnet-sdk-10.0
1010

1111
FROM dotnet-sdk-${BUILD_SDK_VERSION} AS build
1212
ARG PUBLISH_CONFIGURATION=Release

‎test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN git clone --branch level-1 https://github.com/w3c/trace-context.git
1313

1414
FROM mcr.microsoft.com/dotnet/sdk:8.0.416@sha256:a87db299d259cec53210df406cd5e51f900a0c6d938fe56d5f392629c0505d75 AS dotnet-sdk-8.0
1515
FROM mcr.microsoft.com/dotnet/sdk:9.0.307@sha256:1ea5b7f2154cbd1e20a336cb56957dba30a7ce30ef5c1c032a37c42801594713 AS dotnet-sdk-9.0
16-
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2@sha256:ed46c853a4f100ba7aab2394e9fb9f9b8989e93346b04632dbce11e5da7623d8 AS dotnet-sdk-10.0
16+
FROM mcr.microsoft.com/dotnet/sdk:10.0.100@sha256:c7445f141c04f1a6b454181bd098dcfa606c61ba0bd213d0a702489e5bd4cd71 AS dotnet-sdk-10.0
1717

1818
FROM dotnet-sdk-${BUILD_SDK_VERSION} AS build
1919
ARG PUBLISH_CONFIGURATION=Release

0 commit comments

Comments
 (0)