Skip to content

Commit 00e80de

Browse files
[AA-1782] Release AdminApp (#542)
* Release AdminApp * Dummy Change
1 parent efe3e14 commit 00e80de

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

Application/EdFi.Ods.AdminApp.Web/Controllers/ApplicationController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ public ActionResult Delete(DeleteApplicationModel model)
194194

195195
public async Task<ActionResult> Edit(int applicationId)
196196
{
197-
var application = _getApplicationByIdQuery.Execute(applicationId);
198197
var apiFacade = await _odsApiFacadeFactory.Create();
198+
var application = _getApplicationByIdQuery.Execute(applicationId);
199199
var schools = apiFacade.GetAllSchools().ToList();
200200
var psis = apiFacade.GetAllPostSecondaryInstitutions().ToList();
201201
var leas = apiFacade.GetAllLocalEducationAgencies().ToList();

Docker/.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# NuGet Package Versions
2-
ADMINAPP_PACKAGE_VERSION=3.3.3
2+
ADMINAPP_PACKAGE_VERSION=3.3.4
33
ODS_API_PACKAGE_VERSION=v2.3.5 # 2.3.5 corresponds to ODS/API 6.2
44

55
# Local disk folder where log file volumes are mapped

Docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ services:
8686
context: .
8787
dockerfile: pgsql.Dockerfile
8888
args:
89-
ADMINAPP_PACKAGE_VERSION: ${ADMINAPP_PACKAGE_VERSION:-3.3.3}
89+
ADMINAPP_PACKAGE_VERSION: ${ADMINAPP_PACKAGE_VERSION:-3.3.4}
9090
environment:
9191
POSTGRES_USER: "${POSTGRES_USER}"
9292
POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"

Docker/mssql.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
FROM mcr.microsoft.com/dotnet/aspnet@sha256:724275ef1d9fe87eab6e1c45e4cf9cca2c1751dccfbf93a182fc82fd42278ce0
88
LABEL maintainer="Ed-Fi Alliance, LLC and Contributors <techsupport@ed-fi.org>"
99

10-
ARG ADMINAPP_PACKAGE_VERSION=3.3.3
10+
ARG ADMINAPP_PACKAGE_VERSION=3.3.4
1111

1212
ENV ADMINAPP_VIRTUAL_NAME=adminapp
1313
ENV API_MODE=SharedInstance
@@ -19,7 +19,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
1919
WORKDIR /app
2020
COPY Settings/mssql/appsettings.template.json Settings/mssql/run.sh Settings/mssql/log4net.config /app/
2121

22-
ENV ALPINE_PACKAGES="unzip=~6 dos2unix=~7 bash=~5 gettext=~0 jq=~1 curl=~8 icu=~76 ca-certificates=~20241121"
22+
ENV ALPINE_PACKAGES="unzip=~6 dos2unix=~7 bash=~5 gettext=~0 jq=~1 curl=~8 icu=~76 ca-certificates=~20250619-r0"
2323
RUN apk --upgrade --no-cache add ${ALPINE_PACKAGES} && \
2424
wget -nv -O /app/AdminApp.zip ${ADMINAPP_PACKAGE} && \
2525
unzip /app/AdminApp.zip AdminApp/* -d /app/ && \

Docker/pgsql.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
FROM mcr.microsoft.com/dotnet/aspnet@sha256:724275ef1d9fe87eab6e1c45e4cf9cca2c1751dccfbf93a182fc82fd42278ce0
88
LABEL maintainer="Ed-Fi Alliance, LLC and Contributors <techsupport@ed-fi.org>"
99

10-
ARG ADMINAPP_PACKAGE_VERSION=3.3.3
10+
ARG ADMINAPP_PACKAGE_VERSION=3.3.4
1111

1212
ENV POSTGRES_PORT=5432
1313
ENV ADMINAPP_VIRTUAL_NAME=adminapp

EdFi.Suite3.Installer.AdminApp/install.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Configure Admin App to manage an API with url "https://localhost:54746"
4646
ToolsPath = "C:/temp/tools"
4747
DbConnectionInfo = $dbConnectionInfo
4848
OdsApiUrl = "https://localhost:54746"
49-
PackageVersion = '3.3.3.0'
49+
PackageVersion = '3.3.4.0'
5050
}
5151

5252
.EXAMPLE
@@ -60,7 +60,7 @@ Deploy Admin App for use with a "District Specific" ODS API
6060
ToolsPath = "C:/temp/tools"
6161
DbConnectionInfo = $dbConnectionInfo
6262
OdsApiUrl = "http://web-api.example.com/WebApi"
63-
PackageVersion = '3.3.3.0'
63+
PackageVersion = '3.3.4.0'
6464
AdminAppFeatures = $adminAppFeatures
6565
}
6666
#>
@@ -76,7 +76,7 @@ $p = @{
7676
ToolsPath = "C:/temp/tools"
7777
DbConnectionInfo = $dbConnectionInfo
7878
OdsApiUrl = ""
79-
PackageVersion = '3.3.3.0'
79+
PackageVersion = '3.3.4.0'
8080
PackageSource = $adminAppSource
8181
AdminAppFeatures = $adminAppFeatures
8282
}

EdFi.Suite3.Installer.AdminApp/upgrade.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $adminAppSource = "$packageSource/AdminApp"
1919

2020
$p = @{
2121
ToolsPath = "C:/temp/tools"
22-
PackageVersion = '3.3.3.0'
22+
PackageVersion = '3.3.4.0'
2323
PackageSource = $adminAppSource
2424
}
2525

0 commit comments

Comments
 (0)