Use ILAsm from buildtools, take 2 (#15300)

MichalStrehovsky · web-flow · commit be9b92a4a1cc · 2017-11-30T21:23:34.000+01:00
Since #15172 got rolled back in #15292, trying this again. This time also deleting garbage `.permission` attributes from the failing tests. Permissions are not supported in CoreCLR. Filed #15299 on some more ILAsm from CoreCLR frustrations.
diff --git a/tests/dir.props b/tests/dir.props
@@ -43,7 +43,6 @@
     <_TargetFrameworkDirectories Condition="'$(BuildToolsTargetsDesktop)' != 'true'">$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories>
     <_FullFrameworkReferenceAssemblyPaths Condition="'$(BuildToolsTargetsDesktop)' != 'true'">$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
     <ExcludeSigningImport>true</ExcludeSigningImport>
-    <SkipImportILTargets>true</SkipImportILTargets>
   </PropertyGroup>
 
   <!-- Common properties -->
diff --git a/tests/src/IL.targets b/tests/src/IL.targets
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Except.il b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Except.il
@@ -14,11 +14,7 @@
   .ver 4:0:0:0
 }
 
-.assembly Except.exe{
- //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
-  //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )]
-  .permission reqmin ['mscorlib']System.Security.Permissions.SecurityPermissionAttribute ( "SkipVerification" = true )
-}
+.assembly Except.exe{}
 
 .class		Except {
 
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/FiltCatch.il b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/FiltCatch.il
@@ -16,10 +16,7 @@
   .ver 4:0:0:0
 }
 
-.assembly FiltCatch.exe{
-  //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
-  //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )]
-  .permission reqmin ['mscorlib']System.Security.Permissions.SecurityPermissionAttribute ( "SkipVerification" = true )}
+.assembly FiltCatch.exe{}
 
 .class		FiltCatch {
 
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/FiltFallThru.il b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/FiltFallThru.il
@@ -16,10 +16,7 @@
   .ver 4:0:0:0
 }
 
-.assembly FiltFallThru{
-//This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
-  //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )]
-  .permission reqmin ['mscorlib']System.Security.Permissions.SecurityPermissionAttribute ( "SkipVerification" = true )}
+.assembly FiltFallThru{}
 
 .class		FiltFallThru {
 
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Finally.il b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Finally.il
@@ -14,10 +14,7 @@
   .ver 4:0:0:0
 }
 
-.assembly Finally.exe{
-//This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
-  //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )]
-  .permission reqmin ['mscorlib']System.Security.Permissions.SecurityPermissionAttribute ( "SkipVerification" = true )}
+.assembly Finally.exe{}
 
 
 .class		Finally {
diff --git a/tests/src/dir.targets b/tests/src/dir.targets
@@ -106,10 +106,9 @@
   <PropertyGroup Condition="'$(ProjectLanguage)' == ''">
     <ProjectLanguage Condition="'$(MSBuildProjectExtension)' == '.ilproj' OR '$(Language)' == 'IL'">IL</ProjectLanguage>
     <ProjectLanguage Condition="'$(MSBuildProjectExtension)' == '.csproj' OR '$(Language)' == 'C#' OR '$(ProjectLanguage)'==''">CSharp</ProjectLanguage>
-  </PropertyGroup>
-  
-  <Import Project="$(ProjectDir)src\IL.targets" Condition="'$(ProjectLanguage)' == 'IL' And '$(CLRTestPriority)' &lt;= '$(CLRTestPriorityToBuild)'" />
 
+    <SkipImportILTargets Condition="'$(CLRTestPriority)' &gt; '$(CLRTestPriorityToBuild)'">true</SkipImportILTargets>
+  </PropertyGroup>
 
   <Import Project="CLRTest.Execute.targets" />
   <Target Name="CreateExecuteScript" 

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,7 @@`
`16`	`16`	`.ver 4:0:0:0`
`17`	`17`	`}`
`18`	`18`
`19`		`-.assembly FiltCatch.exe{`
`20`		`- //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:`
`21`		`- //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )]`
`22`		`- .permission reqmin ['mscorlib']System.Security.Permissions.SecurityPermissionAttribute ( "SkipVerification" = true )}`
	`19`	`+.assembly FiltCatch.exe{}`
`23`	`20`
`24`	`21`	`.class FiltCatch {`
`25`	`22`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,7 @@`
`14`	`14`	`.ver 4:0:0:0`
`15`	`15`	`}`
`16`	`16`
`17`		`-.assembly Finally.exe{`
`18`		`-//This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:`
`19`		`- //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )]`
`20`		`- .permission reqmin ['mscorlib']System.Security.Permissions.SecurityPermissionAttribute ( "SkipVerification" = true )}`
	`17`	`+.assembly Finally.exe{}`
`21`	`18`
`22`	`19`
`23`	`20`	`.class Finally {`