Skip to content

Commit b6d8405

Browse files
kzukzu
committed
Bump NoTargets SDK in tests and readme
1 parent 38c07d6 commit b6d8405

File tree

6 files changed

+20
-23
lines changed

6 files changed

+20
-23
lines changed

‎readme.md‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ which has built-in support in Visual Studio. It can use the `Microsoft.Build.NoT
366366

367367
```xml
368368
<?xml version="1.0" encoding="utf-8"?>
369-
<Project Sdk="Microsoft.Build.NoTargets/3.5.0">
369+
<Project Sdk="Microsoft.Build.NoTargets/3.7.0">
370370
<PropertyGroup>
371371
<PackageId>MyPackage</PackageId>
372372
<TargetFramework>netstandard2.0</TargetFramework>
@@ -400,7 +400,7 @@ it's automatically imported in consuming projects.
400400
The packaging project would now look as follows:
401401

402402
```xml
403-
<Project Sdk='Microsoft.Build.NoTargets/3.5.0'>
403+
<Project Sdk='Microsoft.Build.NoTargets/3.7.0'>
404404
<PropertyGroup>
405405
<TargetFramework>netstandard2.0</TargetFramework>
406406
<PackageId>MyPackage</PackageId>
@@ -447,11 +447,9 @@ You can also add a reference to a CLI *tools* program like the following:
447447
<TargetFramework>net6.0</TargetFramework>
448448
<OutputType>Exe</OutputType>
449449
<PackFolder>tools</PackFolder>
450-
<!-- We don't need this particular tool in a framework-specific subfolder under /tools -->
451-
<BuildOutputFrameworkSpecific>false</BuildOutputFrameworkSpecific>
452450
</PropertyGroup>
453451
<ItemGroup>
454-
<PackageReference Include='System.CommandLine' Version='2.0.0-beta3.22114.1' PrivateAssets='all' />
452+
<PackageReference Include='System.CommandLine' Version='2.0.0-beta3.22114.1' />
455453
</ItemGroup>
456454
</Project>
457455
```

‎src/NuGetizer.Tests/Scenarios/given_a_packaging_project/a.nuproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.Build.NoTargets/3.5.0">
1+
<Project Sdk="Microsoft.Build.NoTargets/3.7.0">
22
<Import Project="$([MSBuild]::GetPathOfFileAbove(Scenario.props, $(MSBuildThisFileDirectory)))" />
33
<PropertyGroup>
44
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>

‎src/NuGetizer.Tests/Scenarios/given_a_packaging_project_with_netstandard/a.nuproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.Build.NoTargets/3.5.0">
1+
<Project Sdk="Microsoft.Build.NoTargets/3.7.0">
22
<Import Project="$([MSBuild]::GetPathOfFileAbove(Scenario.props, $(MSBuildThisFileDirectory)))" />
33

44
<PropertyGroup>

