Skip to content

Commit 89db992

Browse files
committed
Move away from nuspec for MSTest metapackage
1 parent f524234 commit 89db992

File tree

3 files changed

+12
-135
lines changed

3 files changed

+12
-135
lines changed

src/Package/MSTest/MSTest.NonWindows.nuspec

-52
This file was deleted.

src/Package/MSTest/MSTest.csproj

+12-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
5-
</PropertyGroup>
4+
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks);$(UwpMinimum);$(WinUiMinimum)</TargetFrameworks>
5+
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">$(SupportedNetFrameworks);netstandard2.0</TargetFrameworks>
66

7-
<PropertyGroup>
87
<IsPackable>true</IsPackable>
9-
<NuspecFile Condition=" '$(OS)' == 'Windows_NT' ">MSTest.nuspec</NuspecFile>
10-
<NuspecFile Condition=" '$(OS)' != 'Windows_NT' ">MSTest.NonWindows.nuspec</NuspecFile>
11-
<NuspecBasePath>$(OutputPath)</NuspecBasePath>
128
<PackageId>MSTest</PackageId>
139
<PackageTags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</PackageTags>
10+
<PackageReadmeFile>PACKAGE.md</PackageReadmeFile>
1411
<PackageDescription>
1512
MSTest is Microsoft supported Test Framework.
1613

@@ -23,19 +20,21 @@
2320
- .NET 6.0 Windows.18362+
2421
- UWP 10.0.16299
2522
</PackageDescription>
26-
<!-- Nothing in lib but that's expected -->
27-
<NoWarn>$(NoWarn);NU5128</NoWarn>
2823
</PropertyGroup>
2924

30-
<ItemGroup Label="NuGet">
31-
<NuspecProperty Include="TestPlatformVersion=$(MicrosoftNETTestSdkVersion)" />
32-
<NuspecProperty Include="RepoRoot=$(RepoRoot)" />
25+
<ItemGroup>
26+
<ProjectReference Include="..\..\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
27+
<ProjectReference Include="..\..\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
28+
<ProjectReference Include="..\..\Analyzers\MSTest.Analyzers\MSTest.Analyzers.csproj" />
3329
</ItemGroup>
3430

3531
<ItemGroup>
36-
<!-- Not a real dependency but it ensures correct build order -->
37-
<ProjectReference Include="..\..\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
32+
<!-- Microsoft.NET.Test.Sdk package is referenced by build system, so omitting it. -->
33+
<PackageReference Include="Microsoft.NET.Test.Sdk" Condition="'$(TargetFramework)' != '$(UwpMinimum)'" />
3834
</ItemGroup>
3935

36+
<ItemGroup>
37+
<None Include="$(PackageReadmeFile)" Pack="true" PackagePath="\" />
38+
</ItemGroup>
4039

4140
</Project>

src/Package/MSTest/MSTest.nuspec

-70
This file was deleted.

0 commit comments

Comments
 (0)