Use GenerateFileFromTemplate task from arcade instead of repo copy

They were both based on some aspnetcore build tooling, the only difference in the arcade one is that is uses key=value strings for the replacement properties instead of msbuild items. Also fix an issue in workloads-testing.targets where we didn't use a separate MSBuild evaluation for the Restore task which meant that the build tasks weren't loaded in the Pack task.
dotnet · Dec 15, 2023 · e9c529d · e9c529d
1 parent 99cfd79
commit e9c529d
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 174 deletions.
diff --git a/eng/Tools.props b/eng/Tools.props
@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" />
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" />
   </ItemGroup>
 
   <!-- excluded from source build -->

diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets
@@ -169,10 +169,6 @@
              TaskName="Microsoft.Workload.Build.Tasks.InstallWorkloadFromArtifacts"
              AssemblyFile="$(WorkloadBuildTasksAssemblyPath)" />
 
-  <UsingTask Condition="'$(InstallWorkloadForTesting)' == 'true'"
-             TaskName="GenerateFileFromTemplate"
-             AssemblyFile="$(WorkloadBuildTasksAssemblyPath)" />
-
   <Target Name="InstallWorkloadUsingArtifacts"
           AfterTargets="ArchiveTests"
           DependsOnTargets="$(InstallWorkloadUsingArtifactsDependsOn)"
@@ -193,7 +189,7 @@
       " />
 
     <MSBuild Projects="%(_NuGetsToBuild.Project)"
-             Properties="%(_NuGetsToBuild.Properties)"
+             Properties="%(_NuGetsToBuild.Properties);MSBuildRestoreSessionId=$([System.Guid]::NewGuid())"
              Targets="Restore" />
     <MSBuild Projects="%(_NuGetsToBuild.Project)"
              Properties="%(_NuGetsToBuild.Properties)"

diff --git a/src/coreclr/.nuget/Directory.Build.props b/src/coreclr/.nuget/Directory.Build.props
@@ -2,6 +2,7 @@
   <!-- Packaging projects (.pkgproj) are non-SDK-style, so they need to directly import Directory.Build.props -->
   <Import Project="..\Directory.Build.props" />
   <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" />
+  <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.templating\$(MicrosoftDotNetBuildTasksTemplatingVersion)\build\Microsoft.DotNet.Build.Tasks.Templating.props" />
 
   <PropertyGroup>
     <!-- Defined in Packaging.targets, but we need this before targets are imported -->

diff --git a/src/installer/pkg/projects/Directory.Build.props b/src/installer/pkg/projects/Directory.Build.props
@@ -127,5 +127,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
   </ItemGroup>
 </Project>
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets
@@ -12,7 +12,5 @@
     <PackageReference Condition="'$(SkipInstallersPackageReference)' != 'true'" Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
   </ItemGroup>
 
-  <UsingTask TaskName="GenerateFileFromTemplate" AssemblyFile="$(WorkloadBuildTasksAssemblyPath)" />
-
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
 </Project>
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj
@@ -46,16 +46,20 @@
     <GenerateFileFromTemplate
       Condition="!$([MSBuild]::IsOsPlatform('Windows'))"
       TemplateFile="Microsoft.NETCore.App.MonoCrossAOT.UnixFilePermissions.xml.in"
-      Properties="@(_PermissionsProperties)"
+      Properties="@(_PermissionsProperties->'%(Identity)=%(Value)')"
       OutputPath="$(IntermediateOutputPath)Microsoft.NETCore.App.MonoCrossAOT.UnixFilePermissions.xml" />
     <GenerateFileFromTemplate
       TemplateFile="Microsoft.NETCore.App.MonoCrossAOT.Sdk.props.in"
