bug fixes

Author: w8tcha

yaf_dnn/BuildScripts/AjaxMin.dll

@@ -5,7 +5,7 @@
  <PropertyGroup>
    <MSBuildCommunityTasksPath Condition="'$(MSBuildCommunityTasksPath)' == ''">$(MSBuildProjectDirectory)\BuildScripts</MSBuildCommunityTasksPath>
    <MSBuildDnnBinPath Condition="'$(MSBuildDnnBinPath)' == ''">$(MSBuildProjectDirectory)\..\..\bin</MSBuildDnnBinPath>
-   <MSBuildCommunityTasksLib>$(MSBuildProjectDirectory)\Libaries\MSBuild\MSBuild.Community.Tasks.dll</MSBuildCommunityTasksLib>
+   <MSBuildCommunityTasksLib>$(SolutionDir)packages\MSBuildTasks.1.5.0.235\tools\MSBuild.Community.Tasks.dll</MSBuildCommunityTasksLib>
  </PropertyGroup>
 
  <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.AspNet.InstallAspNet" />
@@ -20,7 +20,6 @@
  <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.GetSolutionProjects" />
  <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.ILMerge" />
  <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Mail" />
- <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Move" />
 
  <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Math.Add" />
  <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Math.Divide" />

yaf_dnn/BuildScripts/AjaxMin.tasks

@@ -2,8 +2,6 @@
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <Import Project="MSBuild.Community.Tasks.Targets" />
-  <Import Project="MSBuild.Extended.Tasks.Targets" />
-  <Import Project="AjaxMin.tasks" />
 
   <Target Name="PackageModule" Condition=" '$(Configuration)' == 'Release' AND '$(CreateDnnPackages)' == 'true' ">
     <XmlRead Prefix="n"
@@ -13,9 +11,10 @@
       <Output TaskParameter="Value" PropertyName="Version" />
     </XmlRead>
 
-    <StringReplace Pattern="0(\d.)(\d+.\d)(\d+)" InputString="$(Version)" Replace="$1$2-$3">
-      <Output PropertyName="YAFVersion" TaskParameter="Result" />
-    </StringReplace>
+    <PropertyGroup>
+      <YAFVersion>$([System.Text.RegularExpressions.Regex]::Replace($(Version), '0(\d.)(\d+.\d)(\d+)', '$1$2-$3'))</YAFVersion>
+    </PropertyGroup>
+
 
     <RemoveDir Directories ="$(MSBuildProjectDirectory)\deploy\" />
 
@@ -274,7 +273,6 @@
     <ItemGroup>
       <CSS Include="$(MSBuildProjectDirectory)\yafdnn-res\**\*.css" Exclude="**\*.min.css;**\*_src.css;$(MSBuildProjectDirectory)\yafdnn-res\themes\**\*.css;$(MSBuildProjectDirectory)\yafdnn-res\Scripts\**\*.css;$(MSBuildProjectDirectory)\yafdnn-res\Content\**\*.css;" />
     </ItemGroup>
-    <AjaxMin JsSourceFiles="@(JS)" JsSourceExtensionPattern="\.js$" JsTargetExtension=".js" CssSourceFiles="@(CSS)" CssSourceExtensionPattern="\.css$" CssTargetExtension=".css"  />
 
     <CreateItem Include="$(MSBuildProjectDirectory)\yafdnn-res\**\*.*">
       <Output TaskParameter="Include" ItemName="yafdnn-resContent" />

yaf_dnn/BuildScripts/AjaxMinTask.dll

@@ -43,7 +43,7 @@ namespace YAF.DotNetNuke.Components.WebAPI
     /// <summary>
     /// The YAF Album controller.
     /// </summary>
-    public class AlbumController : ApiController, IHaveServiceLocator
+    public class AlbumController : DnnApiController, IHaveServiceLocator
     {
         #region Properties
 

yaf_dnn/BuildScripts/AjaxMinTask.targets

@@ -41,7 +41,7 @@ namespace YAF.DotNetNuke.Components.WebAPI
     /// <summary>
     /// The YAF Attachment controller.
     /// </summary>
-    public class AttachmentController : ApiController, IHaveServiceLocator
+    public class AttachmentController : DnnApiController, IHaveServiceLocator
     {
         #region Properties
 
@@ -63,7 +63,7 @@ public class AttachmentController : ApiController, IHaveServiceLocator
         /// </returns>
         [DnnAuthorize]
         [HttpPost]
-        public IHttpActionResult GetAttachments(PagedResults pagedResults)
+        public IHttpActionResult GetAttachments([FromBody] PagedResults pagedResults)
         {
             var userId = pagedResults.UserId;
             var pageSize = pagedResults.PageSize;

yaf_dnn/BuildScripts/MSBuild.Community.Tasks.Targets

@@ -38,7 +38,7 @@ namespace YAF.DotNetNuke.Components.WebAPI
     /// <summary>
     /// The YAF MultiQuote Button controller.
     /// </summary>
-    public class MultiQuoteController : ApiController, IHaveServiceLocator
+    public class MultiQuoteController : DnnApiController, IHaveServiceLocator
     {
         #region Properties