Merge pull request #16023 from jmarolf/bugfix/cleaning-up-Roslyn-SDK

updating dependencies since they are not auto-updated anymore

Merge pull request #16023 from jmarolf/bugfix/cleaning-up-Roslyn-SDK
updating dependencies since they are not auto-updated anymore
8823ba3a · Jonathon Marolf · GitHub · 958ed692 · 7d4c4ec6 · 8823ba3a
26 changed file
--- a/src/Setup/Templates/CSRef.vstemplate
+++ b/src/Setup/Templates/CSRef.vstemplate
@@ -12,7 +12,7 @@
    <LocationField>Enabled</LocationField>
    <EnableLocationBrowseButton>true</EnableLocationBrowseButton>
    <Icon>CodeInformation.ico</Icon>
-    <RequiredFrameworkVersion>4.5.2</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
    <PromptForSaveOnCreation>true</PromptForSaveOnCreation>
  </TemplateData>
  <TemplateContent>
@@ -29,7 +29,7 @@
    </ProjectCollection>
  </TemplateContent>
  <WizardExtension>
-    <Assembly>Roslyn.Templates, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <Assembly>Roslyn.Templates, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
    <FullClassName>RoslynSDKRootTemplateWizard</FullClassName>
  </WizardExtension>
 </VSTemplate>
\ No newline at end of file
--- a/src/Setup/Templates/CSharp/CodeRefactoring/Ref/CSharpCodeRefactoring.vstemplate
+++ b/src/Setup/Templates/CSharp/CodeRefactoring/Ref/CSharpCodeRefactoring.vstemplate
@@ -11,7 +11,7 @@
    <LocationField>Enabled</LocationField>
    <EnableLocationBrowseButton>true</EnableLocationBrowseButton>
    <Icon></Icon>
-    <RequiredFrameworkVersion>4.5.2</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
    <PromptForSaveOnCreation>true</PromptForSaveOnCreation>
  </TemplateData>
  <TemplateContent>
@@ -23,19 +23,19 @@
    </Project>
  </TemplateContent>
  <WizardExtension>
-    <Assembly>Roslyn.Templates, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <Assembly>Roslyn.Templates, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
    <FullClassName>RoslynSDKAnalyzerTemplateWizard</FullClassName>
  </WizardExtension>
  <WizardData>
    <packages repository="extension"
              repositoryId="3a012d4e-6057-4e7c-8123-6d4be1d4723c">
-      <package id="Microsoft.CodeAnalysis.Analyzers" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.Common" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.CSharp" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="System.Collections.Immutable" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="System.Reflection.Metadata" version="0.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Common" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="System.Collections.Immutable" version="1.1.36" skipAssemblyReferences="false" />
+      <package id="System.Reflection.Metadata" version="1.0.21" skipAssemblyReferences="false" />
      <package id="Microsoft.Composition" version="1.0.27" skipAssemblyReferences="false" />
    </packages>
  </WizardData>

--- a/src/Setup/Templates/CSharp/CodeRefactoring/Ref/CodeRefactoring.csproj
+++ b/src/Setup/Templates/CSharp/CodeRefactoring/Ref/CodeRefactoring.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
 	<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <SchemaVersion>2.0</SchemaVersion>
@@ -36,17 +36,5 @@
    <Compile Include="CodeRefactoringProvider.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
-  $if$ ($targetframeworkversion$ > 4.5)
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.6\Microsoft.Portable.CSharp.targets" />
-  $else$
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.5\Microsoft.Portable.CSharp.targets" />
-  $endif$
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
 </Project>
