updating roslyn versions to use prerelease 2.9 packages

2018-06-06 14:48:01 -07:00 · 2018-06-06 14:48:01 -07:00 · 3f30687e53
--- a/build/Versions.props
+++ b/build/Versions.props
@ -28,7 +28,6 @@
    <SystemCollectionsImmutableVersionVS2015>1.1.36</SystemCollectionsImmutableVersionVS2015>
    <SystemCompositionVersionVS2015>1.0.31</SystemCompositionVersionVS2015>
    <SystemReflectionMetadataVersionVS2015>1.0.21</SystemReflectionMetadataVersionVS2015>
-
    <!-- VS SDK -->
    <!-- NOTE: Do not upgrade these to be newer than what shipped in VS 2015
               we need out extensions to work on both. -->
--- a/src/Templates/VS2017/ProjectTemplates/CSharp/CodeRefactoring/Ref/CodeRefactoring.csproj
+++ b/src/Templates/VS2017/ProjectTemplates/CSharp/CodeRefactoring/Ref/CodeRefactoring.csproj
@ -6,7 +6,7 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.8.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.9.0-beta4-63006-05" PrivateAssets="all" />
    <PackageReference Update="NETStandard.Library" PrivateAssets="all" />
  </ItemGroup>

--- a/src/Templates/VS2017/ProjectTemplates/CSharp/ConsoleApplication/CSharpConsoleApplication.vstemplate
+++ b/src/Templates/VS2017/ProjectTemplates/CSharp/ConsoleApplication/CSharpConsoleApplication.vstemplate
@ -21,4 +21,8 @@
      <ProjectItem ReplaceParameters="true" OpenInEditor="true">Program.cs</ProjectItem>
    </Project>
  </TemplateContent>
+  <WizardExtension>
+    <Assembly>Roslyn.SDK.Template.Wizard, Version=$(AssemblyVersion), Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <FullClassName>RoslynSDKAnalyzerTemplateWizard</FullClassName>
+  </WizardExtension>
 </VSTemplate>
--- a/src/Templates/VS2017/ProjectTemplates/CSharp/ConsoleApplication/ConsoleApplication.csproj
+++ b/src/Templates/VS2017/ProjectTemplates/CSharp/ConsoleApplication/ConsoleApplication.csproj
@ -9,9 +9,9 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.Build.Locator" Version="1.0.18" />
    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.9.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.9.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="2.9.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.9.0-beta4-63006-05" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.9.0-beta4-63006-05" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="2.9.0-beta4-63006-05" />
  </ItemGroup>

 </Project>
--- a/src/Templates/VS2017/ProjectTemplates/CSharp/Diagnostic/Analyzer/DiagnosticAnalyzer.csproj
+++ b/src/Templates/VS2017/ProjectTemplates/CSharp/Diagnostic/Analyzer/DiagnosticAnalyzer.csproj
@ -24,7 +24,7 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.8.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.9.0-beta4-63006-05" PrivateAssets="all" />
    <PackageReference Update="NETStandard.Library" PrivateAssets="all" />
  </ItemGroup>

--- a/src/Templates/VS2017/ProjectTemplates/CSharp/Diagnostic/Test/Test.csproj
+++ b/src/Templates/VS2017/ProjectTemplates/CSharp/Diagnostic/Test/Test.csproj
@ -6,7 +6,7 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.8.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.9.0-beta4-63006-05" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
    <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
--- a/src/Templates/VS2017/ProjectTemplates/VisualBasic/CodeRefactoring/Ref/CodeRefactoring.vbproj
+++ b/src/Templates/VS2017/ProjectTemplates/VisualBasic/CodeRefactoring/Ref/CodeRefactoring.vbproj
@ -6,7 +6,7 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.8.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.9.0-beta4-63006-05" PrivateAssets="all" />
    <PackageReference Update="NETStandard.Library" PrivateAssets="all" />
  </ItemGroup>

--- a/src/Templates/VS2017/ProjectTemplates/VisualBasic/ConsoleApplication/ConsoleApplication.vbproj
+++ b/src/Templates/VS2017/ProjectTemplates/VisualBasic/ConsoleApplication/ConsoleApplication.vbproj
@ -9,9 +9,9 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.Build.Locator" Version="1.0.18" />
    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.9.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.9.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="2.9.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.9.0-beta4-63006-05" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.9.0-beta4-63006-05" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="2.9.0-beta4-63006-05" />
  </ItemGroup>

 </Project>
--- a/src/Templates/VS2017/ProjectTemplates/VisualBasic/ConsoleApplication/VBConsoleApplication.vstemplate
+++ b/src/Templates/VS2017/ProjectTemplates/VisualBasic/ConsoleApplication/VBConsoleApplication.vstemplate
@ -21,4 +21,8 @@
      <ProjectItem ReplaceParameters="true" TargetFileName="$safeprojectname$.vb" OpenInEditor="true">Module1.vb</ProjectItem>
    </Project>
  </TemplateContent>
+  <WizardExtension>
+    <Assembly>Roslyn.SDK.Template.Wizard, Version=$(AssemblyVersion), Culture=neutral, PublicKeyToken=31bf3856ad364e35</Assembly>
+    <FullClassName>RoslynSDKAnalyzerTemplateWizard</FullClassName>
+  </WizardExtension>
 </VSTemplate>
--- a/src/Templates/VS2017/ProjectTemplates/VisualBasic/Diagnostic/Analyzer/Diagnostic.vbproj
+++ b/src/Templates/VS2017/ProjectTemplates/VisualBasic/Diagnostic/Analyzer/Diagnostic.vbproj
@ -24,7 +24,7 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.8.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.9.0-beta4-63006-05" PrivateAssets="all" />
    <PackageReference Update="NETStandard.Library" PrivateAssets="all" />
  </ItemGroup>

