Version bump

lithnet · Nov 6, 2021 · 6173ca1 · 6173ca1
1 parent 528006f
commit 6173ca1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/...cessManager/Lithnet.AccessManager.Agent.MacOs/io.lithnet.accessmanager.agent.entitlements b/...cessManager/Lithnet.AccessManager.Agent.MacOs/io.lithnet.accessmanager.agent.entitlements
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="us-ascii"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

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.4" Modules="enterprise" RootPath="." Language="en" Id="{6231D1B4-23AF-4C6E-998C-070D74534FAD}">
+<DOCUMENT Type="Advanced Installer" CreateVersion="17.3" version="18.8.1" Modules="enterprise" RootPath="." Language="en" Id="{6231D1B4-23AF-4C6E-998C-070D74534FAD}">
   <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
     <ROW Property="AGENTENABLED" Comments="AMS"/>
     <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
@@ -17,10 +17,10 @@
     <ROW Property="AZUREADTENANTID" Comments="AMS"/>
     <ROW Property="INTERVAL" Comments="AMS"/>
     <ROW Property="Manufacturer" Value="Lithnet"/>
-    <ROW Property="ProductCode" Value="1033:{744DB768-BA07-4AD7-9657-18C407BE2B5A} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{0E887E24-0C2D-47B2-8733-FD9F959F242B} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Lithnet Access Manager Agent"/>
-    <ROW Property="ProductVersion" Value="1.14.8382.0" Type="32" TargetFile="Lithnet.AccessManager.Agent.exe"/>
+    <ROW Property="ProductVersion" Value="2.0.8392.0" Type="32" TargetFile="Lithnet.AccessManager.Agent.exe"/>
     <ROW Property="REGISTRATIONKEY" Options="1" Comments="AMS"/>
     <ROW Property="REGKEYNOTREQUIRED" Value="0" Comments="AMS"/>
     <ROW Property="REG_REGISTRATIONKEY" Options="1" Comments="AMS"/>

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.4" Modules="enterprise" RootPath="." Language="en" Id="{6231D1B4-23AF-4C6E-998C-070D74534FAD}">
+<DOCUMENT Type="Advanced Installer" CreateVersion="17.3" version="18.8.1" Modules="enterprise" RootPath="." Language="en" Id="{6231D1B4-23AF-4C6E-998C-070D74534FAD}">
   <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
     <ROW Property="AGENTENABLED" Comments="AMS"/>
     <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
@@ -17,10 +17,10 @@
     <ROW Property="AZUREADTENANTID" Comments="AMS"/>
     <ROW Property="INTERVAL" Comments="AMS"/>
     <ROW Property="Manufacturer" Value="Lithnet"/>
-    <ROW Property="ProductCode" Value="1033:{317530D7-BEAA-4140-BAE3-9974CFA59518} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{5754CB99-B77F-46F6-A451-A6888DC9E413} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Lithnet Access Manager Agent"/>
-    <ROW Property="ProductVersion" Value="1.14.8382.0" Type="32" TargetFile="Lithnet.AccessManager.Agent.exe"/>
+    <ROW Property="ProductVersion" Value="2.0.8392.0" Type="32" TargetFile="Lithnet.AccessManager.Agent.exe"/>
     <ROW Property="REGISTRATIONKEY" Options="1" Comments="AMS"/>
     <ROW Property="REGKEYNOTREQUIRED" Value="0" Comments="AMS"/>
     <ROW Property="REG_REGISTRATIONKEY" Options="1" Comments="AMS"/>

diff --git a/...AccessManager/Lithnet.AccessManager.Service.Setup/Lithnet.AccessManager.Service.Setup.aip b/...AccessManager/Lithnet.AccessManager.Service.Setup/Lithnet.AccessManager.Service.Setup.aip
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT Type="Advanced Installer" CreateVersion="17.1.2" version="18.4" Modules="enterprise" RootPath="." Language="en" Id="{8ADA5C46-1F9D-45B3-A39D-37B0D337D0DD}">
+<DOCUMENT Type="Advanced Installer" CreateVersion="17.1.2" version="18.8.1" Modules="enterprise" RootPath="." Language="en" Id="{8ADA5C46-1F9D-45B3-A39D-37B0D337D0DD}">
   <COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent">
     <ROW Name="MigrationUninstallCode" Value="{D17AC68C-2F91-4344-A3BF-B13404566A40}"/>
   </COMPONENT>
