Move logic to arcade Microsoft.DotNet.Build.Tasks

dotnet · Feb 26, 2024 · c564e27 · c564e27
1 parent eb1afce
commit c564e27
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -186,9 +186,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24112.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24126.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
+      <Sha>6f665a25162ef1cad9b252f5fb3dc7c822d2a4a5</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24112.1">
       <Uri>https://github.com/dotnet/arcade</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -93,7 +93,7 @@
     <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksArchivesVersion>
     <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksInstallersVersion>
     <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksPackagingVersion>
-    <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
+    <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24126.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
     <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksTemplatingVersion>
     <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
     <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24112.1</MicrosoftDotNetRemoteExecutorVersion>

diff --git a/eng/testing/outerBuild.targets b/eng/testing/outerBuild.targets
@@ -1,19 +1,18 @@
 <Project>
-  <Target Name="Test" DependsOnTargets="GetProjectWithBestTargetFrameworks;RemoveNetFrameworkProjectsOnNonWindows">
+  <Target Name="Test" DependsOnTargets="RemoveNetFrameworkProjectsOnNonWindows;GetProjectWithBestTargetFrameworks">
     <MSBuild Projects="@(InnerBuildProjectsWithBestTargetFramework)"
              Targets="Test">
     </MSBuild>
   </Target>
-  <Target Name="VSTest" DependsOnTargets="GetProjectWithBestTargetFrameworks;RemoveNetFrameworkProjectsOnNonWindows">
+  <Target Name="VSTest" DependsOnTargets="RemoveNetFrameworkProjectsOnNonWindows;GetProjectWithBestTargetFrameworks">
     <MSBuild Projects="@(InnerBuildProjectsWithBestTargetFramework)"
              Targets="VSTest">
     </MSBuild>
   </Target>
   <Target Name="RemoveNetFrameworkProjectsOnNonWindows" Condition="'$(TargetOS)' != 'windows'">
-    <ItemGroup>
+    <PropertyGroup>
       <!-- we'd try to run tests with Mono for netfx projects which doesn't work so filter them out -->
-      <InnerBuildProjectsWithBestTargetFramework Remove="@(InnerBuildProjectsWithBestTargetFramework)" Condition="$([System.String]::Copy('%(AdditionalProperties)').Contains('TargetFramework=$(NetFrameworkCurrent)'))" />
-      <InnerBuildProjectsWithBestTargetFramework Remove="@(InnerBuildProjectsWithBestTargetFramework)" Condition="$([System.String]::Copy('%(AdditionalProperties)').Contains('TargetFramework=$(NetFrameworkMinimum)'))" />
-    </ItemGroup>
+      <IncludeNetFrameworkTfms>false</IncludeNetFrameworkTfms>
+    </PropertyGroup>
   </Target>
 </Project>