--- a/src/Templates/VS2017/ProjectTemplates/VisualBasic/Diagnostic/Test/UnitTestProject.vbproj
+++ b/src/Templates/VS2017/ProjectTemplates/VisualBasic/Diagnostic/Test/UnitTestProject.vbproj
@ -6,7 +6,7 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.8.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="2.9.0-beta4-63006-05" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
    <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
--- a/src/Templates/VS2017/Roslyn.SDK.VS2017.csproj
+++ b/src/Templates/VS2017/Roslyn.SDK.VS2017.csproj
@ -114,6 +114,7 @@
      <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
    </ProjectReference>
  </ItemGroup>
+
  <!-- rewriting of .vstemplate files to reference the correct assembly version number -->
  <UsingTask AssemblyFile="$(ArtifactsBinDir)UpdateTemplateVersion\net461\UpdateTemplateVersion.dll" TaskName="UpdateTemplateVersion" />
  <Target Name="UpdateAssemblyVersionInTemplates" BeforeTargets="GetZipFilesFromVSTemplates">
--- a/src/Tools/Roslyn.SDK.Template.Wizard/RoslynSDKChildTemplateWizard.InterfaceMembers.cs
+++ b/src/Tools/Roslyn.SDK.Template.Wizard/RoslynSDKChildTemplateWizard.InterfaceMembers.cs
@ -2,7 +2,10 @@

 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Reflection;
+using System.Xml.Linq;
 using EnvDTE;
 using Microsoft.VisualStudio.TemplateWizard;

@ -31,7 +34,25 @@ public partial class RoslynSDKChildTemplateWizard : IWizard
    public void ProjectItemFinishedGenerating(ProjectItem projectItem) => NugetWizard.ProjectItemFinishedGenerating(projectItem);
    public void RunStarted(object automationObject, Dictionary<string, string> replacementsDictionary, WizardRunKind runKind, object[] customParams)
    {
+        WriteOutBetaNugetSource("dotnet.myget.org roslyn", "https://dotnet.myget.org/F/roslyn/api/v3/index.json");
        NugetWizard.RunStarted(automationObject, replacementsDictionary, runKind, customParams);
        OnRunStarted(automationObject as DTE, replacementsDictionary, runKind, customParams);
    }
+
+    private void WriteOutBetaNugetSource(string key, string value)
+    {
+        var appDataFolder = Environment.GetEnvironmentVariable("APPDATA");
+        var nugetConfigPath = Path.Combine(appDataFolder, @"NuGet\NuGet.Config");
+        var document = XDocument.Load(nugetConfigPath);
+        var packageSources = document.Root.Descendants().Where(x => x.Name.LocalName == "packageSources");
+        var sources = packageSources.Elements(XName.Get("add"));
+        if (!sources.Where(x => x.Attribute(XName.Get("value")).Value == "https://dotnet.myget.org/F/roslyn/api/v3/index.json").Any())
+        {
+            var newSource = new XElement(XName.Get("add"));
+            newSource.SetAttributeValue(XName.Get("key"), key);
+            newSource.SetAttributeValue(XName.Get("value"), value);
+            sources.Last().AddAfterSelf(newSource);
+            document.Save(nugetConfigPath);
+        }
+    }
 }
--- a/src/Tools/Roslyn.SDK.Template.Wizard/RoslynSDKRootTemplateWizard.InterfaceMembers.cs
+++ b/src/Tools/Roslyn.SDK.Template.Wizard/RoslynSDKRootTemplateWizard.InterfaceMembers.cs
@ -1,6 +1,10 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

+using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Xml.Linq;
 using EnvDTE;
 using Microsoft.VisualStudio.TemplateWizard;

@ -12,5 +16,25 @@ public partial class RoslynSDKRootTemplateWizard : IWizard
    public bool ShouldAddProjectItem(string filePath) => true;
    public void ProjectItemFinishedGenerating(ProjectItem projectItem) { }
    public void RunStarted(object automationObject, Dictionary<string, string> replacementsDictionary, WizardRunKind runKind, object[] customParams)
-        => OnRunStarted(automationObject as DTE, replacementsDictionary, runKind, customParams);
+    {
+        WriteOutBetaNugetSource("dotnet.myget.org roslyn", "https://dotnet.myget.org/F/roslyn/api/v3/index.json");
+        OnRunStarted(automationObject as DTE, replacementsDictionary, runKind, customParams);
+    }
+
+    private void WriteOutBetaNugetSource(string key, string value)
+    {
+        var appDataFolder = Environment.GetEnvironmentVariable("APPDATA");
+        var nugetConfigPath = Path.Combine(appDataFolder, @"NuGet\NuGet.Config");
+        var document = XDocument.Load(nugetConfigPath);
+        var packageSources = document.Root.Descendants().Where(x => x.Name.LocalName == "packageSources");
+        var sources = packageSources.Elements(XName.Get("add"));
+        if (!sources.Where(x => x.Attribute(XName.Get("value")).Value == "https://dotnet.myget.org/F/roslyn/api/v3/index.json").Any())
+        {
+            var newSource = new XElement(XName.Get("add"));
+            newSource.SetAttributeValue(XName.Get("key"), key);
+            newSource.SetAttributeValue(XName.Get("value"), value);
+            sources.Last().AddAfterSelf(newSource);
+            document.Save(nugetConfigPath);
+        }
+    }
 }