From b1fbfc5b83780fc8f7740e811b5840464fe1be4a Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Jun 2021 01:19:16 +0200 Subject: [PATCH 1/8] Run libraries package testing on build agent instead of on Helix as with recent changes the entire package testing doesn't take more than 2 minutes. Helix created a work item per package test even though it only took seconds and the average wait time for a client was 10-15min. Also cleaning up how the generated package test projects are restored and incorporating a fix from Eric St John to not hard code the package feeds. --- eng/pipelines/libraries/base-job.yml | 1 - eng/pipelines/runtime.yml | 2 - .../pkg/test/Directory.Build.targets | 4 - .../test/{ => build}/Directory.Build.props | 3 +- .../pkg/test/build/Directory.Build.targets | 4 + src/libraries/pkg/test/build/dirs.proj | 15 ++ .../pkg/test/{ => build}/packageTest.targets | 11 +- .../netcoreapp/settings.targets | 2 - .../netstandard/settings.targets | 2 - .../pkg/test/project.csproj.template | 11 +- src/libraries/pkg/test/test.msbuild | 32 ---- src/libraries/pkg/test/testPackages.proj | 141 +++++------------- src/libraries/sendtohelix.proj | 9 +- src/libraries/sendtohelixhelp.proj | 30 +--- 14 files changed, 65 insertions(+), 202 deletions(-) delete mode 100644 src/libraries/pkg/test/Directory.Build.targets rename src/libraries/pkg/test/{ => build}/Directory.Build.props (58%) create mode 100644 src/libraries/pkg/test/build/Directory.Build.targets create mode 100644 src/libraries/pkg/test/build/dirs.proj rename src/libraries/pkg/test/{ => build}/packageTest.targets (94%) delete mode 100644 src/libraries/pkg/test/test.msbuild diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index bea30446deed64..9c5cff7cc5e81f 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -80,7 +80,6 @@ jobs: - ${{ if eq(parameters.framework, 'allConfigurations') }}: - _finalFrameworkArg: -allConfigurations - _testModeArg: /p:TestAssemblies=false /p:TestPackages=true - - _extraHelixArguments: /p:TestPackages=true - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}: - librariesBuildArtifactName: 'libraries_bin_official_allconfigurations' diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 818fb1360a8863..b3e0df3e8f2526 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -758,11 +758,9 @@ jobs: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - windows_x64 - helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: isFullMatrix: ${{ variables.isFullMatrix }} framework: allConfigurations - runTests: true condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), diff --git a/src/libraries/pkg/test/Directory.Build.targets b/src/libraries/pkg/test/Directory.Build.targets deleted file mode 100644 index 31ce0ecab0ccc0..00000000000000 --- a/src/libraries/pkg/test/Directory.Build.targets +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/libraries/pkg/test/Directory.Build.props b/src/libraries/pkg/test/build/Directory.Build.props similarity index 58% rename from src/libraries/pkg/test/Directory.Build.props rename to src/libraries/pkg/test/build/Directory.Build.props index 5baf3287b2e1e9..1024671d47f70b 100644 --- a/src/libraries/pkg/test/Directory.Build.props +++ b/src/libraries/pkg/test/build/Directory.Build.props @@ -3,5 +3,6 @@ true - + + diff --git a/src/libraries/pkg/test/build/Directory.Build.targets b/src/libraries/pkg/test/build/Directory.Build.targets new file mode 100644 index 00000000000000..c73efb87b0f5a8 --- /dev/null +++ b/src/libraries/pkg/test/build/Directory.Build.targets @@ -0,0 +1,4 @@ + + + + diff --git a/src/libraries/pkg/test/build/dirs.proj b/src/libraries/pkg/test/build/dirs.proj new file mode 100644 index 00000000000000..7417bc0d690655 --- /dev/null +++ b/src/libraries/pkg/test/build/dirs.proj @@ -0,0 +1,15 @@ + + + false + false + true + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/pkg/test/packageTest.targets b/src/libraries/pkg/test/build/packageTest.targets similarity index 94% rename from src/libraries/pkg/test/packageTest.targets rename to src/libraries/pkg/test/build/packageTest.targets index 1ca80d6e15ad1a..28f5cc0240a7c2 100644 --- a/src/libraries/pkg/test/packageTest.targets +++ b/src/libraries/pkg/test/build/packageTest.targets @@ -4,14 +4,6 @@ - - https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json; - https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; - https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json; - https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json; - $(LocalPackagesPath) - - true @@ -38,7 +30,8 @@ - + diff --git a/src/libraries/pkg/test/frameworkSettings/netcoreapp/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcoreapp/settings.targets index f1604d74dae114..7338b1a0a84be1 100644 --- a/src/libraries/pkg/test/frameworkSettings/netcoreapp/settings.targets +++ b/src/libraries/pkg/test/frameworkSettings/netcoreapp/settings.targets @@ -1,6 +1,4 @@ - - true true diff --git a/src/libraries/pkg/test/frameworkSettings/netstandard/settings.targets b/src/libraries/pkg/test/frameworkSettings/netstandard/settings.targets index 4a40cba07e36cd..523094ac931dda 100644 --- a/src/libraries/pkg/test/frameworkSettings/netstandard/settings.targets +++ b/src/libraries/pkg/test/frameworkSettings/netstandard/settings.targets @@ -1,6 +1,4 @@ - - true true diff --git a/src/libraries/pkg/test/project.csproj.template b/src/libraries/pkg/test/project.csproj.template index ef6b193e0cc5a5..b95421da382d93 100644 --- a/src/libraries/pkg/test/project.csproj.template +++ b/src/libraries/pkg/test/project.csproj.template @@ -1,19 +1,15 @@ - - - $(SupportFilesDir)Directory.Build.props - $(SupportFilesDir)Directory.Build.targets - - - + {TargetFrameworks} {PackageId} + {RestoreAdditionalProjectSources} {NetCoreAppCurrentVersion} {NetCoreAppCurrent} {MicrosoftNetCoreAppFrameworkName} + {MicrosoftNetCoreAppRefPackDir} false @@ -24,5 +20,4 @@ - diff --git a/src/libraries/pkg/test/test.msbuild b/src/libraries/pkg/test/test.msbuild deleted file mode 100644 index 6a3c2cd0f9fef7..00000000000000 --- a/src/libraries/pkg/test/test.msbuild +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - $(MSBuildThisFileDirectory)..\projects - <_projectProperties>SupportFilesDir=$(MSBuildThisFileDirectory);MicrosoftNetCoreAppRefPackDir=$(MicrosoftNetCoreAppRefPackDir) - $(MSBuildThisFileDirectory)\packages - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj index 455dfb67508dd9..5ef2887c336adb 100644 --- a/src/libraries/pkg/test/testPackages.proj +++ b/src/libraries/pkg/test/testPackages.proj @@ -1,8 +1,15 @@ - - + + + [a-zA-z\.]*\. + + $(ArtifactsBinDir)testPackages\ + $(TestDir)projects\ + $(TestDir)cache\ + dirs.proj + project.csproj.template @@ -28,44 +35,28 @@ - - $(ArtifactsBinDir)testPkg\ - $(TestDir)support\ - test.msbuild - $(TestSupportDir)$(TestProjectName) - $(TestDir)projects\ - $(ArtifactsBinDir)testPackages - $(DotNetRoot)dotnet - - project.csproj.template - - - - + + - + build\packageTest.targets; + build\Directory.Build.props; + build\Directory.Build.targets" + DestinationFolder="$(TestDir)" /> + DestinationFolder="$(TestDir)%(RecursiveDir)" /> + DestinationFolder="$(TestDir)frameworkSettings\%(RecursiveDir)" /> - - - - - - + DestinationFolder="$(TestDir)packageSettings\%(RecursiveDir)" /> - - @@ -112,94 +101,34 @@ Inputs="@(TestPackagesPath);$(ProjectTemplate)" Outputs="%(SupportedPackage.ProjectFile)"> - <_projectDir>%(SupportedPackage.ProjectDir)/ + <_projectDir>%(SupportedPackage.ProjectDir) <_projectFile>%(SupportedPackage.ProjectFile) <_packageId>%(SupportedPackage.Identity) <_packageVersion>%(SupportedPackage.Version) <_projectTFMs>@(SupportedPackage->'%(TargetFrameworkShort)') + - - - - + - <_localPackages Include="$(ArtifactsShippingPackagesDir)*.nupkg"/> - <_localPackages Include="$(ArtifactsNonShippingPackagesDir)*.nupkg"/> + + + - - - - - - - - - - - - - - - - - "$(TestDotNetPath)" - $(TestRestoreCommand) restore - $(TestRestoreCommand) --packages "$(TestPackageDir)" - $(TestRestoreCommand) /p:LocalPackagesPath=$(ArtifactsPackagesDir) - $(TestRestoreCommand) /p:MicrosoftNetCoreAppRefPackDir=$(MicrosoftNetCoreAppRefPackDir) - $(TestRestoreCommand) /nr:false - $(TestRestoreCommand) /warnaserror - $(TestRestoreCommand) /p:PackagesToTest=$(PackagesToTest) - - - - - - - - - - "$(TestDotNetPath)" - $(TestBuildCommand) msbuild - $(TestBuildCommand) /t:Test - $(TestBuildCommand) /nr:false - $(TestBuildCommand) /warnaserror - $(TestBuildCommand) /p:MicrosoftNetCoreAppRefPackDir=$(MicrosoftNetCoreAppRefPackDir) - $(TestBuildCommand) /p:PackagesToTest=$(PackagesToTest) - - - - - + - - - - - - diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj index 7640d51fedec70..940bb713331e1d 100644 --- a/src/libraries/sendtohelix.proj +++ b/src/libraries/sendtohelix.proj @@ -16,13 +16,11 @@ $(NetCoreAppToolCurrent) - $([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)')) + $([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)')) true - $(TestArchiveRuntimeRoot)test-runtime-$(NetCoreAppCurrentBuildSettings).zip - $(TestArchiveRuntimeRoot)packages-testPayload-$(Configuration).zip + $(TestArchiveRuntimeRoot)test-runtime-$(NetCoreAppCurrentBuildSettings).zip @@ -157,8 +155,7 @@ DependsOnTargets="IncludeDumpDocsInTesthost;_CollectRuntimeInputs" Inputs="@(_RuntimeInput);@(TestArchiveRuntimeDependency)" Outputs="$(TestArchiveRuntimeFile)" - Condition="'$(TestPackages)' != 'true' and - '$(TargetsMobile)' != 'true' and + Condition="'$(TargetsMobile)' != 'true' and '$(TestArchiveRuntimeFile)' != ''"> diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 4c9ca394a9c48a..52906c281f4016 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -53,43 +53,16 @@ true - - - true - true - - packaging- - - innerloop test/functional/cli/$(TestScope)/ - test/functional/packaging/ true - - - - - - - - - - - dotnet msbuild %HELIX_CORRELATION_PAYLOAD%\test.msbuild - $(HelixCommand) /bl:%HELIX_WORKITEM_UPLOAD_ROOT%\%HELIX_WORKITEM_FRIENDLYNAME%.package.test.binlog - $(HelixCommand) /warnaserror - $(HelixCommand) /p:PackageTestProjectsDir=%HELIX_WORKITEM_PAYLOAD% - $(HelixCommand) /p:LocalPackagesPath=%HELIX_CORRELATION_PAYLOAD%\packages\ - $(HelixCommand) /p:MicrosoftNetCoreAppRefPackDir=%HELIX_CORRELATION_PAYLOAD%\targetingpack\ - - @@ -408,7 +381,6 @@ - - + From 0ee945a416cc718e039e9a9b244ca62af50c5e86 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Jun 2021 01:35:50 +0200 Subject: [PATCH 2/8] Remove allconfigurations conditions from helix ymls --- eng/pipelines/libraries/helix-queues-setup.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 7cea78b1a5f3c7..b766f1af96aecb 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -128,7 +128,7 @@ jobs: # windows x64 - ${{ if eq(parameters.platform, 'windows_x64') }}: # netcoreapp - - ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net48') }}: + - ${{ if notIn(parameters.jobParameters.framework, 'net48') }}: - ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}: - Windows.81.Amd64.Open - Windows.10.Amd64.Server19H1.Open @@ -152,14 +152,10 @@ jobs: - ${{ if eq(parameters.jobParameters.framework, 'net48') }}: - Windows.10.Amd64.Client19H1.Open - # AllConfigurations - - ${{ if eq(parameters.jobParameters.framework, 'allConfigurations') }}: - - Windows.10.Amd64.Server19H1.Open - # windows x86 - ${{ if eq(parameters.platform, 'windows_x86') }}: # netcoreapp - - ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net48') }}: + - ${{ if notIn(parameters.jobParameters.framework, 'net48') }}: - ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}: - Windows.7.Amd64.Open - Windows.10.Amd64.ServerRS5.Open From a303aa43e7c4ff5bee18e5d00f2941a8e9de65fa Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Jun 2021 01:53:00 +0200 Subject: [PATCH 3/8] Enable single package testing --- src/libraries/pkg/test/build/Directory.Build.props | 1 + src/libraries/pkg/test/testPackages.proj | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libraries/pkg/test/build/Directory.Build.props b/src/libraries/pkg/test/build/Directory.Build.props index 1024671d47f70b..d26162f97bd955 100644 --- a/src/libraries/pkg/test/build/Directory.Build.props +++ b/src/libraries/pkg/test/build/Directory.Build.props @@ -1,6 +1,7 @@ true + true diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj index 5ef2887c336adb..3d902cccd80f27 100644 --- a/src/libraries/pkg/test/testPackages.proj +++ b/src/libraries/pkg/test/testPackages.proj @@ -73,11 +73,10 @@ - $(TestProjectDir)%(Identity)/ + $(TestProjectDir)%(Identity)\ %(ProjectDir)project.csproj - %(ProjectDir)obj/project.assets.json @@ -120,15 +119,15 @@ DependsOnTargets="GenerateProjects" AfterTargets="Build;Test"> - + + - + From 17ebcbcfa8dfcb8ae4a41edf40a895057ca88189 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Jun 2021 02:02:23 +0200 Subject: [PATCH 4/8] Avoid global properties - cleanup --- src/libraries/pkg/test/build/dirs.proj | 1 + src/libraries/pkg/test/project.csproj.template | 3 +++ src/libraries/pkg/test/testPackages.proj | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libraries/pkg/test/build/dirs.proj b/src/libraries/pkg/test/build/dirs.proj index 7417bc0d690655..ab3b637846a64b 100644 --- a/src/libraries/pkg/test/build/dirs.proj +++ b/src/libraries/pkg/test/build/dirs.proj @@ -3,6 +3,7 @@ false false true + $(MSBuildThisFileDirectory)cache\ diff --git a/src/libraries/pkg/test/project.csproj.template b/src/libraries/pkg/test/project.csproj.template index b95421da382d93..b2c4858b1e1f47 100644 --- a/src/libraries/pkg/test/project.csproj.template +++ b/src/libraries/pkg/test/project.csproj.template @@ -3,6 +3,9 @@ {TargetFrameworks} {PackageId} + + + {RestorePackagesPath} {RestoreAdditionalProjectSources} diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj index 3d902cccd80f27..f23e27fdef3126 100644 --- a/src/libraries/pkg/test/testPackages.proj +++ b/src/libraries/pkg/test/testPackages.proj @@ -111,7 +111,7 @@ @@ -124,7 +124,7 @@ From e5e07f8998e1ebe36d4097a9ac0922ce143bd362 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Jun 2021 10:44:17 +0200 Subject: [PATCH 5/8] Pass down test build action for allconfig --- eng/pipelines/libraries/base-job.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index 9c5cff7cc5e81f..72f869d4f410cf 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -54,6 +54,7 @@ jobs: - _extraHelixArguments: '' - _crossBuildPropertyArg: '' - _testRunNamePrefixSuffix: '' + - _buildAction: '' - librariesBuildArtifactName: ${{ format('libraries_bin_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} @@ -79,6 +80,7 @@ jobs: - ${{ if eq(parameters.framework, 'allConfigurations') }}: - _finalFrameworkArg: -allConfigurations + - _buildAction: -restore -build -test - _testModeArg: /p:TestAssemblies=false /p:TestPackages=true - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}: @@ -111,7 +113,7 @@ jobs: - ${{ if ne(parameters.osGroup, 'windows') }}: - _buildScript: ./$(_buildScriptFileName)$(scriptExt) - - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg) + - _buildArguments: $(_buildAction) $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg) - ${{ parameters.variables }} # we need to override this value to support build-coreclr-and-libraries-job.yml From 9ae73872e24bdce3f23e407d5a867c308754384f Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Jun 2021 11:40:50 +0200 Subject: [PATCH 6/8] Expose useHelix argument --- eng/pipelines/libraries/base-job.yml | 4 +--- eng/pipelines/libraries/build-job.yml | 10 ++++++++-- eng/pipelines/runtime.yml | 2 ++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index 72f869d4f410cf..9c5cff7cc5e81f 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -54,7 +54,6 @@ jobs: - _extraHelixArguments: '' - _crossBuildPropertyArg: '' - _testRunNamePrefixSuffix: '' - - _buildAction: '' - librariesBuildArtifactName: ${{ format('libraries_bin_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} @@ -80,7 +79,6 @@ jobs: - ${{ if eq(parameters.framework, 'allConfigurations') }}: - _finalFrameworkArg: -allConfigurations - - _buildAction: -restore -build -test - _testModeArg: /p:TestAssemblies=false /p:TestPackages=true - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}: @@ -113,7 +111,7 @@ jobs: - ${{ if ne(parameters.osGroup, 'windows') }}: - _buildScript: ./$(_buildScriptFileName)$(scriptExt) - - _buildArguments: $(_buildAction) $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg) + - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_osArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg) - ${{ parameters.variables }} # we need to override this value to support build-coreclr-and-libraries-job.yml diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml index ee0c0fc938f696..11fdde6316dae7 100644 --- a/eng/pipelines/libraries/build-job.yml +++ b/eng/pipelines/libraries/build-job.yml @@ -29,6 +29,7 @@ parameters: variables: {} pool: '' runTests: false + useHelix: true testScope: '' testBuildPlatforms: [] @@ -66,6 +67,7 @@ jobs: variables: - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}_{1}_{2}', parameters.osGroup, parameters.archType, parameters.buildConfig) }} - _subset: libs + - _buildAction: '' - _additionalBuildArguments: '' - ${{ parameters.variables }} @@ -73,7 +75,10 @@ jobs: # If platform is in testBuildPlatforms we build tests as well. - ${{ if or(eq(parameters.runTests, true), containsValue(parameters.testBuildPlatforms, parameters.platform)) }}: - _subset: libs+libs.tests - - _additionalBuildArguments: /p:ArchiveTests=true + - ${{ if eq(parameters.useHelix, false) }}: + - _buildAction: -restore -build -test + - ${{ if eq(parameters.useHelix, true) }}: + - _additionalBuildArguments: /p:ArchiveTests=true - ${{ parameters.variables }} @@ -92,6 +97,7 @@ jobs: - script: $(_buildScript) -subset $(_subset) + $(_buildAction) $(_buildArguments) $(_additionalBuildArguments) displayName: Restore and Build Product @@ -136,7 +142,7 @@ jobs: parameters: name: Libraries_AllConfigurations - - ${{ if eq(parameters.runTests, true) }}: + - ${{ if and(eq(parameters.runTests, true), eq(parameters.useHelix, true)) }}: - template: /eng/pipelines/libraries/helix.yml parameters: osGroup: ${{ parameters.osGroup }} diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index b3e0df3e8f2526..148566ea7a262d 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -761,6 +761,8 @@ jobs: jobParameters: isFullMatrix: ${{ variables.isFullMatrix }} framework: allConfigurations + runTests: true + useHelix: false condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), From 107f9dc2d086dfc24aad3dc978d320f9c29e1ace Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Jun 2021 16:56:59 +0200 Subject: [PATCH 7/8] Fixesssss --- eng/Tools.props | 1 - src/libraries/pkg/Directory.Build.props | 2 +- src/libraries/pkg/test/testPackages.proj | 12 ++++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/eng/Tools.props b/eng/Tools.props index 04f1c9d742510c..1a9804dbaf6925 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -7,7 +7,6 @@ - diff --git a/src/libraries/pkg/Directory.Build.props b/src/libraries/pkg/Directory.Build.props index 1594de11844b8b..f05c02795a6512 100644 --- a/src/libraries/pkg/Directory.Build.props +++ b/src/libraries/pkg/Directory.Build.props @@ -1,6 +1,6 @@ - true + true diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj index f23e27fdef3126..a73d823acf12c2 100644 --- a/src/libraries/pkg/test/testPackages.proj +++ b/src/libraries/pkg/test/testPackages.proj @@ -1,6 +1,12 @@ - + + + + + [a-zA-z\.]*\. @@ -115,7 +121,7 @@ Overwrite="true" /> - @@ -130,4 +136,6 @@ + + From 40111476b324f6ce182d9fc7734991e101ea82de Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Jun 2021 20:20:51 +0200 Subject: [PATCH 8/8] Add missing package --- src/libraries/pkg/test/testPackages.proj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj index a73d823acf12c2..03492c30ee0f97 100644 --- a/src/libraries/pkg/test/testPackages.proj +++ b/src/libraries/pkg/test/testPackages.proj @@ -6,6 +6,8 @@ + +