dotnet · ViktorHofer · Jun 9, 2021 · Jun 8, 2021 · Jun 8, 2021 · Jun 8, 2021
diff --git 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
@@ -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
diff --git a/src/libraries/pkg/test/Directory.Build.props → ...ries/pkg/test/build/Directory.Build.props b/src/libraries/pkg/test/Directory.Build.props → ...ries/pkg/test/build/Directory.Build.props
@@ -3,5 +3,6 @@
  <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
  </PropertyGroup>
 
- <Import Project="$(MSBuildThisFileDirectory)Versions.props" />
+ <Import Project="Versions.props" />
+ <Import Project="netfxreference.props" />
 </Project>
diff --git a/src/libraries/pkg/test/build/Directory.Build.targets b/src/libraries/pkg/test/build/Directory.Build.targets
@@ -0,0 +1,4 @@
+<Project>
+ <Import Project="targetingpacks.targets" />
+ <Import Project="packageTest.targets" />
+</Project>
diff --git a/src/libraries/pkg/test/build/dirs.proj b/src/libraries/pkg/test/build/dirs.proj
@@ -0,0 +1,15 @@
+<Project>
+ <PropertyGroup>
+ <ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
+ <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
+ <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
+ </PropertyGroup>
+
+ <Import Project="Sdk.props" Sdk="Microsoft.Build.Traversal" />
+
+ <ItemGroup>
+ <ProjectReference Include="projects\**\*.csproj" />
+ </ItemGroup>
+
+ <Import Project="Sdk.targets" Sdk="Microsoft.Build.Traversal" />
+</Project>
diff --git a/src/libraries/pkg/test/packageTest.targets → ...raries/pkg/test/build/packageTest.targets b/src/libraries/pkg/test/packageTest.targets → ...raries/pkg/test/build/packageTest.targets
@@ -4,14 +4,6 @@
  </PropertyGroup>
 
  <PropertyGroup>
- <RestoreSources>
- 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)
- </RestoreSources>
-
  <!-- Make sure the SDK raises the runtime items so that they are passed to conflict resolution -->
  <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
  <!-- Suppress any SYSLIB9000 errors, as in these cases restore/build would succeed, the failure would be at run-time -->
@@ -38,7 +30,8 @@
  </ItemGroup>
 
 
- <Target Name="LogBeginTest">
+ <Target Name="LogBeginTest"
+ Condition="'$(TargetFramework)' != ''">
  <Message Importance="High" Text="Testing $(TestPackageID) TFM=$(TargetFramework)" />
  </Target>
 

diff --git a/src/libraries/pkg/test/frameworkSettings/netcoreapp/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcoreapp/settings.targets
@@ -1,6 +1,4 @@
 <Project>
- <Import Project="$(SupportFilesDir)netfxreference.props" />
-
  <PropertyGroup>
  <ShouldVerifyClosure>true</ShouldVerifyClosure>
  <ShouldVerifyTypes>true</ShouldVerifyTypes>

diff --git a/src/libraries/pkg/test/frameworkSettings/netstandard/settings.targets b/src/libraries/pkg/test/frameworkSettings/netstandard/settings.targets
@@ -1,6 +1,4 @@
 <Project>
- <Import Project="$(SupportFilesDir)netfxreference.props" />
-
  <PropertyGroup>
  <ShouldVerifyClosure>true</ShouldVerifyClosure>
  <ShouldVerifyTypes>true</ShouldVerifyTypes>

diff --git a/src/libraries/pkg/test/project.csproj.template b/src/libraries/pkg/test/project.csproj.template
@@ -1,19 +1,15 @@
-<Project>
- <PropertyGroup>
- <DirectoryBuildPropsPath>$(SupportFilesDir)Directory.Build.props</DirectoryBuildPropsPath>
- <DirectoryBuildTargetsPath>$(SupportFilesDir)Directory.Build.targets</DirectoryBuildTargetsPath>
- </PropertyGroup>
-
- <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
  <TargetFrameworks>{TargetFrameworks}</TargetFrameworks>
  <TestPackageId>{PackageId}</TestPackageId>
+ <RestoreAdditionalProjectSources>{RestoreAdditionalProjectSources}</RestoreAdditionalProjectSources>
 
  <!-- Used in targetingpacks.targets -->
  <NetCoreAppCurrentVersion>{NetCoreAppCurrentVersion}</NetCoreAppCurrentVersion>
  <NetCoreAppCurrent>{NetCoreAppCurrent}</NetCoreAppCurrent>
  <MicrosoftNetCoreAppFrameworkName>{MicrosoftNetCoreAppFrameworkName}</MicrosoftNetCoreAppFrameworkName>
+ <MicrosoftNetCoreAppRefPackDir>{MicrosoftNetCoreAppRefPackDir}</MicrosoftNetCoreAppRefPackDir>
 
  <!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
  <CheckEolTargetFramework>false</CheckEolTargetFramework>
