Merge branch 'develop' into github-actions

donker · web-flow · commit f7f9bfe9ee5b · 2026-03-13T22:54:37.000+01:00
diff --git a/Build/BuildScripts/MSBuild.Community.Tasks.Targets b/Build/BuildScripts/MSBuild.Community.Tasks.Targets
diff --git a/Build/BuildScripts/MSBuild.Community.Tasks.dll b/Build/BuildScripts/MSBuild.Community.Tasks.dll
diff --git a/Build/BuildScripts/ModulePackage.targets b/Build/BuildScripts/ModulePackage.targets
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="MSBuild.Community.Tasks.Targets" />
   <Target Name="PackageModule" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <XmlRead Prefix="n"
                     Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
diff --git a/Build/BuildScripts/Package.targets b/Build/BuildScripts/Package.targets
@@ -5,7 +5,6 @@
     <YuiLib>$(BuildScriptsPath)\Yahoo.Yui.Compressor.MsBuild.dll</YuiLib>
   </PropertyGroup>
 
-  <Import Project="MSBuild.Community.Tasks.Targets" />
   <UsingTask TaskName="ExtensionPackager" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
     <ParameterGroup>
       <WorkingFolder ParameterType="System.String" />
diff --git a/Build/BuildScripts/ProviderPackage.targets b/Build/BuildScripts/ProviderPackage.targets
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="DebugModule" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="MSBuild.Community.Tasks.Targets" />
   <Target Name="PackageProvider" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <XmlRead Prefix="n"
                     Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
diff --git a/DNN Platform/Modules/DDRMenu/BuildScripts/ModulePackage.targets b/DNN Platform/Modules/DDRMenu/BuildScripts/ModulePackage.targets
@@ -5,10 +5,7 @@
 
 
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" Condition="Exists('$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets')"/>
-
-  
+ 
   <PropertyGroup>
     <DNNFileName>DDRMenu.dnn</DNNFileName>
     <PackageName>DDRMenu</PackageName>
diff --git a/DNN_Platform.sln b/DNN_Platform.sln
@@ -354,8 +354,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildScripts", "BuildScript
 		Build\BuildScripts\CombineSymbols.ps1 = Build\BuildScripts\CombineSymbols.ps1
 		Build\BuildScripts\Module.build = Build\BuildScripts\Module.build
 		Build\BuildScripts\ModulePackage.targets = Build\BuildScripts\ModulePackage.targets
-		Build\BuildScripts\MSBuild.Community.Tasks.dll = Build\BuildScripts\MSBuild.Community.Tasks.dll
-		Build\BuildScripts\MSBuild.Community.Tasks.Targets = Build\BuildScripts\MSBuild.Community.Tasks.Targets
 		Build\BuildScripts\Package.targets = Build\BuildScripts\Package.targets
 		Build\BuildScripts\Provider.build = Build\BuildScripts\Provider.build
 		Build\BuildScripts\ProviderPackage.targets = Build\BuildScripts\ProviderPackage.targets
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -67,6 +67,7 @@
   </ItemGroup>
   <ItemGroup>
     <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.103" />
+    <GlobalPackageReference Include="MSBuildTasks" Version="1.5.0.235" />
     <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
   </ItemGroup>
 </Project>