--- a/src/Setup/Templates/CSharp/CodeRefactoring/Vsix/Deployment.csproj
+++ b/src/Setup/Templates/CSharp/CodeRefactoring/Vsix/Deployment.csproj
@@ -53,11 +53,4 @@
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
--- a/src/Setup/Templates/CSharp/CodeRefactoring/Vsix/Deployment.vstemplate
+++ b/src/Setup/Templates/CSharp/CodeRefactoring/Vsix/Deployment.vstemplate
@@ -5,7 +5,7 @@
    <Description>&lt;No description available&gt;</Description>
    <Icon></Icon>
    <ProjectType>CSharp</ProjectType>
-    <RequiredFrameworkVersion>4.5.2</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
    <SortOrder>1000</SortOrder>
    <TemplateID>bb967cab-2ca5-4dac-8809-65b2b28a6350</TemplateID>
    <CreateNewFolder>true</CreateNewFolder>
@@ -18,7 +18,7 @@
    </Project>
  </TemplateContent>
  <WizardExtension>
-    <Assembly>Roslyn.Templates, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <Assembly>Roslyn.Templates, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
    <FullClassName>RoslynSDKVsixTemplateWizardSecondProject</FullClassName>
  </WizardExtension>
 </VSTemplate>
--- a/src/Setup/Templates/CSharp/ConsoleApplication/CSharpConsoleApplication.vstemplate
+++ b/src/Setup/Templates/CSharp/ConsoleApplication/CSharpConsoleApplication.vstemplate
@@ -12,7 +12,7 @@
    <LocationField>Enabled</LocationField>
    <EnableLocationBrowseButton>true</EnableLocationBrowseButton>
    <Icon>CodeAnalysisConsole.ico</Icon>
-    <RequiredFrameworkVersion>4.5.2</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
    <PromptForSaveOnCreation>true</PromptForSaveOnCreation>
  </TemplateData>
  <TemplateContent>
@@ -30,13 +30,13 @@
  <WizardData>
    <packages repository="extension"
              repositoryId="3a012d4e-6057-4e7c-8123-6d4be1d4723c">
-      <package id="Microsoft.CodeAnalysis.Analyzers" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.Common" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.CSharp" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="System.Collections.Immutable" version="1.1.34-rc" skipAssemblyReferences="false" />
-      <package id="System.Reflection.Metadata" version="1.0.19-rc" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Common" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="System.Collections.Immutable" version="1.1.36" skipAssemblyReferences="false" />
+      <package id="System.Reflection.Metadata" version="1.0.21" skipAssemblyReferences="false" />
      <package id="Microsoft.Composition" version="1.0.27" skipAssemblyReferences="false" />
    </packages>
  </WizardData>

--- a/src/Setup/Templates/CSharp/ConsoleApplication/ConsoleApplication.csproj
+++ b/src/Setup/Templates/CSharp/ConsoleApplication/ConsoleApplication.csproj
@@ -47,12 +47,4 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-
 </Project>
--- a/src/Setup/Templates/CSharp/Diagnostic/Analyzer/DiagnosticAnalyzer.csproj
+++ b/src/Setup/Templates/CSharp/Diagnostic/Analyzer/DiagnosticAnalyzer.csproj
@@ -60,11 +60,7 @@
    </None>
    <None Include="ReadMe.txt" />
  </ItemGroup>
-  $if$ ($targetframeworkversion$ > 4.5)
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.6\Microsoft.Portable.CSharp.targets" />
-  $else$
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.5\Microsoft.Portable.CSharp.targets" />
-  $endif$
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
  <Target Name="AfterBuild">
    <GetAssemblyIdentity AssemblyFiles="$(OutDir)\$(AssemblyName).dll">
      <Output TaskParameter="Assemblies" ItemName="AnalyzerAssemblyInfo" />
@@ -76,11 +72,4 @@
      <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
    </Exec>
  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
--- a/src/Setup/Templates/CSharp/Diagnostic/Analyzer/DiagnosticAnalyzer.vstemplate
+++ b/src/Setup/Templates/CSharp/Diagnostic/Analyzer/DiagnosticAnalyzer.vstemplate
@@ -5,7 +5,7 @@
    <Description>&lt;No description available&gt;</Description>
    <Icon></Icon>
    <ProjectType>CSharp</ProjectType>
