Merge pull request #146 from microsoftgraph/rsh/pipelineBugFixes

Rsh/pipeline bug fixes

Author: baywet

.azure-pipelines/buildAndPackage.yml

@@ -35,11 +35,11 @@ stages:
   - job: 
     steps: 
     - template: templates/build/checkout-and-credscan.yml
-    - template: templates/build/install-java.yml
+    - template: templates/install-java.yml
     - template: templates/secure-files.yml
       parameters: 
         stageID: 'build'
-    - template: templates/build/build-and-coverage.yml
+    - template: templates/build/pipeline-build.yml
     - template: templates/build/publish-artifacts.yml
 
 - stage: Maven_Preview_And_Github_Release
@@ -53,6 +53,8 @@ stages:
      runOnce: 
       deploy: 
         steps: 
+        - template: templates/download-artifacts.yml
+        - template: templates/install-java.yml
         - template: templates/secure-files.yml 
         - template: templates/copy-and-build.yml
 
@@ -65,6 +67,7 @@ stages:
      runOnce:
       deploy:   
         steps: 
+        - template: templates/download-artifacts.yml
         - template: templates/version-and-release.yml
           parameters:
             gitConnection: 'microsoftgraphrelease'

…s/templates/build/build-and-coverage.yml …lines/templates/build/pipeline-build.yml.azure-pipelines/templates/build/build-and-coverage.yml renamed to .azure-pipelines/templates/build/pipeline-build.yml .azure-pipelines/templates/build/build-and-coverage.yml renamed to .azure-pipelines/templates/build/pipeline-build.yml

@@ -1,9 +1,9 @@
 steps: 
 - task: Gradle@2
   inputs:
-    gradleWrapperFile: 'gradlew'
+    gradleWrapperFile: ' $(Build.SourcesDirectory)/gradlew'
     tasks: 'build'
     publishJUnitResults: true
     testResultsFiles: '**/TEST-*.xml'
     javaHomeOption: 'JDKVersion'
-    sonarQubeRunAnalysis: false
+    sonarQubeRunAnalysis: false

.azure-pipelines/templates/copy-and-build.yml

@@ -3,12 +3,12 @@ steps:
   inputs:
     SourceFolder: '$(Agent.TempDirectory)'
     Contents: '**'
-    TargetFolder: '$(DROP_PATH)/'
+    TargetFolder: '$(Agent.BuildDirectory)/Drop/'
 
 - task: Gradle@2
   inputs:
-    gradleWrapperFile: '$(DROP_PATH)/gradlew'
-    workingDirectory: '$(DROP_PATH)/'
+    gradleWrapperFile: '$(Agent.BuildDirectory)/Drop/gradlew'
+    workingDirectory: '$(Agent.BuildDirectory)/Drop/'
     options: '-x jar -x javadoc -x javadocJar -x compileJava -x processResources -x classes -x sourceJar'
     tasks: 'publishSnapshotPublicationToSonatypeSnapshotRepository'
     publishJUnitResults: true

.azure-pipelines/templates/download-artifacts.yml

@@ -0,0 +1,10 @@
+steps: 
+- download: none
+- task: DownloadPipelineArtifact@2
+  inputs:
+    buildType: 'current'
+    artifactName: 'Drop'
+    itemPattern: |
+      **
+      *
+    targetPath: '$(Agent.BuildDirectory)/Drop/'

.azure-pipelines/templates/install-java.yml

@@ -0,0 +1,11 @@
+steps:
+- pwsh: 'Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_windows_hotspot_16_36.zip -OutFile OpenJDK.zip'
+  displayName: 'Download JDK'
+
+- task: JavaToolInstaller@0
+  inputs:
+    versionSpec: '16'
+    jdkArchitectureOption: 'x64'
+    jdkSourceOption: 'LocalDirectory'
+    jdkFile: 'OpenJDK.zip'
+    jdkDestinationDirectory: 'binaries'

.azure-pipelines/templates/version-and-release.yml

@@ -7,7 +7,7 @@ steps:
 - task: PowerShell@2
   inputs:
     filePath: '$(DROP_PATH)/Scripts/getLatestVersion.ps1'
-    arguments: '-propertiesPath "$(PROPERTIES_PATH)"'
+    arguments: '-propertiesPath "$(DROP_PATH)/gradle.properties"'
     pwsh: true
 
 - task: GitHubRelease@1