Skip to content

Commit f571895

Browse files
KielekKielek
authored
Bump .NET SDK to 10.0.300/9.0.314/8.0.412 (#5071)
1 parent 371efe6 commit f571895

10 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎.github/actions/setup-dotnet/action.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ runs:
88
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # tag: v5.2.0
99
with:
1010
dotnet-version: |
11-
8.0.420
12-
9.0.313
13-
10.0.203
11+
8.0.421
12+
9.0.314
13+
10.0.300

‎docker/alpine.dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:10.0.203-alpine3.23@sha256:0191ff386e93923edf795d363ea0ae0669ce467ada4010b370644b670fa495c1
1+
FROM mcr.microsoft.com/dotnet/sdk:10.0.300-alpine3.23@sha256:5c559aa5d99337e400d39ab4fa1f6979d126c29b20939d53658ed38300571e74
22
RUN apk update \
33
&& apk upgrade \
44
&& apk add --no-cache --update \
@@ -20,8 +20,8 @@ COPY ./scripts/dotnet-install.sh ./dotnet-install.sh
2020

2121
# Install older SDKs using the install script
2222
RUN chmod +x ./dotnet-install.sh \
23-
&& ./dotnet-install.sh -v 9.0.313 --install-dir /usr/share/dotnet --no-path \
24-
&& ./dotnet-install.sh -v 8.0.420 --install-dir /usr/share/dotnet --no-path \
23+
&& ./dotnet-install.sh -v 9.0.314 --install-dir /usr/share/dotnet --no-path \
24+
&& ./dotnet-install.sh -v 8.0.421 --install-dir /usr/share/dotnet --no-path \
2525
&& rm dotnet-install.sh
2626

2727
WORKDIR /project

‎docker/centos-stream9.dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/centos/centos:stream9@sha256:d5b319ece56684157ce9a09a857ad7002794159f572c890005cddeb2c5043b1f
1+
FROM quay.io/centos/centos:stream9@sha256:dbd9d8293d90c33829dab178cb2713218855c11d30353ea1b2e06fb168a7ceba
22

33
# Install dotnet sdk
44
RUN dnf install -y \
@@ -7,9 +7,9 @@ RUN dnf install -y \
77
COPY ./scripts/dotnet-install.sh ./dotnet-install.sh
88

99
RUN chmod +x ./dotnet-install.sh \
10-
&& ./dotnet-install.sh -v 10.0.203 --install-dir /usr/share/dotnet --no-path \
11-
&& ./dotnet-install.sh -v 9.0.313 --install-dir /usr/share/dotnet --no-path \
12-
&& ./dotnet-install.sh -v 8.0.420 --install-dir /usr/share/dotnet --no-path \
10+
&& ./dotnet-install.sh -v 10.0.300 --install-dir /usr/share/dotnet --no-path \
11+
&& ./dotnet-install.sh -v 9.0.314 --install-dir /usr/share/dotnet --no-path \
12+
&& ./dotnet-install.sh -v 8.0.421 --install-dir /usr/share/dotnet --no-path \
1313
&& rm dotnet-install.sh
1414

1515
ENV PATH="$PATH:/usr/share/dotnet"

‎docker/debian-arm64.dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:9.0.313-bookworm-slim@sha256:f9ddb8a31ae90f4b38d18355d82f03d76dcdd2a57d7235a2ffdf008fab11a862
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0.314-bookworm-slim@sha256:087fc98e5c6ffcea6c3e276c135c4a6717c589d9509a09cc22e7c634830a4db8
22
# There is no official base image for .NET SDK 10+ on Debian, so install .NET10 via dotnet-install
33

44
RUN apt-get update && \
@@ -11,8 +11,8 @@ COPY ./scripts/dotnet-install.sh ./dotnet-install.sh
1111

1212
# Install older SDKs using the install script as there are no arm64 SDK packages.
1313
RUN chmod +x ./dotnet-install.sh \
14-
&& ./dotnet-install.sh -v 10.0.203 --install-dir /usr/share/dotnet --no-path \
15-
&& ./dotnet-install.sh -v 8.0.420 --install-dir /usr/share/dotnet --no-path \
14+
&& ./dotnet-install.sh -v 10.0.300 --install-dir /usr/share/dotnet --no-path \
15+
&& ./dotnet-install.sh -v 8.0.421 --install-dir /usr/share/dotnet --no-path \
1616
&& rm dotnet-install.sh
1717

1818
WORKDIR /project

‎docker/debian.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:9.0.313-bookworm-slim@sha256:f9ddb8a31ae90f4b38d18355d82f03d76dcdd2a57d7235a2ffdf008fab11a862
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0.314-bookworm-slim@sha256:087fc98e5c6ffcea6c3e276c135c4a6717c589d9509a09cc22e7c634830a4db8
22
# There is no official base image for .NET SDK 10+ on Debian, so install .NET10 via apt-get
33

44
RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \

‎docker/ubuntu1604.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN curl -fsSL -o cmake.sh https://github.com/Kitware/CMake/releases/download/v3
3535
COPY ./scripts/dotnet-install.sh ./dotnet-install.sh
3636

3737
RUN chmod +x ./dotnet-install.sh \
38-
&& ./dotnet-install.sh -v 9.0.313 --install-dir /usr/share/dotnet --no-path \
38+
&& ./dotnet-install.sh -v 9.0.314 --install-dir /usr/share/dotnet --no-path \
3939
&& rm dotnet-install.sh
4040

4141
ENV IsLegacyUbuntu=true

‎examples/demo/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:10.0.203-noble@sha256:adc02be8b87957d07208a4a3e51775935b33bad3317de8c45b1e67357b4c073b
1+
FROM mcr.microsoft.com/dotnet/sdk:10.0.300-noble@sha256:dc8430e6024d454edadad1e160e1973be3cabbb7125998ef190d9e5c6adf7dbb
22

33
# install OpenTelemetry .NET Automatic Instrumentation
44
ARG OTEL_VERSION=1.15.0

‎src/OpenTelemetry.AutoInstrumentation/Generated/net8.0/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ partial class EnvVarTypeConverter
2525
/// ○ Match '}'.<br/>
2626
/// </code>
2727
/// </remarks>
28-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.14.16921")]
28+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.14.22922")]
2929
private static partial global::System.Text.RegularExpressions.Regex GetEnvVarRegex() => global::System.Text.RegularExpressions.Generated.GetEnvVarRegex_0.Instance;
3030
}
3131
}
@@ -66,7 +66,7 @@ partial class SqlConnectionDetails
6666
/// ○ Match if at the end of the string or if before an ending newline.<br/>
6767
/// </code>
6868
/// </remarks>
69-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.14.16921")]
69+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.14.22922")]
7070
private static partial global::System.Text.RegularExpressions.Regex DataSourceRegex() => global::System.Text.RegularExpressions.Generated.DataSourceRegex_1.Instance;
7171
}
7272
}
@@ -86,7 +86,7 @@ partial class SqlConnectionDetails
8686
/// ○ Match '\\'.<br/>
8787
/// </code>
8888
/// </remarks>
89-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.14.16921")]
89+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.14.22922")]
9090
private static partial global::System.Text.RegularExpressions.Regex NamedPipeRegex() => global::System.Text.RegularExpressions.Generated.NamedPipeRegex_2.Instance;
9191
}
9292
}
@@ -104,7 +104,7 @@ namespace System.Text.RegularExpressions.Generated
104104
using System.Threading;
105105

