Re-enable test now that the msbuild fix has propagated (dotnet#71745)

davidwrighton · web-flow · commit e79526a4a251 · 2022-07-08T10:49:14.000-07:00
diff --git a/src/tests/reflection/GenericAttribute/GenericAttributeMetadata.il b/src/tests/reflection/GenericAttribute/GenericAttributeMetadata.il
@@ -10,14 +10,13 @@
 
   // --- The following custom attribute is added automatically, do not uncomment -------
   //  .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 07 01 00 00 00 00 ) 
-/*  Re-enable once the fix to https://github.com/dotnet/msbuild/issues/6734 propagates to this repo.
   .custom instance void class SingleAttribute`1<int32>::.ctor() = ( 01 00 00 00 ) 
   .custom instance void class SingleAttribute`1<bool>::.ctor() = ( 01 00 00 00 ) 
   .custom instance void class MultiAttribute`1<int32>::.ctor() = ( 01 00 00 00 ) 
   .custom instance void class MultiAttribute`1<int32>::.ctor(!0) = ( 01 00 01 00 00 00 00 00 ) 
   .custom instance void class MultiAttribute`1<int32>::.ctor() = ( 01 00 01 00 54 08 05 56 61 6C 75 65 02 00 00 00 ) // ....T..Value....
   .custom instance void class MultiAttribute`1<bool>::.ctor() = ( 01 00 00 00 ) 
-  .custom instance void class MultiAttribute`1<bool>::.ctor(!0) = ( 01 00 01 00 00 ) */
+  .custom instance void class MultiAttribute`1<bool>::.ctor(!0) = ( 01 00 01 00 00 )
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
diff --git a/src/tests/reflection/GenericAttribute/GenericAttributeTests.cs b/src/tests/reflection/GenericAttribute/GenericAttributeTests.cs
@@ -8,7 +8,6 @@ class Program
 {
     static int Main(string[] args)
     {
-/* Re-enable once the fix to https://github.com/dotnet/msbuild/issues/6734 propagates to this repo.
         Assembly assembly = typeof(Class).GetTypeInfo().Assembly;
         Assert(CustomAttributeExtensions.GetCustomAttribute<SingleAttribute<int>>(assembly) != null);
         Assert(((ICustomAttributeProvider)assembly).GetCustomAttributes(typeof(SingleAttribute<int>), true) != null);
@@ -20,7 +19,6 @@ static int Main(string[] args)
         Assert(((ICustomAttributeProvider)assembly).IsDefined(typeof(SingleAttribute<bool>), true));
         Assert(CustomAttributeExtensions.GetCustomAttributes(assembly, typeof(SingleAttribute<>)).GetEnumerator().MoveNext());
         Assert(CustomAttributeExtensions.GetCustomAttributes(assembly, typeof(SingleAttribute<>)).GetEnumerator().MoveNext());
-*/
 
         // Uncomment when https://github.com/dotnet/runtime/issues/66168 is resolved
         // Module module = programTypeInfo.Module;

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ class Program`
`8`	`8`	`{`
`9`	`9`	`static int Main(string[] args)`
`10`	`10`	`{`
`11`		`-/* Re-enable once the fix to https://github.com/dotnet/msbuild/issues/6734 propagates to this repo.`
`12`	`11`	`Assembly assembly = typeof(Class).GetTypeInfo().Assembly;`
`13`	`12`	`Assert(CustomAttributeExtensions.GetCustomAttribute<SingleAttribute<int>>(assembly) != null);`
`14`	`13`	`Assert(((ICustomAttributeProvider)assembly).GetCustomAttributes(typeof(SingleAttribute<int>), true) != null);`
`@@ -20,7 +19,6 @@ static int Main(string[] args)`
`20`	`19`	`Assert(((ICustomAttributeProvider)assembly).IsDefined(typeof(SingleAttribute<bool>), true));`
`21`	`20`	`Assert(CustomAttributeExtensions.GetCustomAttributes(assembly, typeof(SingleAttribute<>)).GetEnumerator().MoveNext());`
`22`	`21`	`Assert(CustomAttributeExtensions.GetCustomAttributes(assembly, typeof(SingleAttribute<>)).GetEnumerator().MoveNext());`
`23`		`-*/`
`24`	`22`
`25`	`23`	`// Uncomment when https://github.com/dotnet/runtime/issues/66168 is resolved`
`26`	`24`	`// Module module = programTypeInfo.Module;`