Skip to content

Commit 59b5567

Browse files
asbjornuasbjornu
authored
Merge pull request #2332 from odalet/hotfix/fix-2330
`#if`-ed the definition of `ExcludeFromCodeCoverageAttribute` depending on the target framework, as it is not supported on some older .NET framework targets.
2 parents 9f5211d + 2246945 commit 59b5567

File tree

6 files changed

+96
-0
lines changed

6 files changed

+96
-0
lines changed

‎src/GitVersionCore.Tests/VersionConverters/Approved/cs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,22 @@
88
// </auto-generated>
99
//------------------------------------------------------------------------------
1010

11+
#if NET20 || NET35 || NETCOREAPP1_0 || NETCOREAPP1_1 || NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2 || NETSTANDARD1_3 || NETSTANDARD1_4 || NETSTANDARD1_5 || NETSTANDARD1_6
12+
namespace System.Diagnostics.CodeAnalysis
13+
{
14+
[global::System.AttributeUsage(
15+
global::System.AttributeTargets.Assembly |
16+
global::System.AttributeTargets.Class |
17+
global::System.AttributeTargets.Struct |
18+
global::System.AttributeTargets.Constructor |
19+
global::System.AttributeTargets.Method |
20+
global::System.AttributeTargets.Property |
21+
global::System.AttributeTargets.Event,
22+
Inherited = false, AllowMultiple = false)]
23+
internal sealed class ExcludeFromCodeCoverageAttribute : global::System.Attribute { }
24+
}
25+
#endif
26+
1127
[global::System.Runtime.CompilerServices.CompilerGenerated]
1228
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
1329
static class GitVersionInformation

‎src/GitVersionCore.Tests/VersionConverters/Approved/fs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,22 @@
88
// </auto-generated>
99
//------------------------------------------------------------------------------
1010

11+
#if NET20 || NET35 || NETCOREAPP1_0 || NETCOREAPP1_1 || NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2 || NETSTANDARD1_3 || NETSTANDARD1_4 || NETSTANDARD1_5 || NETSTANDARD1_6
12+
namespace System.Diagnostics.CodeAnalysis
13+
14+
[<Sealed>]
15+
[<global.System.AttributeUsage(
16+
global.System.AttributeTargets.Assembly |||
17+
global.System.AttributeTargets.Class |||
18+
global.System.AttributeTargets.Struct |||
19+
global.System.AttributeTargets.Constructor |||
20+
global.System.AttributeTargets.Method |||
21+
global.System.AttributeTargets.Property |||
22+
global.System.AttributeTargets.Event,
23+
Inherited = false, AllowMultiple = false)>]
24+
type ExcludeFromCodeCoverageAttribute() = inherit global.System.Attribute()
25+
#endif
26+
1127
namespace global
1228

1329
[<AbstractClass; Sealed>]

‎src/GitVersionCore.Tests/VersionConverters/Approved/vb/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,22 @@
88
' </auto-generated>
99
'------------------------------------------------------------------------------
1010

11+
#If NET20 OrElse NET35 OrElse NETCOREAPP1_0 OrElse NETCOREAPP1_1 OrElse NETSTANDARD1_0 OrElse NETSTANDARD1_1 OrElse NETSTANDARD1_2 OrElse NETSTANDARD1_3 OrElse NETSTANDARD1_4 OrElse NETSTANDARD1_5 OrElse NETSTANDARD1_6 Then
12+
Namespace Global.System.Diagnostics.CodeAnalysis
13+
<Global.System.AttributeUsage(
14+
Global.System.AttributeTargets.Assembly Or
15+
Global.System.AttributeTargets.Class Or
16+
Global.System.AttributeTargets.Struct Or
17+
Global.System.AttributeTargets.Constructor Or
18+
Global.System.AttributeTargets.Method Or
19+
Global.System.AttributeTargets.Property Or
20+
Global.System.AttributeTargets.Event, Inherited:=False, AllowMultiple:=False)>
21+
Friend NotInheritable Class ExcludeFromCodeCoverageAttribute
22+
Inherits Global.System.Attribute
23+
End Class
24+
End Namespace
25+
#End If
26+
1127
Namespace Global
1228

