From 8f28770b1ffb1a37b34a10cdcb5db995f906d64b Mon Sep 17 00:00:00 2001 From: Ryan Newington Date: Tue, 25 Jan 2022 20:47:15 +1100 Subject: [PATCH] Updates UserInterfaceView to show descriptions of access request type ordering items Fixes EV build script Fixes #133 --- .../Lithnet.AccessManager.Agent.Setup-x64.aip | 6 +++--- .../Lithnet.AccessManager.Agent.Setup-x86.aip | 6 +++--- .../Lithnet.AccessManager.Server.UI.csproj | 2 +- .../Views/UserInterfaceView.xaml | 8 +++++++- .../Lithnet.AccessManager.Server.csproj | 2 +- .../Providers/SqlDbProvider.cs | 2 +- .../Providers/SqlServerInstanceProvider.cs | 2 +- .../Lithnet.AccessManager.Service.Setup.aip | 8 ++++---- .../Lithnet.AccessManager.Service.csproj | 2 +- src/Lithnet.AccessManager/build-all-ev.bat | 3 ++- src/Lithnet.AccessManager/version.txt | 2 +- 11 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/Lithnet.AccessManager/Lithnet.AccessManager.Agent.Setup/Lithnet.AccessManager.Agent.Setup-x64.aip b/src/Lithnet.AccessManager/Lithnet.AccessManager.Agent.Setup/Lithnet.AccessManager.Agent.Setup-x64.aip index fafb46a8..7b922998 100644 --- a/src/Lithnet.AccessManager/Lithnet.AccessManager.Agent.Setup/Lithnet.AccessManager.Agent.Setup-x64.aip +++ b/src/Lithnet.AccessManager/Lithnet.AccessManager.Agent.Setup/Lithnet.AccessManager.Agent.Setup-x64.aip @@ -1,5 +1,5 @@ - + @@ -10,10 +10,10 @@ - + - + diff --git a/src/Lithnet.AccessManager/Lithnet.AccessManager.Agent.Setup/Lithnet.AccessManager.Agent.Setup-x86.aip b/src/Lithnet.AccessManager/Lithnet.AccessManager.Agent.Setup/Lithnet.AccessManager.Agent.Setup-x86.aip index adfd974b..79e2881f 100644 --- a/src/Lithnet.AccessManager/Lithnet.AccessManager.Agent.Setup/Lithnet.AccessManager.Agent.Setup-x86.aip +++ b/src/Lithnet.AccessManager/Lithnet.AccessManager.Agent.Setup/Lithnet.AccessManager.Agent.Setup-x86.aip @@ -1,5 +1,5 @@ - + @@ -10,10 +10,10 @@ - + - + diff --git a/src/Lithnet.AccessManager/Lithnet.AccessManager.Server.UI/Lithnet.AccessManager.Server.UI.csproj b/src/Lithnet.AccessManager/Lithnet.AccessManager.Server.UI/Lithnet.AccessManager.Server.UI.csproj index 8c17f769..d4638ab9 100644 --- a/src/Lithnet.AccessManager/Lithnet.AccessManager.Server.UI/Lithnet.AccessManager.Server.UI.csproj +++ b/src/Lithnet.AccessManager/Lithnet.AccessManager.Server.UI/Lithnet.AccessManager.Server.UI.csproj @@ -60,7 +60,7 @@ - + diff --git a/src/Lithnet.AccessManager/Lithnet.AccessManager.Server.UI/Views/UserInterfaceView.xaml b/src/Lithnet.AccessManager/Lithnet.AccessManager.Server.UI/Views/UserInterfaceView.xaml index 33d8809b..c6f582c8 100644 --- a/src/Lithnet.AccessManager/Lithnet.AccessManager.Server.UI/Views/UserInterfaceView.xaml +++ b/src/Lithnet.AccessManager/Lithnet.AccessManager.Server.UI/Views/UserInterfaceView.xaml @@ -130,7 +130,13 @@ SelectedItem="{Binding SelectedAuthZDisplayOrderItem}" BorderBrush="{DynamicResource MahApps.Brushes.Control.Border}" BorderThickness="1" - Margin="5"/> + Margin="5"> + + + + + + - + diff --git a/src/Lithnet.AccessManager/Lithnet.AccessManager.Server/Providers/SqlDbProvider.cs b/src/Lithnet.AccessManager/Lithnet.AccessManager.Server/Providers/SqlDbProvider.cs index 7fa57f76..5336b85d 100644 --- a/src/Lithnet.AccessManager/Lithnet.AccessManager.Server/Providers/SqlDbProvider.cs +++ b/src/Lithnet.AccessManager/Lithnet.AccessManager.Server/Providers/SqlDbProvider.cs @@ -42,7 +42,7 @@ public SqlConnection GetConnection() private void InitializeDb() { - if (licenseManager.IsFeatureEnabled(LicensedFeatures.ExternalSql) && highAvailabilityOptions.UseExternalSql) + if (licenseManager.IsFeatureEnabled(LicensedFeatures.HighAvailability) && highAvailabilityOptions.UseExternalSql) { this.activeInstanceProvider = this.sqlServerInstanceProvider; } diff --git a/src/Lithnet.AccessManager/Lithnet.AccessManager.Server/Providers/SqlServerInstanceProvider.cs b/src/Lithnet.AccessManager/Lithnet.AccessManager.Server/Providers/SqlServerInstanceProvider.cs index 5ac43945..ac952706 100644 --- a/src/Lithnet.AccessManager/Lithnet.AccessManager.Server/Providers/SqlServerInstanceProvider.cs +++ b/src/Lithnet.AccessManager/Lithnet.AccessManager.Server/Providers/SqlServerInstanceProvider.cs @@ -44,7 +44,7 @@ public SqlConnection GetConnection() public void InitializeDb() { - this.licenseManager.ThrowOnMissingFeature(LicensedFeatures.ExternalSql); + this.licenseManager.ThrowOnMissingFeature(LicensedFeatures.HighAvailability); this.logger.LogTrace("Initializing external DB"); this.ConnectionString = this.highAvailabilityOptions.ConnectionString; diff --git a/src/Lithnet.AccessManager/Lithnet.AccessManager.Service.Setup/Lithnet.AccessManager.Service.Setup.aip b/src/Lithnet.AccessManager/Lithnet.AccessManager.Service.Setup/Lithnet.AccessManager.Service.Setup.aip index 8fdd4e63..b7642c76 100644 --- a/src/Lithnet.AccessManager/Lithnet.AccessManager.Service.Setup/Lithnet.AccessManager.Service.Setup.aip +++ b/src/Lithnet.AccessManager/Lithnet.AccessManager.Service.Setup/Lithnet.AccessManager.Service.Setup.aip @@ -19,10 +19,10 @@ - + - + @@ -1863,8 +1863,8 @@ - - + + diff --git a/src/Lithnet.AccessManager/Lithnet.AccessManager.Service/Lithnet.AccessManager.Service.csproj b/src/Lithnet.AccessManager/Lithnet.AccessManager.Service/Lithnet.AccessManager.Service.csproj index 83086067..e7869943 100644 --- a/src/Lithnet.AccessManager/Lithnet.AccessManager.Service/Lithnet.AccessManager.Service.csproj +++ b/src/Lithnet.AccessManager/Lithnet.AccessManager.Service/Lithnet.AccessManager.Service.csproj @@ -86,7 +86,7 @@ - + diff --git a/src/Lithnet.AccessManager/build-all-ev.bat b/src/Lithnet.AccessManager/build-all-ev.bat index 9b104a17..59f45a88 100644 --- a/src/Lithnet.AccessManager/build-all-ev.bat +++ b/src/Lithnet.AccessManager/build-all-ev.bat @@ -14,7 +14,8 @@ call action-core-build-agent.bat if %errorlevel% neq 0 exit /b %errorlevel% ECHO Signing installers with EV certificate -"%SIGNTOOLPATH%\signtool.exe" sign /sha1 %EVCSCERTTHUMBPRINT% /d "Lithnet Access Manager" /t http://timestamp.digicert.com /fd sha256 /v "%amsBuildFolder%\*" +"%SIGNTOOLPATH%\signtool.exe" sign /sha1 %EVCSCERTTHUMBPRINT% /d "Lithnet Access Manager" /t http://timestamp.digicert.com /fd sha256 /v "%amsBuildFolder%\*.exe" +"%SIGNTOOLPATH%\signtool.exe" sign /sha1 %EVCSCERTTHUMBPRINT% /d "Lithnet Access Manager" /t http://timestamp.digicert.com /fd sha256 /v "%amsBuildFolder%\*.msi" if %errorlevel% neq 0 ECHO Build failed && exit /b %errorlevel% ECHO %version%| clip diff --git a/src/Lithnet.AccessManager/version.txt b/src/Lithnet.AccessManager/version.txt index 748d6232..13f61757 100644 --- a/src/Lithnet.AccessManager/version.txt +++ b/src/Lithnet.AccessManager/version.txt @@ -1 +1 @@ -7933 +7939