Saxonite 1.2.11.3
This commit is contained in:
@@ -88,6 +88,17 @@ namespace Sarand.Net.Standard.Base.Helpers
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Location URLs. [[https:]//]www.google.*/maps/place/...
|
||||||
|
private static readonly Regex reLocationUrl = new Regex("^(?:(?:http(?:s)?:)?//)?\\" + Regex.Escape("www.google.") + "\\w{2,3}" + Regex.Escape("/maps/place/") + ".+", RegexOptions.IgnoreCase);
|
||||||
|
private static readonly Regex reLocationUrl_Alt = new Regex("^(?:(?:http(?:s)?:)?//)?\\" + Regex.Escape("www.google.") + "\\w{2,3}" + Regex.Escape("/maps?") + ".+", RegexOptions.IgnoreCase);
|
||||||
|
public static bool IsValidLocationUrl(String value)
|
||||||
|
{
|
||||||
|
if (!IsValidUrl(value)) return false;
|
||||||
|
if (reLocationUrl.Matches(value).Count > 0) return true;
|
||||||
|
if (reLocationUrl_Alt.Matches(value).Count > 0) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// LinkedIn URLs. [[https:]//][www|xx].linkedin.com/in...
|
// LinkedIn URLs. [[https:]//][www|xx].linkedin.com/in...
|
||||||
private static readonly Regex reLinkedInUrl = new Regex("^(?:(?:http(?:s)?:)?//)?(?:(?:www|\\w{2})\\.)?" + Regex.Escape("linkedin.com/in/") + ".+", RegexOptions.IgnoreCase);
|
private static readonly Regex reLinkedInUrl = new Regex("^(?:(?:http(?:s)?:)?//)?(?:(?:www|\\w{2})\\.)?" + Regex.Escape("linkedin.com/in/") + ".+", RegexOptions.IgnoreCase);
|
||||||
private static readonly Regex reLinkedInUrl_Company = new Regex("^(?:(?:http(?:s)?:)?//)?(?:(?:www|\\w{2})\\.)?" + Regex.Escape("linkedin.com/company/") + ".+", RegexOptions.IgnoreCase);
|
private static readonly Regex reLinkedInUrl_Company = new Regex("^(?:(?:http(?:s)?:)?//)?(?:(?:www|\\w{2})\\.)?" + Regex.Escape("linkedin.com/company/") + ".+", RegexOptions.IgnoreCase);
|
||||||
|
|||||||
@@ -133,6 +133,13 @@ namespace Sarand.Net.Standard.Base.Utils
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>Remove all duplicate values from the list, case-insensitive.</summary>
|
||||||
|
public static void RemoveTrailingBlanks(this List<String> values)
|
||||||
|
{
|
||||||
|
while (!values.IsEmpty() && StringUtil.IsBlank(values.Last()))
|
||||||
|
values.RemoveAt(values.Count - 1);
|
||||||
|
}
|
||||||
|
|
||||||
//-------------------------------------------------------------------
|
//-------------------------------------------------------------------
|
||||||
// M o d i f i c a t i o n
|
// M o d i f i c a t i o n
|
||||||
//-------------------------------------------------------------------
|
//-------------------------------------------------------------------
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="CsvHelper" Version="19.0.0" />
|
<PackageReference Include="CsvHelper" Version="19.0.0" />
|
||||||
<PackageReference Include="MailKit" Version="2.15.0" />
|
<PackageReference Include="MailKit" Version="4.3.0" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
|
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
|
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||||
|
|||||||
@@ -109,9 +109,11 @@ namespace Sarand.Net.Standard.Dbas.Base
|
|||||||
connectionString += "UID=" + config.user + ";";
|
connectionString += "UID=" + config.user + ";";
|
||||||
connectionString += "PWD=" + config.pword + ";";
|
connectionString += "PWD=" + config.pword + ";";
|
||||||
}
|
}
|
||||||
connectionString += (String)"Trusted_Connection=" + (config.user.IsEmpty() ? "Yes" : "No") + ";";
|
connectionString += "Trusted_Connection=" + (config.user.IsEmpty() ? "Yes" : "No") + ";";
|
||||||
|
// Mar24 Added to avoid 'The certificate chain was issued by an authority that is not trusted'.
|
||||||
|
connectionString += "TrustServerCertificate=Yes;";
|
||||||
// Multiple Active Result Sets.
|
// Multiple Active Result Sets.
|
||||||
connectionString += "MARS_Connection=yes;";
|
connectionString += "MARS_Connection=Yes;";
|
||||||
//if (iQueryLogTime > 0)
|
//if (iQueryLogTime > 0)
|
||||||
// connectionString += "QueryLogTime="+String(iQueryLogTime)+";";
|
// connectionString += "QueryLogTime="+String(iQueryLogTime)+";";
|
||||||
//if (iCommandTimeout > 0)
|
//if (iCommandTimeout > 0)
|
||||||
@@ -128,7 +130,9 @@ namespace Sarand.Net.Standard.Dbas.Base
|
|||||||
connectionString += "User Id=" + config.user + ";";
|
connectionString += "User Id=" + config.user + ";";
|
||||||
connectionString += "Password=" + config.pword + ";";
|
connectionString += "Password=" + config.pword + ";";
|
||||||
}
|
}
|
||||||
connectionString += (String)"Trusted_Connection=" + (config.user.IsEmpty() ? "Yes" : "No") + ";";
|
connectionString += "Trusted_Connection=" + (config.user.IsEmpty() ? "Yes" : "No") + ";";
|
||||||
|
// Mar24 Added to avoid 'The certificate chain was issued by an authority that is not trusted'.
|
||||||
|
connectionString += "TrustServerCertificate=Yes;";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Populate configuration values if blank.
|
// Populate configuration values if blank.
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
|
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
|
||||||
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
|
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
|
||||||
<PackageReference Include="System.Data.Odbc" Version="8.0.0" />
|
<PackageReference Include="System.Data.Odbc" Version="8.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="DocumentFormat.OpenXml" Version="2.12.3" />
|
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.1" />
|
||||||
<PackageReference Include="NPOI" Version="2.6.2" />
|
<PackageReference Include="NPOI" Version="2.6.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user