mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge in 'release/8.0.1xx' changes

Browse source
This commit is contained in:
dotnet-bot 2024-04-04 16:49:43 +00:00
commit de85172fc4
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
eng/pipelines/source-build-license-scan.yml → src/SourceBuild/content/eng/pipelines/source-build-license-scan.yml
View file

0
eng/pipelines/source-build-sdk-diff-tests.yml → src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml
View file

7
eng/pipelines/templates/jobs/sdk-diff-tests.yml → src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml
View file

@ -100,7 +100,7 @@ jobs:
exit 1 exit 1
fi fi
eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore
echo "##vso[task.setvariable variable=Platform]$platform" echo "##vso[task.setvariable variable=Platform]$platform"
echo "##vso[task.setvariable variable=MsftSdkTarballPath]$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name" echo "##vso[task.setvariable variable=MsftSdkTarballPath]$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name"
@ -110,7 +110,7 @@ jobs:
- script: > - script: >
.dotnet/dotnet test .dotnet/dotnet test
$(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
--filter "Category=SdkContent" --filter "Category=SdkContent"
--logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx' --logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx'
--logger:'console;verbosity=detailed' --logger:'console;verbosity=detailed'
@ -137,7 +137,6 @@ jobs:
find artifacts/ -type f -name "BuildTests*.binlog" -exec cp {} --parents -t ${targetFolder} \; find artifacts/ -type f -name "BuildTests*.binlog" -exec cp {} --parents -t ${targetFolder} \;
find artifacts/ -type f -name "BuildTests*.log" -exec cp {} --parents -t ${targetFolder} \; find artifacts/ -type f -name "BuildTests*.log" -exec cp {} --parents -t ${targetFolder} \;
find artifacts/ -type f -name "Build.binlog" -exec cp {} --parents -t ${targetFolder} \; find artifacts/ -type f -name "Build.binlog" -exec cp {} --parents -t ${targetFolder} \;
cd "$(Build.SourcesDirectory)/src/SourceBuild/content"
find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \;
find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \; find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \;
find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \; find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \;
@ -158,7 +157,7 @@ jobs:
inputs: inputs:
testRunner: vSTest testRunner: vSTest
testResultsFiles: '*.trx' testResultsFiles: '*.trx'
searchFolder: $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults searchFolder: $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults
mergeTestResults: true mergeTestResults: true
publishRunAttachments: true publishRunAttachments: true
testRunTitle: $(Agent.JobName) testRunTitle: $(Agent.JobName)

0
eng/pipelines/templates/variables/pipelines.yml → src/SourceBuild/content/eng/pipelines/templates/variables/pipelines.yml
View file