-    <RequiredFrameworkVersion>4.5.2</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
    <SortOrder>952</SortOrder>
    <TemplateID>bb967cab-2ca5-4dac-8809-65b2b28a6350</TemplateID>
    <CreateNewFolder>true</CreateNewFolder>
@@ -26,18 +26,18 @@
    </Project>
  </TemplateContent>
  <WizardExtension>
-    <Assembly>Roslyn.Templates, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <Assembly>Roslyn.Templates, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
    <FullClassName>RoslynSDKAnalyzerTemplateWizard</FullClassName>
  </WizardExtension>
  <WizardData>
    <packages repository="extension" repositoryId="3a012d4e-6057-4e7c-8123-6d4be1d4723c">
-      <package id="Microsoft.CodeAnalysis.Analyzers" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.Common" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.CSharp" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="System.Collections.Immutable" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="System.Reflection.Metadata" version="0.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Common" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="System.Collections.Immutable" version="1.1.36" skipAssemblyReferences="false" />
+      <package id="System.Reflection.Metadata" version="1.0.21" skipAssemblyReferences="false" />
      <package id="Microsoft.Composition" version="1.0.27" skipAssemblyReferences="false" />
      <package id="NuGet.CommandLine" />
    </packages>

--- a/src/Setup/Templates/CSharp/Diagnostic/Test/Test.csproj
+++ b/src/Setup/Templates/CSharp/Diagnostic/Test/Test.csproj
@@ -57,11 +57,4 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
--- a/src/Setup/Templates/CSharp/Diagnostic/Test/Test.vstemplate
+++ b/src/Setup/Templates/CSharp/Diagnostic/Test/Test.vstemplate
@@ -5,7 +5,7 @@
    <Description>&lt;No description available&gt;</Description>
    <Icon></Icon>
    <ProjectType>CSharp</ProjectType>
-    <RequiredFrameworkVersion>4.5.2</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
    <SortOrder>1000</SortOrder>
    <TemplateID>bb967cab-2ca5-4dac-8809-65b2b28a6351</TemplateID>
    <CreateNewFolder>true</CreateNewFolder>
@@ -24,19 +24,19 @@
    </Project>
  </TemplateContent>
  <WizardExtension>
-    <Assembly>Roslyn.Templates, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <Assembly>Roslyn.Templates, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
    <FullClassName>RoslynSDKTestTemplateWizard</FullClassName>
  </WizardExtension>
  <WizardData>
    <packages repository="extension" repositoryId="3a012d4e-6057-4e7c-8123-6d4be1d4723c">
-      <package id="Microsoft.CodeAnalysis.Common" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.CSharp" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.VisualBasic" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="System.Collections.Immutable" version="1.1.34-rc" skipAssemblyReferences="false" />
-      <package id="System.Reflection.Metadata" version="1.0.19-rc" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Common" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.VisualBasic" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="System.Collections.Immutable" version="1.1.36" skipAssemblyReferences="false" />
+      <package id="System.Reflection.Metadata" version="1.0.21" skipAssemblyReferences="false" />
      <package id="Microsoft.Composition" version="1.0.27" skipAssemblyReferences="false" />
    </packages>
  </WizardData>

--- a/src/Setup/Templates/CSharp/Diagnostic/Vsix/Deployment.csproj
+++ b/src/Setup/Templates/CSharp/Diagnostic/Vsix/Deployment.csproj
@@ -53,11 +53,4 @@
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
--- a/src/Setup/Templates/CSharp/Diagnostic/Vsix/Deployment.vstemplate
+++ b/src/Setup/Templates/CSharp/Diagnostic/Vsix/Deployment.vstemplate
@@ -5,7 +5,7 @@
    <Description>&lt;No description available&gt;</Description>
    <Icon></Icon>
    <ProjectType>CSharp</ProjectType>
