Skip to content

Commit a3fa9c9

Browse files
renemadsenrenemadsen
committed
Merge branch 'master' into stable
2 parents 43fe80c + 6060879 commit a3fa9c9

File tree

6 files changed

+32
-32
lines changed

6 files changed

+32
-32
lines changed

‎.github/workflows/dotnet-core-master.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
run: |-
5858
docker tag microtingas/work-items-planning-container:latest microtingas/work-items-planning-container:latest
5959
- run: docker save microtingas/work-items-planning-container:latest -o work-items-planning-container.tar
60-
- uses: actions/upload-artifact@v3
60+
- uses: actions/upload-artifact@v4
6161
with:
6262
name: work-items-planning-container
6363
path: work-items-planning-container.tar
@@ -75,7 +75,7 @@ jobs:
7575
- name: Extract branch name
7676
id: extract_branch
7777
run: echo "BRANCH=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
78-
- uses: actions/download-artifact@v3
78+
- uses: actions/download-artifact@v4
7979
with:
8080
name: work-items-planning-container
8181
- run: docker load -i work-items-planning-container.tar
@@ -198,7 +198,7 @@ jobs:
198198
if [ $result -ne 1 ];then exit 1; fi
199199
- name: Archive screenshot artifacts
200200
if: ${{ failure() }}
201-
uses: actions/upload-artifact@v3
201+
uses: actions/upload-artifact@v4
202202
with:
203203
name: error Screenshots
204204
path: |
@@ -210,7 +210,7 @@ jobs:
210210
cat docker_run_log
211211
- name: Archive videos
212212
if: ${{ failure() }}
213-
uses: actions/upload-artifact@v3
213+
uses: actions/upload-artifact@v4
214214
with:
215215
name: error Screenshots
216216
path: |
@@ -235,7 +235,7 @@ jobs:
235235
- name: Setup .NET Core
236236
uses: actions/setup-dotnet@v3
237237
with:
238-
dotnet-version: 8.0.x
238+
dotnet-version: 9.0.x
239239
- name: Build
240240
run: dotnet build eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.sln
241241
- name: Unit Tests

‎.github/workflows/dotnet-core-pr.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
run: |-
5252
docker tag microtingas/work-items-planning-container:latest microtingas/work-items-planning-container:latest
5353
- run: docker save microtingas/work-items-planning-container:latest -o work-items-planning-container.tar
54-
- uses: actions/upload-artifact@v3
54+
- uses: actions/upload-artifact@v4
5555
with:
5656
name: work-items-planning-container
5757
path: work-items-planning-container.tar
@@ -66,7 +66,7 @@ jobs:
6666
- uses: actions/checkout@v3
6767
with:
6868
path: eform-backendconfiguration-plugin
69-
- uses: actions/download-artifact@v3
69+
- uses: actions/download-artifact@v4
7070
with:
7171
name: work-items-planning-container
7272
- run: docker load -i work-items-planning-container.tar
@@ -190,14 +190,14 @@ jobs:
190190
cat docker_run_log
191191
- name: Archive screenshot artifacts
192192
if: ${{ failure() }}
193-
uses: actions/upload-artifact@v3
193+
uses: actions/upload-artifact@v4
194194
with:
195195
name: error Screenshots
196196
path: |
197197
eform-angular-frontend/eform-client/errorShots/chrome*.png
198198
- name: Archive videos
199199
if: ${{ failure() }}
200-
uses: actions/upload-artifact@v3
200+
uses: actions/upload-artifact@v4
201201
with:
202202
name: error Screenshots
203203
path: |
@@ -222,7 +222,7 @@ jobs:
222222
- name: Setup .NET Core
223223
uses: actions/setup-dotnet@v3
224224
with:
225-
dotnet-version: 8.0.x
225+
dotnet-version: 9.0.x
226226
- name: Build
227227
run: dotnet build eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.sln
228228
- name: Unit Tests

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ COPY eform-angular-frontend/eform-client ./
55
RUN yarn install
66
RUN npm run build
77

