Skip to content

Commit ca5952f

Browse files
committed
Nuget path changes.
1 parent 13146a4 commit ca5952f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

build/ci/job-template.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
- ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.name, 'Hosted Ubuntu 1604')) }}:
7070
- bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH"
7171
displayName: Set LD_LIBRARY_PATH for Ubuntu and CentOS to locate Native shared library in current running path
72-
- script: ${{ parameters.buildScript }} -restore -build -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }}
72+
- script: ${{ parameters.buildScript }} -restore -build -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} /p:RestorePackagesPath=$(Build.SourcesDirectory)\.packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\.packages
7373
displayName: Build
7474
- ${{ if eq(parameters.pool.name, 'Hosted macOS') }}:
7575
- task: Bash@3
@@ -89,7 +89,7 @@ jobs:
8989
- task: PowerShell@2
9090
inputs:
9191
targetType: inline
92-
script: Get-ChildItem -Path "$env:USERPROFILE\.nuget\packages\*\runtimes\*" -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
92+
script: Get-ChildItem -Path '.\.packages\*\runtimes\*' -Recurse | Select -ExpandProperty FullName | Where {$_ -notlike '*\win-*'} | sort length -Descending | Remove-Item -Recurse -Confirm:$false -Force
9393
displayName: Clean up non-Windows runtime folders of NuGet Packages to save disk space
9494
- ${{ if eq(parameters.nightlyBuild, 'true') }}:
9595
- script: $(dotnetPath) restore $(nightlyBuildProjPath)
@@ -109,7 +109,7 @@ jobs:
109109
displayName: Clean up useless project
110110
- script: $(dotnetPath) msbuild -restore $(nightlyBuildProjPath) /p:ReferenceTypeForTestFramework="Nuget" -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }}
111111
displayName: Build Nightly-Build Project with latest package versions
112-
- script: ${{ parameters.buildScript }} -$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -runnightlybuildtests
112+
- script: ${{ parameters.buildScript }} -$(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -runnightlybuildtests /p:RestorePackagesPath=$(Build.SourcesDirectory)\.packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\.packages
113113
displayName: Run Nightly Build Tests
114114
- ${{ if eq(parameters.nightlyBuild, 'false') }}:
115115
- ${{ if eq(parameters.innerLoop, 'false') }}:
@@ -118,7 +118,7 @@ jobs:
118118
- script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -ci #-coverage=${{ parameters.codeCoverage }}
119119
displayName: Run All Tests.
120120
- ${{ if and(eq(parameters.runSpecific, 'true'), eq(parameters.useVSTestTask, 'false')) }}:
121-
- script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -ci /p:TestRunnerAdditionalArguments='-trait$(spaceValue)Category=RunSpecificTest' #-coverage=${{ parameters.codeCoverage }}
121+
- script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -ci /p:TestRunnerAdditionalArguments='-trait$(spaceValue)Category=RunSpecificTest' /p:RestorePackagesPath=$(Build.SourcesDirectory)\.packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\.packages #-coverage=${{ parameters.codeCoverage }}
122122
displayName: Run Specific Tests.
123123
- ${{ if and(eq(parameters.buildScript, 'build.cmd'), eq(parameters.useVSTestTask, 'true')) }}:
124124
- task: VSTest@2
@@ -142,7 +142,7 @@ jobs:
142142
collectDumpOn: onAbortOnly
143143
publishRunAttachments: true
144144
- ${{ if eq(parameters.innerLoop, 'true') }}:
145-
- script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -ci /p:TestRunnerAdditionalArguments='-notrait$(spaceValue)Category=SkipInCI' #-coverage=${{ parameters.codeCoverage }}
145+
- script: ${{ parameters.buildScript }} -configuration $(_configuration) /p:TargetArchitecture=${{ parameters.architecture }} /p:TestArchitectures=${{ parameters.architecture }} -test -ci /p:TestRunnerAdditionalArguments='-notrait$(spaceValue)Category=SkipInCI' /p:RestorePackagesPath=$(Build.SourcesDirectory)\.packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\.packages #-coverage=${{ parameters.codeCoverage }}
146146
displayName: Run CI Tests.
147147
- script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
148148
displayName: Upload coverage to codecov.io
@@ -190,5 +190,5 @@ jobs:
190190
artifactName: ${{ parameters.name }} $(_config_short)
191191
artifactType: container
192192
- ${{ if eq(parameters.nightlyBuild, 'false') }}:
193-
- script: ${{ parameters.buildScript }} -configuration $(_configuration) -pack -ci /p:TargetArchitecture=${{ parameters.architecture }}
193+
- script: ${{ parameters.buildScript }} -configuration $(_configuration) -pack -ci /p:TargetArchitecture=${{ parameters.architecture }} /p:RestorePackagesPath=$(Build.SourcesDirectory)\.packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\.packages
194194
displayName: Build Packages

0 commit comments

Comments
 (0)