Skip to content

Commit ef0a194

Browse files
committed
Task 41737: Merge feat/azure-split to main: Step 3 - Tie everything together
- Fixed Azure build command lines.
1 parent df540b1 commit ef0a194

3 files changed

Lines changed: 5 additions & 8 deletions

File tree

eng/pipelines/jobs/pack-azure-package-ci-job.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ jobs:
106106
- name: commonArguments
107107
value: >-
108108
--verbosity ${{ parameters.dotnetVerbosity }}
109-
--configfile $(nugetConfigFile)
110109
-p:ReferenceType=${{ parameters.referenceType }}
111110
-p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
112111
@@ -169,7 +168,7 @@ jobs:
169168
command: custom
170169
custom: restore
171170
projects: $(project)
172-
arguments: $(commonArguments)
171+
arguments: $(commonArguments) --configfile $(nugetConfigFile)
173172

174173
# Build the project.
175174
- task: DotNetCoreCLI@2

eng/pipelines/jobs/test-azure-package-ci-job.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ jobs:
147147
- name: commonArguments
148148
value: >-
149149
--verbosity ${{ parameters.dotnetVerbosity }}
150-
--configfile $(nugetConfigFile)
151150
-p:ReferenceType=${{ parameters.referenceType }}
152151
-p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
153152
-p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
@@ -261,7 +260,7 @@ jobs:
261260
command: custom
262261
custom: restore
263262
projects: $(project)
264-
arguments: $(commonArguments)
263+
arguments: $(commonArguments) --configfile $(nugetConfigFile)
265264

266265
# Build the project.
267266
- task: DotNetCoreCLI@2

eng/pipelines/stages/stress-tests-ci-stage.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ stages:
9595
value: >-
9696
--verbosity ${{parameters.dotnetVerbosity}}
9797
--artifacts-path $(dotnetArtifactsDir)
98-
--configfile=$(Build.SourcesDirectory)/NuGet.config.local
9998
-p:MdsPackageVersion=${{parameters.mdsPackageVersion}}
10099
-p:AzurePackageVersion=${{parameters.azurePackageVersion}}
101100
@@ -141,7 +140,7 @@ stages:
141140
mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
142141
solution: $(solution)
143142
testProject: $(testProject)
144-
restoreArguments: $(commonArguments)
143+
restoreArguments: $(commonArguments) --configfile=$(Build.SourcesDirectory)/NuGet.config.local
145144
buildArguments: $(buildArguments)
146145
netTestRuntimes: ${{ parameters.netTestRuntimes }}
147146
configContent: $(ConfigContent)
@@ -161,7 +160,7 @@ stages:
161160
mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
162161
solution: $(solution)
163162
testProject: $(testProject)
164-
restoreArguments: $(commonArguments)
163+
restoreArguments: $(commonArguments) --configfile=$(Build.SourcesDirectory)/NuGet.config.local
165164
buildArguments: $(buildArguments)
166165
netTestRuntimes: ${{ parameters.netTestRuntimes }}
167166
# Note that we include the .NET Framework runtimes for test runs on
@@ -184,7 +183,7 @@ stages:
184183
mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
185184
solution: $(solution)
186185
testProject: $(testProject)
187-
restoreArguments: $(commonArguments)
186+
restoreArguments: $(commonArguments) --configfile=$(Build.SourcesDirectory)/NuGet.config.local
188187
buildArguments: $(buildArguments)
189188
netTestRuntimes: ${{ parameters.netTestRuntimes }}
190189
configContent: $(ConfigContent)

0 commit comments

Comments
 (0)