diff --git a/build-tools/create-vsix/create-vsix.csproj b/build-tools/create-vsix/create-vsix.csproj
index dfbcd97eec2..38088d85fc7 100644
--- a/build-tools/create-vsix/create-vsix.csproj
+++ b/build-tools/create-vsix/create-vsix.csproj
@@ -62,7 +62,6 @@
-
{7CE69551-BD73-4726-ACAA-AAF89C84BAF8}
diff --git a/build-tools/create-vsix/create-vsix.targets b/build-tools/create-vsix/create-vsix.targets
index e7159c0bac1..5cc7f9aae9b 100644
--- a/build-tools/create-vsix/create-vsix.targets
+++ b/build-tools/create-vsix/create-vsix.targets
@@ -121,4 +121,34 @@
DestinationFiles="$(VsixPath)"
/>
+
+
+ <_TasksAssembly Condition=" Exists('$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll') ">$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll
+ <_TasksAssembly Condition=" '$(_TasksAssembly)' == '' ">$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll
+
+
+
+
+
+
+
+ var toolsPath = System.IO.Path.Combine(ProjectDirectory, "tools", "VSSDK", "bin");
+ System.Environment.SetEnvironmentVariable("VsSDKToolsPath",
+ System.IO.Path.GetFullPath(toolsPath),
+ EnvironmentVariableTarget.Process);
+ var schemaDir = System.IO.Path.Combine(ProjectDirectory, "tools", "VSSDK", "schemas");
+ System.Environment.SetEnvironmentVariable("VsSDKSchemaDir",
+ System.IO.Path.GetFullPath(schemaDir),
+ EnvironmentVariableTarget.Process);
+
+
+
+
+
+