8-
FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env
8+
FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build-env
99
WORKDIR /app
1010
ARG GITVERSION
1111
ARG PLUGINVERSION
@@ -26,7 +26,7 @@ RUN dotnet publish TimePlanning.Pn -o TimePlanning.Pn/out /p:Version=$PLUGIN5VER
2626
RUN dotnet publish BackendConfiguration.Pn -o BackendConfiguration.Pn/out /p:Version=$PLUGIN4VERSION --runtime linux-x64 --configuration Release
2727

2828
# Build runtime image
29-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy
29+
FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble
3030
WORKDIR /app
3131
COPY --from=build-env /app/eFormAPI.Web/out .
3232
RUN mkdir -p ./Plugins/ItemsPlanning.Pn

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.Integration.Test/BackendConfiguration.Pn.Integration.Test.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

@@ -10,16 +10,16 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1414
<PackageReference Include="NSubstitute" Version="5.1.0" />
1515
<PackageReference Include="NUnit" Version="3.14.0" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
1717
<PackageReference Include="NUnit.Analyzers" Version="3.10.0">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>
21-
<PackageReference Include="Testcontainers" Version="4.0.0" />
22-
<PackageReference Include="Testcontainers.MariaDb" Version="4.0.0" />
21+
<PackageReference Include="Testcontainers" Version="4.1.0" />
22+
<PackageReference Include="Testcontainers.MariaDb" Version="4.1.0" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.Test/BackendConfiguration.Pn.Test.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<IsPublishable>false</IsPublishable>
77
<IsPublishable>false</IsPublishable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1212
<PackageReference Include="NSubstitute" Version="5.1.0" />
1313
<PackageReference Include="NUnit" Version="3.14.0" />
1414
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
15-
<PackageReference Include="Testcontainers" Version="4.0.0" />
16-
<PackageReference Include="Testcontainers.MariaDb" Version="4.0.0" />
15+
<PackageReference Include="Testcontainers" Version="4.1.0" />
16+
<PackageReference Include="Testcontainers.MariaDb" Version="4.1.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/BackendConfiguration.Pn.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ServerGarbageCollection>false</ServerGarbageCollection>
66
</PropertyGroup>
77

@@ -217,20 +217,20 @@
217217
<ItemGroup>
218218
<PackageReference Include="ChemicalsBase" Version="8.0.10" />
219219
<PackageReference Include="Google.Apis.Sheets.v4" Version="1.68.0.3568" />
220-
<PackageReference Include="HtmlToOpenXml.dll" Version="3.2.1" />
220+
<PackageReference Include="HtmlToOpenXml.dll" Version="3.2.2" />
221221
<PackageReference Include="Ical.Net" Version="4.3.1" />
222-
<PackageReference Include="Microting.eForm" Version="8.0.72" />
223-
<PackageReference Include="Microting.EformAngularFrontendBase" Version="8.0.76" />
224-
<PackageReference Include="Microting.eFormApi.BasePn" Version="8.0.73" />
222+
<PackageReference Include="Microting.eForm" Version="9.0.1" />
223+
<PackageReference Include="Microting.EformAngularFrontendBase" Version="9.0.1" />
224+
<PackageReference Include="Microting.eFormApi.BasePn" Version="9.0.1" />
225225
<PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" />
226226
<PackageReference Include="Microting.EformBackendConfigurationBase" Version="8.0.29" />
227-
<PackageReference Include="Microting.eFormCaseTemplateBase" Version="8.0.62" />
228-
<PackageReference Include="Microting.ItemsPlanningBase" Version="8.0.62" />
229-
<PackageReference Include="Microting.TimePlanningBase" Version="8.0.67" />
230-
<PackageReference Include="QuestPDF" Version="2024.10.2" />
231-
<PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.3" />
232-
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.9" />
233-
<PackageReference Include="Sentry" Version="4.13.0" />
227+
<PackageReference Include="Microting.eFormCaseTemplateBase" Version="8.0.67" />
228+
<PackageReference Include="Microting.ItemsPlanningBase" Version="8.0.67" />
229+
<PackageReference Include="Microting.TimePlanningBase" Version="8.0.72" />
230+
<PackageReference Include="QuestPDF" Version="2024.12.1" />
231+
<PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.0.1" />
232+
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.116.1" />
233+
<PackageReference Include="Sentry" Version="5.0.0" />
234234
</ItemGroup>
235235

236236
<ItemGroup>

0 commit comments

Comments
 (0)