[WIP] Use NET=Runtime on tasks and delete .NET Framework task implementations

Arcade.slnx

@@ -60,7 +60,6 @@
   <Project Path="src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj" />
   <Project Path="src/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj" />
   <Project Path="src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj" />
-  <Project Path="src/Microsoft.DotNet.Git.IssueManager/src/Microsoft.DotNet.Git.IssueManager.csproj" />
   <Project Path="src/Microsoft.DotNet.Internal.DependencyInjection.Testing/Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj" />
   <Project Path="src/Microsoft.DotNet.Internal.SymbolHelper/Microsoft.DotNet.Internal.SymbolHelper.csproj" />
   <Project Path="src/Microsoft.DotNet.MacOsPkg/Cli/Microsoft.DotNet.MacOsPkg.Cli.csproj" />
@@ -72,7 +71,6 @@
   <Project Path="src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj" />
   <Project Path="src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj" />
   <Project Path="src/Microsoft.DotNet.StrongName/Microsoft.DotNet.StrongName.csproj" />
-  <Project Path="src/Microsoft.DotNet.Tar/Microsoft.DotNet.Tar.csproj" />
   <Project Path="src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj" />
   <Project Path="src/Microsoft.DotNet.XUnitAssert/src/Microsoft.DotNet.XUnitAssert.csproj" />
   <Project Path="src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj" />

Directory.Packages.props

@@ -89,14 +89,14 @@
     <PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="2.3.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights" Version="2.23.0" />
     <PackageVersion Include="Microsoft.Data.OData" Version="5.8.4" />
-    <PackageVersion Include="Microsoft.DataServices.Client" Version="$(MicrosoftDataServicesClientVersion)" />
+    <PackageVersion Include="Microsoft.Data.Services.Client" Version="$(MicrosoftDataServicesClientVersion)" />
     <PackageVersion Include="Microsoft.Diagnostics.Runtime" Version="1.0.5" />
     <PackageVersion Include="Microsoft.Identity.Client" Version="4.73.1" />
     <PackageVersion Include="Microsoft.OpenApi" Version="1.3.2" />
     <PackageVersion Include="Microsoft.OpenApi.Readers" Version="1.3.2" />
     <PackageVersion Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" />
     <PackageVersion Include="Microsoft.WixToolset.Sdk" Version="$(MicrosoftWixToolsetSdkVersion)" />
-    <PackageVersion Include="Microsoft.VisualStudio.OLE.Interop" Version="7.10.6071" />
+    <PackageVersion Include="Microsoft.VisualStudio.OLE.Interop" Version="17.14.40260" />
     <PackageVersion Include="Mono.Options" Version="5.3.0.1" />
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />

eng/BuildTask.targets

@@ -1,7 +1,5 @@
 <Project>
 
-  <Import Project="BuildTask.Packages.props"/>
-
   <PropertyGroup>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IsPackable>true</IsPackable>
@@ -10,8 +8,10 @@
     <!-- Build Tasks should have this set per https://github.com/dotnet/arcade/blob/master/Documentation/CorePackages/Versioning.md#recommended-settings -->
     <AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
     <BuildTaskTargetFolder Condition="'$(BuildTaskTargetFolder)' == ''">tools</BuildTaskTargetFolder>
-    <PackTasks Condition="'$(PackTasks)' == ''">true</PackTasks>
-    <TargetsForTfmSpecificContentInPackage Condition="'$(PackTasks)' == 'true'">$(TargetsForTfmSpecificContentInPackage);_AddBuildOutputToPackageCore;_AddBuildOutputToPackageDesktop</TargetsForTfmSpecificContentInPackage>
+    <BuildTaskTargetTfmSpecificFolder Condition="'$(BuildTaskTargetTfmSpecificFolder)' == ''">net</BuildTaskTargetTfmSpecificFolder>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_AddBuildOutputToPackage</TargetsForTfmSpecificContentInPackage>
+    <!-- Invoke publish before pack as packaging depends on published outputs. -->
+    <BeforePack Condition="'$(_SuppressAllTargets)' != 'true'">$(BeforePack);Publish</BeforePack>
   </PropertyGroup>
 
   <!--
