Updates UserInterfaceView to show descriptions of access request type…

… ordering items Fixes EV build script Fixes #133
lithnet · Jan 25, 2022 · 8f28770 · 8f28770
1 parent 96906e4
commit 8f28770
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 18 deletions.
diff --git a/...AccessManager/Lithnet.AccessManager.Agent.Setup/Lithnet.AccessManager.Agent.Setup-x64.aip b/...AccessManager/Lithnet.AccessManager.Agent.Setup/Lithnet.AccessManager.Agent.Setup-x64.aip
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT Type="Advanced Installer" CreateVersion="17.3" version="18.8.1" Modules="professional" RootPath="." Language="en" Id="{6231D1B4-23AF-4C6E-998C-070D74534FAD}">
+<DOCUMENT Type="Advanced Installer" CreateVersion="17.3" version="19.0" Modules="professional" RootPath="." Language="en" Id="{6231D1B4-23AF-4C6E-998C-070D74534FAD}">
   <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
     <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
     <ROW Property="AI_CURRENT_YEAR" Value="2022" ValueLocId="-"/>
@@ -10,10 +10,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPPRODUCTICON" Value="accessmanager.exe" Type="8"/>
     <ROW Property="Manufacturer" Value="Lithnet"/>
-    <ROW Property="ProductCode" Value="1033:{6A5859CD-930B-4584-8D75-AA85674B8AED} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{39A9CC9C-9C55-48F2-BCB3-A05872CDB443} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Lithnet Access Manager Agent"/>
-    <ROW Property="ProductVersion" Value="1.0.7929.0" Type="32" TargetFile="Lithnet.AccessManager.Agent.exe"/>
+    <ROW Property="ProductVersion" Value="1.0.7939.0" Type="32" TargetFile="Lithnet.AccessManager.Agent.exe"/>
     <ROW Property="SETUPEXEDIR" Value="1"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{EEDECF4C-BABB-4AE0-9CB9-DC051FF1AE75}"/>

diff --git a/...AccessManager/Lithnet.AccessManager.Agent.Setup/Lithnet.AccessManager.Agent.Setup-x86.aip b/...AccessManager/Lithnet.AccessManager.Agent.Setup/Lithnet.AccessManager.Agent.Setup-x86.aip
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT Type="Advanced Installer" CreateVersion="17.3" version="18.8.1" Modules="professional" RootPath="." Language="en" Id="{6231D1B4-23AF-4C6E-998C-070D74534FAD}">
+<DOCUMENT Type="Advanced Installer" CreateVersion="17.3" version="19.0" Modules="professional" RootPath="." Language="en" Id="{6231D1B4-23AF-4C6E-998C-070D74534FAD}">
   <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
     <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
     <ROW Property="AI_CURRENT_YEAR" Value="2022" ValueLocId="-"/>
@@ -10,10 +10,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPPRODUCTICON" Value="accessmanager.exe" Type="8"/>
     <ROW Property="Manufacturer" Value="Lithnet"/>
-    <ROW Property="ProductCode" Value="1033:{170A644B-E350-4E27-A797-542CE32F784B} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{E480130C-4439-4D4B-A81A-D5983CB705D5} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Lithnet Access Manager Agent"/>
-    <ROW Property="ProductVersion" Value="1.0.7929.0" Type="32" TargetFile="Lithnet.AccessManager.Agent.exe"/>
+    <ROW Property="ProductVersion" Value="1.0.7939.0" Type="32" TargetFile="Lithnet.AccessManager.Agent.exe"/>
     <ROW Property="SETUPEXEDIR" Value="1"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{EEDECF4C-BABB-4AE0-9CB9-DC051FF1AE75}"/>

diff --git a/...hnet.AccessManager/Lithnet.AccessManager.Server.UI/Lithnet.AccessManager.Server.UI.csproj b/...hnet.AccessManager/Lithnet.AccessManager.Server.UI/Lithnet.AccessManager.Server.UI.csproj
@@ -60,7 +60,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentValidation" Version="9.0.1" />
-    <PackageReference Include="Lithnet.AccessManager.Enterprise" Version="1.0.7770.30380" />
+    <PackageReference Include="Lithnet.AccessManager.Enterprise" Version="1.0.8060.36339" />
     <PackageReference Include="mahapps.metro" Version="2.1.1" />
     <PackageReference Include="MahApps.Metro.IconPacks" Version="4.6.0" />
     <PackageReference Include="MahApps.Metro.SimpleChildWindow" Version="2.0.0-alpha0043" />

diff --git 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">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Converter={StaticResource EnumDescriptionConverter}}"></TextBlock>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
 
 
             <StackPanel Orientation="Vertical" Margin="0 5 5 5" Width="35"