106106
/// <summary>Custom <see cref="Regex"/>-derived type for the GetEnvVarRegex method.</summary>
107-
[GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.14.16921")]
107+
[GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.14.22922")]
108108
file sealed class GetEnvVarRegex_0 : Regex
109109
{
110110
/// <summary>Cached, thread-safe singleton instance.</summary>
@@ -385,7 +385,7 @@ void UncaptureUntil(int capturePosition)
385385
}
386386

387387
/// <summary>Custom <see cref="Regex"/>-derived type for the DataSourceRegex method.</summary>
388-
[GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.14.16921")]
388+
[GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.14.22922")]
389389
file sealed class DataSourceRegex_1 : Regex
390390
{
391391
/// <summary>Cached, thread-safe singleton instance.</summary>
@@ -1039,7 +1039,7 @@ void UncaptureUntil(int capturePosition)
10391039
}
10401040

10411041
/// <summary>Custom <see cref="Regex"/>-derived type for the NamedPipeRegex method.</summary>
1042-
[GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.14.16921")]
1042+
[GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.14.22922")]
10431043
file sealed class NamedPipeRegex_2 : Regex
10441044
{
10451045
/// <summary>Cached, thread-safe singleton instance.</summary>
@@ -1200,7 +1200,7 @@ void UncaptureUntil(int capturePosition)
12001200
}
12011201

12021202
/// <summary>Helper methods used by generated <see cref="Regex"/>-derived implementations.</summary>
1203-
[GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.14.16921")]
1203+
[GeneratedCodeAttribute("System.Text.RegularExpressions.Generator", "8.0.14.22922")]
12041204
file static class Utilities
12051205
{
12061206
/// <summary>Default timeout value set in <see cref="AppContext"/>, or <see cref="Regex.InfiniteMatchTimeout"/> if none was set.</summary>

‎test/OpenTelemetry.AutoInstrumentation.Tests/Configurations/FileBased/FilebasedTracesSettingsTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public class FilebasedTracesSettingsTests
1414
{
1515
public static TheoryData<SkipConfigurationTestCase> LoadMethod_SkipWrongExporterConfiguration_Data()
1616
{
17-
return
18-
[
17+
return new TheoryData<SkipConfigurationTestCase>
18+
{
1919
new(new YamlConfiguration
2020
{
2121
TracerProvider = new TracerProviderConfiguration
@@ -224,7 +224,7 @@ public static TheoryData<SkipConfigurationTestCase> LoadMethod_SkipWrongExporter
224224
]
225225
}
226226
}),
227-
];
227+
};
228228
}
229229

230230
[Fact]

‎test/test-applications/integrations/TestApplication.MongoDB/TestApplication.MongoDB.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageReference Include="MongoDB.Driver" VersionOverride="$(LibraryVersion)" />
1414
<!-- Snappier is transitive dependency of MongoDB.Driver. All versions up to 3.8.0 references v1.0.0
1515
All versions pruor to 1.3.1 are vulnerable for https://github.com/advisories/GHSA-pggp-6c3x-2xmx -->
16-
<PackageReference Include="Snappier" Condition="'$(OS)' == 'Windows_NT' and '$(LibraryVersion)' != '' and $([MSBuild]::VersionLessThan('$(LibraryVersion)', '3.8.1'))" />
16+
<PackageReference Include="Snappier" Condition="'$(LibraryVersion)' != '' and $([MSBuild]::VersionLessThan('$(LibraryVersion)', '3.8.1'))" />
1717
<!-- SharpCompress is a transitive dependency of MongoDB.Driver. Version up to 0.47.4 are vulnerable.
1818
for https://github.com/advisories/GHSA-6c8g-7p36-r338 -->
1919
<PackageReference Include="SharpCompress" />

0 commit comments

Comments
 (0)