Remove ILC testing (dotnet#37681)

* Remove ILC testing

Directory.Build.props

@@ -390,16 +390,13 @@
 
     <!-- We add extra binplacing for the test shared framework until we can get hardlinking with the runtime directory working on all platforms -->
     <BinPlaceTestSharedFramework Condition="'$(_bc_TargetGroup)' == 'netcoreapp' AND '$(BuildTests)'!='false'">true</BinPlaceTestSharedFramework>
-    <BinPlaceILCInputFolder Condition="$(_bc_TargetGroup.EndsWith('aot')) And '$(BinPlaceILCInputFolder)' == ''">true</BinPlaceILCInputFolder>
     <BinPlaceUAPFramework Condition="'$(_bc_TargetGroup)' == 'uap'">true</BinPlaceUAPFramework>
     <BinPlaceNETFXRuntime Condition="'$(_bc_TargetGroup)' == 'netfx'">true</BinPlaceNETFXRuntime>
 
     <NETCoreAppTestSharedFxVersion>9.9.9</NETCoreAppTestSharedFxVersion>
     <TestHostRootPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(BuildConfiguration)'))</TestHostRootPath>
     <NETCoreAppTestHostFxrPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'host', 'fxr', '$(NETCoreAppTestSharedFxVersion)'))</NETCoreAppTestHostFxrPath>
     <NETCoreAppTestSharedFrameworkPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', 'Microsoft.NETCore.App', '$(NETCoreAppTestSharedFxVersion)'))</NETCoreAppTestSharedFrameworkPath>
-    <ILCFXInputFolder>$(TestHostRootPath)ILCInputFolder</ILCFXInputFolder>
-    <InternalTestILCFolder>$(TestHostRootPath)TestILC</InternalTestILCFolder>
 
     <!-- For UAP, we'll produce the layout and hard-link this into each test's directory -->
     <UAPTestSharedFrameworkPath>$(TestHostRootPath)UAPLayout</UAPTestSharedFrameworkPath>
@@ -423,13 +420,6 @@
     <ProjectExclusions Include="$(SourceDir)CoreFx.Private.TestUtilities/**/*.csproj" />
   </ItemGroup>
 
-  <!-- Properties related to multi-file mode for ILC tests -->
-  <PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'">
-    <!-- Only enable multi-file for Release-x64 and Debug-x86 for now -->
-    <!-- Temporarily disabling multifile test configurations. For more info, please check: https://github.com/dotnet/corefx/issues/22826
-    <EnableMultiFileILCTests Condition="'$(ConfigurationGroup)|$(ArchGroup)' == 'Release|x64' Or '$(ConfigurationGroup)|$(ArchGroup)' == 'Debug|x86' Or '$(ConfigurationGroup)|$(ArchGroup)' == 'Release|arm'">true</EnableMultiFileILCTests> -->
-  </PropertyGroup>
-
   <!-- Specify the default constants for each target group -->
   <PropertyGroup>
     <DefineConstants Condition="'$(TargetGroup)' == 'uap'">$(DefineConstants),uap</DefineConstants>

Directory.Build.targets

@@ -83,10 +83,6 @@
     <BinPlaceConfiguration Condition="'$(BinPlaceTestSharedFramework)' == 'true'" Include="netcoreapp-$(_bc_OSGroup)">
       <RuntimePath>$(NETCoreAppTestSharedFrameworkPath)</RuntimePath>
     </BinPlaceConfiguration>
-    <!-- Setup the ILCInputFolder directory for testing aot -->
-    <BinPlaceConfiguration Condition="'$(BinPlaceILCInputFolder)' == 'true'" Include="uapaot-Windows_NT">
-      <RuntimePath>$(ILCFXInputFolder)</RuntimePath>
-    </BinPlaceConfiguration>
     <!-- And the UAP folder for the F5 (CoreCLR UAP-debugging) scenario -->
     <BinPlaceConfiguration Condition="'$(BinPlaceUAPFramework)' == 'true'" Include="uap-Windows_NT">
       <RuntimePath>$(UAPTestSharedFrameworkPath)</RuntimePath>

eng/Versions.props

