merge

starlying · starlying · commit e35196ecfcdb · 2019-02-24T03:09:05.000+08:00
diff --git a/SiteServer.Web/Home/pages/contents.html b/SiteServer.Web/Home/pages/contents.html
@@ -237,7 +237,7 @@ <h4 class="page-title">稿件管理</h4>
           <div class="col-3">
             <multiselect v-on:select="onPageSelect" v-model="page" placeholder="Select one" :options="pageOptions"
               :searchable="false" :show-labels="false">
-              <template slot="singleLabel" slot-scope="{ option }">第 {{ option }} 页（共 {{ pages }} 页）</template>
+              <template slot="singleLabel" slot-scope="props">第 {{ props.option }} 页（共 {{ pages }} 页）</template>
               <template slot="option" slot-scope="props"> 第 {{ props.option }} 页 </template>
             </multiselect>
           </div>
diff --git a/SiteServer.Web/SiteServer/Cms/contents.cshtml b/SiteServer.Web/SiteServer/Cms/contents.cshtml
@@ -200,9 +200,11 @@ min-height: 34px;
   <div class="col-3">
     <multiselect v-on:select="onPageSelect" v-model="page" placeholder="Select one" :options="pageOptions" :searchable="false"
       :show-labels="false">
-      <template slot="singleLabel" slot-scope="{ option }">第 {{ option }} 页（共 {{ pages }} 页）</template>
-      <template slot="option" slot-scope="props"> 第 {{ props.option }} 页 </template>
+      <template slot="singleLabel" slot-scope="props">第 {{ props.option }} 页（共 {{ pages }} 页）</template>
+      <template slot="option" slot-scope="props">
+        第 {{ props.option }} 页
+      </template>
     </multiselect>
   </div>
 </div> @section Scripts{ <script src="../assets/lib/vue-multiselect-2.1.0/script.min.js"></script>
-<script src="contents.js" type="text/javascript"></script> }
+<script src="contents.js" type="text/javascript"></script> }
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -0,0 +1,34 @@
+# ASP.NET
+# Build and test ASP.NET projects.
+# Add steps that publish symbols, save build artifacts, deploy, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/apps/aspnet/build-aspnet-4
+
+trigger:
+- dev
+
+pool:
+  vmImage: 'VS2017-Win2016'
+
+variables:
+  solution: '**/*.sln'
+  buildPlatform: 'Any CPU'
+  buildConfiguration: 'Release'
+
+steps:
+- task: NuGetToolInstaller@0
+
+- task: NuGetCommand@2
+  inputs:
+    restoreSolution: '$(solution)'
+
+- task: VSBuild@1
+  inputs:
+    solution: '$(solution)'
+    msbuildArgs: '/p:DeployOnBuild=true /p:WebPublishMethod=Package /p:PackageAsSingleFile=true /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactStagingDirectory)"'
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
+
+- task: VSTest@2
+  inputs:
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