@@ -22,10 +22,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:{943014D3-2435-476B-8AD4-33716AC6A810} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{EC175F33-4B54-4239-BFF6-6BACA01D42B5} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Lithnet Access Manager Service"/>
-    <ROW Property="ProductVersion" Value="1.14.8383.0" Type="32" TargetFile="Lithnet.AccessManager.Service.exe"/>
+    <ROW Property="ProductVersion" Value="2.0.8392.0" Type="32" TargetFile="Lithnet.AccessManager.Service.exe"/>
     <ROW Property="SHOW_DB_CONFIG" Value="1"/>
     <ROW Property="SQLEXPRESS_DEFAULT_ADMINS" Value="Builtin\Administrators"/>
     <ROW Property="SQLEXPRESS_DEFAULT_INSTANCENAME" Value="AMS"/>
@@ -1238,7 +1238,7 @@
     <ROW Dialog_="ServiceAccountDialog" Control="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Attributes="196611" Text="Service Configuration" TextStyle="[DlgTitleFont]" Order="900"/>
     <ROW Dialog_="ServiceAccountDialog" Control="Text_4" Type="Text" X="25" Y="128" Width="243" Height="14" Attributes="65539" Property="TEXT_4_PROP" Text="1. Use a group-managed service account" Order="1000"/>
     <ROW Dialog_="ServiceAccountDialog" Control="Text_5" Type="Text" X="25" Y="142" Width="300" Height="26" Attributes="65539" Property="TEXT_5_PROP" Text="2. Make sure the account has the &apos;account is sensitive and cannot be delegated&apos; flag set" Order="1100"/>
-    <ROW Dialog_="ServiceAccountDialog" Control="Hyperlink_2" Type="Hyperlink" X="15" Y="177" Width="310" Height="17" Attributes="65539" Property="HYPERLINK_2_PROP" Text="&lt;a href=&quot;https://go.lithnet.io/fwlink/enhjqpaz&quot;&gt;Creation script and more details...&lt;/a&gt;" Order="1200"/>
+    <ROW Dialog_="ServiceAccountDialog" Control="Hyperlink_2" Type="Hyperlink" X="15" Y="177" Width="310" Height="17" Attributes="65539" Property="HYPERLINK_2_PROP" Text="&lt;a href=&quot;https://go.lithnet.io/fwlink/pydygixu&quot;&gt;Creation script and more details...&lt;/a&gt;" Order="1200"/>
     <ROW Dialog_="ServiceAccountDialog" Control="Text_6" Type="Text" X="15" Y="62" Width="337" Height="30" Attributes="65539" Property="TEXT_6_PROP" Text="Lithnet Access Manager should never be run as a privileged account (eg Domain Admins), the configuration utility will guide you through the process of delegating the minimum necessary permissions." Order="1300"/>
     <ROW Dialog_="ServiceAccountDialog" Control="Text_7" Type="Text" X="15" Y="109" Width="316" Height="15" Attributes="65539" Property="TEXT_7_PROP" Text="To keep your service account as safe as possible, we recommend doing the following" Order="1400"/>
     <ROW Dialog_="ShowGsmaScript" Control="OK" Type="PushButton" X="256" Y="158" Width="56" Height="17" Attributes="3" Text="[ButtonText_OK]" Order="100"/>
@@ -1893,7 +1893,7 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiIniFileComponent">
     <ROW IniFile="IconFile" FileName="LITHNE~1.URL|Lithnet Access Manager online help.url" DirProperty="Lithnet_Dir" Section="InternetShortcut" Key="IconFile" Value="[#Lithnet.AccessManager.Server.UI.exe]" Action="0" Component_="Lithnet.AccessManager.Server.UI.exe"/>
     <ROW IniFile="IconIndex" FileName="LITHNE~1.URL|Lithnet Access Manager online help.url" DirProperty="Lithnet_Dir" Section="InternetShortcut" Key="IconIndex" Value="0" Action="0" Component_="Lithnet.AccessManager.Server.UI.exe"/>
-    <ROW IniFile="URL" FileName="LITHNE~1.URL|Lithnet Access Manager online help.url" DirProperty="Lithnet_Dir" Section="InternetShortcut" Key="URL" Value="https://go.lithnet.io/fwlink/ujoohidm" Action="0" Component_="Lithnet.AccessManager.Server.UI.exe"/>
+    <ROW IniFile="URL" FileName="LITHNE~1.URL|Lithnet Access Manager online help.url" DirProperty="Lithnet_Dir" Section="InternetShortcut" Key="URL" Value="https://go.lithnet.io/fwlink/rbxytmmv" Action="0" Component_="Lithnet.AccessManager.Server.UI.exe"/>
     <ROW IniFile="WorkingDirectory" FileName="LITHNE~1.URL|Lithnet Access Manager online help.url" DirProperty="Lithnet_Dir" Section="InternetShortcut" Key="WorkingDirectory" Value="[Lithnet_Dir]" Action="0" Component_="Lithnet.AccessManager.Server.UI.exe"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
