Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
mjuen authored Aug 15, 2019
2 parents ecab1ca + 668089a commit e32622d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions azure-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ steps:
solution: '$(coreSolution)'
configuration: '$(buildConfiguration)'
platform: '$(buildPlatform)'
msbuildArgs: '/t:Pack /p:JavaSdkDirectory="$(JAVA_HOME)/"'
msbuildArgs: '/t:Pack /p:JavaSdkDirectory="$(JAVA_HOME_8_X64)"'

- task: DotNetCoreCLI@2
displayName: Run Unit Tests
Expand All @@ -65,7 +65,7 @@ steps:
solution: '$(setupSamplesSolution)'
configuration: '$(buildConfiguration)'
platform: '$(buildPlatform)'
msbuildArgs: '/t:Build /p:JavaSdkDirectory="$(JAVA_HOME)/"'
msbuildArgs: '/t:Build /p:JavaSdkDirectory="$(JAVA_HOME_8_X64)"'

- task: NuGetCommand@2
displayName: Restore Features Solution
Expand All @@ -78,7 +78,7 @@ steps:
solution: '$(featuresSamplesSolution)'
configuration: '$(buildConfiguration)'
platform: '$(buildPlatform)'
msbuildArgs: '/t:Build /p:JavaSdkDirectory="$(JAVA_HOME)/"'
msbuildArgs: '/t:Build /p:JavaSdkDirectory="$(JAVA_HOME_8_X64)"'

- task: CopyFiles@2
displayName: Copy Packages to Artifact Directory
Expand Down

0 comments on commit e32622d

Please sign in to comment.