‎src/NuGetizer.Tests/given_a_notargets_sdk_project.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public void cam_reference_packaging_project()
1515
var result = Builder.BuildProjects(
1616
"GetPackageContents", output, null,
1717
("main.msbuildproj", @"
18-
<Project Sdk='Microsoft.Build.NoTargets/3.5.0'>
18+
<Project Sdk='Microsoft.Build.NoTargets/3.7.0'>
1919
<PropertyGroup>
2020
<PackageId>Foo</PackageId>
2121
<TargetFramework>netstandard2.0</TargetFramework>
@@ -26,7 +26,7 @@ public void cam_reference_packaging_project()
2626
</ItemGroup>
2727
</Project>"),
2828
("other.msbuildproj", @"
29-
<Project Sdk='Microsoft.Build.NoTargets/3.5.0'>
29+
<Project Sdk='Microsoft.Build.NoTargets/3.7.0'>
3030
<PropertyGroup>
3131
<PackageId>Bar</PackageId>
3232
<TargetFramework>netstandard2.0</TargetFramework>
@@ -76,7 +76,7 @@ public void cam_be_referenced()
7676
</ItemGroup>
7777
</Project>"),
7878
("other.msbuildproj", @"
79-
<Project Sdk='Microsoft.Build.NoTargets/3.5.0'>
79+
<Project Sdk='Microsoft.Build.NoTargets/3.7.0'>
8080
<PropertyGroup>
8181
<PackageId>Bar</PackageId>
8282
<TargetFramework>netstandard2.0</TargetFramework>

‎src/NuGetizer.Tests/given_a_packaging_project.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public void when_packing_then_succeeeds()
177177
public void when_framework_specific_then_retargets_direct_and_referenced_content()
178178
{
179179
var result = Builder.BuildProject(@"
180-
<Project Sdk='Microsoft.Build.NoTargets/3.5.0'>
180+
<Project Sdk='Microsoft.Build.NoTargets/3.7.0'>
181181
<PropertyGroup>
182182
<PackageId>Packer</PackageId>
183183
<TargetFramework>net6.0</TargetFramework>
@@ -221,7 +221,7 @@ specifying PackFolder and FrameworkSpecific to match the project's. -->
221221
public void when_referenced_project_has_packfolder_then_preserves_it()
222222
{
223223
var result = Builder.BuildProject(@"
224-
<Project Sdk='Microsoft.Build.NoTargets/3.5.0'>
224+
<Project Sdk='Microsoft.Build.NoTargets/3.7.0'>
225225
<PropertyGroup>
226226
<PackageId>Packer</PackageId>
227227
<TargetFramework>net6.0</TargetFramework>
@@ -266,7 +266,7 @@ public void when_referenced_project_has_packfolder_then_preserves_it()
266266
public void when_project_reference_packfolder_additional_properties_then_overrides_project_pack_folder()
267267
{
268268
var result = Builder.BuildProject(@"
269-
<Project Sdk='Microsoft.Build.NoTargets/3.5.0'>
269+
<Project Sdk='Microsoft.Build.NoTargets/3.7.0'>
270270
<PropertyGroup>
271271
<PackageId>Packer</PackageId>
272272
<TargetFramework>net6.0</TargetFramework>
@@ -295,7 +295,7 @@ public void when_project_reference_packfolder_additional_properties_then_overrid
295295
public void when_project_reference_packfolder_then_overrides_project_pack_folder()
296296
{
297297
var result = Builder.BuildProject(@"
298-
<Project Sdk='Microsoft.Build.NoTargets/3.5.0'>
298+
<Project Sdk='Microsoft.Build.NoTargets/3.7.0'>
299299
<PropertyGroup>
300300
<PackageId>Packer</PackageId>
301301
<TargetFramework>net6.0</TargetFramework>
@@ -324,7 +324,7 @@ public void when_project_reference_packfolder_then_overrides_project_pack_folder
324324
public void when_pack_folder_build_then_none_packs_as_build()
325325
{
326326
var result = Builder.BuildProject(@"
327-
<Project Sdk='Microsoft.Build.NoTargets/3.5.0'>
327+
<Project Sdk='Microsoft.Build.NoTargets/3.7.0'>
328328
<PropertyGroup>
329329
<PackageId>Packer</PackageId>
330330
<TargetFramework>net6.0</TargetFramework>
@@ -347,7 +347,7 @@ public void when_pack_folder_build_then_none_packs_as_build()
347347
public void when_readme_found_but_pack_readme_false_then_does_not_add_it()
348348
{
349349
var result = Builder.BuildProject(@"
350-
<Project Sdk='Microsoft.Build.NoTargets/3.5.0'>
350+
<Project Sdk='Microsoft.Build.NoTargets/3.7.0'>
351351
<PropertyGroup>
352352
<PackageId>Packer</PackageId>
353353
<TargetFramework>net6.0</TargetFramework>
@@ -379,7 +379,7 @@ public void when_readme_found_but_pack_readme_false_then_does_not_add_it()
379379
public void when_readme_found_but_project_not_packable_then_does_not_add_content()
380380
{
381381
var result = Builder.BuildProject(@"
382-
<Project Sdk='Microsoft.Build.NoTargets/3.5.0'>
382+
<Project Sdk='Microsoft.Build.NoTargets/3.7.0'>
383383
<PropertyGroup>
384384
<IsPackable>false</IsPackable>
385385
<TargetFramework>net6.0</TargetFramework>
@@ -410,7 +410,7 @@ public void when_readme_found_but_project_not_packable_then_does_not_add_content
410410
public void when_readme_found_then_adds_metadata_and_content()
411411
{
412412
var result = Builder.BuildProject(@"
413-
<Project Sdk='Microsoft.Build.NoTargets/3.5.0'>
413+
<Project Sdk='Microsoft.Build.NoTargets/3.7.0'>
414414
<PropertyGroup>
415415
<PackageId>Packer</PackageId>
416416
<TargetFramework>net6.0</TargetFramework>
@@ -441,7 +441,7 @@ public void when_readme_found_then_adds_metadata_and_content()
441441
public void when_readme_custom_extension_specified_then_adds_metadata_and_content()
442442
{
443443
var result = Builder.BuildProject(@"
444-
<Project Sdk='Microsoft.Build.NoTargets/3.5.0'>
444+
<Project Sdk='Microsoft.Build.NoTargets/3.7.0'>
445445
<PropertyGroup>
446446
<PackageId>Packer</PackageId>
447447
<TargetFramework>net6.0</TargetFramework>

‎src/NuGetizer.Tests/given_a_tool_project.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class given_a_tool_project
1313
public void when_pack_as_tool_then_packs_no_dependencies()
1414
{
1515
var result = Builder.BuildProject(@"
16-
<Project Sdk='Microsoft.Build.NoTargets/3.5.0'>
16+
<Project Sdk='Microsoft.Build.NoTargets/3.7.0'>
1717
<PropertyGroup>
1818
<PackageId>MyTool</PackageId>
1919
<TargetFramework>net6.0</TargetFramework>
@@ -67,7 +67,7 @@ public void when_pack_as_tool_then_packs_dotnet_tool_runtime_assets()
6767
public void when_pack_folder_tool_but_no_pack_as_tool_then_packs_dependencies_normally()
6868
{
6969
var result = Builder.BuildProject(@"
70-
<Project Sdk='Microsoft.Build.NoTargets/3.5.0'>
70+
<Project Sdk='Microsoft.Build.NoTargets/3.7.0'>
7171
<PropertyGroup>
7272
<PackageId>MyTool</PackageId>
7373
<TargetFramework>net6.0</TargetFramework>
@@ -94,9 +94,8 @@ public void when_pack_folder_tool_no_pack_as_tool_and_executable_then_packs_as_p
9494
<Project Sdk="Microsoft.NET.Sdk">
9595
<PropertyGroup>
9696
<OutputType>Exe</OutputType>
97-
<PackageId>MyTool</PackageId>
9897
<TargetFramework>net6.0</TargetFramework>
99-
<PackageId>MyTool</PackageId>
98+
<PackageId>MyTool</PackageId>
10099
<PackFolder>tools</PackFolder>
101100
</PropertyGroup>
102101
<ItemGroup>

0 commit comments

Comments
 (0)