Merge branch 'master' into release/v2.1

microsoft · Feb 18, 2020 · 90300c2 · 90300c2
2 parents f60abae + 180ca66
commit 90300c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/Pipelines/pr-validation.yml b/Pipelines/pr-validation.yml
@@ -37,13 +37,13 @@ stages:
       displayName: 'Build Tests'
       inputs:
         projects: 'AsaTests/AsaTests.csproj'
-        arguments: '--configuration $(BuildConfiguration) --output $(build.binariesdirectory)/Tests'
+        arguments: '--configuration $(BuildConfiguration) --output $(build.binariesdirectory)\Tests'
 
     - task: VSTest@2
       displayName: 'Run Tests'
       inputs:
         testAssemblyVer2: AsaTests.dll
-        searchFolder: '$(build.binariesdirectory)/Tests'
+        searchFolder: '$(build.binariesdirectory)\Tests'
       continueOnError: true
 
     - task: PublishBuildArtifacts@1

diff --git a/Pipelines/release.yml b/Pipelines/release.yml
@@ -35,13 +35,13 @@ stages:
       displayName: 'Build Tests'
       inputs:
         projects: 'AsaTests/AsaTests.csproj'
-        arguments: '--configuration $(BuildConfiguration) --output $(build.binariesdirectory)/Tests'
+        arguments: '--configuration $(BuildConfiguration) --output $(build.binariesdirectory)\Tests'
 
     - task: VSTest@2
       displayName: 'Run Tests'
       inputs:
         testAssemblyVer2: AsaTests.dll
-        searchFolder: '$(build.binariesdirectory)/Tests'
+        searchFolder: '$(build.binariesdirectory)\Tests'
 
 - stage: Build
   jobs:
@@ -219,7 +219,6 @@ stages:
 
     - task: GitHubRelease@1
       displayName: 'GitHub release update'
-      condition: not(variables['DisableGithubRelease'])
       inputs:
         gitHubConnection: 'Gabe-Asa'
         action: edit
@@ -288,7 +287,6 @@ stages:
 
     - task: GitHubRelease@1
       displayName: 'GitHub release update'
-      condition: not(variables['DisableGithubRelease'])
       inputs:
         gitHubConnection: 'Gabe-Asa'
         action: edit
@@ -357,7 +355,6 @@ stages:
 
     - task: GitHubRelease@1
       displayName: 'GitHub release update'
-      condition: not(variables['DisableGithubRelease'])
       inputs:
         gitHubConnection: 'Gabe-Asa'
         action: edit
@@ -371,7 +368,7 @@ stages:
 
 - stage: Hashes
   jobs:
-  - job: Sign
+  - job: CombineAndPublish
     pool:
       vmImage: 'windows-latest'
     steps:
@@ -393,7 +390,6 @@ stages:
 
     - task: GitHubRelease@1
       displayName: 'GitHub release update'
-      condition: not(variables['DisableGithubRelease'])
       inputs:
         gitHubConnection: 'Gabe-Asa'
         action: edit