@@ -2028,8 +2028,8 @@
   </COMPONENT>
   <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="xmy" MD5="a3255cb51f1bad3d78a0a0f777952823" TargetName="PowerShell 5.0"/>
-    <ROW PrereqKey="C6FE8A2F0943D2B7A0CB204E12F1F4" DisplayName="ASP.NET Core Runtime 3.1 x64" VersionMin="3.1" SetupFileUrl="https://download.visualstudio.microsoft.com/download/pr/a59188f0-7ac7-4cb7-b808-ac9a69c2fd68/8f14e0256f4986c13e053235ee44c297/aspnetcore-runtime-3.1.16-win-x64.exe" Location="1" ExactSize="7864992" 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 version 1507 x64, Windows 10 version 1511 x64" Operator="1" NoUiComLine="/q /norestart" Options="xym" MD5="f8afba0f899034c50ff27fea0bf493c4" 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/7cea63ad-1e76-41f0-a54a-eacb48fec749/87c339835cd7647c0fee3f14820cd909/windowsdesktop-runtime-3.1.16-win-x64.exe" Location="1" ExactSize="54394104" 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 version 1507 x64, Windows 10 version 1511 x64" Operator="1" NoUiComLine="/q /norestart" Options="xym" MD5="e83f04c11282fd6efd30542b93670586" TargetName=".NET Core 3.1"/>
+    <ROW PrereqKey="C6FE8A2F0943D2B7A0CB204E12F1F4" DisplayName="ASP.NET Core Runtime 3.1 x64" VersionMin="3.1" SetupFileUrl="https://download.visualstudio.microsoft.com/download/pr/dad6553b-3005-4b9f-b91e-ca759c9a36c3/9c63c8b6932a468180060a6a5fa24a00/aspnetcore-runtime-3.1.20-win-x64.exe" Location="1" ExactSize="7834832" 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 version 1507 x64, Windows 10 version 1511 x64" Operator="1" NoUiComLine="/q /norestart" Options="xym" MD5="abd5330ff2e09deff5dd13f613824674" 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/93c69a29-d379-4a5d-bb9e-3116cc14de41/907bbc52446d8bb7baa0c6faebde1d44/windowsdesktop-runtime-3.1.20-win-x64.exe" Location="1" ExactSize="54410952" 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 version 1507 x64, Windows 10 version 1511 x64" Operator="1" NoUiComLine="/q /norestart" Options="xym" MD5="8665af0f310d2cc5703d33579ea5235b" TargetName=".NET Core 3.1"/>
     <ROW PrereqKey="RequiredApplication" DisplayName="SQL Express 2017" VersionMin="14.0" SetupFileUrl="https://download.microsoft.com/download/E/F/2/EF23C21D-7860-4F05-88CE-39AA114B014B/SQLEXPR_x64_ENU.exe" Location="1" ExactSize="289058768" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" Operator="1" ComLine="/x:&quot;%SystemDrive%\temp\sqlx&quot; /SkipInstallerRunCheck /ACTION=Install /ROLE=AllFeatures_WithDefaults /QUIETSIMPLE=True /UpdateEnabled=False /USEMICROSOFTUPDATE=&quot;False&quot; /FEATURES=SQLENGINE /INSTANCENAME=&quot;[SQLEXPRESS_DEFAULT_INSTANCENAME]&quot; /INSTANCEID=&quot;[SQLEXPRESS_DEFAULT_INSTANCENAME]&quot; /SQLTELSVCACCT=&quot;NT Service\SQLTELEMETRY$[SQLEXPRESS_DEFAULT_INSTANCENAME]&quot; /AGTSVCACCOUNT=&quot;NT AUTHORITY\NETWORK SERVICE&quot; /AGTSVCSTARTUPTYPE=&quot;Disabled&quot; /SQLSVCSTARTUPTYPE=&quot;Automatic&quot; /SQLCOLLATION=&quot;Latin1_General_CI_AS&quot; /SQLSVCACCOUNT=&quot;NT Service\MSSQL$[SQLEXPRESS_DEFAULT_INSTANCENAME]&quot; /SQLSYSADMINACCOUNTS=&quot;[SQLEXPRESS_DEFAULT_ADMINS]&quot; &quot;[USER_NAME]&quot; &quot;[AMS_ADMINS_NAME]&quot; /ADDCURRENTUSERASSQLADMIN=&quot;True&quot; /BROWSERSVCSTARTUPTYPE=&quot;Disabled&quot; /NPENABLED=&quot;0&quot; /TCPENABLED=&quot;0&quot; /IAcceptSQLServerLicenseTerms=True" BasicUiComLine="/x:&quot;%SystemDrive%\temp\sqlx&quot; /SkipInstallerRunCheck /ACTION=Install /ROLE=AllFeatures_WithDefaults /QUIETSIMPLE=True /UpdateEnabled=False /USEMICROSOFTUPDATE=&quot;False&quot; /FEATURES=SQLENGINE /INSTANCENAME=&quot;[SQLEXPRESS_DEFAULT_INSTANCENAME]&quot; /INSTANCEID=&quot;[SQLEXPRESS_DEFAULT_INSTANCENAME]&quot; /SQLTELSVCACCT=&quot;NT Service\SQLTELEMETRY$[SQLEXPRESS_DEFAULT_INSTANCENAME]&quot; /AGTSVCACCOUNT=&quot;NT AUTHORITY\NETWORK SERVICE&quot; /AGTSVCSTARTUPTYPE=&quot;Disabled&quot; /SQLSVCSTARTUPTYPE=&quot;Automatic&quot; /SQLCOLLATION=&quot;Latin1_General_CI_AS&quot; /SQLSVCACCOUNT=&quot;NT Service\MSSQL$[SQLEXPRESS_DEFAULT_INSTANCENAME]&quot; /SQLSYSADMINACCOUNTS=&quot;[SQLEXPRESS_DEFAULT_ADMINS]&quot; &quot;[USER_NAME]&quot; &quot;[AMS_ADMINS_NAME]&quot; /ADDCURRENTUSERASSQLADMIN=&quot;True&quot; /BROWSERSVCSTARTUPTYPE=&quot;Disabled&quot; /NPENABLED=&quot;0&quot; /TCPENABLED=&quot;0&quot; /IAcceptSQLServerLicenseTerms=True" NoUiComLine="/x:&quot;%SystemDrive%\temp\sqlx&quot; /SkipInstallerRunCheck /ACTION=Install /ROLE=AllFeatures_WithDefaults /QUIETSIMPLE=True /UpdateEnabled=False /USEMICROSOFTUPDATE=&quot;False&quot; /FEATURES=SQLENGINE /INSTANCENAME=&quot;[SQLEXPRESS_DEFAULT_INSTANCENAME]&quot; /INSTANCEID=&quot;[SQLEXPRESS_DEFAULT_INSTANCENAME]&quot; /SQLTELSVCACCT=&quot;NT Service\SQLTELEMETRY$[SQLEXPRESS_DEFAULT_INSTANCENAME]&quot; /AGTSVCACCOUNT=&quot;NT AUTHORITY\NETWORK SERVICE&quot; /AGTSVCSTARTUPTYPE=&quot;Disabled&quot; /SQLSVCSTARTUPTYPE=&quot;Automatic&quot; /SQLCOLLATION=&quot;Latin1_General_CI_AS&quot; /SQLSVCACCOUNT=&quot;NT Service\MSSQL$[SQLEXPRESS_DEFAULT_INSTANCENAME]&quot; /SQLSYSADMINACCOUNTS=&quot;[SQLEXPRESS_DEFAULT_ADMINS]&quot; &quot;[USER_NAME]&quot; &quot;[AMS_ADMINS_NAME]&quot; /ADDCURRENTUSERASSQLADMIN=&quot;True&quot; /BROWSERSVCSTARTUPTYPE=&quot;Disabled&quot; /NPENABLED=&quot;0&quot; /TCPENABLED=&quot;0&quot; /IAcceptSQLServerLicenseTerms=True" Options="fx" MD5="409d2384684cd6a45c64bdd5414fbf24" TargetName="SQL Server Express 2017" Feature="RequiredApplication"/>
     <ATTRIBUTE name="PrereqsOrder" value="C6FE8A2F0943D2B7A0CB204E12F1F4 D0156DFD814047AB868D49D0D15F8245 B467AE9894134312A9993D40B82F830D RequiredApplication"/>
   </COMPONENT>

diff --git a/src/Lithnet.AccessManager/action-new-version.bat b/src/Lithnet.AccessManager/action-new-version.bat
@@ -2,6 +2,6 @@
 for /f "delims=" %%x in (version.txt) do set build=%%x
 SET /A build=build+1
 echo %build% > version.txt
-SET version=1.14.%build%.0
+SET version=2.0.%build%.0
 
 ECHO [92mNew version is %version%[0m
diff --git a/src/Lithnet.AccessManager/version.txt b/src/Lithnet.AccessManager/version.txt
@@ -1 +1 @@
-8383 
+8392