Remove MNADeprecationWorkaround in host test assets (#44259)

diff --git a/src/installer/tests/Assets/TestProjects/AppWithSubDirs/Directory.Build.props b/src/installer/tests/Assets/TestProjects/AppWithSubDirs/Directory.Build.props
deleted file mode 100644 (file)
index de2e458..0000000
--- a/src/installer/tests/Assets/TestProjects/AppWithSubDirs/Directory.Build.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <UseMicrosoftNETCoreAppInternalWorkaround>false</UseMicrosoftNETCoreAppInternalWorkaround>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
-
-</Project>

diff --git a/src/installer/tests/Assets/TestProjects/AppWithWait/Directory.Build.props b/src/installer/tests/Assets/TestProjects/AppWithWait/Directory.Build.props
deleted file mode 100644 (file)
index de2e458..0000000
--- a/src/installer/tests/Assets/TestProjects/AppWithWait/Directory.Build.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <UseMicrosoftNETCoreAppInternalWorkaround>false</UseMicrosoftNETCoreAppInternalWorkaround>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
-
-</Project>

diff --git a/src/installer/tests/Assets/TestProjects/SingleFileApiTests/Directory.Build.props b/src/installer/tests/Assets/TestProjects/SingleFileApiTests/Directory.Build.props
deleted file mode 100644 (file)
index de2e458..0000000
--- a/src/installer/tests/Assets/TestProjects/SingleFileApiTests/Directory.Build.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <UseMicrosoftNETCoreAppInternalWorkaround>false</UseMicrosoftNETCoreAppInternalWorkaround>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
-
-</Project>

diff --git a/src/installer/tests/Assets/TestProjects/StandaloneApp20/Directory.Build.props b/src/installer/tests/Assets/TestProjects/StandaloneApp20/Directory.Build.props
deleted file mode 100644 (file)
index 1162811..0000000
--- a/src/installer/tests/Assets/TestProjects/StandaloneApp20/Directory.Build.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project>
-
-  <!-- This project targets a released verison of .net core, don't use workaround. -->
-  <PropertyGroup>
-    <UseMicrosoftNETCoreAppInternalWorkaround>false</UseMicrosoftNETCoreAppInternalWorkaround>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
-
-</Project>

diff --git a/src/installer/tests/Assets/TestProjects/StandaloneApp21/Directory.Build.props b/src/installer/tests/Assets/TestProjects/StandaloneApp21/Directory.Build.props
deleted file mode 100644 (file)
index 1162811..0000000
--- a/src/installer/tests/Assets/TestProjects/StandaloneApp21/Directory.Build.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project>
-
-  <!-- This project targets a released verison of .net core, don't use workaround. -->
-  <PropertyGroup>
-    <UseMicrosoftNETCoreAppInternalWorkaround>false</UseMicrosoftNETCoreAppInternalWorkaround>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
-
-</Project>

diff --git a/src/installer/tests/Assets/TestProjects/StandaloneApp3x/Directory.Build.props b/src/installer/tests/Assets/TestProjects/StandaloneApp3x/Directory.Build.props
deleted file mode 100644 (file)
index 1162811..0000000
--- a/src/installer/tests/Assets/TestProjects/StandaloneApp3x/Directory.Build.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project>
-
-  <!-- This project targets a released verison of .net core, don't use workaround. -->
-  <PropertyGroup>
-    <UseMicrosoftNETCoreAppInternalWorkaround>false</UseMicrosoftNETCoreAppInternalWorkaround>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
-
-</Project>

diff --git a/src/installer/tests/Assets/TestUtils/MNADeprecationWorkaround.props b/src/installer/tests/Assets/TestUtils/MNADeprecationWorkaround.props
deleted file mode 100644 (file)
index e852ac8..0000000
--- a/src/installer/tests/Assets/TestUtils/MNADeprecationWorkaround.props
+++ /dev/null
@@ -1,26 +0,0 @@
-<Project>
-
-  <!--
-    Starting with 3.0, Microsoft.NETCore.App (MNA) is a dummy package, no longer providing any build
-    or runtime assets. For compatibility with existing tests, Microsoft.NETCore.App.Internal (MNAI)
-    now exists as an internal compatibility package. It contains the assets MNA used to have.
-
-    Inject the MNAI package with an opportunity to disable for non-3.0 projects.
-  -->
-  <PropertyGroup>
-    <UseMicrosoftNETCoreAppInternalWorkaround Condition="'$(UseMicrosoftNETCoreAppInternalWorkaround)' == ''">true</UseMicrosoftNETCoreAppInternalWorkaround>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(UseMicrosoftNETCoreAppInternalWorkaround)' == 'true'">
-    <PackageReference Include="Microsoft.NETCore.App.Internal" Version="$(MNAVersion)" />
-    <!-- Provide a framework to put in the runtimeconfig. -->
-    <RuntimeFramework Include="Microsoft.NETCore.App" Version="$(MNAVersion)" />
-  </ItemGroup>
-
-  <PropertyGroup Condition="'$(UseMicrosoftNETCoreAppInternalWorkaround)' == 'true'">
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
-    <UseAppHostFromAssetsFile>true</UseAppHostFromAssetsFile>
-  </PropertyGroup>
-
-</Project>

diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.props b/src/installer/tests/Assets/TestUtils/TestProjects.props
index 46ff750..72150d0 100644 (file)
--- a/src/installer/tests/Assets/TestUtils/TestProjects.props
+++ b/src/installer/tests/Assets/TestUtils/TestProjects.props
@@ -7,7 +7,6 @@
   -->
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),global.json))\eng\Configurations.props" />
-  <Import Project="$(MSBuildThisFileDirectory)MNADeprecationWorkaround.props" />
 
   <PropertyGroup>
     <!--