diff --git a/src/Lithnet.AccessManager/Lithnet.AccessManager.Server/Lithnet.AccessManager.Server.csproj b/src/Lithnet.AccessManager/Lithnet.AccessManager.Server/Lithnet.AccessManager.Server.csproj
@@ -65,7 +65,7 @@
   <ItemGroup>
     <PackageReference Include="DbUp-SqlServer" Version="4.4.0" />
     <PackageReference Include="htmlagilitypack" Version="1.11.24" />
-    <PackageReference Include="lithnet.accessmanager.enterprise" Version="1.0.7770.30380" />
+    <PackageReference Include="lithnet.accessmanager.enterprise" Version="1.0.8060.36339" />
     <PackageReference Include="lithnet.security.authorization" Version="1.0.7518.2238" />
     <PackageReference Include="MartinCostello.SqlLocalDb" Version="3.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="2.2.0" />

diff --git 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/...Lithnet.AccessManager/Lithnet.AccessManager.Server/Providers/SqlServerInstanceProvider.cs b/...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/...AccessManager/Lithnet.AccessManager.Service.Setup/Lithnet.AccessManager.Service.Setup.aip b/...AccessManager/Lithnet.AccessManager.Service.Setup/Lithnet.AccessManager.Service.Setup.aip
@@ -19,10 +19,10 @@
     <ROW Property="IAgree" Value="No" Type="4" MsiKey="IAgree"/>
     <ROW Property="Manufacturer" Value="Lithnet"/>
     <ROW Property="NO_USER_CHECK" Comments="Skips checking username"/>
-    <ROW Property="ProductCode" Value="1033:{730B479E-7A2C-4941-8FB2-F35ED71B9A07} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{5654428D-B8AE-48BB-AE8C-C0E9C438E1A3} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Lithnet Access Manager Service"/>
-    <ROW Property="ProductVersion" Value="1.0.7933.0" Type="32" TargetFile="Lithnet.AccessManager.Service.exe"/>
+    <ROW Property="ProductVersion" Value="1.0.7939.0" Type="32" TargetFile="Lithnet.AccessManager.Service.exe"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{D17AC68C-2F91-4344-A3BF-B13404566A40}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -1863,8 +1863,8 @@
   <COMPONENT cid="caphyon.advinst.msicomp.PreReqComponent">
     <ROW PrereqKey="B467AE9894134312A9993D40B82F830D" DisplayName="PowerShell 5.0 for Windows 8.1/Server 2012R2 x64" VersionMin="5.0" SetupFileUrl="https://download.microsoft.com/download/2/C/6/2C6E1B4A-EBE5-48A6-B225-2D2058A9CEFB/Win8.1AndW2K12R2-KB3134758-x64.msu" Location="1" ExactSize="19764832" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" WinNT64Versions="Windows Vista x64, Windows Server 2008 x64, Windows 7 x64, Windows Server 2008 R2 x64, Windows 8 x64, Windows Server 2012 x64, Windows 10 x64, Windows Server x64" Operator="1" NoUiComLine="/quiet" Options="xym" MD5="a3255cb51f1bad3d78a0a0f777952823" TargetName="PowerShell 5.0"/>
     <ROW PrereqKey="C4FE6FD5B7C4D07B3A313E754A9A6A8" DisplayName="Visual C++ Redistributable for Visual Studio 2015-2019 x64" VersionMin="14.26" SetupFileUrl="Prerequisites\Visual C++ Redistributable for Visual Studio 2015-2019\VC_redist.x64.exe" Location="0" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" WinNT64Versions="Windows Vista RTM x64, Windows Vista SP1 x64, Windows Server 2008 RTM x64, Windows 7 RTM x64, Windows Server 2008 R2 RTM x64" Operator="1" ComLine="/q /norestart" BasicUiComLine="/q /norestart" NoUiComLine="/q /norestart" Options="xy" TargetName="Visual C++ Redistributable for Visual Studio 2015-2019\VC_redist.x64.exe" ParentPrereq="D17D1EE3B5447079AEF0A1CF58498F1"/>
