Oooops! Revert "Move InstrumentationUniqueIdAttribute to where it belongs"

Mohammad Dehghan · Mohammad Dehghan · commit 43ca130e9dd0 · 2020-12-29T17:02:51.000+03:30
This reverts commit ca9d2c8. The attribute is added to every instrumented assembly. It should be in the Recorder assembly, because only the Recorder assembly is being (should be) referenced by instrumented assemblies.
diff --git a/SG.CodeCoverage.Recorder/InstrumentationUniqueIdAttribute.cs b/SG.CodeCoverage.Recorder/InstrumentationUniqueIdAttribute.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace SG.CodeCoverage.Instrumentation
+namespace SG.CodeCoverage.Recorder
 {
     [AttributeUsage(AttributeTargets.Assembly)]
     public sealed class InstrumentationUniqueIdAttribute : Attribute
diff --git a/SG.CodeCoverage/Instrumentation/Instrumenter.cs b/SG.CodeCoverage/Instrumentation/Instrumenter.cs
@@ -154,7 +154,7 @@ private InstrumentedTypeMap InstrumentType(TypeDefinition type)
         private void AddUniqueIdAssemblyAttribute(AssemblyDefinition assembly)
         {
             var module = assembly.MainModule;
-            var attribType = typeof(InstrumentationUniqueIdAttribute);
+            var attribType = typeof(Recorder.InstrumentationUniqueIdAttribute);
             var attribTypeRef = module.ImportReference(attribType);
             var attrib = assembly.CustomAttributes.FirstOrDefault(a => a.AttributeType == attribTypeRef);
             var attribArgument = new CustomAttributeArgument(module.ImportReference(typeof(string)), UniqueId.ToString());
diff --git a/SG.CodeCoverage/SG.CodeCoverage.csproj b/SG.CodeCoverage/SG.CodeCoverage.csproj
@@ -58,7 +58,6 @@
     <Compile Include="Coverage\CoverageTypeResult.cs" />
     <Compile Include="Coverage\SummaryResult.cs" />
     <Compile Include="Instrumentation\InstrumentationOptions.cs" />
-    <Compile Include="Instrumentation\InstrumentationUniqueIdAttribute.cs" />
     <Compile Include="Metadata\InstrumentedAssemblyMap.cs" />
     <Compile Include="Instrumentation\AssemblyResolver.cs" />
     <Compile Include="Instrumentation\Instrumenter.cs" />

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`		`-namespace SG.CodeCoverage.Instrumentation`
	`3`	`+namespace SG.CodeCoverage.Recorder`
`4`	`4`	`{`
`5`	`5`	`[AttributeUsage(AttributeTargets.Assembly)]`
`6`	`6`	`public sealed class InstrumentationUniqueIdAttribute : Attribute`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ private InstrumentedTypeMap InstrumentType(TypeDefinition type)`
`154`	`154`	`private void AddUniqueIdAssemblyAttribute(AssemblyDefinition assembly)`
`155`	`155`	`{`
`156`	`156`	`var module = assembly.MainModule;`
`157`		`- var attribType = typeof(InstrumentationUniqueIdAttribute);`
	`157`	`+ var attribType = typeof(Recorder.InstrumentationUniqueIdAttribute);`
`158`	`158`	`var attribTypeRef = module.ImportReference(attribType);`
`159`	`159`	`var attrib = assembly.CustomAttributes.FirstOrDefault(a => a.AttributeType == attribTypeRef);`
`160`	`160`	`var attribArgument = new CustomAttributeArgument(module.ImportReference(typeof(string)), UniqueId.ToString());`