@@ -41,7 +41,7 @@
   </ItemGroup>
 
   <!-- Don't include assemblies that are provided by the SDK, next to MSBuild. -->
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(SkipSDKInboxPublishExcludes)' != 'true'">
+  <ItemGroup>
     <PackageReference Update="Newtonsoft.Json" Publish="false" />
     <PackageReference Update="NuGet.Commands" Publish="false" />
     <PackageReference Update="NuGet.Common" Publish="false" />
@@ -55,24 +55,6 @@
     <PackageReference Update="System.Text.Encoding.CodePages" Publish="false" />
   </ItemGroup>
 
-  <!-- Don't include assemblies that are inbox in Desktop MSBuild -->
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
-    <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Publish="false" />
-    <PackageReference Update="System.Buffers" Publish="false" />
-    <PackageReference Update="System.Collections.Immutable" Publish="false" />
-    <PackageReference Update="System.Memory" Publish="false" />
-    <PackageReference Update="System.Numerics.Vectors" Publish="false" />
-    <PackageReference Update="System.Reflection.Metadata" Publish="false" />
-    <PackageReference Update="System.Reflection.MetadataLoadContext" Publish="false" />
-    <PackageReference Update="System.Runtime.CompilerServices.Unsafe" Publish="false" />
-    <PackageReference Update="System.Text.Encodings.Web" Publish="false" />
-    <PackageReference Update="System.Text.Json" Publish="false" />
-    <PackageReference Update="System.Threading.Channels" Publish="false" />
-    <PackageReference Update="System.Threading.Tasks.Dataflow" Publish="false" />
-    <PackageReference Update="System.Threading.Tasks.Extensions" Publish="false" />
-    <PackageReference Update="System.ValueTuple" Publish="false" />
-  </ItemGroup>
-
   <ItemGroup>
     <!--
       Update all PackageReference items to default Publish to true.
@@ -82,34 +64,14 @@
       <Publish Condition="'%(PackageReference.Publish)' == ''">true</Publish>
       <ExcludeAssets Condition="'%(PackageReference.Publish)' == 'false'">runtime</ExcludeAssets>
     </PackageReference>
-
-    <!--
-      Update all Reference items to have Pack="false"
-      This removes the frameworkDependency nodes from the generated nuspec
-    -->
-    <Reference Update="@(Reference)"
-               Pack="false" />
   </ItemGroup>
 
-  <!-- Publish .NET Core assets and include them in the package under $(BuildTaskTargetFolder) directory. -->
-  <Target Name="_AddBuildOutputToPackageCore" DependsOnTargets="Publish" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
-    <PropertyGroup>
-      <BuildTaskTargetTfmSpecificFolder Condition="'$(BuildTaskTargetTfmSpecificFolder)' == ''">net</BuildTaskTargetTfmSpecificFolder>
-    </PropertyGroup>
+  <!-- Publish assets and include them in the package under $(BuildTaskTargetFolder) directory. -->
+  <Target Name="_AddBuildOutputToPackage">
     <ItemGroup>
       <TfmSpecificPackageFile Include="$(PublishDir)**"
                               PackagePath="$(BuildTaskTargetFolder)/$(BuildTaskTargetTfmSpecificFolder)/%(RecursiveDir)%(FileName)%(Extension)"/>
     </ItemGroup>
   </Target>
 
-  <!-- Include .NET Framework build outputs in the package under $(BuildTaskTargetFolder) directory. -->
-  <Target Name="_AddBuildOutputToPackageDesktop" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
-    <PropertyGroup>
-      <BuildTaskTargetTfmSpecificFolder Condition="'$(BuildTaskTargetTfmSpecificFolder)' == ''">netframework</BuildTaskTargetTfmSpecificFolder>
-    </PropertyGroup>
-    <ItemGroup>
-      <TfmSpecificPackageFile Include="$(OutputPath)**" PackagePath="$(BuildTaskTargetFolder)/$(BuildTaskTargetTfmSpecificFolder)/%(RecursiveDir)%(FileName)%(Extension)"/>
-    </ItemGroup>
-  </Target>
-
 </Project>

