Skip to content

AssemblyVersionInfo: Use global:: for all references to types in System.* namespaces. #1012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 31, 2023
Merged

AssemblyVersionInfo: Use global:: for all references to types in System.* namespaces. #1012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ private static IEnumerable<CodeTypeMember> CreateDateTimeField(string name, Date
{
Requires.NotNullOrEmpty(name, nameof(name));

////internal static System.DateTime GitCommitDate => new System.DateTime({ticks}, System.DateTimeKind.Utc);");
////internal static global::System.DateTime GitCommitDate => new global::System.DateTime({ticks}, global::System.DateTimeKind.Utc);");

var property = new CodeMemberProperty()
{
Expand Down Expand Up @@ -294,7 +294,7 @@ private CodeTypeDeclaration CreateThisAssemblyClass()

var codeAttributeDeclarationCollection = new CodeAttributeDeclarationCollection();
codeAttributeDeclarationCollection.Add(new CodeAttributeDeclaration(
"System.CodeDom.Compiler.GeneratedCode",
"global::System.CodeDom.Compiler.GeneratedCode",
new CodeAttributeArgument(new CodePrimitiveExpression(GeneratorName)),
new CodeAttributeArgument(new CodePrimitiveExpression(GeneratorVersion))));
thisAssembly.CustomAttributes = codeAttributeDeclarationCollection;
Expand Down Expand Up @@ -718,7 +718,7 @@ internal override void AddThisAssemblyMember(string name, bool value)

internal override void AddThisAssemblyMember(string name, DateTime value)
{
this.CodeBuilder.AppendLine($" static member internal {name} = new System.DateTime({value.Ticks}L, System.DateTimeKind.Utc)");
this.CodeBuilder.AppendLine($" static member internal {name} = new global.System.DateTime({value.Ticks}L, global.System.DateTimeKind.Utc)");
}

internal override void StartAssemblyAttributes()
Expand All @@ -728,7 +728,7 @@ internal override void StartAssemblyAttributes()

internal override void DeclareAttribute(Type type, string arg)
{
this.CodeBuilder.AppendLine($"[<assembly: {type.FullName}(\"{arg}\")>]");
this.CodeBuilder.AppendLine($"[<assembly: global.{type.FullName}(\"{arg}\")>]");
}

internal override void EndThisAssemblyClass()
Expand All @@ -740,10 +740,10 @@ internal override void StartThisAssemblyClass()
{
this.CodeBuilder.AppendLine("do()");
this.CodeBuilder.AppendLine($"#if {CompilerDefinesAroundGeneratedCodeAttribute}");
this.CodeBuilder.AppendLine($"[<System.CodeDom.Compiler.GeneratedCode(\"{GeneratorName}\",\"{GeneratorVersion}\")>]");
this.CodeBuilder.AppendLine($"[<global.System.CodeDom.Compiler.GeneratedCode(\"{GeneratorName}\",\"{GeneratorVersion}\")>]");
this.CodeBuilder.AppendLine("#endif");
this.CodeBuilder.AppendLine($"#if {CompilerDefinesAroundExcludeFromCodeCoverageAttribute}");
this.CodeBuilder.AppendLine("[<System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>]");
this.CodeBuilder.AppendLine("[<global.System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>]");
this.CodeBuilder.AppendLine("#endif");
this.CodeBuilder.AppendLine("type internal ThisAssembly() =");
}
Expand All @@ -768,7 +768,7 @@ internal override void AddComment(string comment)

internal override void DeclareAttribute(Type type, string arg)
{
this.CodeBuilder.AppendLine($"[assembly: {type.FullName}(\"{arg}\")]");
this.CodeBuilder.AppendLine($"[assembly: global::{type.FullName}(\"{arg}\")]");
}

internal override void StartThisAssemblyClass()
Expand All @@ -779,10 +779,10 @@ internal override void StartThisAssemblyClass()
}

this.CodeBuilder.AppendLine($"#if {CompilerDefinesAroundGeneratedCodeAttribute}");
this.CodeBuilder.AppendLine($"[System.CodeDom.Compiler.GeneratedCode(\"{GeneratorName}\",\"{GeneratorVersion}\")]");
this.CodeBuilder.AppendLine($"[global::System.CodeDom.Compiler.GeneratedCode(\"{GeneratorName}\",\"{GeneratorVersion}\")]");
this.CodeBuilder.AppendLine("#endif");
this.CodeBuilder.AppendLine($"#if {CompilerDefinesAroundExcludeFromCodeCoverageAttribute}");
this.CodeBuilder.AppendLine("[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]");
this.CodeBuilder.AppendLine("[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]");
this.CodeBuilder.AppendLine("#endif");
this.CodeBuilder.AppendLine("internal static partial class ThisAssembly {");
}
Expand All @@ -799,7 +799,7 @@ internal override void AddThisAssemblyMember(string name, bool value)