@@ -24,5 +20,4 @@
  <PackageReference Include="{PackageId}" Version="{PackageVersion}" />
  </ItemGroup>
 
- <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/src/libraries/pkg/test/test.msbuild b/src/libraries/pkg/test/test.msbuild
diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj
@@ -1,8 +1,15 @@
-<Project DefaultTargets="Build">
- <Import Project="..\Directory.Build.props" />
+<Project Sdk="Microsoft.Build.NoTargets">
+
+ <UsingTask TaskName="GetCompatiblePackageTargetFrameworks" AssemblyFile="$(DotNetPackageTestingAssembly)"/>
 
  <PropertyGroup>
  <PackageNamePattern>[a-zA-z\.]*\.</PackageNamePattern>
+
+ <TestDir>$(ArtifactsBinDir)testPackages\</TestDir>
+ <TestProjectDir>$(TestDir)projects\</TestProjectDir>
+ <TestPackageDir>$(TestDir)cache\</TestPackageDir>
+ <TestProjectName>dirs.proj</TestProjectName>
+ <ProjectTemplate>project.csproj.template</ProjectTemplate>
  </PropertyGroup>
 
  <ItemGroup>
@@ -28,44 +35,28 @@
  <TargetFrameworksToExclude Include="netcoreapp2.2" />
  </ItemGroup>
 
- <PropertyGroup>
- <TestDir>$(ArtifactsBinDir)testPkg\</TestDir>
- <TestSupportDir>$(TestDir)support\</TestSupportDir>
- <TestProjectName>test.msbuild</TestProjectName>
- <TestProject>$(TestSupportDir)$(TestProjectName)</TestProject>
- <TestProjectDir>$(TestDir)projects\</TestProjectDir>
- <TestPackageDir>$(ArtifactsBinDir)testPackages</TestPackageDir>
- <TestDotNetPath>$(DotNetRoot)dotnet</TestDotNetPath>
-
- <ProjectTemplate>project.csproj.template</ProjectTemplate>
- </PropertyGroup>
-
  <ItemGroup>
- <!-- The main entry point file: test.msbuild -->
- <TestSupportFile Include="$(TestProjectName)"
- DestinationFolder="$(TestSupportDir)" />
+ <!-- The main entry point file. -->
+ <TestSupportFile Include="build\$(TestProjectName)"
+ DestinationFolder="$(TestDir)" />
  <!-- msbuild support files and the packaging VerifyClosure assembly. -->
- <TestSupportFile Include="$(RepositoryEngineeringDir)Versions.props;
+ <TestSupportFile Include="$(RepoRoot)global.json;
+ $(RepoRoot)NuGet.config;
+ $(RepositoryEngineeringDir)Versions.props;
  $(RepositoryEngineeringDir)targetingpacks.targets;
  $(LibrariesProjectRoot)shims\netfxreference.props;
- packageTest.targets;
- Directory.Build.props;
- Directory.Build.targets"
- DestinationFolder="$(TestSupportDir)" />
+ build\packageTest.targets;
+ build\Directory.Build.props;
+ build\Directory.Build.targets"
+ DestinationFolder="$(TestDir)" />
  <TestSupportFile Include="$(PackagingTaskDir)..\..\**\*.*"
  Exclude="$(PackagingTaskDir)..\..\*.*"
- DestinationFolder="$(TestSupportDir)%(RecursiveDir)" />
+ DestinationFolder="$(TestDir)%(RecursiveDir)" />
  <!-- frameworksettings and packagesettings -->
  <TestSupportFile Include="frameworkSettings\**\*"
- DestinationFolder="$(TestSupportDir)frameworkSettings\%(RecursiveDir)" />
+ DestinationFolder="$(TestDir)frameworkSettings\%(RecursiveDir)" />
  <TestSupportFile Include="packageSettings\**\*"
- DestinationFolder="$(TestSupportDir)packageSettings\%(RecursiveDir)" />
- </ItemGroup>
-
- <ItemGroup>
- <CliEnvironment Include="DOTNET_CLI_TELEMETRY_OPTOUT=1" />
- <CliEnvironment Include="DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1" />
- <CliEnvironment Include="DOTNET_MULTILEVEL_LOOKUP=0" />
+ DestinationFolder="$(TestDir)packageSettings\%(RecursiveDir)" />
  </ItemGroup>
 
  <Target Name="CreateTestDir"
@@ -75,8 +66,6 @@
  <Copy SourceFiles="@(TestSupportFile)" DestinationFolder="%(TestSupportFile.DestinationFolder)" />
  </Target>
 
