aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLibravatar vnugent <public@vaughnnugent.com>2023-01-21 21:43:21 -0500
committerLibravatar vnugent <public@vaughnnugent.com>2023-01-21 21:43:21 -0500
commit05ebe3b38342ba38ad0f1c418058d5100ca776ab (patch)
tree42d8b368c7dabc09d8761f3cce7411c8f5b0565f /lib
parent46caaac9debdaad496c07af9d3806e67a447066c (diff)
Fix FBM session cancel, fix plugin log file names
Diffstat (limited to 'lib')
-rw-r--r--lib/Hashing.Portable/src/VNLib.Hashing.Portable.csproj1
-rw-r--r--lib/Net.Http/src/Helpers/ContentType.cs2
-rw-r--r--lib/Net.Http/src/Helpers/HelperTypes.cs68
-rw-r--r--lib/Net.Http/src/VNLib.Net.Http.csproj1
-rw-r--r--lib/Net.Messaging.FBM/src/Server/FBMListener.cs4
-rw-r--r--lib/Net.Messaging.FBM/src/VNLib.Net.Messaging.FBM.csproj1
-rw-r--r--lib/Net.Rest.Client/src/VNLib.Net.Rest.Client.csproj3
-rw-r--r--lib/Net.Transport.SimpleTCP/src/VNLib.Net.Transport.SimpleTCP.csproj1
-rw-r--r--lib/Plugins.Essentials.ServiceStack/src/ServiceDomain.cs3
-rw-r--r--lib/Plugins.Essentials.ServiceStack/src/VNLib.Plugins.Essentials.ServiceStack.csproj1
-rw-r--r--lib/Plugins.Essentials/src/Extensions/EssentialHttpEventExtensions.cs7
-rw-r--r--lib/Plugins.Essentials/src/Extensions/RedirectType.cs24
-rw-r--r--lib/Plugins.Essentials/src/VNLib.Plugins.Essentials.csproj1
-rw-r--r--lib/Plugins.PluginBase/src/PluginBase.cs1
-rw-r--r--lib/Plugins.PluginBase/src/VNLib.Plugins.PluginBase.csproj1
-rw-r--r--lib/Plugins.Runtime/src/VNLib.Plugins.Runtime.csproj1
-rw-r--r--lib/Plugins/src/VNLib.Plugins.csproj1
-rw-r--r--lib/Utils/src/ERRNO.cs25
-rw-r--r--lib/Utils/src/Memory/MemoryUtil.cs9
-rw-r--r--lib/Utils/src/VNLib.Utils.csproj1
-rw-r--r--lib/WinRpMalloc/src/WinRpMalloc.vcxproj19
21 files changed, 149 insertions, 26 deletions
diff --git a/lib/Hashing.Portable/src/VNLib.Hashing.Portable.csproj b/lib/Hashing.Portable/src/VNLib.Hashing.Portable.csproj
index 9494521..ada0908 100644
--- a/lib/Hashing.Portable/src/VNLib.Hashing.Portable.csproj
+++ b/lib/Hashing.Portable/src/VNLib.Hashing.Portable.csproj
@@ -12,6 +12,7 @@
<RootNamespace>VNLib.Hashing</RootNamespace>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>\\vaughnnugent.com\Internal\Folder Redirection\vman\Documents\Programming\Software\StrongNameingKey.snk</AssemblyOriginatorKeyFile>
+ <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
</PropertyGroup>
<!-- Resolve nuget dll files and store them in the output dir -->
diff --git a/lib/Net.Http/src/Helpers/ContentType.cs b/lib/Net.Http/src/Helpers/ContentType.cs
index ce7b7ce..6c215a7 100644
--- a/lib/Net.Http/src/Helpers/ContentType.cs
+++ b/lib/Net.Http/src/Helpers/ContentType.cs
@@ -22,6 +22,8 @@
* along with this program. If not, see https://www.gnu.org/licenses/.
*/
+#pragma warning disable CS1591
+
namespace VNLib.Net.Http
{
/// <summary>
diff --git a/lib/Net.Http/src/Helpers/HelperTypes.cs b/lib/Net.Http/src/Helpers/HelperTypes.cs
index a8aeb1f..d9db604 100644
--- a/lib/Net.Http/src/Helpers/HelperTypes.cs
+++ b/lib/Net.Http/src/Helpers/HelperTypes.cs
@@ -32,26 +32,73 @@ namespace VNLib.Net.Http
[Flags]
public enum HttpMethod
{
+ /// <summary>
+ /// default/no method found
+ /// </summary>
None,
+ /// <summary>
+ /// Http GET request method
+ /// </summary>
GET = 0x01,
+ /// <summary>
+ /// Http POST request method
+ /// </summary>
POST = 0x02,
+ /// <summary>
+ /// Http PUT request method
+ /// </summary>
PUT = 0x04,
+ /// <summary>
+ /// Http OPTIONS request method
+ /// </summary>
OPTIONS = 0x08,
+ /// <summary>
+ /// Http HEAD request method
+ /// </summary>
HEAD = 0x10,
+ /// <summary>
+ /// Http MERGE request method
+ /// </summary>
MERGE = 0x20,
+ /// <summary>
+ /// Http COPY request method
+ /// </summary>
COPY = 0x40,
+ /// <summary>
+ /// Http DELETE request method
+ /// </summary>
DELETE = 0x80,
+ /// <summary>
+ /// Http PATCH request method
+ /// </summary>
PATCH = 0x100,
+ /// <summary>
+ /// Http TRACE request method
+ /// </summary>
TRACE = 0x200,
+ /// <summary>
+ /// Http MOVE request method
+ /// </summary>
MOVE = 0x400,
- LOCK = 0x800
+ /// <summary>
+ /// Http LOCK request method
+ /// </summary>
+ LOCK = 0x800,
+ /// <summary>
+ /// Http UNLOCK request method
+ /// </summary>
+ UNLOCK = 0x1000
}
+
/// <summary>
/// HTTP protocol version
/// </summary>
[Flags]
public enum HttpVersion
{
+ /// <summary>
+ /// Enum empty type
+ /// </summary>
None,
/// <summary>
/// Http Version 1
@@ -74,17 +121,36 @@ namespace VNLib.Net.Http
/// </summary>
Http3 = 0x0A
}
+
/// <summary>
/// HTTP response entity cache flags
/// </summary>
[Flags]
public enum CacheType
{
+ /// <summary>
+ /// default cache type
+ /// </summary>
None = 0x00,
+ /// <summary>
+ /// Set the cache header to 'No-Cache'
+ /// </summary>
NoCache = 0x01,
+ /// <summary>
+ /// Sets the cache type private varibale
+ /// </summary>
Private = 0x02,
+ /// <summary>
+ /// sets the cache type to public
+ /// </summary>
Public = 0x04,
+ /// <summary>
+ /// Sets the nocache to no-store
+ /// </summary>
NoStore = 0x08,
+ /// <summary>
+ /// Sets the must-revalidate cache flag
+ /// </summary>
Revalidate = 0x10
}
diff --git a/lib/Net.Http/src/VNLib.Net.Http.csproj b/lib/Net.Http/src/VNLib.Net.Http.csproj
index 30e698c..3bbd73d 100644
--- a/lib/Net.Http/src/VNLib.Net.Http.csproj
+++ b/lib/Net.Http/src/VNLib.Net.Http.csproj
@@ -20,6 +20,7 @@ outside of the VNLib ecosystem are required. The VNLib.Plugins and VNLib.Plugins
<AnalysisLevel>latest-all</AnalysisLevel>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>\\vaughnnugent.com\Internal\Folder Redirection\vman\Documents\Programming\Software\StrongNameingKey.snk</AssemblyOriginatorKeyFile>
+ <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
</PropertyGroup>
<!-- Resolve nuget dll files and store them in the output dir -->
diff --git a/lib/Net.Messaging.FBM/src/Server/FBMListener.cs b/lib/Net.Messaging.FBM/src/Server/FBMListener.cs
index 6cca2a9..1388774 100644
--- a/lib/Net.Messaging.FBM/src/Server/FBMListener.cs
+++ b/lib/Net.Messaging.FBM/src/Server/FBMListener.cs
@@ -155,9 +155,7 @@ namespace VNLib.Net.Messaging.FBM.Server
//No more contexts in use, dispose internals
if (Cancellation.IsCancellationRequested && current == 0)
{
- ResponseLock.Dispose();
- Cancellation.Dispose();
- CtxStore.Dispose();
+ CleanupInternal();
}
}
}
diff --git a/lib/Net.Messaging.FBM/src/VNLib.Net.Messaging.FBM.csproj b/lib/Net.Messaging.FBM/src/VNLib.Net.Messaging.FBM.csproj
index b1b501a..ca15fa3 100644
--- a/lib/Net.Messaging.FBM/src/VNLib.Net.Messaging.FBM.csproj
+++ b/lib/Net.Messaging.FBM/src/VNLib.Net.Messaging.FBM.csproj
@@ -11,6 +11,7 @@
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>\\vaughnnugent.com\Internal\Folder Redirection\vman\Documents\Programming\Software\StrongNameingKey.snk</AssemblyOriginatorKeyFile>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
+ <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
</PropertyGroup>
diff --git a/lib/Net.Rest.Client/src/VNLib.Net.Rest.Client.csproj b/lib/Net.Rest.Client/src/VNLib.Net.Rest.Client.csproj
index 42cc536..117855e 100644
--- a/lib/Net.Rest.Client/src/VNLib.Net.Rest.Client.csproj
+++ b/lib/Net.Rest.Client/src/VNLib.Net.Rest.Client.csproj
@@ -11,6 +11,9 @@
<RootNamespace>VNLib.Net.Rest.Client</RootNamespace>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<AnalysisLevel>latest-all</AnalysisLevel>
+ <SignAssembly>True</SignAssembly>
+ <AssemblyOriginatorKeyFile>\\vaughnnugent.com\Internal\Folder Redirection\vman\Documents\Programming\Software\StrongNameingKey.snk</AssemblyOriginatorKeyFile>
+ <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/lib/Net.Transport.SimpleTCP/src/VNLib.Net.Transport.SimpleTCP.csproj b/lib/Net.Transport.SimpleTCP/src/VNLib.Net.Transport.SimpleTCP.csproj
index 7a476da..ef2b0cb 100644
--- a/lib/Net.Transport.SimpleTCP/src/VNLib.Net.Transport.SimpleTCP.csproj
+++ b/lib/Net.Transport.SimpleTCP/src/VNLib.Net.Transport.SimpleTCP.csproj
@@ -13,6 +13,7 @@ simple high performance TCP servers with or without TLS security.</Description>
<AssemblyName>VNLib.Net.Transport.SimpleTCP</AssemblyName>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>\\vaughnnugent.com\Internal\Folder Redirection\vman\Documents\Programming\Software\StrongNameingKey.snk</AssemblyOriginatorKeyFile>
+ <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
</PropertyGroup>
<!-- Resolve nuget dll files and store them in the output dir -->
diff --git a/lib/Plugins.Essentials.ServiceStack/src/ServiceDomain.cs b/lib/Plugins.Essentials.ServiceStack/src/ServiceDomain.cs
index 0d3d83d..7b06e70 100644
--- a/lib/Plugins.Essentials.ServiceStack/src/ServiceDomain.cs
+++ b/lib/Plugins.Essentials.ServiceStack/src/ServiceDomain.cs
@@ -35,7 +35,6 @@ using VNLib.Plugins.Runtime;
using VNLib.Plugins.Essentials.Content;
using VNLib.Plugins.Essentials.Sessions;
-
namespace VNLib.Plugins.Essentials.ServiceStack
{
/// <summary>
@@ -187,7 +186,9 @@ namespace VNLib.Plugins.Essentials.ServiceStack
try
{
sw.Start();
+
await plugin.InitLoaderAsync();
+
//Listen for reload events to remove and re-add endpoints
plugin.Reloaded += OnPluginReloaded;
diff --git a/lib/Plugins.Essentials.ServiceStack/src/VNLib.Plugins.Essentials.ServiceStack.csproj b/lib/Plugins.Essentials.ServiceStack/src/VNLib.Plugins.Essentials.ServiceStack.csproj
index 6f93d5d..3fa262f 100644
--- a/lib/Plugins.Essentials.ServiceStack/src/VNLib.Plugins.Essentials.ServiceStack.csproj
+++ b/lib/Plugins.Essentials.ServiceStack/src/VNLib.Plugins.Essentials.ServiceStack.csproj
@@ -13,6 +13,7 @@
<AnalysisLevel>latest-all</AnalysisLevel>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>\\vaughnnugent.com\Internal\Folder Redirection\vman\Documents\Programming\Software\StrongNameingKey.snk</AssemblyOriginatorKeyFile>
+ <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/lib/Plugins.Essentials/src/Extensions/EssentialHttpEventExtensions.cs b/lib/Plugins.Essentials/src/Extensions/EssentialHttpEventExtensions.cs
index 9458487..4fd77a6 100644
--- a/lib/Plugins.Essentials/src/Extensions/EssentialHttpEventExtensions.cs
+++ b/lib/Plugins.Essentials/src/Extensions/EssentialHttpEventExtensions.cs
@@ -428,9 +428,16 @@ namespace VNLib.Plugins.Essentials.Extensions
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void Redirect(this IHttpEvent ev, RedirectType type, Uri location)
{
+
+ if(type == RedirectType.None)
+ {
+ throw new ArgumentException("Invalid redirect type of none", nameof(type));
+ }
+
//Encode the string for propery http url formatting and set the location header
ev.Server.Headers[HttpResponseHeader.Location] = location.ToString();
ev.Server.SetNoCache();
+
//Set redirect the ressponse redirect code type
ev.CloseResponse((HttpStatusCode)type);
}
diff --git a/lib/Plugins.Essentials/src/Extensions/RedirectType.cs b/lib/Plugins.Essentials/src/Extensions/RedirectType.cs
index eff4d38..4c9f025 100644
--- a/lib/Plugins.Essentials/src/Extensions/RedirectType.cs
+++ b/lib/Plugins.Essentials/src/Extensions/RedirectType.cs
@@ -31,7 +31,29 @@ namespace VNLib.Plugins.Essentials.Extensions
/// </summary>
public enum RedirectType
{
+ /// <summary>
+ /// NOT-USED
+ /// </summary>
None,
- Moved = 301, Found = 302, SeeOther = 303, Temporary = 307, Permanent = 308
+ /// <summary>
+ /// Sets the HTTP 301 response code for a "moved" redirect
+ /// </summary>
+ Moved = 301,
+ /// <summary>
+ /// Sets the HTTP 302 response code for a "Found" redirect
+ /// </summary>
+ Found = 302,
+ /// <summary>
+ /// Sets the HTTP 303 response code for a "SeeOther" redirect
+ /// </summary>
+ SeeOther = 303,
+ /// <summary>
+ /// Sets the HTTP 307 response code for a "Temporary" redirect
+ /// </summary>
+ Temporary = 307,
+ /// <summary>
+ /// Sets the HTTP 308 response code for a "Permanent" redirect
+ /// </summary>
+ Permanent = 308
}
} \ No newline at end of file
diff --git a/lib/Plugins.Essentials/src/VNLib.Plugins.Essentials.csproj b/lib/Plugins.Essentials/src/VNLib.Plugins.Essentials.csproj
index 8d09067..e6b24aa 100644
--- a/lib/Plugins.Essentials/src/VNLib.Plugins.Essentials.csproj
+++ b/lib/Plugins.Essentials/src/VNLib.Plugins.Essentials.csproj
@@ -19,6 +19,7 @@
<EnableNETAnalyzers>True</EnableNETAnalyzers>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>\\vaughnnugent.com\Internal\Folder Redirection\vman\Documents\Programming\Software\StrongNameingKey.snk</AssemblyOriginatorKeyFile>
+ <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
</PropertyGroup>
<!-- Resolve nuget dll files and store them in the output dir -->
diff --git a/lib/Plugins.PluginBase/src/PluginBase.cs b/lib/Plugins.PluginBase/src/PluginBase.cs
index 105deab..a291e77 100644
--- a/lib/Plugins.PluginBase/src/PluginBase.cs
+++ b/lib/Plugins.PluginBase/src/PluginBase.cs
@@ -210,6 +210,7 @@ namespace VNLib.Plugins
//Default if not set
filePath ??= Path.Combine(Environment.CurrentDirectory, $"{PluginName}.txt");
+ template ??= LogTemplate;
//Configure the log file writer
logConfig.WriteTo.File(filePath,
diff --git a/lib/Plugins.PluginBase/src/VNLib.Plugins.PluginBase.csproj b/lib/Plugins.PluginBase/src/VNLib.Plugins.PluginBase.csproj
index 7d6485a..3293018 100644
--- a/lib/Plugins.PluginBase/src/VNLib.Plugins.PluginBase.csproj
+++ b/lib/Plugins.PluginBase/src/VNLib.Plugins.PluginBase.csproj
@@ -10,6 +10,7 @@
<DocumentationFile></DocumentationFile>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>\\vaughnnugent.com\Internal\Folder Redirection\vman\Documents\Programming\Software\StrongNameingKey.snk</AssemblyOriginatorKeyFile>
+ <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
</PropertyGroup>
<!-- Resolve nuget dll files and store them in the output dir -->
diff --git a/lib/Plugins.Runtime/src/VNLib.Plugins.Runtime.csproj b/lib/Plugins.Runtime/src/VNLib.Plugins.Runtime.csproj
index fa57c9e..9b77b22 100644
--- a/lib/Plugins.Runtime/src/VNLib.Plugins.Runtime.csproj
+++ b/lib/Plugins.Runtime/src/VNLib.Plugins.Runtime.csproj
@@ -15,6 +15,7 @@ that export the VNLib.Plugin.IPlugin interface.</Description>
<AnalysisLevel>latest-all</AnalysisLevel>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>\\vaughnnugent.com\Internal\Folder Redirection\vman\Documents\Programming\Software\StrongNameingKey.snk</AssemblyOriginatorKeyFile>
+ <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/lib/Plugins/src/VNLib.Plugins.csproj b/lib/Plugins/src/VNLib.Plugins.csproj
index 76d292f..37811ac 100644
--- a/lib/Plugins/src/VNLib.Plugins.csproj
+++ b/lib/Plugins/src/VNLib.Plugins.csproj
@@ -19,6 +19,7 @@ with the VNLib.Plugins.Runtime loader library.</Description>
<AnalysisLevel>latest-all</AnalysisLevel>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>\\vaughnnugent.com\Internal\Folder Redirection\vman\Documents\Programming\Software\StrongNameingKey.snk</AssemblyOriginatorKeyFile>
+ <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
</PropertyGroup>
<ItemGroup>
diff --git a/lib/Utils/src/ERRNO.cs b/lib/Utils/src/ERRNO.cs
index 972aa49..03ebd17 100644
--- a/lib/Utils/src/ERRNO.cs
+++ b/lib/Utils/src/ERRNO.cs
@@ -124,14 +124,36 @@ namespace VNLib.Utils
public readonly override int GetHashCode() => ErrorCode.GetHashCode();
/// <summary>
+ /// Attempts to parse the value of the character sequence as a new error code
+ /// </summary>
+ /// <param name="value">The character sequence value to parse</param>
+ /// <param name="result">The value </param>
+ /// <returns>True if the value was successfully parsed, false othwerwise</returns>
+ public static bool TryParse(ReadOnlySpan<char> value, out ERRNO result)
+ {
+ result = 0;
+ if (nint.TryParse(value, out nint res))
+ {
+ result = new ERRNO(res);
+ return true;
+ }
+ return false;
+ }
+
+ /// <summary>
/// The integer error value of the current instance in radix 10
/// </summary>
- /// <returns></returns>
+ /// <returns>The radix 10 formatted error code</returns>
public readonly override string ToString()
{
//Return the string of the error code number
return ErrorCode.ToString();
}
+ /// <summary>
+ /// Formats the internal nint error code as a string in specified format
+ /// </summary>
+ /// <param name="format">The format to use</param>
+ /// <returns>The formatted error code</returns>
public readonly string ToString(string format)
{
//Return the string of the error code number
@@ -143,6 +165,7 @@ namespace VNLib.Utils
{
return ErrorCode.TryFormat(destination, out charsWritten, format, provider);
}
+
///<inheritdoc/>
public readonly string ToString(string format, IFormatProvider formatProvider)
{
diff --git a/lib/Utils/src/Memory/MemoryUtil.cs b/lib/Utils/src/Memory/MemoryUtil.cs
index c20d956..56ccb7e 100644
--- a/lib/Utils/src/Memory/MemoryUtil.cs
+++ b/lib/Utils/src/Memory/MemoryUtil.cs
@@ -88,11 +88,11 @@ namespace VNLib.Utils.Memory
private static Lazy<IUnmangedHeap> InitHeapInternal()
{
//Get env for heap diag
- bool enableDiag = Environment.GetEnvironmentVariable(SHARED_HEAP_ENABLE_DIAGNOISTICS_ENV) == "1";
-
- Trace.WriteIf(enableDiag, "Shared heap diagnostics enabled");
+ _ = ERRNO.TryParse(Environment.GetEnvironmentVariable(SHARED_HEAP_ENABLE_DIAGNOISTICS_ENV), out ERRNO diagEnable);
+
+ Trace.WriteIf(diagEnable, "Shared heap diagnostics enabled");
- Lazy<IUnmangedHeap> heap = new (() => InitHeapInternal(true, enableDiag), LazyThreadSafetyMode.PublicationOnly);
+ Lazy<IUnmangedHeap> heap = new (() => InitHeapInternal(true, diagEnable), LazyThreadSafetyMode.PublicationOnly);
//Cleanup the heap on process exit
AppDomain.CurrentDomain.DomainUnload += DomainUnloaded;
@@ -505,6 +505,7 @@ namespace VNLib.Utils.Memory
/// <exception cref="OverflowException"></exception>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static nuint ByteCount<T>(nuint elementCount) => checked(elementCount * (nuint)Unsafe.SizeOf<T>());
+
/// <summary>
/// Gets the byte multiple of the length parameter
/// </summary>
diff --git a/lib/Utils/src/VNLib.Utils.csproj b/lib/Utils/src/VNLib.Utils.csproj
index b14ab27..d326325 100644
--- a/lib/Utils/src/VNLib.Utils.csproj
+++ b/lib/Utils/src/VNLib.Utils.csproj
@@ -16,6 +16,7 @@
<AnalysisLevel>latest-all</AnalysisLevel>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>\\vaughnnugent.com\Internal\Folder Redirection\vman\Documents\Programming\Software\StrongNameingKey.snk</AssemblyOriginatorKeyFile>
+ <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
</PropertyGroup>
<ItemGroup>
diff --git a/lib/WinRpMalloc/src/WinRpMalloc.vcxproj b/lib/WinRpMalloc/src/WinRpMalloc.vcxproj
index b39deed..70c9d87 100644
--- a/lib/WinRpMalloc/src/WinRpMalloc.vcxproj
+++ b/lib/WinRpMalloc/src/WinRpMalloc.vcxproj
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <VCToolsInstallDir>C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.34.31933\</VCToolsInstallDir>
+ </PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -23,7 +26,7 @@
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{f5bfb8aa-a436-4a8d-94bc-9eff3ad8aa1d}</ProjectGuid>
<RootNamespace>WinRpMalloc</RootNamespace>
- <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -57,18 +60,6 @@
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
@@ -131,7 +122,6 @@
<CallingConvention>StdCall</CallingConvention>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- <GenerateXMLDocumentationFiles>false</GenerateXMLDocumentationFiles>
<GenerateSourceDependencies>true</GenerateSourceDependencies>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<MinimalRebuild>false</MinimalRebuild>
@@ -140,7 +130,6 @@
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<Version>
</Version>
<LargeAddressAware>true</LargeAddressAware>