1329
<Global.System.Runtime.CompilerServices.CompilerGenerated()>

‎src/GitVersionCore/VersionConverters/GitVersionInfo/Templates/GitVersionInformation.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,22 @@
88
// </auto-generated>
99
//------------------------------------------------------------------------------
1010

11+
#if NET20 || NET35 || NETCOREAPP1_0 || NETCOREAPP1_1 || NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2 || NETSTANDARD1_3 || NETSTANDARD1_4 || NETSTANDARD1_5 || NETSTANDARD1_6
12+
namespace System.Diagnostics.CodeAnalysis
13+
{{
14+
[global::System.AttributeUsage(
15+
global::System.AttributeTargets.Assembly |
16+
global::System.AttributeTargets.Class |
17+
global::System.AttributeTargets.Struct |
18+
global::System.AttributeTargets.Constructor |
19+
global::System.AttributeTargets.Method |
20+
global::System.AttributeTargets.Property |
21+
global::System.AttributeTargets.Event,
22+
Inherited = false, AllowMultiple = false)]
23+
internal sealed class ExcludeFromCodeCoverageAttribute : global::System.Attribute {{ }}
24+
}}
25+
#endif
26+
1127
[global::System.Runtime.CompilerServices.CompilerGenerated]
1228
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
1329
static class GitVersionInformation

‎src/GitVersionCore/VersionConverters/GitVersionInfo/Templates/GitVersionInformation.fs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,22 @@
88
// </auto-generated>
99
//------------------------------------------------------------------------------
1010

11+
#if NET20 || NET35 || NETCOREAPP1_0 || NETCOREAPP1_1 || NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2 || NETSTANDARD1_3 || NETSTANDARD1_4 || NETSTANDARD1_5 || NETSTANDARD1_6
12+
namespace System.Diagnostics.CodeAnalysis
13+
14+
[<Sealed>]
15+
[<global.System.AttributeUsage(
16+
global.System.AttributeTargets.Assembly |||
17+
global.System.AttributeTargets.Class |||
18+
global.System.AttributeTargets.Struct |||
19+
global.System.AttributeTargets.Constructor |||
20+
global.System.AttributeTargets.Method |||
21+
global.System.AttributeTargets.Property |||
22+
global.System.AttributeTargets.Event,
23+
Inherited = false, AllowMultiple = false)>]
24+
type ExcludeFromCodeCoverageAttribute() = inherit global.System.Attribute()
25+
#endif
26+
1127
namespace global
1228

1329
[<AbstractClass; Sealed>]

‎src/GitVersionCore/VersionConverters/GitVersionInfo/Templates/GitVersionInformation.vb‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,22 @@
88
' </auto-generated>
99
'------------------------------------------------------------------------------
1010

11+
#If NET20 OrElse NET35 OrElse NETCOREAPP1_0 OrElse NETCOREAPP1_1 OrElse NETSTANDARD1_0 OrElse NETSTANDARD1_1 OrElse NETSTANDARD1_2 OrElse NETSTANDARD1_3 OrElse NETSTANDARD1_4 OrElse NETSTANDARD1_5 OrElse NETSTANDARD1_6 Then
12+
Namespace Global.System.Diagnostics.CodeAnalysis
13+
<Global.System.AttributeUsage(
14+
Global.System.AttributeTargets.Assembly Or
15+
Global.System.AttributeTargets.Class Or
16+
Global.System.AttributeTargets.Struct Or
17+
Global.System.AttributeTargets.Constructor Or
18+
Global.System.AttributeTargets.Method Or
19+
Global.System.AttributeTargets.Property Or
20+
Global.System.AttributeTargets.Event, Inherited:=False, AllowMultiple:=False)>
21+
Friend NotInheritable Class ExcludeFromCodeCoverageAttribute
22+
Inherits Global.System.Attribute
23+
End Class
24+
End Namespace
25+
#End If
26+
1127
Namespace Global
1228

1329
<Global.System.Runtime.CompilerServices.CompilerGenerated()>

0 commit comments

Comments
 (0)