- <UsingTask TaskName="GetCompatiblePackageTargetFrameworks" AssemblyFile="$(DotNetPackageTestingAssembly)"/>
-
  <Target Name="GetSupportedPackages">
  <GetCompatiblePackageTargetFrameworks PackagePaths="@(TestPackagesPath)">
  <Output TaskParameter="TestProjects" ItemName="SupportedPackage" />
@@ -112,94 +101,34 @@
  Inputs="@(TestPackagesPath);$(ProjectTemplate)"
  Outputs="%(SupportedPackage.ProjectFile)">
  <PropertyGroup>
- <_projectDir>%(SupportedPackage.ProjectDir)/</_projectDir>
+ <_projectDir>%(SupportedPackage.ProjectDir)</_projectDir>
  <_projectFile>%(SupportedPackage.ProjectFile)</_projectFile>
  <_packageId>%(SupportedPackage.Identity)</_packageId>
  <_packageVersion>%(SupportedPackage.Version)</_packageVersion>
  <_projectTFMs>@(SupportedPackage->'%(TargetFrameworkShort)')</_projectTFMs>
  </PropertyGroup>
 
+ <!-- Generate project.csproj from template. -->
  <MakeDir Directories="$(_projectDir)" />
- <!-- Update project.csproj template -->
  <WriteLinesToFile
  File="$(_projectFile)"
- Lines="$([System.IO.File]::ReadAllText('$(ProjectTemplate)').Replace('{PackageId}', $(_packageId)).Replace('{PackageVersion}', $(_packageVersion)).Replace('{TargetFrameworks}', $(_projectTFMs)).Replace('{NetCoreAppCurrent}', $(NetCoreAppCurrent)).Replace('{NetCoreAppCurrentVersion}', $(NetCoreAppCurrentVersion)).Replace('{MicrosoftNetCoreAppFrameworkName}', $(MicrosoftNetCoreAppFrameworkName)))"
+ Lines="$([System.IO.File]::ReadAllText('$(ProjectTemplate)').Replace('{PackageId}', $(_packageId)).Replace('{PackageVersion}', $(_packageVersion)).Replace('{TargetFrameworks}', $(_projectTFMs)).Replace('{NetCoreAppCurrent}', $(NetCoreAppCurrent)).Replace('{NetCoreAppCurrentVersion}', $(NetCoreAppCurrentVersion)).Replace('{MicrosoftNetCoreAppFrameworkName}', $(MicrosoftNetCoreAppFrameworkName)).Replace('{MicrosoftNetCoreAppRefPackDir}', $(MicrosoftNetCoreAppRefPackDir)).Replace('{RestoreAdditionalProjectSources}', $(ArtifactsPackagesDir)))"
  Overwrite="true" />
- <Message Text="Generated $(_projectFile)" />
  </Target>
 
- <Target Name="CopyProducedPackages">
- <!-- Copy over package local cache to our helix runtime path -->
+ <Target Name="GenerateAndInvokeProjects"
+ DependsOnTargets="GenerateProjects"
+ AfterTargets="Build;Test">
  <ItemGroup>
- <_localPackages Include="$(ArtifactsShippingPackagesDir)*.nupkg"/>
- <_localPackages Include="$(ArtifactsNonShippingPackagesDir)*.nupkg"/>
+ <TestProject Include="$(TestDir)$(TestProjectName)" />
  </ItemGroup>
+
+ <MSBuild Projects="@(TestProject)"
+ Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid());RestorePackagesPath=$(TestPackageDir)"
+ Targets="Restore" />
 