-      Properties="@(_SdkPropsProperties)"
+      Properties="@(_SdkPropsProperties->'%(Identity)=%(Value)')"
       OutputPath="$(IntermediateOutputPath)$(TargetCrossRid).Sdk.props" />
   </Target>
 
   <Target Name="ValidateProperties" BeforeTargets="GetFilesToPackage">
     <Error Condition="'$(TargetCrossRid)' == ''" Text="TargetCrossRid not set" />
     <Error Condition="!Exists('$(AotCompilerPath)$(AotCompilerFileName)')" Text="Cross compiler not found in $(AotCompilerPath). MonoAotCrossDir=$(MonoAotCrossDir)" />
   </Target>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" />
+  </ItemGroup>
 </Project>
diff --git a/src/mono/nuget/Directory.Build.props b/src/mono/nuget/Directory.Build.props
@@ -1,6 +1,7 @@
 <Project>
   <!-- Packaging projects (.pkgproj) are non-SDK-style, so they need to directly import Directory.Build.props -->
   <Import Project="..\Directory.Build.props" />
+  <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.templating\$(MicrosoftDotNetBuildTasksTemplatingVersion)\build\Microsoft.DotNet.Build.Tasks.Templating.props" />
   <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" />
 
   <PropertyGroup>

diff --git a/src/mono/nuget/Directory.Build.targets b/src/mono/nuget/Directory.Build.targets
@@ -1,5 +1,4 @@
 <Project>
-  <UsingTask TaskName="GenerateFileFromTemplate" AssemblyFile="$(WorkloadBuildTasksAssemblyPath)" />
   <Import Project="..\Directory.Build.targets" />
 
   <PropertyGroup>

diff --git a/...Microsoft.NET.Runtime.LibraryBuilder.Sdk/Microsoft.NET.Runtime.LibraryBuilder.Sdk.pkgproj b/...Microsoft.NET.Runtime.LibraryBuilder.Sdk/Microsoft.NET.Runtime.LibraryBuilder.Sdk.pkgproj
@@ -32,7 +32,7 @@
 
     <GenerateFileFromTemplate
       TemplateFile="Sdk/Sdk.targets.in"
-      Properties="@(_ReplacementValue)"
+      Properties="@(_ReplacementValue->'%(Identity)=%(Value)')"
       OutputPath="$(SdkTargetsPath)" />
 
     <ItemGroup>

diff --git a/...osoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj b/...osoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj
@@ -23,7 +23,7 @@
 
     <GenerateFileFromTemplate
       TemplateFile="Sdk/Sdk.props.in"
-      Properties="@(_ReplacementValue)"
+      Properties="@(_ReplacementValue->'%(Identity)=%(Value)')"
       OutputPath="$(SdkPropsPath)" />
 
     <ItemGroup>

diff --git a/...nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Microsoft.NET.Runtime.MonoTargets.Sdk.pkgproj b/...nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Microsoft.NET.Runtime.MonoTargets.Sdk.pkgproj
@@ -28,7 +28,7 @@
 
     <GenerateFileFromTemplate
       TemplateFile="Sdk/MonoTargetsTasks.props.in"
-      Properties="@(_ReplacementValue)"
+      Properties="@(_ReplacementValue->'%(Identity)=%(Value)')"
       OutputPath="$(MonoTargetsTasksPropsPath)" />
 
     <ItemGroup>

diff --git a/...nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Microsoft.NET.Runtime.WebAssembly.Sdk.pkgproj b/...nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Microsoft.NET.Runtime.WebAssembly.Sdk.pkgproj
@@ -36,7 +36,7 @@
 
     <GenerateFileFromTemplate
       TemplateFile="Sdk/Sdk.targets.in"
-      Properties="@(_ReplacementValue)"
+      Properties="@(_ReplacementValue->'%(Identity)=%(Value)')"
       OutputPath="$(SdkTargetsPath)" />
 
     <ItemGroup>

diff --git a/...osoft.NET.Runtime.WebAssembly.Wasi.Sdk/Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk.pkgproj b/...osoft.NET.Runtime.WebAssembly.Wasi.Sdk/Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk.pkgproj
@@ -33,7 +33,7 @@
 
     <GenerateFileFromTemplate
       TemplateFile="Sdk/Sdk.targets.in"