-    <RequiredFrameworkVersion>4.5.2</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
    <SortOrder>1000</SortOrder>
    <TemplateID>bb967cab-2ca5-4dac-8809-65b2b28a6350</TemplateID>
    <CreateNewFolder>true</CreateNewFolder>
@@ -18,7 +18,7 @@
    </Project>
  </TemplateContent>
  <WizardExtension>
-    <Assembly>Roslyn.Templates, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <Assembly>Roslyn.Templates, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
    <FullClassName>RoslynSDKVsixTemplateWizardThirdProject</FullClassName>
  </WizardExtension>
 </VSTemplate>
--- a/src/Setup/Templates/CSharpDiagnostic.vstemplate
+++ b/src/Setup/Templates/CSharpDiagnostic.vstemplate
@@ -9,7 +9,7 @@
    <DefaultName>Analyzer</DefaultName>
    <ProvideDefaultName>true</ProvideDefaultName>
    <Icon>CodeInformation.ico</Icon>
-    <RequiredFrameworkVersion>4.5.2</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
  </TemplateData>
  <TemplateContent>
    <!-- These projects are created in the order they are listed. 
@@ -28,7 +28,7 @@
    </ProjectCollection>
  </TemplateContent>
  <WizardExtension>
-    <Assembly>Roslyn.Templates, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <Assembly>Roslyn.Templates, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
    <FullClassName>RoslynSDKRootTemplateWizard</FullClassName>
  </WizardExtension>
 </VSTemplate>
\ No newline at end of file
--- a/src/Setup/Templates/Templates.csproj
+++ b/src/Setup/Templates/Templates.csproj
@@ -47,6 +47,7 @@
      <Link>EULA.rtf</Link>
      <IncludeInVSIX>true</IncludeInVSIX>
    </Content>
+    <None Include="project.json" />
    <None Include="VisualBasic\Diagnostic\Vsix\Deployment.vbproj" />
    <None Include="VisualBasic\Diagnostic\Vsix\Deployment.vstemplate">
      <SubType>Designer</SubType>
@@ -345,4 +346,4 @@
    <GetVsixSourceItemsDependsOn>$(GetVsixSourceItemsDependsOn);GetVsixTemplateItems</GetVsixSourceItemsDependsOn>
  </PropertyGroup>
  <Import Project="..\..\..\build\Targets\Imports.targets" />
-</Project>
+</Project>
\ No newline at end of file
--- a/src/Setup/Templates/VBDiagnostic.vstemplate
+++ b/src/Setup/Templates/VBDiagnostic.vstemplate
@@ -10,7 +10,7 @@
    <SortOrder>1000</SortOrder>
    <DefaultName>Analyzer</DefaultName>
    <ProvideDefaultName>true</ProvideDefaultName>
-    <RequiredFrameworkVersion>4.5.2</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
  </TemplateData>
  <TemplateContent>
    <!-- These projects are created in the order they are listed. 
@@ -29,7 +29,7 @@
    </ProjectCollection>
  </TemplateContent>
  <WizardExtension>
-    <Assembly>Roslyn.Templates, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <Assembly>Roslyn.Templates, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
    <FullClassName>RoslynSDKRootTemplateWizard</FullClassName>
  </WizardExtension>
 </VSTemplate>
\ No newline at end of file
--- a/src/Setup/Templates/VBRef.vstemplate
+++ b/src/Setup/Templates/VBRef.vstemplate
@@ -13,7 +13,7 @@
    <LocationField>Enabled</LocationField>
    <EnableLocationBrowseButton>true</EnableLocationBrowseButton>
    <Icon>CodeInformation.ico</Icon>
-    <RequiredFrameworkVersion>4.5.2</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
    <PromptForSaveOnCreation>true</PromptForSaveOnCreation>
  </TemplateData>
  <TemplateContent>
