Skip to content

Commit 58352af

Browse files
committed
Use .NET Test SDK instead of regular one
- This adds props and targets from "Microsoft.NET.Test.Sdk". - Also fix some mistakes in the NuGet project files.
1 parent 78c5c6e commit 58352af

File tree

7 files changed

+6
-18
lines changed

7 files changed

+6
-18
lines changed

Sources/NuGet.Build.Sdk/NuGet.Build.Sdk.nuproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageTags>$(PackageTags);nuget;build;pack;package;restore;dependency;reference</PackageTags>
1212
<Summary>An MSBuild SDK package that provides package reference support and dependency management to the projects.</Summary>
1313
<Description>$(Summary) It adds a `Restore` target which facilitates downloading and referencing shared libraries from a remote server.</Description>
14-
<Description>$(Summary) It also adds a `Pack` target which facilitates creation of such packages using project outputs with pre-determined layouts.</Description>
14+
<Description>$(Description) It also adds a `Pack` target which facilitates creation of such packages using project outputs with pre-determined layouts.</Description>
1515
<Description>$(Description) It can be used either directly on your project (_via the `<Sdk/>` element_) or in-directly (_via other SDKs which refer to it internally_).</Description>
1616
</PropertyGroup>
1717

Sources/NuGet.Packaging.Sdk/NuGet.Packaging.Sdk.nuproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Title>NuGet Packaging Sdk</Title>
99
<PackageId>NuGet.Packaging.Sdk</PackageId>
1010
<PackageVersion Condition="'$(PackageVersion)' == ''">1.0.0</PackageVersion>
11-
<PackageTags>$(PackageTags);nuget;build;packaging;project;sysytem;nuproj;pkgproj;sfxproj</PackageTags>
11+
<PackageTags>$(PackageTags);nuget;build;packaging;project;system;nuproj;pkgproj;sfxproj</PackageTags>
1212
<Summary>An MSBuild SDK package that provides Project System support for NuGet package authoring.</Summary>
1313
<Description>$(Summary) Having a separate Project System makes it possible to author complex NuGet packages, otherwise not possible with Pack targets.</Description>
1414
<Description>$(Description) One such need is to create a completely customized package with a custom layout that is different from the standard layout.</Description>

Tests/Directory.Build.props

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,10 @@
1616

1717
<Choose>
1818
<When Condition="$(MSBuildProjectName.EndsWith('Tests'))">
19-
<PropertyGroup>
20-
<IsPackable>false</IsPackable>
21-
</PropertyGroup>
22-
2319
<ItemGroup>
2420
<ProjectReference Include="..\MSBuild.TestFramework\MSBuild.TestFramework.csproj" />
2521
</ItemGroup>
26-
27-
<ItemGroup>
28-
<PackageReference Include="MSTest.TestAdapter" />
29-
<PackageReference Include="MSTest.TestFramework" />
30-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
31-
</ItemGroup>
3222
</When>
33-
34-
<Otherwise/>
3523
</Choose>
3624

3725
</Project>

Tests/Directory.Build.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project>
22

33
<PropertyGroup Condition="'$(IsTestProject)' == 'true' AND '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
4-
<GenerateProgramFile>false</GenerateProgramFile>
5-
<GeneratedProgramFile>Program$(DefaultLanguageSourceExtension)</GeneratedProgramFile>
4+
<EnableDefaultProgramFile>false</EnableDefaultProgramFile>
65
</PropertyGroup>
76

87
<Import Project="..\$(MSBuildThisFile)"/>

Tests/MSBuild.Core.Tests/MSBuild.Core.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="MSBuild.NET.Sdk">
1+
<Project Sdk="MSBuild.NET.Test.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>net6.0;net472</TargetFrameworks>

Tests/MSBuild.NET.Tests/MSBuild.NET.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="MSBuild.NET.Sdk">
1+
<Project Sdk="MSBuild.NET.Test.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>net6.0;net472</TargetFrameworks>

global.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"MSBuild.Solution.Sdk": "1.0.0-dev.*",
77

88
"MSBuild.NET.Sdk": "1.0.0-dev.*",
9+
"MSBuild.NET.Test.Sdk": "1.0.0-dev.*",
910
"MSBuild.NET.Legacy.Sdk": "1.0.0-dev.*",
1011

1112
"NuGet.Build.Sdk": "1.0.0-dev.*",

0 commit comments

Comments
 (0)