-    <ROW PrereqKey="C6FE8A2F0943D2B7A0CB204E12F1F4" DisplayName="ASP.NET Core Runtime 3.1 x64" VersionMin="3.1" SetupFileUrl="https://download.visualstudio.microsoft.com/download/pr/c1ea0601-abe4-4c6d-96ed-131764bf5129/a1823d8ff605c30af412776e2e617a36/aspnetcore-runtime-3.1.10-win-x64.exe" Location="1" ExactSize="7847136" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" WinNT64Versions="Windows Vista x64, Windows Server 2008 x64, Windows 7 RTM x64, Windows Server 2008 R2 x64, Windows 8 x64, Windows Server 2012 x64, Windows 10 version 1507 x64, Windows 10 version 1511 x64" Operator="1" NoUiComLine="/q /norestart" Options="xym" MD5="c4206758df507bbc92a0be1657ce5e99" TargetName="ASP.NET Core 3.1"/>
-    <ROW PrereqKey="D0156DFD814047AB868D49D0D15F8245" DisplayName=".NET Core Desktop Runtime 3.1 x64" VersionMin="3.1" SetupFileUrl="https://download.visualstudio.microsoft.com/download/pr/513acf37-8da2-497d-bdaa-84d6e33c1fee/eb7b010350df712c752f4ec4b615f89d/windowsdesktop-runtime-3.1.10-win-x64.exe" Location="1" ExactSize="54513872" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" WinNT64Versions="Windows Vista x64, Windows Server 2008 x64, Windows 7 RTM x64, Windows Server 2008 R2 x64, Windows 8 x64, Windows Server 2012 x64, Windows 10 version 1507 x64, Windows 10 version 1511 x64" Operator="1" NoUiComLine="/q /norestart" Options="xym" MD5="f5289dc19c63a60e063c77ba3f59fb43" TargetName=".NET Core 3.1"/>
+    <ROW PrereqKey="C6FE8A2F0943D2B7A0CB204E12F1F4" DisplayName="ASP.NET Core Runtime 3.1 x64" VersionMin="3.1" VersionMax="3.9999.9999.9999" SetupFileUrl="https://download.visualstudio.microsoft.com/download/pr/c1ea0601-abe4-4c6d-96ed-131764bf5129/a1823d8ff605c30af412776e2e617a36/aspnetcore-runtime-3.1.10-win-x64.exe" Location="1" ExactSize="7847136" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" WinNT64Versions="Windows Vista x64, Windows Server 2008 x64, Windows 7 RTM x64, Windows Server 2008 R2 x64, Windows 8 x64, Windows Server 2012 x64, Windows 10 version 1507 x64, Windows 10 version 1511 x64" Operator="1" NoUiComLine="/q /norestart" Options="xym" MD5="c4206758df507bbc92a0be1657ce5e99" TargetName="ASP.NET Core 3.1"/>
+    <ROW PrereqKey="D0156DFD814047AB868D49D0D15F8245" DisplayName=".NET Core Desktop Runtime 3.1 x64" VersionMin="3.1" VersionMax="3.9999.9999.9999" SetupFileUrl="https://download.visualstudio.microsoft.com/download/pr/513acf37-8da2-497d-bdaa-84d6e33c1fee/eb7b010350df712c752f4ec4b615f89d/windowsdesktop-runtime-3.1.10-win-x64.exe" Location="1" ExactSize="54513872" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" WinNT64Versions="Windows Vista x64, Windows Server 2008 x64, Windows 7 RTM x64, Windows Server 2008 R2 x64, Windows 8 x64, Windows Server 2012 x64, Windows 10 version 1507 x64, Windows 10 version 1511 x64" Operator="1" NoUiComLine="/q /norestart" Options="xym" MD5="f5289dc19c63a60e063c77ba3f59fb43" TargetName=".NET Core 3.1"/>
     <ROW PrereqKey="D17D1EE3B5447079AEF0A1CF58498F1" DisplayName="SQL Server Express LocalDB 2017" VersionMin="14.0" SetupFileUrl="https://download.microsoft.com/download/E/F/2/EF23C21D-7860-4F05-88CE-39AA114B014B/SqlLocalDB.msi" Location="1" ExactSize="48230400" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" WinNT64Versions="Windows Vista x64, Windows Server 2008 x64, Windows 7 x64, Windows Server 2008 R2 x64" Operator="1" BasicUiComLine="/qb IACCEPTSQLLOCALDBLICENSETERMS=YES" NoUiComLine="/qn IACCEPTSQLLOCALDBLICENSETERMS=YES" Options="xym" MD5="d180ae500607f6eae8942eaa285d8a06" TargetName="SQL Server Express LocalDB 2017"/>
     <ATTRIBUTE name="PrereqsOrder" value="C6FE8A2F0943D2B7A0CB204E12F1F4 D0156DFD814047AB868D49D0D15F8245 C4FE6FD5B7C4D07B3A313E754A9A6A8 D17D1EE3B5447079AEF0A1CF58498F1 B467AE9894134312A9993D40B82F830D"/>
   </COMPONENT>

diff --git 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 @@
 
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack" Version="1.11.24" />
-    <PackageReference Include="Lithnet.AccessManager.Enterprise" Version="1.0.7770.30380" />
+    <PackageReference Include="Lithnet.AccessManager.Enterprise" Version="1.0.8060.36339" />
     <PackageReference Include="lithnet.EventLogMessages" Version="1.0.0.4" />
     <PackageReference Include="microsoft.aspnetcore.authentication.cookies" Version="2.2.0" />
     <PackageReference Include="microsoft.aspnetcore.authentication.jwtbearer" Version="3.1.18" />

diff --git 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 [92mSigning installers with EV certificate[0m
-"%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 [91mBuild failed[0m && exit /b %errorlevel%
 
 ECHO %version%| clip

diff --git a/src/Lithnet.AccessManager/version.txt b/src/Lithnet.AccessManager/version.txt
@@ -1 +1 @@
-7933 
+7939