Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.

Commit 53b6436

Browse files
kzukzu
committed
Switch Build tasks/tests to PackageReference
1 parent 7a4d6e9 commit 53b6436

6 files changed

Lines changed: 33 additions & 62 deletions

File tree

‎src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,20 @@
1313
<Reference Include="System" />
1414
<Reference Include="System.Core" />
1515
</ItemGroup>
16-
<ItemGroup>
16+
<ItemGroup>
17+
<PackageReference Include="Costura.Fody" Version="1.3.3" />
18+
<PackageReference Include="Fody" Version="1.29.4" />
19+
<PackageReference Include="GitInfo" Version="1.*" />
20+
<PackageReference Include="netfx-System.StringResources" Version="*" />
21+
<PackageReference Include="Microsoft.Build" Version="14.3.0" />
22+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3.0" />
23+
<PackageReference Include="MSBuilder.ThisAssembly.Project" Version="0.3.3" />
24+
<PackageReference Include="Newtonsoft.Json" Version="6.0.8" />
25+
<PackageReference Include="NuGet.Client" Version="4.0.0" />
26+
<PackageReference Include="NuGet.Packaging" Version="4.0.0" />
27+
<PackageReference Include="NuGet.ProjectManagement" Version="4.0.0" />
28+
</ItemGroup>
29+
<ItemGroup>
1730
<Content Include="FodyWeavers.xml" />
1831
<Content Include="NuGet.Build.Packaging.props">
1932
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎src/Build/NuGet.Build.Packaging.Tasks/project.json‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/Build/NuGet.Build.Packaging.Tests/NuGet.Build.Packaging.Tests.csproj‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,29 @@
77
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
88
<SignAssembly>false</SignAssembly>
99
<PublicSign>false</PublicSign>
10-
<TargetFrameworkProfile />
1110
</PropertyGroup>
1211
<ItemGroup>
1312
<Reference Include="System" />
1413
<Reference Include="System.Core" />
1514
<Reference Include="System.Xml" />
1615
<Reference Include="System.Xml.Linq" />
1716
</ItemGroup>
18-
<ItemGroup>
19-
<None Include="project.json" />
20-
<None Include="NuGet.Build.Packaging.Tests.targets">
21-
<SubType>Designer</SubType>
22-
</None>
17+
<ItemGroup>
18+
<PackageReference Include="GitInfo" Version="1.*" />
19+
<PackageReference Include="Microsoft.Build" Version="14.3.0" />
20+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3.0" />
21+
<PackageReference Include="Newtonsoft.Json" Version="6.0.8" />
22+
<PackageReference Include="MSBuilder.Dump" Version="*" />
23+
<PackageReference Include="MSBuilder.DumpItems" Version="*" />
24+
<PackageReference Include="MSBuilder.Introspect" Version="*" />
25+
<PackageReference Include="xunit" Version="2.2.0" />
26+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
27+
<PackageReference Include="NuGet.Client" Version="4.0.0" />
28+
<PackageReference Include="NuGet.Packaging" Version="4.0.0" />
29+
<PackageReference Include="NuGet.ProjectManagement" Version="4.0.0" />
30+
</ItemGroup>
31+
<ItemGroup>
32+
<None Include="NuGet.Build.Packaging.Tests.targets" />
2333
<Content Include="Scenarios\given_a_custom_build_project\Readme.txt" />
2434
<Content Include="Scenarios\given_duplicate_package_files\a.csproj" />
2535
<Content Include="Scenarios\given_duplicate_package_files\b.csproj" />

‎src/Build/NuGet.Build.Packaging.Tests/given_a_packaging_project_with_netstandard.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
namespace NuGet.Build.Packaging
66
{
7+
// NOTE: not added to the main project because it's built using MSBuild 14 and it's not working
8+
// by adding binding redirects, appdomain isolation, etc. :(
79
public class given_a_packaging_project_with_netstandard
810
{
911
ITestOutputHelper output;

‎src/Build/NuGet.Build.Packaging.Tests/project.json‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/Build/NuGet.Build.Packaging.sln‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
3-
VisualStudioVersion = 15.0.26214.1
3+
VisualStudioVersion = 15.0.26510.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Build.Packaging.Tasks", "NuGet.Build.Packaging.Tasks\NuGet.Build.Packaging.Tasks.csproj", "{A3D231D7-31E4-4A70-8CD1-7246C7D069F6}"
66
EndProject
@@ -27,35 +27,21 @@ EndProject
2727
Global
2828
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2929
Debug|Any CPU = Debug|Any CPU
30-
Debug|x86 = Debug|x86
3130
Release|Any CPU = Release|Any CPU
32-
Release|x86 = Release|x86
3331
EndGlobalSection
3432
GlobalSection(ProjectConfigurationPlatforms) = postSolution
3533
{A3D231D7-31E4-4A70-8CD1-7246C7D069F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3634
{A3D231D7-31E4-4A70-8CD1-7246C7D069F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
37-
{A3D231D7-31E4-4A70-8CD1-7246C7D069F6}.Debug|x86.ActiveCfg = Debug|Any CPU
38-
{A3D231D7-31E4-4A70-8CD1-7246C7D069F6}.Debug|x86.Build.0 = Debug|Any CPU
3935
{A3D231D7-31E4-4A70-8CD1-7246C7D069F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
4036
{A3D231D7-31E4-4A70-8CD1-7246C7D069F6}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{A3D231D7-31E4-4A70-8CD1-7246C7D069F6}.Release|x86.ActiveCfg = Release|Any CPU
42-
{A3D231D7-31E4-4A70-8CD1-7246C7D069F6}.Release|x86.Build.0 = Release|Any CPU
4337
{212952C3-22F5-4263-BF9B-B17316B3B3CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4438
{212952C3-22F5-4263-BF9B-B17316B3B3CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
45-
{212952C3-22F5-4263-BF9B-B17316B3B3CA}.Debug|x86.ActiveCfg = Debug|Any CPU
46-
{212952C3-22F5-4263-BF9B-B17316B3B3CA}.Debug|x86.Build.0 = Debug|Any CPU
4739
{212952C3-22F5-4263-BF9B-B17316B3B3CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
4840
{212952C3-22F5-4263-BF9B-B17316B3B3CA}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{212952C3-22F5-4263-BF9B-B17316B3B3CA}.Release|x86.ActiveCfg = Release|Any CPU
50-
{212952C3-22F5-4263-BF9B-B17316B3B3CA}.Release|x86.Build.0 = Release|Any CPU
5141
{CD767D93-6C99-4D6A-A303-3C139A73400E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5242
{CD767D93-6C99-4D6A-A303-3C139A73400E}.Debug|Any CPU.Build.0 = Debug|Any CPU
53-
{CD767D93-6C99-4D6A-A303-3C139A73400E}.Debug|x86.ActiveCfg = Debug|Any CPU
54-
{CD767D93-6C99-4D6A-A303-3C139A73400E}.Debug|x86.Build.0 = Debug|Any CPU
5543
{CD767D93-6C99-4D6A-A303-3C139A73400E}.Release|Any CPU.ActiveCfg = Release|Any CPU
5644
{CD767D93-6C99-4D6A-A303-3C139A73400E}.Release|Any CPU.Build.0 = Release|Any CPU
57-
{CD767D93-6C99-4D6A-A303-3C139A73400E}.Release|x86.ActiveCfg = Release|Any CPU
58-
{CD767D93-6C99-4D6A-A303-3C139A73400E}.Release|x86.Build.0 = Release|Any CPU
5945
EndGlobalSection
6046
GlobalSection(SolutionProperties) = preSolution
6147
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)