34
34
35
35
echo "Dotnet-dotnet build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results"
36
36
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")
38
38
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)
39
39
if [[ -z "$installer_build" ]]; then
40
40
echo "Could not find a build of installer for commit '$installer_sha'"
@@ -100,7 +100,7 @@ jobs:
100
100
exit 1
101
101
fi
102
102
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
104
104
105
105
echo "##vso[task.setvariable variable=Platform]$platform"
106
106
echo "##vso[task.setvariable variable=MsftSdkTarballPath]$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name"
@@ -110,7 +110,7 @@ jobs:
110
110
111
111
- script : >
112
112
.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
114
114
--filter "Category=SdkContent"
115
115
--logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx'
116
116
--logger:'console;verbosity=detailed'
@@ -137,7 +137,6 @@ jobs:
137
137
find artifacts/ -type f -name "BuildTests*.binlog" -exec cp {} --parents -t ${targetFolder} \;
138
138
find artifacts/ -type f -name "BuildTests*.log" -exec cp {} --parents -t ${targetFolder} \;
139
139
find artifacts/ -type f -name "Build.binlog" -exec cp {} --parents -t ${targetFolder} \;
140
- cd "$(Build.SourcesDirectory)/src/SourceBuild/content"
141
140
find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \;
142
141
find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \;
143
142
find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \;
@@ -158,7 +157,7 @@ jobs:
158
157
inputs :
159
158
testRunner : vSTest
160
159
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
162
161
mergeTestResults : true
163
162
publishRunAttachments : true
164
163
testRunTitle : $(Agent.JobName)
0 commit comments