Merge remote-tracking branch 'origin/master'

This commit is contained in:
SpoinkyNL committed 2020-11-06 23:44:02 +01:00
commit d37c70371c
2 files changed
+8 -5

No files matched your search

+3
View File
@@ -5,6 +5,7 @@
trigger: trigger:
- master - master
pr: none
pool: pool:
vmImage: 'windows-latest' vmImage: 'windows-latest'
@@ -13,6 +14,8 @@ variables:
artemisSolution: '**/Artemis.sln' artemisSolution: '**/Artemis.sln'
steps: steps:
- checkout: self
- task: NuGetToolInstaller@1 - task: NuGetToolInstaller@1
- task: NuGetCommand@2 - task: NuGetCommand@2
+5 -5
View File
@@ -33,11 +33,11 @@ steps:
inputs: inputs:
restoreSolution: '$(artemisSolution)' restoreSolution: '$(artemisSolution)'
- task: ResharperCli@2 # - task: ResharperCli@2
inputs: # inputs:
solutionOrProjectPath: 'src/Artemis.sln' # solutionOrProjectPath: 'src/Artemis.sln'
failBuildLevelSelector: 'Error' # failBuildLevelSelector: 'Error'
additionalArguments: '/disable-settings-layers:SolutionPersonal --properties:Configuration=win-x64' # additionalArguments: '/disable-settings-layers:SolutionPersonal --properties:Configuration=win-x64'
- task: DotNetCoreCLI@2 - task: DotNetCoreCLI@2
displayName: 'Publish Artemis' displayName: 'Publish Artemis'