From 521b38773af1f8c9dd870e362b8b709fb96e201b Mon Sep 17 00:00:00 2001
From: Gen Lu <gel@microsoft.com>
Date: Fri, 16 Apr 2021 11:47:41 -0700
Subject: [PATCH] dev17 setup

---
 eng/Versions.props                                            | 4 +++-
 src/VisualStudio.Roslyn.SDK/Roslyn.SDK/Roslyn.SDK.csproj      | 1 +
 .../Roslyn.SyntaxVisualizer.Extension.csproj                  | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index f5a7f0b8a..86f96bdf9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -52,7 +52,9 @@
     <NuGetSolutionRestoreManagerInteropVersion>5.6.0</NuGetSolutionRestoreManagerInteropVersion>
     <StreamJsonRpcVersion>2.7.67</StreamJsonRpcVersion>
     <VSLangProjVersion>17.0.0-preview-1-31214-1111</VSLangProjVersion>
-    <MicrosoftVisualStudioTemplateWizardInterfaceVersion>17.0.0-preview-1-31209-1111</MicrosoftVisualStudioTemplateWizardInterfaceVersion>    
+    <MicrosoftVisualStudioTemplateWizardInterfaceVersion>17.0.0-preview-1-31209-1111</MicrosoftVisualStudioTemplateWizardInterfaceVersion>
+    <MicrosoftVSSDKBuildToolsVersion>17.0.63-dev17-g3f11f5ab</MicrosoftVSSDKBuildToolsVersion>
+    <MicroBuildPluginsSwixBuildVersion>1.1.33</MicroBuildPluginsSwixBuildVersion>    
     <SystemThreadingTasksDataflowVersion>5.0.0</SystemThreadingTasksDataflowVersion>
     <!-- Project System-->    
     <MicrosoftVisualStudioProjectSystemManagedVersion>17.0.0-beta1-10413-02</MicrosoftVisualStudioProjectSystemManagedVersion>
diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/Roslyn.SDK.csproj b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/Roslyn.SDK.csproj
index 9288c32f9..561bb83db 100644
--- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/Roslyn.SDK.csproj
+++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/Roslyn.SDK.csproj
@@ -10,6 +10,7 @@
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
     <!-- VS Insertion -->
     <VisualStudioInsertionComponent>Microsoft.CodeAnalysis.SDK</VisualStudioInsertionComponent>
+    <SetupProductArch>Neutral</SetupProductArch>
     <Ngen>false</Ngen>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Extension/Roslyn.SyntaxVisualizer.Extension.csproj b/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Extension/Roslyn.SyntaxVisualizer.Extension.csproj
index 377c9fb79..a77a35289 100644
--- a/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Extension/Roslyn.SyntaxVisualizer.Extension.csproj
+++ b/src/VisualStudio.Roslyn.SDK/SyntaxVisualizer/Roslyn.SyntaxVisualizer.Extension/Roslyn.SyntaxVisualizer.Extension.csproj
@@ -15,6 +15,7 @@
     <VisualStudioInsertionComponent>Roslyn.SyntaxVisualizer.Extension</VisualStudioInsertionComponent>
     <Ngen>false</Ngen>
     <UseCodeBase>true</UseCodeBase>
+    <SetupProductArch>Neutral</SetupProductArch>
   </PropertyGroup>
 
   <!-- References -->