Skip to content

React to Verify* task PackageTesting change #56694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ViktorHofer merged 4 commits into from
Aug 2, 2021
Merged

React to Verify* task PackageTesting change #56694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6344ab4
React to Verify* task PackageTesting change
ViktorHofer Aug 1, 2021
cc3ed62
Update Versions.props
ViktorHofer Aug 2, 2021
7a4da4c
Update Version.Details.xml
ViktorHofer Aug 2, 2021
5442818
Merge branch 'main' into PreparePackageTestingChangesInRuntime
ViktorHofer Aug 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>ccb49ae05b6d98b29871a1779408d4579e16d6e5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21373.11">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21402.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c6a28c81f96d196338b3ea520bc1e6dc7c440ee2</Sha>
</Dependency>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21373.11</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21373.11</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21373.11</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21373.11</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21402.1</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
12 changes: 6 additions & 6 deletions src/libraries/pkg/test/build/packageTest.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<Project>
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' != ''">
<_targetFrameworkIdentifier>$(TargetFrameworkIdentifier.Substring(1).ToLower())</_targetFrameworkIdentifier>
</PropertyGroup>

<PropertyGroup>
<_targetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' != ''">$(TargetFrameworkIdentifier.Substring(1).ToLower())</_targetFrameworkIdentifier>
<!-- 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 -->
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
</PropertyGroup>

<Import Project="build\Packaging.common.targets" />
<ItemGroup>
<!-- Required for VerifyClosure and VerifyTypes tasks. -->
<PackageReference Include="Microsoft.DotNet.PackageTesting" Version="$(MicrosoftDotNetPackageTestingVersion)" />
</ItemGroup>

<!-- Import framework settings. -->
<Import Project="frameworkSettings\$(_targetFrameworkIdentifier)\*.targets"
Condition="'$(_targetFrameworkIdentifier)' != ''" />
Expand All @@ -28,7 +29,6 @@
<!-- Type duplicated: https://github.com/dotnet/runtime/issues/34420 -->
<IgnoredTypes Include="System.Collections.Generic.CollectionExtensions" />
</ItemGroup>


<Target Name="LogBeginTest"
Condition="'$(TargetFramework)' != ''">
Expand Down
5 changes: 0 additions & 5 deletions src/libraries/pkg/test/frameworkSettings/netcore50/settings.targets
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ...aries/pkg/test/packageSettings/Microsoft.NETCore.Platforms/netcoreapp2.2/settings.targets
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/libraries/pkg/test/project.csproj.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
<MicrosoftNetCoreAppFrameworkName>{MicrosoftNetCoreAppFrameworkName}</MicrosoftNetCoreAppFrameworkName>
<MicrosoftNetCoreAppRefPackDir>{MicrosoftNetCoreAppRefPackDir}</MicrosoftNetCoreAppRefPackDir>

<!-- Turn off end of life target framework checks as we intentionally build older .NETCoreApp configurations. -->
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<NETCoreAppMaximumVersion>$(NetCoreAppCurrentVersion)</NETCoreAppMaximumVersion>
</PropertyGroup>

Expand Down
25 changes: 9 additions & 16 deletions src/libraries/pkg/test/testPackages.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
<Project Sdk="Microsoft.Build.NoTargets">

<UsingTask TaskName="GetCompatiblePackageTargetFrameworks"
AssemblyFile="$(DotNetPackageTestingAssembly)"
Condition="'$(DotNetPackageTestingAssembly)' != ''" />

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.PackageTesting" Version="$(MicrosoftDotNetPackageTestingVersion)" />
<!-- Needed by packageTest.targets, could be moved into PackageTesting: https://github.com/dotnet/arcade/issues/7474. -->
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" />
</ItemGroup>

<PropertyGroup>
Expand Down Expand Up @@ -38,11 +32,6 @@
<ExcludePackages Condition="'$(PackagesToTest)' != ''" Include="@(AllPackages)" Exclude="@(PackagesToTest)" />
<TestPackages Include="@(AllPackages)" Exclude="@(ExcludePackages)" />
<TestPackagesPath Include="@(TestPackages->'%(PackagePath)')" />

<!-- no targeting pack was ever shipped for net463 -->
<TargetFrameworksToExclude Include="net463" />
<TargetFrameworksToExclude Include="net47" />
<TargetFrameworksToExclude Include="netcoreapp2.2" />
</ItemGroup>

<ItemGroup>
Expand All @@ -59,9 +48,6 @@
build\Directory.Build.props;
build\Directory.Build.targets"
DestinationFolder="$(TestDir)" />
<TestSupportFile Include="$(PackagingTaskDir)..\..\**\*.*"
Exclude="$(PackagingTaskDir)..\..\*.*"
DestinationFolder="$(TestDir)%(RecursiveDir)" />
<!-- frameworksettings and packagesettings -->
<TestSupportFile Include="frameworkSettings\**\*"
DestinationFolder="$(TestDir)frameworkSettings\%(RecursiveDir)" />
Expand All @@ -77,7 +63,14 @@
</Target>

<Target Name="GetSupportedPackages">
<GetCompatiblePackageTargetFrameworks PackagePaths="@(TestPackagesPath)" SupportedTestFrameworks="@(SupportedTestFramework)">
<!-- Adding NetCoreAppCurrent to the supported test frameworks list to avoid a test gap when
the repository retargets NetCoreAppCurrent to the next major version. -->
<ItemGroup>
<SupportedTestFramework Include="$(NetCoreAppCurrent)" />
</ItemGroup>

<GetCompatiblePackageTargetFrameworks PackagePaths="@(TestPackagesPath)"
SupportedTestFrameworks="@(SupportedTestFramework)">
<Output TaskParameter="TestProjects" ItemName="SupportedPackage" />
</GetCompatiblePackageTargetFrameworks>

Expand All @@ -98,7 +91,7 @@
</_supportedPackageByTargetFramework>

<_supportedPackageByTargetFrameworkToRemove Include="@(_supportedPackageByTargetFramework)" Exclude="@(TargetFrameworksToInclude)" Condition="'@(TargetFrameworksToInclude)' != ''" />
<_filteredSupportedPackageByTargetFramework Include="@(_supportedPackageByTargetFramework)" Exclude="@(TargetFrameworksToExclude);@(_supportedPackageByTargetFrameworkToRemove)" />
<_filteredSupportedPackageByTargetFramework Include="@(_supportedPackageByTargetFramework)" Exclude="@(_supportedPackageByTargetFrameworkToRemove)" />

<SupportedPackage Remove="@(SupportedPackage)" />
<SupportedPackage Include="@(_filteredSupportedPackageByTargetFramework->'%(Original)')" />
Expand Down