diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index cbe35f5..12f3c4f 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -16,7 +16,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Restore dependencies run: dotnet restore - name: Build diff --git a/Huxley2/Dockerfile b/Huxley2/Dockerfile index 1f41c3c..d05caca 100644 --- a/Huxley2/Dockerfile +++ b/Huxley2/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env WORKDIR /app # Copy csproj and restore as distinct layers @@ -16,7 +16,7 @@ RUN dotnet publish -c Release -o out \ # Build runtime image -FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-alpine +FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-alpine WORKDIR /app COPY --from=build-env /app/out . ENTRYPOINT ["./Huxley2"] diff --git a/Huxley2/Huxley2.csproj b/Huxley2/Huxley2.csproj index 92d83c7..8edbd4e 100644 --- a/Huxley2/Huxley2.csproj +++ b/Huxley2/Huxley2.csproj @@ -1,13 +1,13 @@ - net6.0 + net8.0 51de7d1a-2f59-4a62-880b-89b08cc57a86 10.0 enable true Huxley2 - 2.0.5 + 2.0.6 © James Singleton diff --git a/Huxley2/Pages/Index.cshtml b/Huxley2/Pages/Index.cshtml index a7790a9..a1adcf1 100644 --- a/Huxley2/Pages/Index.cshtml +++ b/Huxley2/Pages/Index.cshtml @@ -38,8 +38,8 @@ API (called Darwin). It supports both the Public Version (PV) and the Staff Version (SV). - It's built with ASP.NET Core LTS (.NET 6.0), C# 10 and lots of - abbreviations! + It's built with ASP.NET Core LTS (.NET 8.0), + C# 10 and lots of abbreviations!

The primary purpose of Huxley 2 is to allow easy use of the LDB API from browser-based @@ -197,7 +197,7 @@ You can now use Huxley on any platform (pun intended)

  • - .NET 6.0 LTS supported until 2024-11-08 + .NET 8.0 LTS supported until 2026-11-10
    • diff --git a/Huxley2/Startup.cs b/Huxley2/Startup.cs index f108939..f33ca77 100644 --- a/Huxley2/Startup.cs +++ b/Huxley2/Startup.cs @@ -29,7 +29,7 @@ public Startup(IConfiguration config) public static void ConfigureServices(IServiceCollection services) { // Shouldn't be a security issue as plaintext isn't chosen by the user and we aren't using auth or sessions - // https://docs.microsoft.com/en-us/aspnet/core/performance/response-compression?view=aspnetcore-6.0#compression-with-secure-protocol + // https://docs.microsoft.com/en-us/aspnet/core/performance/response-compression?view=aspnetcore-8.0 services.AddResponseCompression(options => { options.EnableForHttps = true; diff --git a/Huxley2Tests/Huxley2Tests.csproj b/Huxley2Tests/Huxley2Tests.csproj index d77018c..4e1451e 100644 --- a/Huxley2Tests/Huxley2Tests.csproj +++ b/Huxley2Tests/Huxley2Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 false diff --git a/README.md b/README.md index 7fe9e48..083309c 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ _Note:_ Huxley 2 is considered feature-complete and will only be updated to fix ## About -Huxley 2 is a CORS enabled cross-platform JSON ReST proxy for the GB NRE LDB WCF SOAP XML API (called Darwin). It supports both the Public Version (PV) and the Staff Version (SV). It's built with ASP.NET Core LTS (.NET 6.0), C# 10 and lots of abbreviations! +Huxley 2 is a CORS enabled cross-platform JSON ReST proxy for the GB NRE LDB WCF SOAP XML API (called Darwin). It supports both the Public Version (PV) and the Staff Version (SV). It's built with ASP.NET Core LTS (.NET 8.0), C# 10 and lots of abbreviations! The primary purpose of Huxley 2 is to allow easy use of the LDB API from browser-based client-side PWAs made with JavaScript or TypeScript. Additionally, it opens up the Windows enterprise API to agile developers on macOS and Linux. @@ -44,7 +44,7 @@ To rebuild use `docker-compose build` or `docker-compose up --build`. If you want to run the container in the background you can run `docker-compose up --detach` -If you would like the docker container to _reboot upon restart_ on the host machine you can uncomment `restart: always` in the docker-compose.yml file and make sure the docker service is set to start upon bootup. +If you would like the docker container to _reboot upon restart_ on the host machine you can uncomment `restart: always` in the docker-compose.yml file and make sure the docker service is set to start upon bootup. ## Station Codes File diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5c03161..e61f914 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,13 +12,13 @@ stages: vmImage: 'ubuntu-latest' steps: - task: UseDotNet@2 - displayName: "Use .NET 6.0 SDK" + displayName: "Use .NET 8.0 SDK" env: DOTNET_CLI_TELEMETRY_OPTOUT: true DOTNET_NOLOGO: true inputs: packageType: 'sdk' - version: '6.0.x' + version: '8.0.x' - task: DotNetCoreCLI@2 displayName: "Build Huxley 2" env: @@ -65,4 +65,4 @@ stages: appType: 'webAppLinux' WebAppName: 'huxley2' packageForLinux: '$(Build.ArtifactStagingDirectory)/**/Huxley2.zip' - RuntimeStack: 'DOTNETCORE|6.0' + RuntimeStack: 'DOTNETCORE|8.0'