@@ -49,5 +49,22 @@
     <NETStandardLibraryPackageVersion>2.1.0-prerelease.19264.3</NETStandardLibraryPackageVersion>
     <!-- dotnet-optimization dependencies -->
     <optimizationwindows_ntx64IBCCoreFxPackageVersion>99.99.99-master-20190510.1</optimizationwindows_ntx64IBCCoreFxPackageVersion>
+    <!-- sni -->
+    <RuntimeWinX64RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeWinX64RuntimeNativeSystemDataSqlClientSniPackageVersion>
+    <RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>
+    <!-- Testing -->
+    <MicrosoftNETTestSdkPackageVersion>16.0.1</MicrosoftNETTestSdkPackageVersion>
+    <XUnitPackageVersion>2.4.1-pre.build.4059</XUnitPackageVersion>
+    <TraceEventPackageVersion>2.0.5</TraceEventPackageVersion>
+    <MicrosoftDotNetUapTestToolsPackageVersion>1.0.31</MicrosoftDotNetUapTestToolsPackageVersion>
+    <!-- Code coverage package version -->
+    <CoverletConsolePackageVersion>1.5.0</CoverletConsolePackageVersion>
+    <DotNetReportGeneratorGlobalToolPackageVersion>4.1.4</DotNetReportGeneratorGlobalToolPackageVersion>
+    <!-- Publish symbol build task package -->
+    <PublishSymbolsPackage>Microsoft.SymbolUploader.Build.Task</PublishSymbolsPackage>
+    <PublishSymbolsPackageVersion>1.0.0-beta-63604-05</PublishSymbolsPackageVersion>
   </PropertyGroup>
+
+  <!-- Override isolated build dependency versions with versions from Repo API. -->
+  <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
 </Project>

eng/dependencies.props

@@ -10,46 +10,11 @@
   -->
   <PropertyGroup>
     <ProjectNTfsCurrentRef>a801a54ca7cc0973da761acb95a7863395515ebe</ProjectNTfsCurrentRef>
-    <ProjectNTfsTestILCCurrentRef>a801a54ca7cc0973da761acb95a7863395515ebe</ProjectNTfsTestILCCurrentRef>
-    <SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
-  </PropertyGroup>
-
-  <!-- Product dependency versions. -->
-  <PropertyGroup>
-    <!-- SNI runtime package -->
-    <RuntimeWinX64RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeWinX64RuntimeNativeSystemDataSqlClientSniPackageVersion>
   </PropertyGroup>
 
   <!-- Tests/infrastructure dependency versions. -->
   <PropertyGroup>
     <ProjectNTfsExpectedPrerelease>beta-27715-00</ProjectNTfsExpectedPrerelease>
-    <ProjectNTfsTestILCExpectedPrerelease>beta-27715-00</ProjectNTfsTestILCExpectedPrerelease>
-    <ProjectNTfsTestILCPackageVersion>1.0.0-beta-27715-00</ProjectNTfsTestILCPackageVersion>
-
-    <!-- CoreFX-built SNI identity package -->
-    <RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>
-
-    <!-- xunit test dependency version  -->
-    <MicrosoftNETTestSdkPackageVersion>16.0.1</MicrosoftNETTestSdkPackageVersion>
-    <XUnitPackageVersion>2.4.1-pre.build.4059</XUnitPackageVersion>
-    <XUnitPerformancePackageVersion>1.0.0-beta-build0020</XUnitPerformancePackageVersion>
-    <TraceEventPackageVersion>2.0.5</TraceEventPackageVersion>
-    <MicrosoftDotNetUapTestToolsPackageVersion>1.0.31</MicrosoftDotNetUapTestToolsPackageVersion>
-
-    <!-- Code coverage package version -->
-    <CoverletConsolePackageVersion>1.5.0</CoverletConsolePackageVersion>
-    <DotNetReportGeneratorGlobalToolPackageVersion>4.1.4</DotNetReportGeneratorGlobalToolPackageVersion>
-
-    <MicrosoftDotNetIBCMergePackageVersion>4.6.0-alpha-00001</MicrosoftDotNetIBCMergePackageVersion>
-    <TestILCAmd64retPackageVersion>$(ProjectNTfsTestILCPackageVersion)</TestILCAmd64retPackageVersion>
-    <TestILCArmretPackageVersion>$(ProjectNTfsTestILCPackageVersion)</TestILCArmretPackageVersion>
-    <TestILCX86retPackageVersion>$(ProjectNTfsTestILCPackageVersion)</TestILCX86retPackageVersion>
-  </PropertyGroup>
-
-  <!-- Publish symbol build task package -->
-  <PropertyGroup>
-    <PublishSymbolsPackage>Microsoft.SymbolUploader.Build.Task</PublishSymbolsPackage>
-    <PublishSymbolsPackageVersion>1.0.0-beta-63604-05</PublishSymbolsPackageVersion>
   </PropertyGroup>
 
   <!-- Package dependency verification/auto-upgrade configuration. -->
