Skip to content

Commit 59bbdb5

Browse files
jeffkljeffkl
committed
Add new NuGet.Build.Tasks.Console.Test assembly
This is a follow-up to NuGet#3109
1 parent 99c7781 commit 59bbdb5

File tree

6 files changed

+45
-8
lines changed

6 files changed

+45
-8
lines changed

‎NuGet.sln

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Msbuild.Integration.Test",
239239
EndProject
240240
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Build.Tasks.Console", "src\NuGet.Core\NuGet.Build.Tasks.Console\NuGet.Build.Tasks.Console.csproj", "{3ED13630-90EB-420E-8083-0959B2955C6E}"
241241
EndProject
242+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Build.Tasks.Console.Test", "test\NuGet.Core.Tests\NuGet.Build.Tasks.Console.Test\NuGet.Build.Tasks.Console.Test.csproj", "{2011B5A4-2184-4F94-9897-E5BC2425DCDA}"
243+
EndProject
242244
Global
243245
GlobalSection(SolutionConfigurationPlatforms) = preSolution
244246
Debug|Any CPU = Debug|Any CPU
@@ -577,6 +579,10 @@ Global
577579
{3ED13630-90EB-420E-8083-0959B2955C6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
578580
{3ED13630-90EB-420E-8083-0959B2955C6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
579581
{3ED13630-90EB-420E-8083-0959B2955C6E}.Release|Any CPU.Build.0 = Release|Any CPU
582+
{2011B5A4-2184-4F94-9897-E5BC2425DCDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
583+
{2011B5A4-2184-4F94-9897-E5BC2425DCDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
584+
{2011B5A4-2184-4F94-9897-E5BC2425DCDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
585+
{2011B5A4-2184-4F94-9897-E5BC2425DCDA}.Release|Any CPU.Build.0 = Release|Any CPU
580586
EndGlobalSection
581587
GlobalSection(SolutionProperties) = preSolution
582588
HideSolutionNode = FALSE
@@ -675,6 +681,7 @@ Global
675681
{437C6B7E-B625-4AE5-A4CE-F2B3747FE1CE} = {01BC4531-1E25-48D7-A8FD-A47D6FEC47FB}
676682
{92EF44DB-4F40-4610-A1AD-3A554A0CA8B9} = {BB63CACA-866F-454F-BA4C-78B788D032BB}
677683
{3ED13630-90EB-420E-8083-0959B2955C6E} = {506AF844-92E0-4404-BBFC-0AB073890A72}
684+
{2011B5A4-2184-4F94-9897-E5BC2425DCDA} = {7323F93B-D141-4001-BB9E-7AF14031143E}
678685
EndGlobalSection
679686
GlobalSection(ExtensibilityGlobals) = postSolution
680687
SolutionGuid = {3747A66A-00D1-41B8-A9C5-ED0D7BEA9D25}

‎src/NuGet.Core/NuGet.Build.Tasks.Console/NuGet.Build.Tasks.Console.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040

4141
<ItemGroup Condition="$(DefineConstants.Contains(SIGNED_BUILD))">
4242
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
43-
<_Parameter1>NuGet.Build.Tasks.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9</_Parameter1>
43+
<_Parameter1>NuGet.Build.Tasks.Console.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9</_Parameter1>
4444
</AssemblyAttribute>
4545
</ItemGroup>
4646

4747
<ItemGroup Condition="!$(DefineConstants.Contains(SIGNED_BUILD))">
4848
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
49-
<_Parameter1>NuGet.Build.Tasks.Test</_Parameter1>
49+
<_Parameter1>NuGet.Build.Tasks.Console.Test</_Parameter1>
5050
</AssemblyAttribute>
5151
</ItemGroup>
5252

‎test/NuGet.Core.Tests/NuGet.Build.Tasks.Test/MSBuildStaticGraphRestoreTests.cs renamed to ‎test/NuGet.Core.Tests/NuGet.Build.Tasks.Console.Test/MSBuildStaticGraphRestoreTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.IO;
77
using System.Linq;
88
using FluentAssertions;
9-
using NuGet.Build.Tasks.Console;
109
using NuGet.Commands;
1110
using NuGet.Common;
1211
using NuGet.Configuration;
@@ -18,7 +17,7 @@
1817
using Test.Utility;
1918
using Xunit;
2019

21-
namespace NuGet.Build.Tasks.Test
20+
namespace NuGet.Build.Tasks.Console.Test
2221
{
2322
public class MSBuildStaticGraphRestoreTests
2423
{

‎test/NuGet.Core.Tests/NuGet.Build.Tasks.Test/MockMSBuildProject.cs renamed to ‎test/NuGet.Core.Tests/NuGet.Build.Tasks.Console.Test/MockMSBuildProject.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33

44
using System.Collections.Generic;
55
using System.IO;
6-
using NuGet.Build.Tasks.Console;
76
using NuGet.Commands;
87
using NuGet.Test.Utility;
98

10-
namespace NuGet.Build.Tasks.Test
9+
namespace NuGet.Build.Tasks.Console.Test
1110
{
1211
public class MockMSBuildProject : MSBuildItem, IMSBuildProject
1312
{

‎test/NuGet.Core.Tests/NuGet.Build.Tasks.Console.Test/NuGet.Build.Tasks.Console.Test.csproj

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<Project>
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\build\common.test.props" />
3+
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
4+
5+
<PropertyGroup>
6+
<TargetFrameworks>$(TargetFrameworksExe)</TargetFrameworks>
7+
<TargetFrameworks Condition=" '$(IsXPlat)' == 'true' ">$(NETCoreTargetFramework)</TargetFrameworks>
8+
<TestProject>true</TestProject>
9+
<UseParallelXunit>true</UseParallelXunit>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<ProjectReference Include="$(TestUtilitiesDirectory)Test.Utility\Test.Utility.csproj" />
14+
<ProjectReference Include="$(NuGetCoreSrcDirectory)NuGet.Build.Tasks.Console\NuGet.Build.Tasks.Console.csproj" />
15+
</ItemGroup>
16+
17+
<ItemGroup>
18+
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildPackageVersion)" PrivateAssets="All" />
19+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildPackageVersion)" PrivateAssets="All" />
20+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildPackageVersion)" PrivateAssets="All" />
21+
</ItemGroup>
22+
23+
<ItemGroup Condition=" '$(TargetFramework)' == '$(NETFXTargetFramework)' ">
24+
<Reference Include="Microsoft.Build.Utilities.v4.0" Aliases="MicrosoftBuildUtilitiesv4" />
25+
</ItemGroup>
26+
27+
<ItemGroup>
28+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
29+
</ItemGroup>
30+
31+
<Import Project="$(BuildCommonDirectory)common.targets" />
32+
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
33+
</Project>

‎test/NuGet.Core.Tests/NuGet.Build.Tasks.Test/ProjectItemInstanceEvaluatedIncludeComparerTests.cs renamed to ‎test/NuGet.Core.Tests/NuGet.Build.Tasks.Console.Test/ProjectItemInstanceEvaluatedIncludeComparerTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
using System;
55
using System.Collections.Generic;
66
using FluentAssertions;
7-
using NuGet.Build.Tasks.Console;
87
using NuGet.Commands;
98
using Xunit;
109

11-
namespace NuGet.Build.Tasks.Test
10+
namespace NuGet.Build.Tasks.Console.Test
1211
{
1312
public class ProjectItemInstanceEvaluatedIncludeComparerTests
1413
{

0 commit comments

Comments
 (0)