Skip to content

Commit bc8518f

Browse files
authored
[automated] Merge branch 'release/8.0.2xx' => 'release/8.0.3xx' (#19296)
2 parents 6468fa6 + 48804f6 commit bc8518f

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

eng/pipelines/templates/jobs/sdk-diff-tests.yml src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
3535
echo "Dotnet-dotnet build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results"
3636
37-
installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --output tsv | sed "s,installer ,,g")
37+
installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --query "[?contains(@, 'installer')]" --output tsv | sed "s,installer ,,g")
3838
installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv)
3939
if [[ -z "$installer_build" ]]; then
4040
echo "Could not find a build of installer for commit '$installer_sha'"
@@ -100,7 +100,7 @@ jobs:
100100
exit 1
101101
fi
102102
103-
eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore
103+
eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore
104104
105105
echo "##vso[task.setvariable variable=Platform]$platform"
106106
echo "##vso[task.setvariable variable=MsftSdkTarballPath]$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name"
@@ -110,7 +110,7 @@ jobs:
110110
111111
- script: >
112112
.dotnet/dotnet test
113-
$(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
113+
$(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
114114
--filter "Category=SdkContent"
115115
--logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx'
116116
--logger:'console;verbosity=detailed'
@@ -137,7 +137,6 @@ jobs:
137137
find artifacts/ -type f -name "BuildTests*.binlog" -exec cp {} --parents -t ${targetFolder} \;
138138
find artifacts/ -type f -name "BuildTests*.log" -exec cp {} --parents -t ${targetFolder} \;
139139
find artifacts/ -type f -name "Build.binlog" -exec cp {} --parents -t ${targetFolder} \;
140-
cd "$(Build.SourcesDirectory)/src/SourceBuild/content"
141140
find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \;
142141
find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \;
143142
find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \;
@@ -158,7 +157,7 @@ jobs:
158157
inputs:
159158
testRunner: vSTest
160159
testResultsFiles: '*.trx'
161-
searchFolder: $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults
160+
searchFolder: $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults
162161
mergeTestResults: true
163162
publishRunAttachments: true
164163
testRunTitle: $(Agent.JobName)

0 commit comments

Comments
 (0)