@@ -60,18 +25,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RemoteDependencyBuildInfo Include="Sni">
-      <BuildInfoPath>$(BaseDotNetBuildInfo)sni/$(DependencyBranch)</BuildInfoPath>
-      <CurrentRef>$(SniCurrentRef)</CurrentRef>
-    </RemoteDependencyBuildInfo>
     <RemoteDependencyBuildInfo Include="ProjectNTfs">
       <BuildInfoPath>$(BaseDotNetBuildInfo)projectn-tfs/$(DependencyBranch)</BuildInfoPath>
       <CurrentRef>$(ProjectNTfsCurrentRef)</CurrentRef>
     </RemoteDependencyBuildInfo>
-    <RemoteDependencyBuildInfo Include="ProjectNTfsTestILC">
-      <BuildInfoPath>$(BaseDotNetBuildInfo)projectn-tfs-testilc/$(DependencyBranch)</BuildInfoPath>
-      <CurrentRef>$(ProjectNTfsTestILCCurrentRef)</CurrentRef>
-    </RemoteDependencyBuildInfo>
 
     <DependencyBuildInfo Include="@(RemoteDependencyBuildInfo)">
       <RawVersionsBaseUrl>https://raw.githubusercontent.com/dotnet/versions</RawVersionsBaseUrl>
@@ -82,61 +39,5 @@
       <ElementName>ProjectNTfsExpectedPrerelease</ElementName>
       <BuildInfoName>ProjectNTfs</BuildInfoName>
     </XmlUpdateStep>
-    <XmlUpdateStep Include="ProjectNTfsTestILC">
-      <Path>$(MSBuildThisFileFullPath)</Path>
-      <ElementName>ProjectNTfsTestILCExpectedPrerelease</ElementName>
-      <BuildInfoName>ProjectNTfsTestILC</BuildInfoName>
-    </XmlUpdateStep>
-    <XmlUpdateStep Include="ProjectNTfsTestILC">
-      <Path>$(MSBuildThisFileFullPath)</Path>
-      <ElementName>ProjectNTfsTestILCPackageVersion</ElementName>
-      <PackageId>TestILC.amd64ret</PackageId>
-    </XmlUpdateStep>
-    <XmlUpdateStep Include="Sni">
-      <Path>$(MSBuildThisFileFullPath)</Path>
-      <ElementName>RuntimeWinX64RuntimeNativeSystemDataSqlClientSniPackageVersion</ElementName>
-      <PackageId>runtime.win-x64.runtime.native.System.Data.SqlClient.sni</PackageId>
-    </XmlUpdateStep>
   </ItemGroup>
