Skip to content

Commit fb2aa9c

Browse files
committed
Do not emit ThisAssembly.Git.IsDirty when GitThisAssembly is false
We missed checking this in the source-generator. Fixes #337
1 parent 10d8c91 commit fb2aa9c

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/Analyzer/GitInfoGenerator.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
1111
Namespace = c.GlobalOptions.TryGetValue("build_property.ThisAssemblyNamespace", out var ns)
1212
&& !string.IsNullOrEmpty(ns) ? ns : null,
1313
IsDirty = c.GlobalOptions.TryGetValue("build_property.GitIsDirty", out var dirty)
14-
&& dirty == "1" ? true : false
14+
&& dirty == "1" ? true : false,
15+
NoThisAssembly = c.GlobalOptions.TryGetValue("build_property.GitThisAssembly", out var value)
16+
&& bool.TryParse(value, out var thisassembly) && !thisassembly ? true : false
1517
});
1618

1719
context.RegisterSourceOutput(ns,
@@ -21,6 +23,9 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
2123
if (!string.IsNullOrEmpty(state.Namespace))
2224
return;
2325

26+
if (state.NoThisAssembly)
27+
return;
28+
2429
c.AddSource("ThisAssembly.Git.IsDirty.g",
2530
$$"""
2631
//------------------------------------------------------------------------------

src/GitInfo/build/GitInfo.ThisAssembly.targets

+5-2
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,15 @@
3333
</GitThisAssemblyDependsOn>
3434
</PropertyGroup>
3535

36+
<ItemGroup>
37+
<CompilerVisibleProperty Include="GitIsDirty" />
38+
<CompilerVisibleProperty Include="GitThisAssembly" />
39+
</ItemGroup>
40+
3641
<Target Name="GitThisAssembly" DependsOnTargets="$(GitThisAssemblyDependsOn)"
3742
BeforeTargets="PrepareConstants;GenerateMSBuildEditorConfigFileShouldRun" Condition="'$(GitThisAssembly)' == 'true'">
3843

3944
<ItemGroup>
40-
<CompilerVisibleProperty Include="GitIsDirty" />
41-
4245
<Constant Include="IsDirtyString" Value="true" Root="Git" Condition="$(GitIsDirty) == '1'" />
4346
<Constant Include="IsDirtyString" Value="false" Root="Git" Condition="$(GitIsDirty) == '0'" />
4447

0 commit comments

Comments
 (0)