From bdd5d325729ae594cce94da56265c6667c861f37 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 7 Feb 2024 17:21:30 +0100 Subject: [PATCH] Use NetTool* TFM properties for msbuild tasks (#98098) ... and remove the custom defined ones. --- Directory.Build.props | 8 +------- ...soft.NET.Runtime.LibraryBuilder.Sdk.pkgproj | 4 ++-- .../Sdk/Sdk.targets.in | 4 ++-- ...ft.NET.Runtime.MonoAOTCompiler.Task.pkgproj | 4 ++-- .../Sdk/Sdk.props.in | 4 ++-- ...crosoft.NET.Runtime.MonoTargets.Sdk.pkgproj | 4 ++-- .../Sdk/MonoTargetsTasks.props.in | 4 ++-- ...crosoft.NET.Runtime.WebAssembly.Sdk.pkgproj | 4 ++-- .../Sdk/Sdk.targets.in | 4 ++-- ...ft.NET.Runtime.WebAssembly.Wasi.Sdk.pkgproj | 4 ++-- .../Sdk/Sdk.targets.in | 4 ++-- src/mono/wasm/build/WasmApp.LocalBuild.props | 10 +++++----- .../AndroidAppBuilder/AndroidAppBuilder.csproj | 4 ++-- .../AotCompilerTask/MonoAOTCompiler.csproj | 6 +++--- .../AppleAppBuilder/AppleAppBuilder.csproj | 4 ++-- src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj | 2 +- src/tasks/LibraryBuilder/LibraryBuilder.csproj | 2 +- ...osoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj | 2 +- .../Microsoft.NET.WebAssembly.Webcil.csproj | 2 +- .../MobileBuildTasks/MobileBuildTasks.csproj | 10 +++++----- .../AssemblyStripper/AssemblyStripper.csproj | 2 +- .../MonoTargetsTasks/MonoTargetsTasks.csproj | 6 +++--- .../TestExclusionListTasks.csproj | 2 +- src/tasks/WasmAppBuilder/WasmAppBuilder.csproj | 18 +++++++++--------- src/tasks/WasmBuildTasks/WasmBuildTasks.csproj | 2 +- .../WorkloadBuildTasks.csproj | 2 +- 26 files changed, 58 insertions(+), 64 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 1e9cfc5e58d..0db4a1cc3d3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -96,7 +96,7 @@ net8.0 $(NetCoreAppCurrent) - 9.0 @@ -117,12 +117,6 @@ 8.0.0 net8.0 - - $(NetFrameworkToolCurrent) - - - - $(NetCoreAppToolCurrent) diff --git a/src/mono/nuget/Microsoft.NET.Runtime.LibraryBuilder.Sdk/Microsoft.NET.Runtime.LibraryBuilder.Sdk.pkgproj b/src/mono/nuget/Microsoft.NET.Runtime.LibraryBuilder.Sdk/Microsoft.NET.Runtime.LibraryBuilder.Sdk.pkgproj index e1400e8d572..8d9a5f20f6e 100644 --- a/src/mono/nuget/Microsoft.NET.Runtime.LibraryBuilder.Sdk/Microsoft.NET.Runtime.LibraryBuilder.Sdk.pkgproj +++ b/src/mono/nuget/Microsoft.NET.Runtime.LibraryBuilder.Sdk/Microsoft.NET.Runtime.LibraryBuilder.Sdk.pkgproj @@ -26,8 +26,8 @@ - <_ReplacementValue Include="TargetFrameworkForNETCoreTasks" Value="$(TargetFrameworkForNETCoreTasks)" /> - <_ReplacementValue Include="TargetFrameworkForNETFrameworkTasks" Value="$(TargetFrameworkForNETFrameworkTasks)" /> + <_ReplacementValue Include="NetCoreAppToolCurrent" Value="$(NetCoreAppToolCurrent)" /> + <_ReplacementValue Include="NetFrameworkToolCurrent" Value="$(NetFrameworkToolCurrent)" /> - <_TasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETCoreTasks}\ - <_TasksDir Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETFrameworkTasks}\ + <_TasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tasks\${NetCoreAppToolCurrent}\ + <_TasksDir Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tasks\${NetFrameworkToolCurrent}\ true shared diff --git a/src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj b/src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj index b1fed9a63ed..9113e169346 100644 --- a/src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj +++ b/src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj @@ -17,8 +17,8 @@ - <_ReplacementValue Include="TargetFrameworkForNETCoreTasks" Value="$(TargetFrameworkForNETCoreTasks)" /> - <_ReplacementValue Include="TargetFrameworkForNETFrameworkTasks" Value="$(TargetFrameworkForNETFrameworkTasks)" /> + <_ReplacementValue Include="NetCoreAppToolCurrent" Value="$(NetCoreAppToolCurrent)" /> + <_ReplacementValue Include="NetFrameworkToolCurrent" Value="$(NetFrameworkToolCurrent)" /> - $(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETCoreTasks}\MonoAOTCompiler.dll - $(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETFrameworkTasks}\MonoAOTCompiler.dll + $(MSBuildThisFileDirectory)..\tasks\${NetCoreAppToolCurrent}\MonoAOTCompiler.dll + $(MSBuildThisFileDirectory)..\tasks\${NetFrameworkToolCurrent}\MonoAOTCompiler.dll diff --git a/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Microsoft.NET.Runtime.MonoTargets.Sdk.pkgproj b/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Microsoft.NET.Runtime.MonoTargets.Sdk.pkgproj index 5cbb2f07483..97935120a4e 100644 --- a/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Microsoft.NET.Runtime.MonoTargets.Sdk.pkgproj +++ b/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Microsoft.NET.Runtime.MonoTargets.Sdk.pkgproj @@ -22,8 +22,8 @@ - <_ReplacementValue Include="TargetFrameworkForNETCoreTasks" Value="$(TargetFrameworkForNETCoreTasks)" /> - <_ReplacementValue Include="TargetFrameworkForNETFrameworkTasks" Value="$(TargetFrameworkForNETFrameworkTasks)" /> + <_ReplacementValue Include="NetCoreAppToolCurrent" Value="$(NetCoreAppToolCurrent)" /> + <_ReplacementValue Include="NetFrameworkToolCurrent" Value="$(NetFrameworkToolCurrent)" /> - $(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETCoreTasks}\MonoTargetsTasks.dll - $(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETFrameworkTasks}\MonoTargetsTasks.dll + $(MSBuildThisFileDirectory)..\tasks\${NetCoreAppToolCurrent}\MonoTargetsTasks.dll + $(MSBuildThisFileDirectory)..\tasks\${NetFrameworkToolCurrent}\MonoTargetsTasks.dll diff --git a/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Microsoft.NET.Runtime.WebAssembly.Sdk.pkgproj b/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Microsoft.NET.Runtime.WebAssembly.Sdk.pkgproj index 60aa2253ff8..52e43c93f03 100644 --- a/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Microsoft.NET.Runtime.WebAssembly.Sdk.pkgproj +++ b/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Microsoft.NET.Runtime.WebAssembly.Sdk.pkgproj @@ -30,8 +30,8 @@ - <_ReplacementValue Include="TargetFrameworkForNETCoreTasks" Value="$(TargetFrameworkForNETCoreTasks)" /> - <_ReplacementValue Include="TargetFrameworkForNETFrameworkTasks" Value="$(TargetFrameworkForNETFrameworkTasks)" /> + <_ReplacementValue Include="NetCoreAppToolCurrent" Value="$(NetCoreAppToolCurrent)" /> + <_ReplacementValue Include="NetFrameworkToolCurrent" Value="$(NetFrameworkToolCurrent)" /> - <_TasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETCoreTasks}\ - <_TasksDir Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETFrameworkTasks}\ + <_TasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tasks\${NetCoreAppToolCurrent}\ + <_TasksDir Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tasks\${NetFrameworkToolCurrent}\ $(_TasksDir)WasmAppBuilder.dll $(_TasksDir)WasmBuildTasks.dll diff --git a/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk/Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk.pkgproj b/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk/Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk.pkgproj index 0e569168b9b..b0b05dbe566 100644 --- a/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk/Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk.pkgproj +++ b/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk/Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk.pkgproj @@ -27,8 +27,8 @@ - <_ReplacementValue Include="TargetFrameworkForNETCoreTasks" Value="$(TargetFrameworkForNETCoreTasks)" /> - <_ReplacementValue Include="TargetFrameworkForNETFrameworkTasks" Value="$(TargetFrameworkForNETFrameworkTasks)" /> + <_ReplacementValue Include="NetCoreAppToolCurrent" Value="$(NetCoreAppToolCurrent)" /> + <_ReplacementValue Include="NetFrameworkToolCurrent" Value="$(NetFrameworkToolCurrent)" /> - <_TasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETCoreTasks}\ - <_TasksDir Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETFrameworkTasks}\ + <_TasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tasks\${NetCoreAppToolCurrent}\ + <_TasksDir Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tasks\${NetFrameworkToolCurrent}\ $(_TasksDir)WasmAppBuilder.dll $(_TasksDir)WasmBuildTasks.dll diff --git a/src/mono/wasm/build/WasmApp.LocalBuild.props b/src/mono/wasm/build/WasmApp.LocalBuild.props index 6a03bc4dc95..3c81958b037 100644 --- a/src/mono/wasm/build/WasmApp.LocalBuild.props +++ b/src/mono/wasm/build/WasmApp.LocalBuild.props @@ -22,7 +22,7 @@ - <_TargetFrameworkForNETCoreTasks>net9.0 + <_NetCoreAppToolCurrent>net9.0 false true @@ -34,10 +34,10 @@ $([MSBuild]::NormalizeDirectory($(ArtifactsBinDir), 'microsoft.netcore.app.runtime.$(RuntimeIdentifier)', $(RuntimeConfig))) - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmAppBuilder', '$(TasksConfiguration)', '$(_TargetFrameworkForNETCoreTasks)')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmBuildTasks', '$(TasksConfiguration)', '$(_TargetFrameworkForNETCoreTasks)', 'publish')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', '$(TasksConfiguration)', '$(_TargetFrameworkForNETCoreTasks)')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoTargetsTasks', '$(TasksConfiguration)', '$(_TargetFrameworkForNETCoreTasks)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmAppBuilder', '$(TasksConfiguration)', '$(_NetCoreAppToolCurrent)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmBuildTasks', '$(TasksConfiguration)', '$(_NetCoreAppToolCurrent)', 'publish')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', '$(TasksConfiguration)', '$(_NetCoreAppToolCurrent)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoTargetsTasks', '$(TasksConfiguration)', '$(_NetCoreAppToolCurrent)')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'mono', '$(TargetOS).$(TargetArchitecture).$(RuntimeConfig)')) <_MonoAotCrossCompilerPath>$([MSBuild]::NormalizePath($(MonoArtifactsPath), 'cross', '$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())', 'mono-aot-cross')) diff --git a/src/tasks/AndroidAppBuilder/AndroidAppBuilder.csproj b/src/tasks/AndroidAppBuilder/AndroidAppBuilder.csproj index 8afaa55486f..298896d2384 100644 --- a/src/tasks/AndroidAppBuilder/AndroidAppBuilder.csproj +++ b/src/tasks/AndroidAppBuilder/AndroidAppBuilder.csproj @@ -1,6 +1,6 @@ - $(TargetFrameworkForNETCoreTasks) + $(NetCoreAppToolCurrent) Library true false @@ -36,7 +36,7 @@ + TargetPath="tasks\$(NetCoreAppToolCurrent)" /> diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj index 32a0203583d..0afdb5563cc 100644 --- a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj +++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj @@ -1,6 +1,6 @@ - $(TargetFrameworkForNETCoreTasks);$(TargetFrameworkForNETFrameworkTasks) + $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) Library true false @@ -42,8 +42,8 @@ - + diff --git a/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj b/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj index 233333c8dcd..fe87320a2da 100644 --- a/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj +++ b/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj @@ -1,6 +1,6 @@ - $(TargetFrameworkForNETCoreTasks) + $(NetCoreAppToolCurrent) Library true false @@ -23,7 +23,7 @@ + TargetPath="tasks\$(NetCoreAppToolCurrent)" /> diff --git a/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj b/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj index 93aab7abede..8554022304c 100644 --- a/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj +++ b/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj @@ -1,6 +1,6 @@ - $(TargetFrameworkForNETCoreTasks) + $(NetCoreAppToolCurrent) Library true $(NoWarn),CA1050 diff --git a/src/tasks/LibraryBuilder/LibraryBuilder.csproj b/src/tasks/LibraryBuilder/LibraryBuilder.csproj index e0445fcddc2..50cd1c06867 100644 --- a/src/tasks/LibraryBuilder/LibraryBuilder.csproj +++ b/src/tasks/LibraryBuilder/LibraryBuilder.csproj @@ -1,6 +1,6 @@ - $(TargetFrameworkForNETCoreTasks);$(TargetFrameworkForNETFrameworkTasks) + $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) Library true false diff --git a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj index 4d329dff024..bf51f45e908 100644 --- a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj +++ b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj @@ -1,7 +1,7 @@ - $(TargetFrameworkForNETCoreTasks);$(TargetFrameworkForNETFrameworkTasks) + $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) $(NoWarn),CA1050,CA1850,CA1845,CA1859,NU5128 Microsoft.NET.Sdk.WebAssembly true diff --git a/src/tasks/Microsoft.NET.WebAssembly.Webcil/Microsoft.NET.WebAssembly.Webcil.csproj b/src/tasks/Microsoft.NET.WebAssembly.Webcil/Microsoft.NET.WebAssembly.Webcil.csproj index 362805f31bc..b5131f4d47b 100644 --- a/src/tasks/Microsoft.NET.WebAssembly.Webcil/Microsoft.NET.WebAssembly.Webcil.csproj +++ b/src/tasks/Microsoft.NET.WebAssembly.Webcil/Microsoft.NET.WebAssembly.Webcil.csproj @@ -1,7 +1,7 @@ - $(TargetFrameworkForNETCoreTasks);$(TargetFrameworkForNETFrameworkTasks) + $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) Abstractions for modifying .NET webcil binary images true enable diff --git a/src/tasks/MobileBuildTasks/MobileBuildTasks.csproj b/src/tasks/MobileBuildTasks/MobileBuildTasks.csproj index f0f24cad084..579323eb4ab 100644 --- a/src/tasks/MobileBuildTasks/MobileBuildTasks.csproj +++ b/src/tasks/MobileBuildTasks/MobileBuildTasks.csproj @@ -1,6 +1,6 @@ - $(TargetFrameworkForNETCoreTasks);$(TargetFrameworkForNETFrameworkTasks) + $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) enable $(NoWarn),CA1050,CA1850 @@ -21,12 +21,12 @@ - + - + \ No newline at end of file diff --git a/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj b/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj index 2eb8a61b633..750919455a8 100644 --- a/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj +++ b/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj @@ -1,6 +1,6 @@ - $(TargetFrameworkForNETCoreTasks);$(TargetFrameworkForNETFrameworkTasks) + $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) false disable diff --git a/src/tasks/MonoTargetsTasks/MonoTargetsTasks.csproj b/src/tasks/MonoTargetsTasks/MonoTargetsTasks.csproj index 1d347799e34..28c68c0150d 100644 --- a/src/tasks/MonoTargetsTasks/MonoTargetsTasks.csproj +++ b/src/tasks/MonoTargetsTasks/MonoTargetsTasks.csproj @@ -1,16 +1,16 @@ - $(TargetFrameworkForNETCoreTasks);$(TargetFrameworkForNETFrameworkTasks) + $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) false enable $(NoWarn),CA1050,CA1850 - + - + diff --git a/src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj b/src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj index 592a8652953..97871978fae 100644 --- a/src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj +++ b/src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj @@ -1,6 +1,6 @@ - $(TargetFrameworkForNETCoreTasks) + $(NetCoreAppToolCurrent) Library true false diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj index 37298685d40..f45b031653f 100644 --- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj +++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj @@ -1,6 +1,6 @@ - $(TargetFrameworkForNETCoreTasks);$(TargetFrameworkForNETFrameworkTasks) + $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) enable $(NoWarn),CA1050 @@ -36,17 +36,17 @@ - - - + + + - + diff --git a/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj b/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj index 32f7be8a7fa..0f7f591c2b9 100644 --- a/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj +++ b/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj @@ -1,6 +1,6 @@ - $(TargetFrameworkForNETCoreTasks) + $(NetCoreAppToolCurrent) Library enable $(NoWarn),CA1050 diff --git a/src/tasks/WorkloadBuildTasks/WorkloadBuildTasks.csproj b/src/tasks/WorkloadBuildTasks/WorkloadBuildTasks.csproj index fbb13d8d9c4..944cd41c0c9 100644 --- a/src/tasks/WorkloadBuildTasks/WorkloadBuildTasks.csproj +++ b/src/tasks/WorkloadBuildTasks/WorkloadBuildTasks.csproj @@ -1,6 +1,6 @@ - $(TargetFrameworkForNETCoreTasks) + $(NetCoreAppToolCurrent) enable $(NoWarn),CA1050,CA1850