-
-  <!-- Set up dependencies on packages that aren't found in a BuildInfo. -->
-  <ItemGroup>
-    <TargetingPackDependency Include="Microsoft.TargetingPack.NETFramework.v4.5" />
-    <TargetingPackDependency Include="Microsoft.TargetingPack.NETFramework.v4.5.1" />
-    <TargetingPackDependency Include="Microsoft.TargetingPack.NETFramework.v4.5.2" />
-    <TargetingPackDependency Include="Microsoft.TargetingPack.NETFramework.v4.6" />
-    <TargetingPackDependency Include="Microsoft.TargetingPack.NETFramework.v4.6.1" />
-    <TargetingPackDependency Include="Microsoft.TargetingPack.NETFramework.v4.6.2" />
-    <StaticDependency Include="@(TargetingPackDependency)">
-      <Version>1.0.1</Version>
-    </StaticDependency>
-
-    <StaticDependency Include="Microsoft.TargetingPack.Private.WinRT">
-      <Version>1.0.5</Version>
-    </StaticDependency>
-
-    <XUnitDependency Include="xunit"/>
-    <XUnitDependency Include="xunit.runner.utility"/>
-    <XUnitDependency Include="xunit.runner.console"/>
-    <StaticDependency Include="@(XUnitDependency)">
-      <Version>$(XUnitPackageVersion)</Version>
-    </StaticDependency>
-
-    <PerformancePackDependency Include="xunit.performance.core" />
-    <PerformancePackDependency Include="xunit.performance.api" />
-    <PerformancePackDependency Include="xunit.performance.execution" />
-    <PerformancePackDependency Include="xunit.performance.metrics" />
-    <StaticDependency Include="@(PerformancePackDependency)">
-      <Version>$(XUnitPerformancePackageVersion)</Version>
-    </StaticDependency>
-
-    <DependencyBuildInfo Include="@(StaticDependency)">
-      <PackageId>%(Identity)</PackageId>
-      <UpdateStableVersions>true</UpdateStableVersions>
-    </DependencyBuildInfo>
-  </ItemGroup>
-
-  <!-- Override isolated build dependency versions with versions from Repo API. -->
-  <Import Project="$(DotNetPackageVersionPropsPath)"
-          Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
 </Project>

eng/internal/NuGet.config

@@ -7,7 +7,6 @@
   <packageSources>
     <clear/>
     <add key="dotnet-core-internal-tooling" value="https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
-    <add key="dotnet-internal" value="https://dnceng.pkgs.visualstudio.com/_packaging/dotnet-internal/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

eng/pipelines/corefx-base.yml

@@ -142,8 +142,6 @@ jobs:
                 restoreDirectory: '$(Build.SourcesDirectory)\.packages'
                 verbosityRestore: 'normal'
                 externalFeedCredentials: 'dotnet-core-internal-tooling'
-              env:
-                TargetGroup: $(_framework)
 
           - ${{ if eq(job.customBuildSteps[0], '') }}:
             - script: $(_buildScript)

eng/pipelines/windows.yml

@@ -96,18 +96,6 @@ jobs:
               _framework: uap
               _helixQueues: $(uapNetfxQueues)
 
-            UAPAOT_x86_Release:
-              _BuildConfig: Release
-              _architecture: x86
-              _framework: uapaot
-              _helixQueues: $(uapNetfxQueues)
-
-            UAPAOT_x64_Release:
-              _BuildConfig: Release
-              _architecture: x64
-              _framework: uapaot
-              _helixQueues: $(uapNetfxQueues)
-
       pool:
         ${{ if eq(parameters.isOfficialBuild, 'true') }}:
           name: NetCoreInternal-Pool
@@ -189,7 +177,6 @@ jobs:
                     $(_msbuildCommonParameters)
             displayName: Build Packages and Tests
 
-      # TODO: UAPAOT official builds should send to helix using continuation runner.
       # Legs without HELIX testing
       - job: WindowsNoTest
         displayName: Windows
@@ -212,16 +199,6 @@ jobs:
                 _architecture: arm
                 _framework: uap
 
-              UAPAOT_arm_Release:
-                _BuildConfig: Release
-                _architecture: arm
-                _framework: uapaot
-
-              UAPAOT_arm64_Release:
-                _BuildConfig: Release
-                _architecture: arm64
-                _framework: uapaot
-
         pool:
           ${{ if eq(parameters.isOfficialBuild, 'true') }}:
             name: NetCoreInternal-Pool

eng/sendtohelix.proj

@@ -42,7 +42,6 @@
     <HelixType Condition="'$(TargetGroup)' == 'AllConfigurations'">test/functional/packaging/</HelixType>
     <HelixType Condition="'$(TargetGroup)' == 'netfx' AND '$(OfficialBuildId)' != ''">test/functional/desktop/cli/</HelixType>
     <HelixType Condition="'$(TargetGroup)' == 'uap' AND '$(OfficialBuildId)' != ''">test/functional/uwp/</HelixType>
-    <HelixType Condition="'$(TargetGroup)' == 'uapaot' AND '$(OfficialBuildId)' != ''">test/functional/ilc/</HelixType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(HelixCommand)' == '' and '$(TargetGroup)' == 'AllConfigurations'">

external/runtime/runtime.depproj