@@ -30,7 +30,7 @@
    </ProjectCollection>
  </TemplateContent>
  <WizardExtension>
-    <Assembly>Roslyn.Templates, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <Assembly>Roslyn.Templates, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
    <FullClassName>RoslynSDKRootTemplateWizard</FullClassName>
  </WizardExtension>
 </VSTemplate>
\ No newline at end of file
--- a/src/Setup/Templates/VisualBasic/CodeRefactoring/Ref/CodeRefactoring.vbproj
+++ b/src/Setup/Templates/VisualBasic/CodeRefactoring/Ref/CodeRefactoring.vbproj
@@ -74,17 +74,5 @@
    <Compile Include="CodeRefactoringProvider.vb" />
    <Compile Include="My Project\AssemblyInfo.vb" />
  </ItemGroup>
-  $if$ ($targetframeworkversion$ > 4.5)
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.6\Microsoft.Portable.VisualBasic.targets" />
-  $else$
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.5\Microsoft.Portable.VisualBasic.targets" />
-  $endif$
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.VisualBasic.targets" />
 </Project>
--- a/src/Setup/Templates/VisualBasic/CodeRefactoring/Ref/VBCodeRefactoring.vstemplate
+++ b/src/Setup/Templates/VisualBasic/CodeRefactoring/Ref/VBCodeRefactoring.vstemplate
@@ -11,7 +11,7 @@
    <LocationField>Enabled</LocationField>
    <EnableLocationBrowseButton>true</EnableLocationBrowseButton>
    <Icon></Icon>
-    <RequiredFrameworkVersion>4.5.2</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
    <PromptForSaveOnCreation>true</PromptForSaveOnCreation>
  </TemplateData>
  <TemplateContent>
@@ -21,19 +21,19 @@
    </Project>
  </TemplateContent>
  <WizardExtension>
-    <Assembly>Roslyn.Templates, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <Assembly>Roslyn.Templates, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
    <FullClassName>RoslynSDKAnalyzerTemplateWizard</FullClassName>
  </WizardExtension>
  <WizardData>
    <packages repository="extension"
              repositoryId="3a012d4e-6057-4e7c-8123-6d4be1d4723c">
-      <package id="Microsoft.CodeAnalysis.Analyzers" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.Common" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.VisualBasic" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="System.Collections.Immutable" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="System.Reflection.Metadata" version="0.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Common" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.VisualBasic" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="System.Collections.Immutable" version="1.1.36" skipAssemblyReferences="false" />
+      <package id="System.Reflection.Metadata" version="1.0.21" skipAssemblyReferences="false" />
      <package id="Microsoft.Composition" version="1.0.27" skipAssemblyReferences="false" />
    </packages>
  </WizardData>

--- a/src/Setup/Templates/VisualBasic/CodeRefactoring/Vsix/Deployment.vstemplate
+++ b/src/Setup/Templates/VisualBasic/CodeRefactoring/Vsix/Deployment.vstemplate
@@ -5,7 +5,7 @@
    <Description>&lt;No description available&gt;</Description>
    <Icon></Icon>
    <ProjectType>VisualBasic</ProjectType>
-    <RequiredFrameworkVersion>4.5.2</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
    <SortOrder>1000</SortOrder>
    <TemplateID>bb967cab-2ca5-4dac-8809-65b2b28a6350</TemplateID>
    <CreateNewFolder>true</CreateNewFolder>
@@ -21,7 +21,7 @@
    </Project>
  </TemplateContent>
  <WizardExtension>
-    <Assembly>Roslyn.Templates, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <Assembly>Roslyn.Templates, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
    <FullClassName>RoslynSDKVsixTemplateWizardSecondProject</FullClassName>
  </WizardExtension>
 </VSTemplate>
