diff --git a/eng/Tools.props b/eng/Tools.props
index 04f1c9d742510..1a9804dbaf692 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -7,7 +7,6 @@
-
diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml
index bea30446deed6..9c5cff7cc5e81 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/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml
index ee0c0fc938f69..11fdde6316dae 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/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
index 7cea78b1a5f3c..b766f1af96aec 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
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 818fb1360a886..148566ea7a262 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -758,11 +758,11 @@ jobs:
buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
platforms:
- windows_x64
- helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
jobParameters:
isFullMatrix: ${{ variables.isFullMatrix }}
framework: allConfigurations
runTests: true
+ useHelix: false
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
diff --git a/src/libraries/pkg/Directory.Build.props b/src/libraries/pkg/Directory.Build.props
index 1594de11844b8..f05c02795a651 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/Directory.Build.props b/src/libraries/pkg/test/Directory.Build.props
deleted file mode 100644
index 5baf3287b2e1e..0000000000000
--- a/src/libraries/pkg/test/Directory.Build.props
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- true
-
-
-
-
diff --git a/src/libraries/pkg/test/Directory.Build.targets b/src/libraries/pkg/test/Directory.Build.targets
deleted file mode 100644
index 31ce0ecab0ccc..0000000000000
--- a/src/libraries/pkg/test/Directory.Build.targets
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/src/libraries/pkg/test/build/Directory.Build.props b/src/libraries/pkg/test/build/Directory.Build.props
new file mode 100644
index 0000000000000..d26162f97bd95
--- /dev/null
+++ b/src/libraries/pkg/test/build/Directory.Build.props
@@ -0,0 +1,9 @@
+
+
+ true
+ 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 0000000000000..c73efb87b0f5a
--- /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 0000000000000..ab3b637846a64
--- /dev/null
+++ b/src/libraries/pkg/test/build/dirs.proj
@@ -0,0 +1,16 @@
+
+
+ false
+ false
+ true
+ $(MSBuildThisFileDirectory)cache\
+
+
+
+
+
+
+
+
+
+
\ 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 1ca80d6e15ad1..28f5cc0240a7c 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 f1604d74dae11..7338b1a0a84be 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 4a40cba07e36c..523094ac931dd 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 ef6b193e0cc5a..b2c4858b1e1f4 100644
--- a/src/libraries/pkg/test/project.csproj.template
+++ b/src/libraries/pkg/test/project.csproj.template
@@ -1,19 +1,18 @@
-
-
- $(SupportFilesDir)Directory.Build.props
- $(SupportFilesDir)Directory.Build.targets
-
-
-
+
{TargetFrameworks}
{PackageId}
+
+ {RestorePackagesPath}
+ {RestoreAdditionalProjectSources}
+
{NetCoreAppCurrentVersion}
{NetCoreAppCurrent}
{MicrosoftNetCoreAppFrameworkName}
+ {MicrosoftNetCoreAppRefPackDir}
false
@@ -24,5 +23,4 @@
-
diff --git a/src/libraries/pkg/test/test.msbuild b/src/libraries/pkg/test/test.msbuild
deleted file mode 100644
index 6a3c2cd0f9fef..0000000000000
--- 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 455dfb67508dd..03492c30ee0f9 100644
--- a/src/libraries/pkg/test/testPackages.proj
+++ b/src/libraries/pkg/test/testPackages.proj
@@ -1,8 +1,23 @@
-
-
+
+
+
+
+
+
+
+
+
[a-zA-z\.]*\.
+
+ $(ArtifactsBinDir)testPackages\
+ $(TestDir)projects\
+ $(TestDir)cache\
+ dirs.proj
+ project.csproj.template
@@ -28,44 +43,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)" />
-
-
@@ -84,11 +81,10 @@
- $(TestProjectDir)%(Identity)/
+ $(TestProjectDir)%(Identity)\
%(ProjectDir)project.csproj
- %(ProjectDir)obj/project.assets.json
@@ -112,94 +108,36 @@
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 7640d51fedec7..940bb713331e1 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 4c9ca394a9c48..52906c281f401 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 @@
-
-
+