eng/Microsoft.DotNet.SwaggerGenerator.MSBuild.InTree.targets

@@ -4,10 +4,7 @@
     <MicrosoftDotNetSwaggerGeneratorMSBuildProjectDirectory>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'Microsoft.DotNet.SwaggerGenerator', 'Microsoft.DotNet.SwaggerGenerator.MSBuild'))</MicrosoftDotNetSwaggerGeneratorMSBuildProjectDirectory>
     <MicrosoftDotNetSwaggerGeneratorMSBuildBaseOutputDirectory>$(ArtifactsBinDir)Microsoft.DotNet.SwaggerGenerator.MSBuild\$(Configuration)\</MicrosoftDotNetSwaggerGeneratorMSBuildBaseOutputDirectory>
     <!-- Keep TFMs in sync with Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj -->
-    <MicrosoftDotNetSwaggerGeneratorMSBuildDirectory Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MicrosoftDotNetSwaggerGeneratorMSBuildBaseOutputDirectory)$(NetToolCurrent)\</MicrosoftDotNetSwaggerGeneratorMSBuildDirectory>
-    <MicrosoftDotNetSwaggerGeneratorMSBuildDirectory Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MicrosoftDotNetSwaggerGeneratorMSBuildBaseOutputDirectory)$(NetFrameworkToolCurrent)\</MicrosoftDotNetSwaggerGeneratorMSBuildDirectory>
-    <!-- Swagger generator msbuild tasks should be invoked out-of-proc in this repository to avoid assembly lock issues. -->
-    <MicrosoftDotNetSwaggerGeneratorMSBuildTaskFactory>TaskHostFactory</MicrosoftDotNetSwaggerGeneratorMSBuildTaskFactory>
+    <MicrosoftDotNetSwaggerGeneratorMSBuildDirectory>$(MicrosoftDotNetSwaggerGeneratorMSBuildBaseOutputDirectory)$(NetToolCurrent)\</MicrosoftDotNetSwaggerGeneratorMSBuildDirectory>
     <!-- Make sure that the P2Ps are built before swagger generator targets are invoked. -->
     <GenerateSwaggerCodeDependsOn>ResolveProjectReferences</GenerateSwaggerCodeDependsOn>
   </PropertyGroup>
@@ -25,9 +22,8 @@
                       ReferenceOutputAssembly="false"
                       PrivateAssets="all"
                       Private="false">
-      <!-- Keep TFMs in sync with Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj -->
-      <SetTargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">TargetFramework=$(NetToolCurrent)</SetTargetFramework>
-      <SetTargetFramework Condition="'$(MSBuildRuntimeType)' != 'Core'">TargetFramework=$(NetFrameworkToolCurrent)</SetTargetFramework>
+      <!-- Keep TFM in sync with Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj -->
+      <SetTargetFramework>TargetFramework=$(NetToolCurrent)</SetTargetFramework>
     </ProjectReference>
   </ItemGroup>
 

src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj

@@ -2,9 +2,8 @@
 
   <PropertyGroup>
     <!-- Treat this as a tooling library as it references msbuild. -->
-    <TargetFrameworks>$(NetToolCurrent);netstandard2.0;$(NetFrameworkToolCurrent)</TargetFrameworks>
+    <TargetFramework>$(NetToolCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <DefaultExcludesInProjectFolder Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) != '.NETFramework'">**/*.Desktop.*</DefaultExcludesInProjectFolder>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,14 +12,4 @@
     <PackageReference Include="NuGet.Packaging" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
-    <Compile Include="..\Internal\AssemblyResolver.cs" />
-
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Net.Http" />
-  </ItemGroup>
-
-  <!-- This project is a build task dependency and needs to follow desktop version requirements. -->
-  <Import Project="$(RepositoryEngineeringDir)BuildTask.Packages.props" />
-
 </Project>