Skip to content
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

Change Object mode for package testing & remove older frameworks & rids #7510

Merged
merged 6 commits into from
Jun 14, 2021
Merged

Change Object mode for package testing & remove older frameworks & rids #7510

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
48a548d
use nuget package model and remove old frameworks and rids
Anipik Jun 10, 2021
7e678e9
some more formatting
Anipik Jun 10, 2021
7334b2a
fix netcoreapp tests
Anipik Jun 11, 2021
c1f3903
automatic calculate the min supported dotnet version, add input for a…
Anipik Jun 11, 2021
9fefdaf
add default supported test frameworks item
Anipik Jun 14, 2021
5d0e893
breaking and grouping SupportedTestFramework
Anipik Jun 14, 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
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.PackageTesting/GetCompatiblePackageTargetFrameworks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class GetCompatiblePackageTargetFrameworks : BuildTask
public string[] PackagePaths { get; set; }

[Required]
public string SupportedFrameworks { get; set; }
public string SupportedTestFrameworks { get; set; }

[Output]
public ITaskItem[] TestProjects { get; set; }
Expand All @@ -31,7 +31,7 @@ public override bool Execute()
List<ITaskItem> testProjects = new List<ITaskItem>();
try
{
Initialize(SupportedFrameworks);
Initialize(SupportedTestFrameworks);
string minDotnetTargetFramework = allTargetFrameworks.Where(t => t.Framework == ".NETCoreApp").OrderBy(t => t.Version).FirstOrDefault()?.GetShortFolderName();

foreach (var packagePath in PackagePaths)
Expand Down
4 changes: 4 additions & 0 deletions src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@
<DotNetPackageTestingAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.PackageTesting.dll</DotNetPackageTestingAssembly>
<DotNetPackageTestingAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\Microsoft.DotNet.PackageTesting.dll</DotNetPackageTestingAssembly>
</PropertyGroup>

<ItemGroup>
<SupportedTestFramework Include="netcoreapp3.1;net5.0;net6.0;net461;net462;net471;net472;net48;netstandard2.0;netstandard2.1" />
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SupportedTargetFramework is currently set by the sdk and it contains all the frameworks so i defined it as SupportedTestFramework

Anipik marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe you are missing test coverage in the test assembly as when I tried to add net6.0 last time, the NuGet Parse mechanism blew up. Can you please add a test that passes these items in?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the tests contains

https://github.com/dotnet/arcade/pull/7510/files#diff-8146571ca49951a4551bb5598cead7b8edde7163a3282710165078471ccbd754R14

and tested with runtime repo as well.

</ItemGroup>
</Project>