Skip to content

Commit 88adc96

Browse files
niemyjskiniemyjski
authored
Upgrade to .NET 9 RC2 (#1708)
1 parent 24e4c53 commit 88adc96

File tree

16 files changed

+44
-43
lines changed

16 files changed

+44
-43
lines changed

‎.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/devcontainers/dotnet:0-8.0
1+
FROM mcr.microsoft.com/devcontainers/dotnet:0-9.0
22

33
RUN apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
44

‎.github/workflows/build-arm64.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
- name: Setup .NET Core
2626
uses: actions/setup-dotnet@v4
2727
with:
28-
dotnet-version: 8.0.*
29-
#dotnet-quality: preview
28+
dotnet-version: 9.0.*
29+
dotnet-quality: preview
3030
- name: Build Reason
3131
env:
3232
GITHUB_EVENT: ${{ toJson(github) }}

‎.github/workflows/build.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838
- name: Setup .NET Core
3939
uses: actions/setup-dotnet@v4
4040
with:
41-
dotnet-version: 8.0.*
42-
#dotnet-quality: preview
41+
dotnet-version: 9.0.*
42+
dotnet-quality: preview
4343

4444
- name: Version
4545
id: version
@@ -64,8 +64,8 @@ jobs:
6464
- name: Setup .NET Core
6565
uses: actions/setup-dotnet@v4
6666
with:
67-
dotnet-version: 8.0.*
68-
#dotnet-quality: preview
67+
dotnet-version: 9.0.*
68+
dotnet-quality: preview
6969

7070
- name: Start Services
7171
working-directory: docker

‎.github/workflows/elasticsearch-docker-7.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
- name: Setup .NET Core
1919
uses: actions/setup-dotnet@v4
2020
with:
21-
dotnet-version: 8.0.*
22-
#dotnet-quality: preview
21+
dotnet-version: 9.0.*
22+
dotnet-quality: preview
2323
- name: Build Reason
2424
env:
2525
GITHUB_EVENT: ${{ toJson(github) }}

‎.github/workflows/elasticsearch-docker-8.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
- name: Setup .NET Core
1919
uses: actions/setup-dotnet@v4
2020
with:
21-
dotnet-version: 8.0.*
22-
#dotnet-quality: preview
21+
dotnet-version: 9.0.*
22+
dotnet-quality: preview
2323
- name: Build Reason
2424
env:
2525
GITHUB_EVENT: ${{ toJson(github) }}

‎.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"request": "launch",
88
"preLaunchTask": "build",
99
// If you have changed target frameworks, make sure to update the program path.
10-
"program": "${workspaceFolder}/src/Exceptionless.Web/bin/Debug/net8.0/Exceptionless.Web.dll",
10+
"program": "${workspaceFolder}/src/Exceptionless.Web/bin/Debug/net9.0/Exceptionless.Web.dll",
1111
"args": [],
1212
"cwd": "${workspaceFolder}/src/Exceptionless.Web",
1313
"stopAtEntry": false,
@@ -25,7 +25,7 @@
2525
"request": "launch",
2626
"preLaunchTask": "build",
2727
// If you have changed target frameworks, make sure to update the program path.
28-
"program": "${workspaceFolder}/src/Exceptionless.Job/bin/Debug/net8.0/Exceptionless.Job.dll",
28+
"program": "${workspaceFolder}/src/Exceptionless.Job/bin/Debug/net9.0/Exceptionless.Job.dll",
2929
"args": [],
3030
"cwd": "${workspaceFolder}",
3131
"stopAtEntry": false,

‎Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
22
WORKDIR /app
33

44
COPY ./*.sln ./NuGet.Config ./
@@ -36,7 +36,7 @@ RUN dotnet publish -c Release -o out
3636

3737
# job
3838

39-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS job
39+
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS job
4040
WORKDIR /app
4141
COPY --from=job-publish /app/src/Exceptionless.Job/out ./
4242

@@ -50,13 +50,13 @@ FROM build AS api-publish
5050
WORKDIR /app/src/Exceptionless.Web
5151

5252
RUN apt-get update -yq
53-
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && apt-get install -yq nodejs
53+
RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -yq nodejs
5454

5555
RUN dotnet publish -c Release -o out /p:SkipSpaPublish=true
5656

5757
# api
5858

59-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS api
59+
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS api
6060
WORKDIR /app
6161
COPY --from=api-publish /app/src/Exceptionless.Web/out ./
6262

@@ -70,13 +70,13 @@ FROM build AS app-publish
7070
WORKDIR /app/src/Exceptionless.Web
7171

7272
RUN apt-get update -yq
73-
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && apt-get install -yq nodejs
73+
RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -yq nodejs
7474

7575
RUN dotnet publish -c Release -o out
7676

7777
# app
7878

79-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS app
79+
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS app
8080

8181
WORKDIR /app
8282
COPY --from=app-publish /app/src/Exceptionless.Web/out ./
@@ -148,7 +148,7 @@ USER elasticsearch
148148

149149
RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
150150
chmod +x dotnet-install.sh && \
151-
./dotnet-install.sh --channel 8.0 --quality ga --runtime aspnetcore && \
151+
./dotnet-install.sh --channel 9.0 --quality preview --runtime aspnetcore && \
152152
rm dotnet-install.sh
153153

154154
EXPOSE 8080 9200
@@ -206,7 +206,7 @@ USER elasticsearch
206206

207207
RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
208208
chmod +x dotnet-install.sh && \
209-
./dotnet-install.sh --channel 8.0 --quality ga --runtime aspnetcore && \
209+
./dotnet-install.sh --channel 9.0 --quality preview --runtime aspnetcore && \
210210
rm dotnet-install.sh
211211

212212
EXPOSE 8080 9200

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ _In appreciation for anyone who submits a non-trivial pull request, we will give
3232
- Please read the [contributing document](https://github.com/exceptionless/Exceptionless/blob/main/CONTRIBUTING.md)
3333
- Requirements
3434
- [Docker](https://www.docker.com/get-docker)
35-
- [.NET 8.0](https://dotnet.microsoft.com/)
35+
- [.NET 9.0](https://dotnet.microsoft.com/)
3636
- [Node 20+](https://nodejs.org/)
3737
- Visual Studio Code
3838
- Open Visual Studio Code and then open the Exceptionless root folder

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100",
3+
"version": "9.0.100-rc*",
44
"rollForward": "latestMinor"
55
}
66
}

‎src/Directory.Build.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Product>Exceptionless</Product>
66
<MinVerSkip Condition="'$(Configuration)' == 'Debug'">true</MinVerSkip>
77
<MinVerTagPrefix>v</MinVerTagPrefix>
88
<Copyright>Copyright (c) 2024 Exceptionless. All rights reserved.</Copyright>
99
<RepositoryUrl>https://github.com/exceptionless/exceptionless</RepositoryUrl>
1010
<Authors>Exceptionless</Authors>
11-
<NoWarn>$(NoWarn);CS1591</NoWarn>
11+
<NoWarn>$(NoWarn);CS1591;</NoWarn>
1212
<Nullable>enable</Nullable>
13+
<WarningsNotAsErrors>NU1902;NU1903;NU1904;</WarningsNotAsErrors>
1314
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1415
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1516
<EmbedUntrackedSources>true</EmbedUntrackedSources>

‎src/Exceptionless.Core/Exceptionless.Core.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
<PackageReference Include="NEST.JsonNetSerializer" Version="7.17.5" />
2828
<PackageReference Include="Handlebars.Net" Version="2.1.6" />
2929
<PackageReference Include="McSherry.SemanticVersioning" Version="1.4.1" />
30-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
31-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.8" />
32-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
30+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rc.2.24473.5" />
31+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24474.3" />
32+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24473.5" />
3333
<PackageReference Include="Stripe.net" Version="45.14.0" />
34-
<PackageReference Include="System.DirectoryServices" Version="8.0.0" />
34+
<PackageReference Include="System.DirectoryServices" Version="9.0.0-rc.2.24473.5" />
3535
<PackageReference Include="UAParser" Version="3.1.47" />
3636

3737
<PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.17.12" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />

‎src/Exceptionless.Insulation/Exceptionless.Insulation.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
<PackageReference Include="Foundatio.Minio" Version="$(FoundatioVersion)" />
99
<PackageReference Include="Foundatio.RabbitMQ" Version="$(FoundatioVersion)" />
1010
<PackageReference Include="Foundatio.Redis" Version="$(FoundatioVersion)" />
11-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.1" />
15-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
16-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.0-rc.2.24473.5" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-rc.2.24473.5" />
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24473.5" />
14+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="9.0.0-rc.2.24473.5" />
15+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rc.2.24473.5" />
16+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0-rc.2.24473.5" />
1717
<PackageReference Include="MailKit" Version="4.7.1.1" />
1818
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
1919
<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />

‎src/Exceptionless.Job/Exceptionless.Job.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<ItemGroup>
77
<PackageReference Include="Exceptionless.AspNetCore" Version="6.0.4" />
8-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.8" />
8+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24474.3" />
99
<PackageReference Include="App.Metrics.AspNetCore" Version="4.3.0" />
1010
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
1111
<PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />

‎src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/connect.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ var s = require("child_process");
55
var proxyRequest = require("grunt-connect-proxy2/lib/utils").proxyRequest;
66

77
module.exports = function () {
8-
var certs = generateCerts();
98
var target = getTarget();
9+
var certs = target.ssl ? generateCerts() : { cert: undefined, key: undefined };
1010

1111
return {
1212
main: {
@@ -85,7 +85,7 @@ function getTarget() {
8585
};
8686
}
8787

88-
/** Function taken from aspnetcore-https.js in ASP.NET React template */
88+
/** Function taken from aspnetcore-https.js in ASP.NET React template https://github.com/microsoft/commercial-marketplace-offer-deploy/blob/main/src/ClientApp/ClientApp/aspnetcore-https.ts */
8989
function generateCerts() {
9090
var baseFolder =
9191
process.env.APPDATA !== undefined && process.env.APPDATA !== ""

‎src/Exceptionless.Web/Exceptionless.Web.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<ItemGroup>
1919
<PackageReference Include="Exceptionless.AspNetCore" Version="6.0.4" />
2020
<PackageReference Include="Joonasw.AspNetCore.SecurityHeaders" Version="5.0.0" />
21-
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.8" />
22-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8" />
23-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.8" />
21+
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="9.0.0-rc.2.24474.3" />
22+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.0-rc.2.24474.3" />
23+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24474.3" />
2424
<PackageReference Include="MiniValidation" Version="0.9.1" />
2525
<PackageReference Include="NEST.JsonNetSerializer" Version="7.17.5" />
2626
<PackageReference Include="OAuth2" Version="0.10.3" />

‎tests/Exceptionless.Tests/Exceptionless.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
<PackageReference Include="FluentRest.NewtonsoftJson" Version="9.9.8" />
1111

12-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8" />
13-
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.9.1" />
12+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rc.2.24474.3" />
13+
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.0.0-preview.9.24507.7" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
1515
<PackageReference Include="xunit" Version="2.9.2" />
1616
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="All" />

0 commit comments

Comments
 (0)