@@ -7,8 +7,6 @@
     <SwapNativeForIL Condition="'$(TargetGroup)'=='uap10.0.16299' OR '$(TargetsAOT)'=='true'">false</SwapNativeForIL>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetsAOT)'=='true'">
-    <!-- System.Private.* can't be on the ILCInputFolder since ilc.exe needs to use the matching one from its toolchain. -->
-    <BinPlaceILCInputFolder>false</BinPlaceILCInputFolder>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
     <AssetTargetFallback>uap10.0</AssetTargetFallback>
     <NoWarn>$(NoWarn);NU1701</NoWarn>

external/test-runtime/XUnit.Runtime.depproj

@@ -151,36 +151,6 @@
 
   </Target>
 
-  <Target Name="VerifyMatchingProjectNVersions"
-          BeforeTargets="Build">
-
-    <Error Condition="'$(ProjectNTfsExpectedPrerelease)' != '$(ProjectNTfsTestILCExpectedPrerelease)'" Text="The versions of ProjectN Targeting pack and TestILC have gone out of sync. Please make sure both of the prerelease versions on dependencies.props match." />
-
-  </Target>
-
-  <Target Name="CopyTestILCToolsToTestHost"
-          AfterTargets="AfterResolveReferences"
-          Condition="'$(TargetsAot)' == 'true'">
-
-    <PropertyGroup>
-      <TestILCToolsPackageName>TestILC</TestILCToolsPackageName>
-      <TestILCToolsPackageName Condition="'$(ArchGroup)' == 'x64'">$(TestILCToolsPackageName).amd64ret</TestILCToolsPackageName>
-      <TestILCToolsPackageName Condition="'$(ArchGroup)' == 'x86'">$(TestILCToolsPackageName).x86ret</TestILCToolsPackageName>
-      <TestILCToolsPackageName Condition="'$(ArchGroup)' == 'arm'">$(TestILCToolsPackageName).armret</TestILCToolsPackageName>
-      <TestILCFolder Condition="'$(TestILCFolder)' == ''">$(PackagesDir)$(TestILCToolsPackageName)\$(ProjectNTfsTestILCPackageVersion)\TestILC</TestILCFolder>
-    </PropertyGroup>
-
-    <ItemGroup Condition="Exists('$(TestILCFolder)')">
-      <TestILCFolderContents Include="$(TestILCFolder)\**\*" />
-    </ItemGroup>
-
-    <Copy Condition="Exists('$(TestILCFolder)')"
-          SourceFiles="@(TestILCFolderContents)"
-          DestinationFolder="$(InternalTestILCFolder)\%(RecursiveDir)"
-          SkipUnchangedFiles="true" />
-
-  </Target>
-
   <Target Name="AddTestPlatformDependencies"
           Condition="'$(EnableVSTestReferences)' == 'true'"
           BeforeTargets="ResolveReferences">

src/pretest.builds

@@ -6,13 +6,7 @@
     <GenerateTestSharedFrameworkDepsFile Condition="'$(BinplaceTestSharedFramework)' == 'true'">true</GenerateTestSharedFrameworkDepsFile>
   </PropertyGroup>
 
-  <Target Name="Build" DependsOnTargets="GenerateTestSharedFrameworkDepsFile;GenerateSharedLibraryForILC;GenerateLaunchSettingsFiles" />
-
-  <!-- Generate the shared library for running ILC tests for configuration Release-x64 -->
-  <Target Name="GenerateSharedLibraryForILC" Condition="'$(EnableMultiFileILCTests)' == 'true'">
-    <Message Importance="High" Text="Generating shared library for running ILC tests." Condition="Exists('$(InternalTestILCFolder)\ilc.exe')" />
-    <Exec Command="$(InternalTestILCFolder)\ilc.exe -buildSharedAssemblies -buildType ret -frameworkPath &quot;$(ILCFXInputFolder)&quot;" StandardOutputImportance="Low" Condition="Exists('$(TestHostRootPath)\TestILC\ilc.exe')" />
-  </Target>
+  <Target Name="Build" DependsOnTargets="GenerateTestSharedFrameworkDepsFile;GenerateLaunchSettingsFiles" />
 
   <!-- Generate launch settings support files to enable VS debugging. -->
   <Target Name="GenerateLaunchSettingsFiles" Condition="'$(EnableLaunchSettings)' == 'true'">