internal override void AddThisAssemblyMember(string name, DateTime value)
{
this.CodeBuilder.AppendLine($" internal static readonly System.DateTime {name} = new System.DateTime({value.Ticks}L, System.DateTimeKind.Utc);");
this.CodeBuilder.AppendLine($" internal static readonly global::System.DateTime {name} = new global::System.DateTime({value.Ticks}L, global::System.DateTimeKind.Utc);");
}

internal override void EndThisAssemblyClass()
Expand Down Expand Up @@ -832,7 +832,7 @@ internal override void AddComment(string comment)

internal override void DeclareAttribute(Type type, string arg)
{
this.CodeBuilder.AppendLine($"<Assembly: {type.FullName}(\"{arg}\")>");
this.CodeBuilder.AppendLine($"<Assembly: Global.{type.FullName}(\"{arg}\")>");
}

internal override void StartThisAssemblyClass()
Expand All @@ -843,11 +843,11 @@ internal override void StartThisAssemblyClass()
}

this.CodeBuilder.AppendLine($"#If {CompilerDefinesAroundExcludeFromCodeCoverageAttribute.Replace("||", " Or ")} Then");
this.CodeBuilder.AppendLine($"<System.CodeDom.Compiler.GeneratedCode(\"{GeneratorName}\",\"{GeneratorVersion}\")>");
this.CodeBuilder.AppendLine("<System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>");
this.CodeBuilder.AppendLine($"<Global.System.CodeDom.Compiler.GeneratedCode(\"{GeneratorName}\",\"{GeneratorVersion}\")>");
this.CodeBuilder.AppendLine("<Global.System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>");
this.CodeBuilder.AppendLine("Partial Friend NotInheritable Class ThisAssembly");
this.CodeBuilder.AppendLine($"#ElseIf {CompilerDefinesAroundGeneratedCodeAttribute.Replace("||", " Or ")} Then");
this.CodeBuilder.AppendLine($"<System.CodeDom.Compiler.GeneratedCode(\"{GeneratorName}\",\"{GeneratorVersion}\")>");
this.CodeBuilder.AppendLine($"<Global.System.CodeDom.Compiler.GeneratedCode(\"{GeneratorName}\",\"{GeneratorVersion}\")>");
this.CodeBuilder.AppendLine("Partial Friend NotInheritable Class ThisAssembly");
this.CodeBuilder.AppendLine("#Else");
this.CodeBuilder.AppendLine("Partial Friend NotInheritable Class ThisAssembly");
Expand All @@ -866,7 +866,7 @@ internal override void AddThisAssemblyMember(string name, bool value)

internal override void AddThisAssemblyMember(string name, DateTime value)
{
this.CodeBuilder.AppendLine($" Friend Shared ReadOnly {name} As System.DateTime = New System.DateTime({value.Ticks}L, System.DateTimeKind.Utc)");
this.CodeBuilder.AppendLine($" Friend Shared ReadOnly {name} As Global.System.DateTime = New Global.System.DateTime({value.Ticks}L, Global.System.DateTimeKind.Utc)");
}

internal override void EndThisAssemblyClass()
Expand Down
68 changes: 34 additions & 34 deletions test/Nerdbank.GitVersioning.Tests/AssemblyInfoTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ public void FSharpGenerator(bool? thisAssemblyClass)
#nowarn ""CA2243""