-      Properties="@(_ReplacementValue)"
+      Properties="@(_ReplacementValue->'%(Identity)=%(Value)')"
       OutputPath="$(SdkTargetsPath)" />
 
     <ItemGroup>

diff --git a/...Toolchain.Current.Manifest/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest.pkgproj b/...Toolchain.Current.Manifest/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest.pkgproj
@@ -56,17 +56,17 @@
 
     <GenerateFileFromTemplate
       TemplateFile="WorkloadManifest.json.in"
-      Properties="@(_WorkloadManifestValues)"
+      Properties="@(_WorkloadManifestValues->'%(Identity)=%(Value)')"
       OutputPath="$(WorkloadManifestPath)" />
 
     <GenerateFileFromTemplate
       TemplateFile="WorkloadManifest.targets.in"
-      Properties="@(_WorkloadManifestValues)"
+      Properties="@(_WorkloadManifestValues->'%(Identity)=%(Value)')"
       OutputPath="$(WorkloadManifestTargetsPath)" />
 
     <GenerateFileFromTemplate
       TemplateFile="WorkloadManifest.Wasi.targets.in"
-      Properties="@(_WorkloadManifestValues)"
+      Properties="@(_WorkloadManifestValues->'%(Identity)=%(Value)')"
       OutputPath="$(WorkloadManifestWasiTargetsPath)" />
   </Target>
 

diff --git a/....Mono.Toolchain.net6.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest.pkgproj b/....Mono.Toolchain.net6.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest.pkgproj
@@ -48,12 +48,12 @@
 
     <GenerateFileFromTemplate
       TemplateFile="WorkloadManifest.json.in"
-      Properties="@(_WorkloadManifestValues)"
+      Properties="@(_WorkloadManifestValues->'%(Identity)=%(Value)')"
       OutputPath="$(WorkloadManifestPath)" />
 
     <GenerateFileFromTemplate
       TemplateFile="WorkloadManifest.targets.in"
-      Properties="@(_WorkloadManifestValues)"
+      Properties="@(_WorkloadManifestValues->'%(Identity)=%(Value)')"
       OutputPath="$(WorkloadManifestTargetsPath)" />
   </Target>
 

diff --git a/....Mono.Toolchain.net7.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net7.Manifest.pkgproj b/....Mono.Toolchain.net7.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net7.Manifest.pkgproj
@@ -50,12 +50,12 @@
 
     <GenerateFileFromTemplate
       TemplateFile="WorkloadManifest.json.in"
-      Properties="@(_WorkloadManifestValues)"
+      Properties="@(_WorkloadManifestValues->'%(Identity)=%(Value)')"
       OutputPath="$(WorkloadManifestPath)" />
 
     <GenerateFileFromTemplate
       TemplateFile="WorkloadManifest.targets.in"
-      Properties="@(_WorkloadManifestValues)"
+      Properties="@(_WorkloadManifestValues->'%(Identity)=%(Value)')"
       OutputPath="$(WorkloadManifestTargetsPath)" />
   </Target>
 

diff --git a/....Mono.Toolchain.net8.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net8.Manifest.pkgproj b/....Mono.Toolchain.net8.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net8.Manifest.pkgproj
@@ -50,12 +50,12 @@
 
     <GenerateFileFromTemplate
       TemplateFile="WorkloadManifest.json.in"
-      Properties="@(_WorkloadManifestValues)"
+      Properties="@(_WorkloadManifestValues->'%(Identity)=%(Value)')"
       OutputPath="$(WorkloadManifestPath)" />
 
     <GenerateFileFromTemplate
       TemplateFile="WorkloadManifest.targets.in"
-      Properties="@(_WorkloadManifestValues)"
+      Properties="@(_WorkloadManifestValues->'%(Identity)=%(Value)')"
       OutputPath="$(WorkloadManifestTargetsPath)" />
   </Target>
 

diff --git a/src/tasks/WorkloadBuildTasks/GenerateFileFromTemplate.cs b/src/tasks/WorkloadBuildTasks/GenerateFileFromTemplate.cs