Merge branch 'master' into develop/v1-attribute

Author: guitarrapc

v1_attribute/.vsts-ci.yml renamed to .vsts/sample/.vsts-ci-webdeploy.yml

@@ -16,18 +16,21 @@ variables:
 
 steps:
 - task: DotNetCoreCLI@1
+ displayName: restore
  inputs:
  command: "restore"
  projects: "$(Parameters.solution)"
 
 - task: MSBuild@1
+ displayName: build
  inputs:
  solution: "$(Parameters.solution)"
  configuration: "$(BuildConfiguration)"
  msbuildArguments: "/p:OutputPath=$(Build.SourcesDirectory)/Tmp"
  clean: "true"
 
 - task: CmdLine@1
+ displayName: deploy
  inputs:
  filename: "C:/Program Files/IIS/Microsoft Web Deploy V3/msdeploy.exe"
  arguments: "-verb:sync -source:contentPath=$(Build.SourcesDirectory)/Tmp -dest:contentPath='$(DeploySiteName)',ComputerName='$(DeployScmUrl)',UserName='$(DeployUserName)',Password='$(DeployPassword)',AuthType='Basic'"

v1_attribute/.vsts-ci_AzureAppDeploy.yml renamed to .vsts/sample/.vsts-ci_AzureAppDeploy.yml

@@ -23,17 +23,17 @@ variables:
 
 steps:
 - task: NuGetToolInstaller@0
- displayName: 'Use NuGet 4.3.0'
+ displayName: nuget tool installer
  inputs:
  checkLatest: true
 
 - task: NuGetCommand@2
- displayName: 'NuGet restore'
+ displayName: restore
  inputs:
  restoreSolution: '$(Parameters.solution)'
 
 - task: VSBuild@1
- displayName: 'Build solution **\*.sln'
+ displayName: build
  inputs:
  solution: '$(Parameters.solution)'
  msbuildArgs: '/p:DeployOnBuild=true /p:WebPublishMethod=Package /p:PackageAsSingleFile=true /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactstagingdirectory)/$(Parameters.WebAppName).zip"'
@@ -42,7 +42,7 @@ steps:
 
 
 - task: AzureRmWebAppDeployment@2
- displayName: 'Azure App Service Deploy: function-v1-function'
+ displayName: deploy
  inputs:
  ConnectedServiceName: '$(Parameters.connectedServiceName)'
  WebAppName: '$(Parameters.WebAppName)'

.vsts/v1_attribute/config-ci-dev.yml

@@ -0,0 +1,32 @@
+name: Develop Build
+trigger:
+ branches:
+ include:
+ - develop/v1-attribute
+
+variables:
+ Parameters.solution: 'v1_attribute/src/AzureFunctionsIntroduction.sln'
+ BuildConfiguration: "Release"
+
+phases:
+
+- phase: build_windows_agent
+ displayName: Windows Agent
+ queue:
+ name: Hosted VS2017
+ demands: msbuild
+
+ steps:
+ - task: DotNetCoreCLI@1
+ displayName: restore
+ inputs:
+ command: "restore"
+ projects: "$(Parameters.solution)"
+
+ - task: MSBuild@1
+ displayName: build
+ inputs:
+ solution: "$(Parameters.solution)"
+ configuration: "$(BuildConfiguration)"
+ msbuildArguments: "/p:OutputPath=$(Build.SourcesDirectory)/Tmp"
+ clean: "true"

.vsts/v1_attribute/config-ci-release.yml

@@ -0,0 +1,40 @@
+name: Release Build
+trigger:
+ branches:
+ include:
+ - release/v1-attribute
+
+variables:
+ Parameters.solution: 'v1_attribute/src/AzureFunctionsIntroduction.sln'
+ Parameters.connectedServiceName: 'AzureResourceManager'
+ Parameters.WebAppName: 'AzureFunctionsIntroduction'
+ BuildConfiguration: "Release"
+
+phases:
+
+- phase: build_windows_agent
+ displayName: Windows Agent
+ queue:
+ name: Hosted VS2017
+ demands: msbuild
+
+ steps:
+ - task: DotNetCoreCLI@1
+ displayName: restore
+ inputs:
+ command: "restore"
+ projects: "$(Parameters.solution)"
+
+ - task: MSBuild@1
+ displayName: build
+ inputs:
+ solution: "$(Parameters.solution)"
+ configuration: "$(BuildConfiguration)"
+ msbuildArguments: "/p:OutputPath=$(Build.SourcesDirectory)/Tmp"
+ clean: "true"
+
+ - task: CmdLine@1
+ displayName: deploy
+ inputs:
+ filename: "C:/Program Files/IIS/Microsoft Web Deploy V3/msdeploy.exe"
+ arguments: "-verb:sync -source:contentPath=$(Build.SourcesDirectory)/Tmp -dest:contentPath='$(DeploySiteName)',ComputerName='$(DeployScmUrl)',UserName='$(DeployUserName)',Password='$(DeployPassword)',AuthType='Basic'"