namespace AssemblyInfo
[<assembly: System.Reflection.AssemblyVersionAttribute(""1.3.0.0"")>]
[<assembly: System.Reflection.AssemblyFileVersionAttribute(""1.3.1.0"")>]
[<assembly: System.Reflection.AssemblyInformationalVersionAttribute("""")>]
[<assembly: global.System.Reflection.AssemblyVersionAttribute(""1.3.0.0"")>]
[<assembly: global.System.Reflection.AssemblyFileVersionAttribute(""1.3.1.0"")>]
[<assembly: global.System.Reflection.AssemblyInformationalVersionAttribute("""")>]
{(thisAssemblyClass.GetValueOrDefault(true) ? $@"do()
#if NETSTANDARD || NETFRAMEWORK || NETCOREAPP
[<System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")>]
[<global.System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")>]
#endif
#if NET40_OR_GREATER || NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_0_OR_GREATER
[<System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>]
[<global.System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>]
#endif
type internal ThisAssembly() =
static member internal AssemblyCompany = ""company""
Expand All @@ -80,7 +80,7 @@ type internal ThisAssembly() =
static member internal CustomBool = true
static member internal CustomString1 = ""abc""
static member internal CustomString3 = """"
static member internal CustomTicks = new System.DateTime(637509805729817056L, System.DateTimeKind.Utc)
static member internal CustomTicks = new global.System.DateTime(637509805729817056L, global.System.DateTimeKind.Utc)
static member internal IsPrerelease = false
static member internal IsPublicRelease = false
static member internal RootNamespace = """"
Expand Down Expand Up @@ -128,15 +128,15 @@ namespace {(
: !string.IsNullOrWhiteSpace(rootNamespace)
? rootNamespace
: "AssemblyInfo")}
[<assembly: System.Reflection.AssemblyVersionAttribute(""1.3.0.0"")>]
[<assembly: System.Reflection.AssemblyFileVersionAttribute(""1.3.1.0"")>]
[<assembly: System.Reflection.AssemblyInformationalVersionAttribute("""")>]
[<assembly: global.System.Reflection.AssemblyVersionAttribute(""1.3.0.0"")>]
[<assembly: global.System.Reflection.AssemblyFileVersionAttribute(""1.3.1.0"")>]
[<assembly: global.System.Reflection.AssemblyInformationalVersionAttribute("""")>]
do()
#if NETSTANDARD || NETFRAMEWORK || NETCOREAPP
[<System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")>]
[<global.System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")>]
#endif
#if NET40_OR_GREATER || NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_0_OR_GREATER
[<System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>]
[<global.System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>]
#endif
type internal ThisAssembly() =
static member internal AssemblyCompany = ""company""
Expand Down Expand Up @@ -201,14 +201,14 @@ public void CSharpGenerator(bool? thisAssemblyClass)

#pragma warning disable CA2243

[assembly: System.Reflection.AssemblyVersionAttribute(""1.3.0.0"")]
[assembly: System.Reflection.AssemblyFileVersionAttribute(""1.3.1.0"")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("""")]
[assembly: global::System.Reflection.AssemblyVersionAttribute(""1.3.0.0"")]
[assembly: global::System.Reflection.AssemblyFileVersionAttribute(""1.3.1.0"")]
[assembly: global::System.Reflection.AssemblyInformationalVersionAttribute("""")]
{(thisAssemblyClass.GetValueOrDefault(true) ? $@"#if NETSTANDARD || NETFRAMEWORK || NETCOREAPP
[System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")]
[global::System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")]
#endif
#if NET40_OR_GREATER || NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_0_OR_GREATER
[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
#endif
internal static partial class ThisAssembly {{
internal const string AssemblyCompany = ""company"";
Expand All @@ -217,7 +217,7 @@ internal static partial class ThisAssembly {{
internal const bool CustomBool = true;
internal const string CustomString1 = ""abc"";
internal const string CustomString3 = """";
internal static readonly System.DateTime CustomTicks = new System.DateTime(637509805729817056L, System.DateTimeKind.Utc);
internal static readonly global::System.DateTime CustomTicks = new global::System.DateTime(637509805729817056L, global::System.DateTimeKind.Utc);
internal const bool IsPrerelease = false;
internal const bool IsPublicRelease = false;
internal const string RootNamespace = """";
Expand Down Expand Up @@ -263,14 +263,14 @@ public void CSharpGeneratorWithNamespace(string thisAssemblyNamespace, string ro

#pragma warning disable CA2243

[assembly: System.Reflection.AssemblyVersionAttribute(""1.3.0.0"")]
[assembly: System.Reflection.AssemblyFileVersionAttribute(""1.3.1.0"")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("""")]{nsStart}
[assembly: global::System.Reflection.AssemblyVersionAttribute(""1.3.0.0"")]
[assembly: global::System.Reflection.AssemblyFileVersionAttribute(""1.3.1.0"")]
[assembly: global::System.Reflection.AssemblyInformationalVersionAttribute("""")]{nsStart}
#if NETSTANDARD || NETFRAMEWORK || NETCOREAPP
[System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")]
[global::System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")]
#endif
#if NET40_OR_GREATER || NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_0_OR_GREATER
[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
#endif
internal static partial class ThisAssembly {{
internal const string AssemblyCompany = ""company"";
Expand Down Expand Up @@ -316,15 +316,15 @@ public void VisualBasicGenerator(bool? thisAssemblyClass)

#Disable Warning CA2243

<Assembly: System.Reflection.AssemblyVersionAttribute(""1.3.0.0"")>
<Assembly: System.Reflection.AssemblyFileVersionAttribute(""1.3.1.0"")>
<Assembly: System.Reflection.AssemblyInformationalVersionAttribute("""")>
<Assembly: Global.System.Reflection.AssemblyVersionAttribute(""1.3.0.0"")>
<Assembly: Global.System.Reflection.AssemblyFileVersionAttribute(""1.3.1.0"")>
<Assembly: Global.System.Reflection.AssemblyInformationalVersionAttribute("""")>
{(thisAssemblyClass.GetValueOrDefault(true) ? $@"#If NET40_OR_GREATER Or NETCOREAPP2_0_OR_GREATER Or NETSTANDARD2_0_OR_GREATER Then
<System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")>
<System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>
<Global.System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")>
<Global.System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>
Partial Friend NotInheritable Class ThisAssembly
#ElseIf NETSTANDARD Or NETFRAMEWORK Or NETCOREAPP Then
<System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")>
<Global.System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")>
Partial Friend NotInheritable Class ThisAssembly
#Else
Partial Friend NotInheritable Class ThisAssembly
Expand Down Expand Up @@ -377,15 +377,15 @@ public void VisualBasicGeneratorWithNamespace(string thisAssemblyNamespace, stri

#Disable Warning CA2243

<Assembly: System.Reflection.AssemblyVersionAttribute(""1.3.0.0"")>
<Assembly: System.Reflection.AssemblyFileVersionAttribute(""1.3.1.0"")>
<Assembly: System.Reflection.AssemblyInformationalVersionAttribute("""")>{nsStart}
<Assembly: Global.System.Reflection.AssemblyVersionAttribute(""1.3.0.0"")>
<Assembly: Global.System.Reflection.AssemblyFileVersionAttribute(""1.3.1.0"")>
<Assembly: Global.System.Reflection.AssemblyInformationalVersionAttribute("""")>{nsStart}
#If NET40_OR_GREATER Or NETCOREAPP2_0_OR_GREATER Or NETSTANDARD2_0_OR_GREATER Then
<System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")>
<System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>
<Global.System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")>
<Global.System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>
Partial Friend NotInheritable Class ThisAssembly
#ElseIf NETSTANDARD Or NETFRAMEWORK Or NETCOREAPP Then
<System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")>
<Global.System.CodeDom.Compiler.GeneratedCode(""{AssemblyVersionInfo.GeneratorName}"",""{AssemblyVersionInfo.GeneratorVersion}"")>
Partial Friend NotInheritable Class ThisAssembly
#Else
Partial Friend NotInheritable Class ThisAssembly
Expand Down