Revert "修改bug"

Src/Libraries/NextCMS.Services/Catalog/ArticleService.cs

@@ -45,7 +45,7 @@ public ArticleService(IRepository<Article> articleRepository, IRepository<Tag> t
         /// <param name="pageSize">每页个数</param>
         public virtual IPagedList<Article> GetAllArticle(string title = null, int categoryId = 0, int tagId = 0, bool showHidden = false, int pageIndex = 0, int pageSize = int.MaxValue)
         {
-            var query = _articleRepository.Table;
+            var query = _articleRepository.Table.Where(t => t.Published);
 
             if (!string.IsNullOrEmpty(title))
                 query = query.Where(t => t.Title.ToLower().Contains(title.ToLower()));
@@ -72,7 +72,7 @@ public virtual IPagedList<Article> GetAllArticle(string title = null, int catego
         /// <param name="tagId">标签</param>
         public virtual IQueryable<Article> GetAllArticle(string title = null, int categoryId = 0, int tagId = 0)
         {
-            var query = _articleRepository.Table.Where(t => t.Published);
+            var query = _articleRepository.Table;
 
             if (!string.IsNullOrEmpty(title))
                 query = query.Where(t => t.Title.ToLower().Contains(title.ToLower()));

Src/packages/AutoMapper.3.2.1/tools/AutoMapper.targets

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Build sequence modification -->
+  <Target Name="CopyAutoMapperAssembly"
+          AfterTargets="ResolveAssemblyReferences">
+    <CreateItem Include="%(ReferencePath.FullPath)"
+                Condition="$([System.String]::new('%(ReferencePath.Filename)').StartsWith('AutoMapper.'))">
+      <Output TaskParameter="Include"
+              ItemName="_AutoMapperReference"/>
+    </CreateItem>
+
+    <Message Importance="low" Text="AutoMapper Platform Extension Assembly: %(_AutoMapperReference.FullPath)"/>
+
+    <ItemGroup>
+      <Content Include="$([MSBuild]::MakeRelative($(MSBuildProjectDirectory), %(_AutoMapperReference.FullPath)))" Condition="'%(_AutoMapperReference.FullPath)' != ''">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
+    </ItemGroup>
+  </Target>
+</Project>

Src/packages/AutoMapper.3.2.1/tools/MonoAndroid/Install.ps1

@@ -0,0 +1,20 @@
+param($installPath, $toolsPath, $package, $project)
+    # This is the MSBuild targets file to add
+    $targetsFile = [System.IO.Path]::Combine($toolsPath, '..\' + $package.Id + '.targets')
+
+    # Need to load MSBuild assembly if it's not loaded yet.
+    Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
+
+    # Grab the loaded MSBuild project for the project
+    $msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+    # Make the path to the targets file relative.
+    $projectUri = new-object Uri($project.FullName, [System.UriKind]::Absolute)
+    $targetUri = new-object Uri($targetsFile, [System.UriKind]::Absolute)
+    $relativePath = [System.Uri]::UnescapeDataString($projectUri.MakeRelativeUri($targetUri).ToString()).Replace([System.IO.Path]::AltDirectorySeparatorChar, [System.IO.Path]::DirectorySeparatorChar)
+
+    # Add the import with a condition, to allow the project to load without the targets present.
+    $import = $msbuild.Xml.AddImport($relativePath)
+    $import.Condition = "Exists('$relativePath')"
+
+    $project.Save()

Src/packages/AutoMapper.3.2.1/tools/MonoAndroid/uninstall.ps1

@@ -0,0 +1,24 @@
+param($installPath, $toolsPath, $package, $project)
+
+  # Need to load MSBuild assembly if it's not loaded yet.
+  Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
+
+  # Grab the loaded MSBuild project for the project
+  $msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+  # Find all the imports and targets added by this package.
+  $itemsToRemove = @()
+
+  # Allow many in case a past package was incorrectly uninstalled
+  $itemsToRemove += $msbuild.Xml.Imports | Where-Object { $_.Project.EndsWith($package.Id + '.targets') }
+
+  # Remove the elements and save the project
+  if ($itemsToRemove -and $itemsToRemove.length)
+  {
+     foreach ($itemToRemove in $itemsToRemove)
+     {
+         $msbuild.Xml.RemoveChild($itemToRemove) | out-null
+     }
+
+     $project.Save()
+  }

Src/packages/AutoMapper.3.2.1/tools/MonoTouch/Install.ps1

@@ -0,0 +1,20 @@
+param($installPath, $toolsPath, $package, $project)
+    # This is the MSBuild targets file to add
+    $targetsFile = [System.IO.Path]::Combine($toolsPath, '..\' + $package.Id + '.targets')
+
+    # Need to load MSBuild assembly if it's not loaded yet.
+    Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
+
+    # Grab the loaded MSBuild project for the project
+    $msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+    # Make the path to the targets file relative.
+    $projectUri = new-object Uri($project.FullName, [System.UriKind]::Absolute)
+    $targetUri = new-object Uri($targetsFile, [System.UriKind]::Absolute)
+    $relativePath = [System.Uri]::UnescapeDataString($projectUri.MakeRelativeUri($targetUri).ToString()).Replace([System.IO.Path]::AltDirectorySeparatorChar, [System.IO.Path]::DirectorySeparatorChar)
+
+    # Add the import with a condition, to allow the project to load without the targets present.
+    $import = $msbuild.Xml.AddImport($relativePath)
+    $import.Condition = "Exists('$relativePath')"
+
+    $project.Save()

Src/packages/AutoMapper.3.2.1/tools/MonoTouch/uninstall.ps1

@@ -0,0 +1,24 @@
+param($installPath, $toolsPath, $package, $project)
+
+  # Need to load MSBuild assembly if it's not loaded yet.
+  Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
+
+  # Grab the loaded MSBuild project for the project
+  $msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+  # Find all the imports and targets added by this package.
+  $itemsToRemove = @()
+
+  # Allow many in case a past package was incorrectly uninstalled
+  $itemsToRemove += $msbuild.Xml.Imports | Where-Object { $_.Project.EndsWith($package.Id + '.targets') }
+
+  # Remove the elements and save the project
+  if ($itemsToRemove -and $itemsToRemove.length)
+  {
+     foreach ($itemToRemove in $itemsToRemove)
+     {
+         $msbuild.Xml.RemoveChild($itemToRemove) | out-null
+     }
+
+     $project.Save()
+  }

Src/packages/AutoMapper.3.2.1/tools/net40/Install.ps1

@@ -0,0 +1,20 @@
+param($installPath, $toolsPath, $package, $project)
+    # This is the MSBuild targets file to add
+    $targetsFile = [System.IO.Path]::Combine($toolsPath, '..\' + $package.Id + '.targets')
+
+    # Need to load MSBuild assembly if it's not loaded yet.
+    Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
+
+    # Grab the loaded MSBuild project for the project
+    $msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+    # Make the path to the targets file relative.
+    $projectUri = new-object Uri($project.FullName, [System.UriKind]::Absolute)
+    $targetUri = new-object Uri($targetsFile, [System.UriKind]::Absolute)
+    $relativePath = [System.Uri]::UnescapeDataString($projectUri.MakeRelativeUri($targetUri).ToString()).Replace([System.IO.Path]::AltDirectorySeparatorChar, [System.IO.Path]::DirectorySeparatorChar)
+
+    # Add the import with a condition, to allow the project to load without the targets present.
+    $import = $msbuild.Xml.AddImport($relativePath)
+    $import.Condition = "Exists('$relativePath')"
+
+    $project.Save()

Src/packages/AutoMapper.3.2.1/tools/net40/uninstall.ps1

@@ -0,0 +1,24 @@
+param($installPath, $toolsPath, $package, $project)
+
+  # Need to load MSBuild assembly if it's not loaded yet.
+  Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
+
+  # Grab the loaded MSBuild project for the project
+  $msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+  # Find all the imports and targets added by this package.
+  $itemsToRemove = @()
+
+  # Allow many in case a past package was incorrectly uninstalled
+  $itemsToRemove += $msbuild.Xml.Imports | Where-Object { $_.Project.EndsWith($package.Id + '.targets') }
+
+  # Remove the elements and save the project
+  if ($itemsToRemove -and $itemsToRemove.length)
+  {
+     foreach ($itemToRemove in $itemsToRemove)
+     {
+         $msbuild.Xml.RemoveChild($itemToRemove) | out-null
+     }
+
+     $project.Save()
+  }

Src/packages/AutoMapper.3.2.1/tools/sl5/Install.ps1

@@ -0,0 +1,20 @@
+param($installPath, $toolsPath, $package, $project)
+    # This is the MSBuild targets file to add
+    $targetsFile = [System.IO.Path]::Combine($toolsPath, '..\' + $package.Id + '.targets')
+
+    # Need to load MSBuild assembly if it's not loaded yet.
+    Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
+
+    # Grab the loaded MSBuild project for the project
+    $msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+    # Make the path to the targets file relative.
+    $projectUri = new-object Uri($project.FullName, [System.UriKind]::Absolute)
+    $targetUri = new-object Uri($targetsFile, [System.UriKind]::Absolute)
+    $relativePath = [System.Uri]::UnescapeDataString($projectUri.MakeRelativeUri($targetUri).ToString()).Replace([System.IO.Path]::AltDirectorySeparatorChar, [System.IO.Path]::DirectorySeparatorChar)
+
+    # Add the import with a condition, to allow the project to load without the targets present.
+    $import = $msbuild.Xml.AddImport($relativePath)
+    $import.Condition = "Exists('$relativePath')"
+
+    $project.Save()

Src/packages/AutoMapper.3.2.1/tools/sl5/uninstall.ps1

@@ -0,0 +1,24 @@
+param($installPath, $toolsPath, $package, $project)
+
+  # Need to load MSBuild assembly if it's not loaded yet.
+  Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
+
+  # Grab the loaded MSBuild project for the project
+  $msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+  # Find all the imports and targets added by this package.
+  $itemsToRemove = @()
+
+  # Allow many in case a past package was incorrectly uninstalled
+  $itemsToRemove += $msbuild.Xml.Imports | Where-Object { $_.Project.EndsWith($package.Id + '.targets') }
+
+  # Remove the elements and save the project
+  if ($itemsToRemove -and $itemsToRemove.length)
+  {
+     foreach ($itemToRemove in $itemsToRemove)
+     {
+         $msbuild.Xml.RemoveChild($itemToRemove) | out-null
+     }
+
+     $project.Save()
+  }

Src/packages/AutoMapper.3.2.1/tools/windows8/Install.ps1

@@ -0,0 +1,20 @@
+param($installPath, $toolsPath, $package, $project)
+    # This is the MSBuild targets file to add
+    $targetsFile = [System.IO.Path]::Combine($toolsPath, '..\' + $package.Id + '.targets')
+
+    # Need to load MSBuild assembly if it's not loaded yet.
+    Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
+
+    # Grab the loaded MSBuild project for the project
+    $msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+    # Make the path to the targets file relative.
+    $projectUri = new-object Uri($project.FullName, [System.UriKind]::Absolute)
+    $targetUri = new-object Uri($targetsFile, [System.UriKind]::Absolute)
+    $relativePath = [System.Uri]::UnescapeDataString($projectUri.MakeRelativeUri($targetUri).ToString()).Replace([System.IO.Path]::AltDirectorySeparatorChar, [System.IO.Path]::DirectorySeparatorChar)
+
+    # Add the import with a condition, to allow the project to load without the targets present.
+    $import = $msbuild.Xml.AddImport($relativePath)
+    $import.Condition = "Exists('$relativePath')"
+
+    $project.Save()

Src/packages/AutoMapper.3.2.1/tools/windows8/uninstall.ps1

@@ -0,0 +1,24 @@
+param($installPath, $toolsPath, $package, $project)
+
+  # Need to load MSBuild assembly if it's not loaded yet.
+  Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
+
+  # Grab the loaded MSBuild project for the project
+  $msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+  # Find all the imports and targets added by this package.
+  $itemsToRemove = @()
+
+  # Allow many in case a past package was incorrectly uninstalled
+  $itemsToRemove += $msbuild.Xml.Imports | Where-Object { $_.Project.EndsWith($package.Id + '.targets') }
+
+  # Remove the elements and save the project
+  if ($itemsToRemove -and $itemsToRemove.length)
+  {
+     foreach ($itemToRemove in $itemsToRemove)
+     {
+         $msbuild.Xml.RemoveChild($itemToRemove) | out-null
+     }
+
+     $project.Save()
+  }

Src/packages/AutoMapper.3.2.1/tools/wp8/Install.ps1

@@ -0,0 +1,20 @@
+param($installPath, $toolsPath, $package, $project)
+    # This is the MSBuild targets file to add
+    $targetsFile = [System.IO.Path]::Combine($toolsPath, '..\' + $package.Id + '.targets')
+
+    # Need to load MSBuild assembly if it's not loaded yet.
+    Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
+
+    # Grab the loaded MSBuild project for the project
+    $msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+    # Make the path to the targets file relative.
+    $projectUri = new-object Uri($project.FullName, [System.UriKind]::Absolute)
+    $targetUri = new-object Uri($targetsFile, [System.UriKind]::Absolute)
+    $relativePath = [System.Uri]::UnescapeDataString($projectUri.MakeRelativeUri($targetUri).ToString()).Replace([System.IO.Path]::AltDirectorySeparatorChar, [System.IO.Path]::DirectorySeparatorChar)
+
+    # Add the import with a condition, to allow the project to load without the targets present.
+    $import = $msbuild.Xml.AddImport($relativePath)
+    $import.Condition = "Exists('$relativePath')"
+
+    $project.Save()

Src/packages/AutoMapper.3.2.1/tools/wp8/uninstall.ps1

@@ -0,0 +1,24 @@
+param($installPath, $toolsPath, $package, $project)
+
+  # Need to load MSBuild assembly if it's not loaded yet.
+  Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
+
+  # Grab the loaded MSBuild project for the project
+  $msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+  # Find all the imports and targets added by this package.
+  $itemsToRemove = @()
+
+  # Allow many in case a past package was incorrectly uninstalled
+  $itemsToRemove += $msbuild.Xml.Imports | Where-Object { $_.Project.EndsWith($package.Id + '.targets') }
+
+  # Remove the elements and save the project
+  if ($itemsToRemove -and $itemsToRemove.length)
+  {
+     foreach ($itemToRemove in $itemsToRemove)
+     {
+         $msbuild.Xml.RemoveChild($itemToRemove) | out-null
+     }
+
+     $project.Save()
+  }

Src/packages/AutoMapper.3.2.1/tools/wpa81/Install.ps1

@@ -0,0 +1,20 @@
+param($installPath, $toolsPath, $package, $project)
+    # This is the MSBuild targets file to add
+    $targetsFile = [System.IO.Path]::Combine($toolsPath, '..\' + $package.Id + '.targets')
+
+    # Need to load MSBuild assembly if it's not loaded yet.
+    Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
+
+    # Grab the loaded MSBuild project for the project
+    $msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+    # Make the path to the targets file relative.
+    $projectUri = new-object Uri($project.FullName, [System.UriKind]::Absolute)
+    $targetUri = new-object Uri($targetsFile, [System.UriKind]::Absolute)
+    $relativePath = [System.Uri]::UnescapeDataString($projectUri.MakeRelativeUri($targetUri).ToString()).Replace([System.IO.Path]::AltDirectorySeparatorChar, [System.IO.Path]::DirectorySeparatorChar)
+
+    # Add the import with a condition, to allow the project to load without the targets present.
+    $import = $msbuild.Xml.AddImport($relativePath)
+    $import.Condition = "Exists('$relativePath')"
+
+    $project.Save()

Src/packages/AutoMapper.3.2.1/tools/wpa81/uninstall.ps1

@@ -0,0 +1,24 @@
+param($installPath, $toolsPath, $package, $project)
+
+  # Need to load MSBuild assembly if it's not loaded yet.
+  Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
+
+  # Grab the loaded MSBuild project for the project
+  $msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+  # Find all the imports and targets added by this package.
+  $itemsToRemove = @()
+
+  # Allow many in case a past package was incorrectly uninstalled
+  $itemsToRemove += $msbuild.Xml.Imports | Where-Object { $_.Project.EndsWith($package.Id + '.targets') }
+
+  # Remove the elements and save the project
+  if ($itemsToRemove -and $itemsToRemove.length)
+  {
+     foreach ($itemToRemove in $itemsToRemove)
+     {
+         $msbuild.Xml.RemoveChild($itemToRemove) | out-null
+     }
+
+     $project.Save()
+  }