fix sth.

KomiMoe · May 5, 2022 · 0503af5 · 0503af5
1 parent 80ada6e
commit 0503af5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ bin/
 Key.snk
 packages/
 *.csproj.user
-TODO/
+TODO/
+/_ReSharper.Caches
diff --git a/Platformx64/Toolset.props b/Platformx64/Toolset.props
@@ -2,10 +2,10 @@
   <Import Project="$(VCTargetsPath)\LLVM.Cpp.Common.props"/>
 
   <PropertyGroup>
-    <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
+    <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(PATH);</ExecutablePath>
     <ReferencePath Condition="'$(ReferencePath)' == ''">$(VC_ReferencesPath_x64);</ReferencePath>
     <LibraryPath Condition="'$(LibraryPath)' == ''">$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
     <ExcludePath Condition="'$(ExcludePath)' == ''">$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64);</ExcludePath>
-    <DebugCppRuntimeFilesPath Condition="'$(DebugCppRuntimeFilesPath)' == ''">$(VCToolsInstallDir)redist\Debug_NonRedist\x64</DebugCppRuntimeFilesPath>
+    <DebugCppRuntimeFilesPath Condition="'$(DebugCppRuntimeFilesPath)' == ''">$(VCToolsInstallDir)Debug_NonRedist\x64;$(WindowsSdkDir)bin\$(TargetPlatformVersion)\x64\ucrt</DebugCppRuntimeFilesPath>
   </PropertyGroup>
 </Project>
diff --git a/Platformx86/Toolset.props b/Platformx86/Toolset.props
@@ -2,10 +2,10 @@
   <Import Project="$(VCTargetsPath)\LLVM.Cpp.Common.props"/>
 
   <PropertyGroup>
-    <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
+    <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(PATH);</ExecutablePath>
     <ReferencePath Condition="'$(ReferencePath)' == ''">$(VC_ReferencesPath_x86);</ReferencePath>
     <LibraryPath Condition="'$(LibraryPath)' == ''">$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
     <ExcludePath Condition="'$(ExcludePath)' == ''">$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);</ExcludePath>
-    <DebugCppRuntimeFilesPath Condition="'$(DebugCppRuntimeFilesPath)' == ''">$(VCToolsInstallDir)redist\Debug_NonRedist\x86</DebugCppRuntimeFilesPath>
+    <DebugCppRuntimeFilesPath Condition="'$(DebugCppRuntimeFilesPath)' == ''">$(VCToolsInstallDir)Debug_NonRedist\x86;$(WindowsSdkDir)bin\$(TargetPlatformVersion)\x86\ucrt</DebugCppRuntimeFilesPath>
   </PropertyGroup>
 </Project>
diff --git a/source.extension.vsixmanifest b/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="llvm2022.c17776c5-ce07-fb35-3729-dfb7a9d50441" Version="1.2022" Language="en-US" Publisher="KomiMoe" />
+        <Identity Id="llvm2022.c17776c5-ce07-fb35-3729-dfb7a9d50441" Version="2.2022" Language="en-US" Publisher="KomiMoe" />
         <DisplayName>llvm2022</DisplayName>
         <Description xml:space="preserve">Allows the LLVM Compiler Toolchain (installed separately) to be used from within Visual Studio 2022 (only) to build C/C++ Projects.</Description>
         <MoreInfo>https://github.com/KomiMoe/llvm2019</MoreInfo>