From 23ba564e3d7ae37bebea297957b57b56323718fd Mon Sep 17 00:00:00 2001
From: AraHaan <seandhunt_7@yahoo.com>
Date: Thu, 13 Jan 2022 18:12:28 -0500
Subject: [PATCH] Fixed bug where the git information is not properly obtained
 and the head information was not properly dumped to the right file name.

This also sadly requires fixing the roslyn version to 4.0.1 for now to avoid loading errors when using the generator when building projects.

Signed-off-by: AraHaan <seandhunt_7@yahoo.com>
---
 build/GitBuildInfo.SourceGenerator.targets                  | 3 +++
 src/GitBuildInfo.SourceGenerator/Directory.Build.props      | 6 +++---
 src/GitBuildInfo.SourceGenerator/Directory.Packages.props   | 2 +-
 .../GitBuildInfo.SourceGenerator.targets                    | 4 ----
 tests/Directory.Packages.props                              | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/build/GitBuildInfo.SourceGenerator.targets b/build/GitBuildInfo.SourceGenerator.targets
index 3a0cd3d..30a2dc1 100644
--- a/build/GitBuildInfo.SourceGenerator.targets
+++ b/build/GitBuildInfo.SourceGenerator.targets
@@ -10,6 +10,7 @@
         WorkingDirectory="$(MSBuildProjectDirectory)"
         ConsoleToMSBuild="true"
         IgnoreExitCode="true"
+        StandardOutputImportance="low"
         Condition="'$(GitHead)' == ''">
         <Output TaskParameter="ConsoleOutput" PropertyName="GitHead" />
     </Exec>
@@ -18,6 +19,7 @@
         WorkingDirectory="$(MSBuildProjectDirectory)"
         ConsoleToMSBuild="true"
         IgnoreExitCode="true"
+        StandardOutputImportance="low"
         Condition="'$(CommitHash)' == ''">
         <Output TaskParameter="ConsoleOutput" PropertyName="CommitHash" />
     </Exec>
@@ -26,6 +28,7 @@
         WorkingDirectory="$(MSBuildProjectDirectory)"
         ConsoleToMSBuild="true"
         IgnoreExitCode="true"
+        StandardOutputImportance="low"
         Condition="'$(GitBranch)' == ''">
         <Output TaskParameter="ConsoleOutput" PropertyName="GitBranch" />
     </Exec>
diff --git a/src/GitBuildInfo.SourceGenerator/Directory.Build.props b/src/GitBuildInfo.SourceGenerator/Directory.Build.props
index 6591883..8d60ae5 100644
--- a/src/GitBuildInfo.SourceGenerator/Directory.Build.props
+++ b/src/GitBuildInfo.SourceGenerator/Directory.Build.props
@@ -4,14 +4,14 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>true</IsPackable>
-    <Version>1.0.15</Version>
-    <PackageReleaseNotes>Fixed bug where the git information is not properly obtained and the head information was not properly dumped to the right file name.</PackageReleaseNotes>
+    <Version>1.0.16</Version>
+    <PackageReleaseNotes>Fixed issue where the roslyn dependencies gets placed in the nuget package.</PackageReleaseNotes>
     <Copyright>Copyright (c) 2021-2022</Copyright>
     <!-- Suppresses the warnings about the package not having assemblies in lib/*/.dll.-->
     <NoPackageAnalysis>true</NoPackageAnalysis>
     <!-- Special properties for analyzer packages. -->
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <NoWarn>$(NoWarn);NU5128;NU5127</NoWarn>
     <NuSpecFile>GitBuildInfo.SourceGenerator.nuspec</NuSpecFile>
     <IsRoslynComponent>true</IsRoslynComponent>
diff --git a/src/GitBuildInfo.SourceGenerator/Directory.Packages.props b/src/GitBuildInfo.SourceGenerator/Directory.Packages.props
index 62ac3cc..72634e6 100644
--- a/src/GitBuildInfo.SourceGenerator/Directory.Packages.props
+++ b/src/GitBuildInfo.SourceGenerator/Directory.Packages.props
@@ -7,7 +7,7 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="*-*" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/GitBuildInfo.SourceGenerator/GitBuildInfo.SourceGenerator.targets b/src/GitBuildInfo.SourceGenerator/GitBuildInfo.SourceGenerator.targets
index 2e12773..30f08d2 100644
--- a/src/GitBuildInfo.SourceGenerator/GitBuildInfo.SourceGenerator.targets
+++ b/src/GitBuildInfo.SourceGenerator/GitBuildInfo.SourceGenerator.targets
@@ -14,10 +14,6 @@
     <ItemGroup>
       <!-- Analysis of C# projects -->
       <TfmSpecificPackageFile Include="$(TargetPath)" PackagePath="analyzers\cs\" />
-      <TfmSpecificPackageFile Include="@(ReferencePath)" PackagePath="analyzers\cs\" Condition=" '%(FileName)%(Extension)' == 'Microsoft.CodeAnalysis.dll' " />
-      <TfmSpecificPackageFile Include="@(SatelliteDllsProjectOutputGroupDependency)" PackagePath="analyzers\cs\%(SatelliteDllsProjectOutputGroupDependency.DestinationSubDirectory)" Condition=" '%(SatelliteDllsProjectOutputGroupDependency.DestinationSubDirectory)' != '' " />
-      <TfmSpecificPackageFile Include="@(SatelliteDllsProjectOutputGroupOutput->'%(FinalOutputPath)')" PackagePath="analyzers\cs\%(SatelliteDllsProjectOutputGroupOutput.Culture)\" />
-      <TfmSpecificPackageFile Include="%(_ResolvedProjectReferencePaths.Identity)" PackagePath="analyzers\cs\" />
     </ItemGroup>
   </Target>
 
diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props
index 8ba695a..ac00d98 100644
--- a/tests/Directory.Packages.props
+++ b/tests/Directory.Packages.props
@@ -1,7 +1,7 @@
 <Project>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="*-*" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="*-*" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="*-*" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing" Version="*-*" />