--- a/src/Setup/Templates/VisualBasic/ConsoleApplication/VBConsoleApplication.vstemplate
+++ b/src/Setup/Templates/VisualBasic/ConsoleApplication/VBConsoleApplication.vstemplate
@@ -11,7 +11,7 @@
    <LocationField>Enabled</LocationField>
    <EnableLocationBrowseButton>true</EnableLocationBrowseButton>
    <Icon>CodeAnalysisConsole.ico</Icon>
-    <RequiredFrameworkVersion>4.5.2</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
    <PromptForSaveOnCreation>true</PromptForSaveOnCreation>
  </TemplateData>
  <TemplateContent>
@@ -33,13 +33,13 @@
  <WizardData>
    <packages repository="extension"
              repositoryId="3a012d4e-6057-4e7c-8123-6d4be1d4723c">
-      <package id="Microsoft.CodeAnalysis.Analyzers" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.Common" version="0.7.0-beta" skipAssemblyReferences="false"/>
-      <package id="Microsoft.CodeAnalysis.VisualBasic" version="0.7.0-beta" skipAssemblyReferences="false"/>
-      <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="0.7.0-beta" skipAssemblyReferences="false"/>
-      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="0.7.0-beta" skipAssemblyReferences="false"/>
-      <package id="System.Collections.Immutable" version="1.1.34-rc" skipAssemblyReferences="false" />
-      <package id="System.Reflection.Metadata" version="1.0.19-rc" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Common" version="1.0.0" skipAssemblyReferences="false"/>
+      <package id="Microsoft.CodeAnalysis.VisualBasic" version="1.0.0" skipAssemblyReferences="false"/>
+      <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="1.0.0" skipAssemblyReferences="false"/>
+      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0" skipAssemblyReferences="false"/>
+      <package id="System.Collections.Immutable" version="1.1.36" skipAssemblyReferences="false" />
+      <package id="System.Reflection.Metadata" version="1.0.21" skipAssemblyReferences="false" />
      <package id="Microsoft.Composition" version="1.0.27" skipAssemblyReferences="false" />
    </packages>
  </WizardData>

--- a/src/Setup/Templates/VisualBasic/Diagnostic/Analyzer/Diagnostic.vbproj
+++ b/src/Setup/Templates/VisualBasic/Diagnostic/Analyzer/Diagnostic.vbproj
@@ -102,11 +102,7 @@
  <ItemGroup>
    <None Include="ReadMe.txt" />
  </ItemGroup>
-  $if$ ($targetframeworkversion$ > 4.5)
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.6\Microsoft.Portable.VisualBasic.targets" />
-  $else$
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\v4.5\Microsoft.Portable.VisualBasic.targets" />
-  $endif$
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.VisualBasic.targets" />
  <Target Name="AfterBuild">
    <GetAssemblyIdentity AssemblyFiles="$(OutDir)\$(AssemblyName).dll">
      <Output TaskParameter="Assemblies" ItemName="AnalyzerAssemblyInfo" />
@@ -118,12 +114,4 @@
      <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
    </Exec>
  </Target>
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
--- a/src/Setup/Templates/VisualBasic/Diagnostic/Analyzer/DiagnosticAnalyzer.vstemplate
+++ b/src/Setup/Templates/VisualBasic/Diagnostic/Analyzer/DiagnosticAnalyzer.vstemplate
@@ -5,7 +5,7 @@
    <Description>&lt;No description available&gt;</Description>
    <Icon></Icon>
    <ProjectType>CSharp</ProjectType>
-    <RequiredFrameworkVersion>4.5.2</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
    <SortOrder>1000</SortOrder>
    <TemplateID>bb967cab-2ca5-4dac-8809-65b2b28a6350</TemplateID>
    <CreateNewFolder>true</CreateNewFolder>
@@ -28,18 +28,18 @@
    </Project>
  </TemplateContent>
  <WizardExtension>