- <Copy SourceFiles="@(_localPackages)"
- UseHardlinksIfPossible="true"
- DestinationFolder="$(TestSupportDir)packages" />
- </Target>
-
- <Target Name="ArchiveHelixItems"
- DependsOnTargets="GenerateProjects;CopyProducedPackages"
- Condition="'$(ArchiveTests)' == 'true'">
-
- <MakeDir Directories="$(TestArchiveTestsRoot)" />
- <ZipDirectory
- SourceDirectory="$(TestProjectDir)%(SupportedPackage.Identity)"
- DestinationFile="$(TestArchiveTestsRoot)%(SupportedPackage.Identity).zip"
- Overwrite="true" />
-
- <MakeDir Directories="$(TestArchiveRuntimeRoot)" />
- <ZipDirectory
- SourceDirectory="$(TestSupportDir)"
- DestinationFile="$(TestArchiveRuntimeRoot)packages-testPayload-$(Configuration).zip"
- Overwrite="true" />
-
- </Target>
-
- <Target Name="RestoreProjects"
- DependsOnTargets="GenerateProjects"
- Condition="'$(ArchiveTests)' != 'true'">
-
- <PropertyGroup>
- <TestRestoreCommand>"$(TestDotNetPath)"</TestRestoreCommand>
- <TestRestoreCommand>$(TestRestoreCommand) restore</TestRestoreCommand>
- <TestRestoreCommand>$(TestRestoreCommand) --packages "$(TestPackageDir)"</TestRestoreCommand>
- <TestRestoreCommand>$(TestRestoreCommand) /p:LocalPackagesPath=$(ArtifactsPackagesDir)</TestRestoreCommand>
- <TestRestoreCommand>$(TestRestoreCommand) /p:MicrosoftNetCoreAppRefPackDir=$(MicrosoftNetCoreAppRefPackDir)</TestRestoreCommand>
- <TestRestoreCommand>$(TestRestoreCommand) /nr:false</TestRestoreCommand>
- <TestRestoreCommand>$(TestRestoreCommand) /warnaserror</TestRestoreCommand>
- <TestRestoreCommand Condition="'$(PackagesToTest)' != ''">$(TestRestoreCommand) /p:PackagesToTest=$(PackagesToTest)</TestRestoreCommand>
- </PropertyGroup>
-
- <Message Importance="High" Text="*** Restoring ***" />
- <Exec Command="$(TestRestoreCommand) &quot;$(TestProject)&quot;" EnvironmentVariables="@(CliEnvironment)" StandardOutputImportance="High" />
- </Target>
-
- <Target Name="BuildProjects"
- DependsOnTargets="RestoreProjects"
- Condition="'$(ArchiveTests)' != 'true'">
-
- <PropertyGroup>
- <TestBuildCommand>"$(TestDotNetPath)"</TestBuildCommand>
- <TestBuildCommand>$(TestBuildCommand) msbuild</TestBuildCommand>
- <TestBuildCommand>$(TestBuildCommand) /t:Test</TestBuildCommand>
- <TestBuildCommand>$(TestBuildCommand) /nr:false</TestBuildCommand>
- <TestBuildCommand>$(TestBuildCommand) /warnaserror</TestBuildCommand>
- <TestBuildCommand>$(TestBuildCommand) /p:MicrosoftNetCoreAppRefPackDir=$(MicrosoftNetCoreAppRefPackDir)</TestBuildCommand>
- <TestBuildCommand Condition="'$(PackagesToTest)' != ''">$(TestBuildCommand) /p:PackagesToTest=$(PackagesToTest)</TestBuildCommand>
- </PropertyGroup>
-
- <Message Importance="High" Text="*** Testing *** %(SupportedPackage.Identity)" />
- <Message Importance="High" Text="$(TestBuildCommand) &quot;$(TestProject)&quot;" />
- <Exec Command="$(TestBuildCommand) &quot;$(TestProject)&quot;" EnvironmentVariables="@(CliEnvironment)" StandardOutputImportance="High" />
+ <MSBuild Projects="@(TestProject)"
+ Targets="Test" />
  </Target>
 
- <Target Name="Build" DependsOnTargets="BuildProjects;ArchiveHelixItems" />
-
- <!-- define test to do nothing, for this project Build does all the testing -->
- <Target Name="Test" />
-
- <Import Project="..\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj
@@ -16,13 +16,11 @@
 
  <PropertyGroup>
  <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
- <BuildTargetFramework Condition="'$(TestPackages)' != 'true'">$([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)'))</BuildTargetFramework>
+ <BuildTargetFramework>$([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)'))</BuildTargetFramework>
  <TargetsWindows Condition="'$(TargetOS)' == 'windows'">true</TargetsWindows>
 
  <!-- The Helix correlation payload file -->
- <TestArchiveRuntimeFile Condition="'$(TestPackages)' != 'true' and
- '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'">$(TestArchiveRuntimeRoot)test-runtime-$(NetCoreAppCurrentBuildSettings).zip</TestArchiveRuntimeFile>
- <TestArchiveRuntimeFile Condition="'$(TestPackages)' == 'true'">$(TestArchiveRuntimeRoot)packages-testPayload-$(Configuration).zip</TestArchiveRuntimeFile>
+ <TestArchiveRuntimeFile Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'">$(TestArchiveRuntimeRoot)test-runtime-$(NetCoreAppCurrentBuildSettings).zip</TestArchiveRuntimeFile>
 
  <!-- Set the name of the scenario file. Note that this is only used in invocations where $(Scenario) is set
  (which is when this project is invoked to call the "CreateOneScenarioTestEnvFile" target). -->
@@ -157,8 +155,7 @@
  DependsOnTargets="IncludeDumpDocsInTesthost;_CollectRuntimeInputs"
  Inputs="@(_RuntimeInput);@(TestArchiveRuntimeDependency)"
  Outputs="$(TestArchiveRuntimeFile)"
- Condition="'$(TestPackages)' != 'true' and
- '$(TargetsMobile)' != 'true' and
+ Condition="'$(TargetsMobile)' != 'true' and
  '$(TestArchiveRuntimeFile)' != ''">
 
  <!-- Compress the test files, testhost, and per-scenario scripts into a single ZIP file for sending to the Helix machines. -->