Skip to content

Commit a823de8

Browse files
martincostellomartincostello
authored
[Infra] Update to .NET 10 RC2 (#6602)
1 parent 355cac6 commit a823de8

File tree

7 files changed

+16
-12
lines changed

7 files changed

+16
-12
lines changed

‎Directory.Build.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@
33
<ArtifactsPath>$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'artifacts'))</ArtifactsPath>
44
<UseArtifactsOutput>true</UseArtifactsOutput>
55
</PropertyGroup>
6+
<!-- HACK Workaround for https://github.com/dotnet/sdk/issues/51265 -->
7+
<PropertyGroup>
8+
<RestoreEnablePackagePruning>false</RestoreEnablePackagePruning>
9+
</PropertyGroup>
610
</Project>

‎Directory.Packages.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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.1.25451.107,)" />
35-
<PackageVersion Update="Microsoft.Extensions.Diagnostics.Abstractions" Version="[10.0.0-rc.1.25451.107,)" />
36-
<PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="[10.0.0-rc.1.25451.107,)" />
37-
<PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="[10.0.0-rc.1.25451.107,)" />
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,)" />
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.1.25451.107,)" />
46+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="[10.0.0-rc.2.25502.107,)" />
4747
</ItemGroup>
4848

4949
<!--

‎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.415@sha256:df1aebc5fd72a1315f34eda24206f195d5ca00ccf2e3009947a74c5a67166cbb AS dotnet-sdk-8.0
33
FROM mcr.microsoft.com/dotnet/sdk:9.0.306@sha256:a5dd7352c0c058a6f847c95a1147b060e95a532444f14b34d8fa9aaa0a76702f AS dotnet-sdk-9.0
4-
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.1@sha256:eee11b0bf11715710bbe8339b9641f0ef8b5d8a8e07f2d6ff3cd4361c1a4e5a7 AS dotnet-sdk-10.0
4+
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2@sha256:8e8a5bbd8dd6a6c594d6c08775fd5fc4a40b67d6bbd27882e6e8b9d5684eac97 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.21@sha256:ebdd28e9ee54ea5032a390500d37bb1b6d45c36c6ba51e10f3ddfcdc746f3e28 AS dotnet-aspnet-8.0
1414
FROM mcr.microsoft.com/dotnet/aspnet:9.0.10@sha256:ad4acf911eada1bcbfd0dd9f3fa514143fba8654ca8844df9032471adc2f9bd9 AS dotnet-aspnet-9.0
15-
FROM mcr.microsoft.com/dotnet/aspnet:10.0.0-rc.1@sha256:d9a0d4006dbbc14d877b00c5e7113b432bac6bca6d12816a6e8fd999bac72797 AS dotnet-aspnet-10.0
15+
FROM mcr.microsoft.com/dotnet/aspnet:10.0.0-rc.2@sha256:20459dc8f0cccd42304c73239edaef18a4667664c0a4d44e25599eab6d9611ca 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.415@sha256:df1aebc5fd72a1315f34eda24206f195d5ca00ccf2e3009947a74c5a67166cbb AS dotnet-sdk-8.0
44
FROM mcr.microsoft.com/dotnet/sdk:9.0.306@sha256:a5dd7352c0c058a6f847c95a1147b060e95a532444f14b34d8fa9aaa0a76702f AS dotnet-sdk-9.0
5-
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.1@sha256:eee11b0bf11715710bbe8339b9641f0ef8b5d8a8e07f2d6ff3cd4361c1a4e5a7 AS dotnet-sdk-10.0
5+
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2@sha256:8e8a5bbd8dd6a6c594d6c08775fd5fc4a40b67d6bbd27882e6e8b9d5684eac97 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.21@sha256:ebdd28e9ee54ea5032a390500d37bb1b6d45c36c6ba51e10f3ddfcdc746f3e28 AS dotnet-aspnet-8.0
1515
FROM mcr.microsoft.com/dotnet/aspnet:9.0.10@sha256:ad4acf911eada1bcbfd0dd9f3fa514143fba8654ca8844df9032471adc2f9bd9 AS dotnet-aspnet-9.0
16-
FROM mcr.microsoft.com/dotnet/aspnet:10.0.0-rc.1@sha256:d9a0d4006dbbc14d877b00c5e7113b432bac6bca6d12816a6e8fd999bac72797 AS dotnet-aspnet-10.0
16+
FROM mcr.microsoft.com/dotnet/aspnet:10.0.0-rc.2@sha256:20459dc8f0cccd42304c73239edaef18a4667664c0a4d44e25599eab6d9611ca 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.1.25451.107"
5+
"version": "10.0.100-rc.2.25502.107"
66
}
77
}

‎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.415@sha256:df1aebc5fd72a1315f34eda24206f195d5ca00ccf2e3009947a74c5a67166cbb AS dotnet-sdk-8.0
88
FROM mcr.microsoft.com/dotnet/sdk:9.0.306@sha256:a5dd7352c0c058a6f847c95a1147b060e95a532444f14b34d8fa9aaa0a76702f AS dotnet-sdk-9.0
9-
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.1@sha256:eee11b0bf11715710bbe8339b9641f0ef8b5d8a8e07f2d6ff3cd4361c1a4e5a7 AS dotnet-sdk-10.0
9+
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2@sha256:8e8a5bbd8dd6a6c594d6c08775fd5fc4a40b67d6bbd27882e6e8b9d5684eac97 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.415@sha256:df1aebc5fd72a1315f34eda24206f195d5ca00ccf2e3009947a74c5a67166cbb AS dotnet-sdk-8.0
1515
FROM mcr.microsoft.com/dotnet/sdk:9.0.306@sha256:a5dd7352c0c058a6f847c95a1147b060e95a532444f14b34d8fa9aaa0a76702f AS dotnet-sdk-9.0
16-
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.1@sha256:eee11b0bf11715710bbe8339b9641f0ef8b5d8a8e07f2d6ff3cd4361c1a4e5a7 AS dotnet-sdk-10.0
16+
FROM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2@sha256:8e8a5bbd8dd6a6c594d6c08775fd5fc4a40b67d6bbd27882e6e8b9d5684eac97 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)