-    <Assembly>Roslyn.Templates, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <Assembly>Roslyn.Templates, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
    <FullClassName>RoslynSDKAnalyzerTemplateWizard</FullClassName>
  </WizardExtension>
  <WizardData>
    <packages repository="extension" repositoryId="3a012d4e-6057-4e7c-8123-6d4be1d4723c">
-      <package id="Microsoft.CodeAnalysis.Analyzers" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.Common" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.VisualBasic" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="System.Collections.Immutable" version="0.0.0" skipAssemblyReferences="false" />
-      <package id="System.Reflection.Metadata" version="0.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Common" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.VisualBasic" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="System.Collections.Immutable" version="1.1.36" skipAssemblyReferences="false" />
+      <package id="System.Reflection.Metadata" version="1.0.21" skipAssemblyReferences="false" />
      <package id="Microsoft.Composition" version="1.0.27" skipAssemblyReferences="false" />
      <package id="NuGet.CommandLine" />
    </packages>

--- a/src/Setup/Templates/VisualBasic/Diagnostic/Test/Test.vstemplate
+++ b/src/Setup/Templates/VisualBasic/Diagnostic/Test/Test.vstemplate
@@ -37,19 +37,19 @@
    </Project>
  </TemplateContent>
  <WizardExtension>
-    <Assembly>Roslyn.Templates, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <Assembly>Roslyn.Templates, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
    <FullClassName>RoslynSDKTestTemplateWizard</FullClassName>
  </WizardExtension>
  <WizardData>
    <packages repository="extension" repositoryId="3a012d4e-6057-4e7c-8123-6d4be1d4723c">
-      <package id="Microsoft.CodeAnalysis.Common" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.CSharp" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.VisualBasic" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="0.7.0-beta" skipAssemblyReferences="false" />
-      <package id="System.Collections.Immutable" version="1.1.34-rc" skipAssemblyReferences="false" />
-      <package id="System.Reflection.Metadata" version="1.0.19-rc" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Common" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.VisualBasic" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0" skipAssemblyReferences="false" />
+      <package id="System.Collections.Immutable" version="1.1.36" skipAssemblyReferences="false" />
+      <package id="System.Reflection.Metadata" version="1.0.21" skipAssemblyReferences="false" />
      <package id="Microsoft.Composition" version="1.0.27" skipAssemblyReferences="false" />
    </packages>
  </WizardData>

--- a/src/Setup/Templates/VisualBasic/Diagnostic/Vsix/Deployment.vstemplate
+++ b/src/Setup/Templates/VisualBasic/Diagnostic/Vsix/Deployment.vstemplate
@@ -5,7 +5,7 @@
    <Description>&lt;No description available&gt;</Description>
    <Icon></Icon>
    <ProjectType>VisualBasic</ProjectType>
-    <RequiredFrameworkVersion>4.5.2</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
    <SortOrder>1000</SortOrder>
    <TemplateID>bb967cab-2ca5-4dac-8809-65b2b28a6350</TemplateID>
    <CreateNewFolder>true</CreateNewFolder>
@@ -21,7 +21,7 @@
    </Project>
  </TemplateContent>
  <WizardExtension>
-    <Assembly>Roslyn.Templates, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <Assembly>Roslyn.Templates, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
    <FullClassName>RoslynSDKVsixTemplateWizardThirdProject</FullClassName>
  </WizardExtension>
 </VSTemplate>
--- a/src/Setup/Templates/Wizard/RoslynSDKAnalyzerTemplateWizard.cs
+++ b/src/Setup/Templates/Wizard/RoslynSDKAnalyzerTemplateWizard.cs
@@ -16,8 +16,7 @@ public override void OnProjectFinishedGenerating(Project project)
        // included in the VSIX. The only way to solve this is to have th wizard mark the
        // assemblies as copy local false.
        Project = project;
-        var vsProject = project.Object as VSProject;
-        if (vsProject != null)
+        if (project.Object is VSProject vsProject)
        {
            if (vsProject.References != null)
            {