From dd39bb134a32664bcce7810ea6b50fa2e3482246 Mon Sep 17 00:00:00 2001 From: Julian Rich <123442863+ric394@users.noreply.github.com> Date: Fri, 24 Apr 2026 14:47:00 +1000 Subject: [PATCH 1/3] remove apsimx project references from the project Co-authored-by: Copilot --- APSIM.Docs.csproj | 6 +----- Components/Custom/DocLink.razor | 2 +- Components/Layout/NavMenu.razor | 3 +-- Components/Pages/Home.razor | 3 +-- Components/Pages/Model.razor | 2 +- Components/Pages/Models.razor | 3 +-- Components/Pages/Tutorial.razor | 3 +-- Components/Pages/Tutorials.razor | 2 +- Components/Pages/Validation.razor | 3 +-- 9 files changed, 9 insertions(+), 18 deletions(-) diff --git a/APSIM.Docs.csproj b/APSIM.Docs.csproj index dd59514..8635d37 100644 --- a/APSIM.Docs.csproj +++ b/APSIM.Docs.csproj @@ -1,9 +1,5 @@ - - - - @@ -17,6 +13,6 @@ false - + diff --git a/Components/Custom/DocLink.razor b/Components/Custom/DocLink.razor index ca0152e..f2dec89 100644 --- a/Components/Custom/DocLink.razor +++ b/Components/Custom/DocLink.razor @@ -1,7 +1,7 @@ @using APSIM.Docs.Components.State @using Microsoft.AspNetCore.Http @using Microsoft.AspNetCore.Mvc -@using APSIM.Documentation.Models +@* @using APSIM.Documentation.Models *@ @using System @inject StateContainer StateContainer @inject NavigationManager NavigationManager diff --git a/Components/Layout/NavMenu.razor b/Components/Layout/NavMenu.razor index 00b07a4..ee70d7b 100644 --- a/Components/Layout/NavMenu.razor +++ b/Components/Layout/NavMenu.razor @@ -1,8 +1,7 @@ 
- - @* APSIM Documentation *@ +
diff --git a/Components/Pages/Home.razor b/Components/Pages/Home.razor index 34dcf1d..bd9a81a 100644 --- a/Components/Pages/Home.razor +++ b/Components/Pages/Home.razor @@ -1,6 +1,5 @@ -@using APSIM.Documentation +@* @using APSIM.Documentation *@ @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage -@using Newtonsoft.Json @using Components.Layout @rendermode InteractiveServer @page "/" diff --git a/Components/Pages/Model.razor b/Components/Pages/Model.razor index aab0d5f..edbdccb 100644 --- a/Components/Pages/Model.razor +++ b/Components/Pages/Model.razor @@ -1,4 +1,4 @@ -@using APSIM.Documentation +@* @using APSIM.Documentation *@ @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage @using Components.Layout @rendermode InteractiveServer diff --git a/Components/Pages/Models.razor b/Components/Pages/Models.razor index e1d064d..c4377cd 100644 --- a/Components/Pages/Models.razor +++ b/Components/Pages/Models.razor @@ -1,5 +1,4 @@ -@using APSIM.Documentation -@using Newtonsoft.Json +@* @using APSIM.Documentation *@ @using Microsoft.AspNetCore.Mvc @using APSIM.Docs.Components.State @inject StateContainer StateContainer diff --git a/Components/Pages/Tutorial.razor b/Components/Pages/Tutorial.razor index d97658e..323a2a8 100644 --- a/Components/Pages/Tutorial.razor +++ b/Components/Pages/Tutorial.razor @@ -1,5 +1,4 @@ -@using APSIM.Documentation -@using Newtonsoft.Json +@* @using APSIM.Documentation *@ @using Microsoft.AspNetCore.Mvc @using APSIM.Docs.Components.State @inject StateContainer StateContainer diff --git a/Components/Pages/Tutorials.razor b/Components/Pages/Tutorials.razor index e415ecb..13b4aae 100644 --- a/Components/Pages/Tutorials.razor +++ b/Components/Pages/Tutorials.razor @@ -1,4 +1,4 @@ -@using APSIM.Documentation +@* @using APSIM.Documentation *@ @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage @using Components.Layout @rendermode InteractiveServer diff --git a/Components/Pages/Validation.razor b/Components/Pages/Validation.razor index 4a3d78f..8f43333 100644 --- a/Components/Pages/Validation.razor +++ b/Components/Pages/Validation.razor @@ -1,5 +1,4 @@ -@using APSIM.Documentation -@using Newtonsoft.Json +@* @using APSIM.Documentation *@ @using Microsoft.AspNetCore.Mvc @using APSIM.Docs.Components.State @inject StateContainer StateContainer From 68724411b77d43de528f3135e755810c5f0a4cf5 Mon Sep 17 00:00:00 2001 From: Julian Rich <123442863+ric394@users.noreply.github.com> Date: Fri, 24 Apr 2026 14:47:47 +1000 Subject: [PATCH 2/3] update dockerfile to no longer pull apsimx repos - no longer required --- dockerfile | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dockerfile b/dockerfile index 64a09db..7365c9a 100644 --- a/dockerfile +++ b/dockerfile @@ -3,29 +3,9 @@ FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-noble AS build ARG TARGETARCH RUN echo ${TARGETARCH} - -# Get ApsimX dependencies. -WORKDIR / -RUN git clone https://github.com/APSIMInitiative/ApsimX.git -# COPY ../ApsimX /ApsimX -WORKDIR /ApsimX -RUN dotnet build - COPY . /apsimdocs WORKDIR /apsimdocs RUN dotnet publish APSIM.Docs.csproj -a amd64 -c Debug -o ../app - -# Runtime stage -# FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble -FROM apsiminitiative/rsensitivity -RUN apt -yq update && \ - apt install -y aspnetcore-runtime-8.0 && \ - apt install -y dotnet-runtime-8.0 - EXPOSE 8080 -WORKDIR / -COPY --link --from=build /app /app -COPY --link --from=build /ApsimX /ApsimX - WORKDIR /app ENTRYPOINT ["dotnet","APSIM.Docs.dll"] From 6d7147c198eeaa8d56230c478f04caf3cddc8c70 Mon Sep 17 00:00:00 2001 From: Julian Rich <123442863+ric394@users.noreply.github.com> Date: Fri, 24 Apr 2026 14:52:46 +1000 Subject: [PATCH 3/3] remove using statements from components --- Components/Custom/DocLink.razor | 1 - Components/Pages/Home.razor | 3 +-- Components/Pages/Model.razor | 1 - Components/Pages/Models.razor | 1 - Components/Pages/Tutorial.razor | 1 - Components/Pages/Tutorials.razor | 1 - Components/Pages/Validation.razor | 1 - 7 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Components/Custom/DocLink.razor b/Components/Custom/DocLink.razor index f2dec89..dc56de3 100644 --- a/Components/Custom/DocLink.razor +++ b/Components/Custom/DocLink.razor @@ -1,7 +1,6 @@ @using APSIM.Docs.Components.State @using Microsoft.AspNetCore.Http @using Microsoft.AspNetCore.Mvc -@* @using APSIM.Documentation.Models *@ @using System @inject StateContainer StateContainer @inject NavigationManager NavigationManager diff --git a/Components/Pages/Home.razor b/Components/Pages/Home.razor index bd9a81a..1a4aa41 100644 --- a/Components/Pages/Home.razor +++ b/Components/Pages/Home.razor @@ -1,5 +1,4 @@ -@* @using APSIM.Documentation *@ -@using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage +@using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage @using Components.Layout @rendermode InteractiveServer @page "/" diff --git a/Components/Pages/Model.razor b/Components/Pages/Model.razor index edbdccb..d069bf4 100644 --- a/Components/Pages/Model.razor +++ b/Components/Pages/Model.razor @@ -1,4 +1,3 @@ -@* @using APSIM.Documentation *@ @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage @using Components.Layout @rendermode InteractiveServer diff --git a/Components/Pages/Models.razor b/Components/Pages/Models.razor index c4377cd..8dfca0d 100644 --- a/Components/Pages/Models.razor +++ b/Components/Pages/Models.razor @@ -1,4 +1,3 @@ -@* @using APSIM.Documentation *@ @using Microsoft.AspNetCore.Mvc @using APSIM.Docs.Components.State @inject StateContainer StateContainer diff --git a/Components/Pages/Tutorial.razor b/Components/Pages/Tutorial.razor index 323a2a8..0f30cad 100644 --- a/Components/Pages/Tutorial.razor +++ b/Components/Pages/Tutorial.razor @@ -1,4 +1,3 @@ -@* @using APSIM.Documentation *@ @using Microsoft.AspNetCore.Mvc @using APSIM.Docs.Components.State @inject StateContainer StateContainer diff --git a/Components/Pages/Tutorials.razor b/Components/Pages/Tutorials.razor index 13b4aae..680f001 100644 --- a/Components/Pages/Tutorials.razor +++ b/Components/Pages/Tutorials.razor @@ -1,4 +1,3 @@ -@* @using APSIM.Documentation *@ @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage @using Components.Layout @rendermode InteractiveServer diff --git a/Components/Pages/Validation.razor b/Components/Pages/Validation.razor index 8f43333..4207741 100644 --- a/Components/Pages/Validation.razor +++ b/Components/Pages/Validation.razor @@ -1,4 +1,3 @@ -@* @using APSIM.Documentation *@ @using Microsoft.AspNetCore.Mvc @using APSIM.Docs.Components.State @inject StateContainer StateContainer