Release prep and some test fixes

phmonte · Dec 20, 2020 · e83ed25 · e83ed25
1 parent 8d4ed30
commit e83ed25
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,5 +1,9 @@
 # 3.1.1
 
+- Added Workspaces support for analyzers and source generators (#157, #158, thanks @svick)
+- Updated the Microsoft.CodeAnalysis packages to 3.8.0 (#155, thanks @jjonescz)
+- Added a fix for F# support (#151, #152, thanks @dukedagmor)
+
 # 3.1.0
 
 - Added `SourceFiles` and `References` for F# projects (#146, thanks @dukedagmor)

diff --git a/build.cake b/build.cake
@@ -277,7 +277,7 @@ Task("Default")
 
 Task("Release")
     .Description("Generates a GitHub release, pushes the NuGet package, and deploys the docs site.")
-    // .IsDependentOn("GitHub")
+    .IsDependentOn("GitHub")
     .IsDependentOn("NuGet");
 
 Task("BuildServer")

diff --git a/src/Buildalyzer.Workspaces/Buildalyzer.Workspaces.csproj b/src/Buildalyzer.Workspaces/Buildalyzer.Workspaces.csproj
@@ -20,8 +20,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.7.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="3.7.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="3.8.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/Buildalyzer.Tests/Integration/SimpleProjectsFixture.cs b/tests/Buildalyzer.Tests/Integration/SimpleProjectsFixture.cs
@@ -109,9 +109,11 @@ public void GetsSourceFiles(
             };
 
             // When
-            IReadOnlyList<string> sourceFiles = analyzer.Build(options).First().SourceFiles;
+            IAnalyzerResults results = analyzer.Build(options);
 
             // Then
+            // If this is the multi-targeted project, use the net462 target
+            IReadOnlyList<string> sourceFiles = results.Count == 1 ? results.First().SourceFiles : results["net462"].SourceFiles;
             sourceFiles.ShouldNotBeNull(log.ToString());
             new[]
             {
@@ -168,9 +170,11 @@ public void GetsSourceFilesFromBinaryLog(
             {
                 // When
                 analyzer.Build(options);
-                IReadOnlyList<string> sourceFiles = analyzer.Manager.Analyze(binLogPath).First().SourceFiles;
+                IAnalyzerResults results = analyzer.Manager.Analyze(binLogPath);
 
                 // Then
+                // If this is the multi-targeted project, use the net462 target
+                IReadOnlyList<string> sourceFiles = results.Count == 1 ? results.First().SourceFiles : results["net462"].SourceFiles;
                 sourceFiles.ShouldNotBeNull(log.ToString());
                 new[]
                 {