Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PC-1344: Update C# and .NET #365

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

PC-1344: Update C# and .NET #365

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0ce660c
PC-1049: Update C# & .Net and fix concurrency
Glenn-Clarke Jul 31, 2024
99de3a2
PC-1049: Update C#
Glenn-Clarke Aug 6, 2024
81f8642
PC-1049: Fix middleware warnings
Glenn-Clarke Aug 6, 2024
f7281f6
PC-1049: Update README.md
Glenn-Clarke Aug 6, 2024
9459906
PC-1049: Update govdesign and hangfire dependencies
Glenn-Clarke Aug 6, 2024
8d0e6f6
PC-1049: Line endings
Glenn-Clarke Aug 6, 2024
cc2f4fb
PC-1344: replace postcode cs file with json
samyou-softwire Sep 27, 2024
3d26601
PC-1344: load json file at runtime
samyou-softwire Sep 27, 2024
ed7a3e3
PC-1344: Revert "Update govdesign and hangfire dependencies"
samyou-softwire Sep 30, 2024
54fbd80
PC-1344: no longer copy json to publish directory
samyou-softwire Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-and-run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
- name: Checkout code onto job runner
uses: actions/checkout@v2

- name: Install .Net (6.0)
- name: Install .Net (8.0)
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x

- name: Restore .Net dependencies
run: dotnet restore --configfile nuget.config
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ WORKDIR /HerPublicWebsite
RUN npm ci
RUN npm run build

FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /source

COPY --from=node_base . .
Expand All @@ -28,7 +28,7 @@ RUN dotnet build HerPublicWebsite.ManagementShell/ --use-current-runtime --self-


# final stage/image
FROM mcr.microsoft.com/dotnet/aspnet:6.0
FROM mcr.microsoft.com/dotnet/aspnet:8.0
WORKDIR /app
COPY --from=build /app .
COPY --from=build /cli ./cli
Expand Down
17 changes: 12 additions & 5 deletions HerPublicWebsite.BusinessLogic/HerPublicWebsite.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.S3" Version="3.7.104.8" />
<PackageReference Include="CabinetOffice.GovUkDesignSystem" Version="1.0.0-456b8e9" />
<PackageReference Include="CabinetOffice.GovUkDesignSystem" Version="1.0.0-3f67920" />
<PackageReference Include="CsvHelper" Version="30.0.1" />
<PackageReference Include="GovukNotify" Version="6.1.0" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.0" />
<PackageReference Include="Hangfire.Core" Version="1.8.0" />
<PackageReference Include="Hangfire.PostgreSql" Version="1.19.12" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.14" />
<PackageReference Include="Hangfire.Core" Version="1.8.14" />
<PackageReference Include="Hangfire.PostgreSql" Version="1.20.9" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to still upgrade(?) these dependencies as part of this ticket? I think this might be a remnant of the original troubleshooting

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

have reverted; will see if pipeline still works fine

<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<ItemGroup>
<Content Include="Services\EligiblePostcode\EligiblePostcodeData.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need both of these? Have you tested without?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems not

</Content>
</ItemGroup>
</Project>
Loading
Loading