Skip to content
This repository was archived by the owner on Jul 14, 2020. It is now read-only.

Add support for IncludeAssets, ExcludeAssets, and PrivateAssets #207

Merged
jeffkl merged 4 commits into from
Dec 7, 2017
Merged

Add support for IncludeAssets, ExcludeAssets, and PrivateAssets #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e432689
Add support for IncludeAssets, ExcludeAssets, and PrivateAssets
jeffkl Nov 3, 2017
add639e
Rewrite everything
jeffkl Dec 6, 2017
a343702
Simplify logic, delete NuGet.Deterministic.props
jeffkl Dec 7, 2017
051450a
Add a DisableImplicitFrameworkReferences property if necessary
jeffkl Dec 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions src/CBT.Modules.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CBT.NuGet.AggregatePackage.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSBuildProjectBuilder.UnitTests", "MSBuildProjectBuilder.UnitTests\MSBuildProjectBuilder.UnitTests.csproj", "{693000B3-F0AD-4AC7-A06F-DD99BE50220A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CBT.UnitTests.Common", "CBT.UnitTests.Common\CBT.UnitTests.Common.csproj", "{D4A35CCE-6ABE-4944-9BC5-F99B143E4330}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Deterministic", "NuGet.Deterministic\NuGet.Deterministic.csproj", "{74BB78C6-0BAD-4551-B173-A7603B280217}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet.Deterministic", "NuGet.Deterministic", "{33EBACA9-598F-463D-B19C-1AD981267DC0}"
Project("{5DD5E4FA-CB73-4610-85AB-557B54E96AA9}") = "NuGet.Deterministic.Package", "NuGet.Deterministic.Package\NuGet.Deterministic.Package.nuproj", "{2D264DAF-7C3B-437B-AEB8-3B5C0535D434}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Deterministic", "NuGet.Deterministic\NuGet.Deterministic.csproj", "{728B794A-F0EB-4A61-987D-26CB0B57B0EA}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Deterministic.UnitTests", "NuGet.Deterministic.UnitTests\NuGet.Deterministic.UnitTests.csproj", "{2277E70A-D81C-4A35-BF96-E8CD358BC864}"
EndProject
Project("{5DD5E4FA-CB73-4610-85AB-557B54E96AA9}") = "NuGet.Deterministic.Package", "NuGet.Deterministic.Package\NuGet.Deterministic.Package.nuproj", "{2D264DAF-7C3B-437B-AEB8-3B5C0535D434}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CBT.UnitTests.Common", "CBT.UnitTests.Common\CBT.UnitTests.Common.csproj", "{D4A35CCE-6ABE-4944-9BC5-F99B143E4330}"
EndProject
Project("{5DD5E4FA-CB73-4610-85AB-557B54E96AA9}") = "CBT.NoTarget", "CBT.NoTarget\CBT.NoTarget.nuproj", "{FAD5ADFB-CDB3-49E4-9B24-336C55556059}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet.Deterministic", "NuGet.Deterministic", "{0C2B7CE3-5F00-480A-BE5C-A2A020210518}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -141,18 +143,22 @@ Global
{693000B3-F0AD-4AC7-A06F-DD99BE50220A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{693000B3-F0AD-4AC7-A06F-DD99BE50220A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{693000B3-F0AD-4AC7-A06F-DD99BE50220A}.Release|Any CPU.Build.0 = Release|Any CPU
{D4A35CCE-6ABE-4944-9BC5-F99B143E4330}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D4A35CCE-6ABE-4944-9BC5-F99B143E4330}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D4A35CCE-6ABE-4944-9BC5-F99B143E4330}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D4A35CCE-6ABE-4944-9BC5-F99B143E4330}.Release|Any CPU.Build.0 = Release|Any CPU
{728B794A-F0EB-4A61-987D-26CB0B57B0EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{728B794A-F0EB-4A61-987D-26CB0B57B0EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{728B794A-F0EB-4A61-987D-26CB0B57B0EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{728B794A-F0EB-4A61-987D-26CB0B57B0EA}.Release|Any CPU.Build.0 = Release|Any CPU
{74BB78C6-0BAD-4551-B173-A7603B280217}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{74BB78C6-0BAD-4551-B173-A7603B280217}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74BB78C6-0BAD-4551-B173-A7603B280217}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74BB78C6-0BAD-4551-B173-A7603B280217}.Release|Any CPU.Build.0 = Release|Any CPU
{2D264DAF-7C3B-437B-AEB8-3B5C0535D434}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2D264DAF-7C3B-437B-AEB8-3B5C0535D434}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2D264DAF-7C3B-437B-AEB8-3B5C0535D434}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2D264DAF-7C3B-437B-AEB8-3B5C0535D434}.Release|Any CPU.Build.0 = Release|Any CPU
{2277E70A-D81C-4A35-BF96-E8CD358BC864}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2277E70A-D81C-4A35-BF96-E8CD358BC864}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2277E70A-D81C-4A35-BF96-E8CD358BC864}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2277E70A-D81C-4A35-BF96-E8CD358BC864}.Release|Any CPU.Build.0 = Release|Any CPU
{D4A35CCE-6ABE-4944-9BC5-F99B143E4330}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D4A35CCE-6ABE-4944-9BC5-F99B143E4330}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D4A35CCE-6ABE-4944-9BC5-F99B143E4330}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D4A35CCE-6ABE-4944-9BC5-F99B143E4330}.Release|Any CPU.Build.0 = Release|Any CPU
{FAD5ADFB-CDB3-49E4-9B24-336C55556059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FAD5ADFB-CDB3-49E4-9B24-336C55556059}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FAD5ADFB-CDB3-49E4-9B24-336C55556059}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -172,8 +178,9 @@ Global
{C0FEDA7D-30A2-4E62-BB92-98700DE46B79} = {105F8F9A-A30C-4516-9359-916B2D00C29E}
{5869575A-94F7-4880-B6E9-F7F6178D65A8} = {105F8F9A-A30C-4516-9359-916B2D00C29E}
{693000B3-F0AD-4AC7-A06F-DD99BE50220A} = {325DC229-1889-473A-AE8A-EFC9EC4F2802}
{728B794A-F0EB-4A61-987D-26CB0B57B0EA} = {33EBACA9-598F-463D-B19C-1AD981267DC0}
{2D264DAF-7C3B-437B-AEB8-3B5C0535D434} = {33EBACA9-598F-463D-B19C-1AD981267DC0}
{74BB78C6-0BAD-4551-B173-A7603B280217} = {0C2B7CE3-5F00-480A-BE5C-A2A020210518}
{2D264DAF-7C3B-437B-AEB8-3B5C0535D434} = {0C2B7CE3-5F00-480A-BE5C-A2A020210518}
{2277E70A-D81C-4A35-BF96-E8CD358BC864} = {0C2B7CE3-5F00-480A-BE5C-A2A020210518}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6CD6DC76-FB33-4241-8A49-4B866AE72E8E}
Expand Down
1 change: 1 addition & 0 deletions src/CBT.UnitTests.Common/CBT.UnitTests.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<Compile Include="MockBuildEngine.cs" />
<Compile Include="MockSettings.cs" />
<Compile Include="MockTask.cs" />
<Compile Include="MockTaskItem.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="TestBase.cs" />
</ItemGroup>
Expand Down
58 changes: 58 additions & 0 deletions src/CBT.UnitTests.Common/MockTaskItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
using Microsoft.Build.Framework;
using System;
using System.Collections;
using System.Collections.Generic;

namespace CBT.UnitTests.Common
{
public class MockTaskItem : Dictionary<string, string>, ITaskItem
{
public MockTaskItem()
: base(StringComparer.OrdinalIgnoreCase)
{
}

public MockTaskItem(string itemSpec)
: this()
{
ItemSpec = itemSpec;
}

public string ItemSpec { get; set; }

public int MetadataCount => Count;

public ICollection MetadataNames => Keys;

public IDictionary CloneCustomMetadata()
{
return new Dictionary<string, string>(this);
}

public void CopyMetadataTo(ITaskItem destinationItem)
{
foreach (KeyValuePair<string, string> metadatum in this)
{
destinationItem.SetMetadata(metadatum.Key, metadatum.Value);
}
}

public string GetMetadata(string metadataName)
{
return this[metadataName];
}

public void RemoveMetadata(string metadataName)
{
if (ContainsKey(metadataName))
{
Remove(metadataName);
}
}

public void SetMetadata(string metadataName, string metadataValue)
{
this[metadataName] = metadataValue;
}
}
}
2 changes: 1 addition & 1 deletion src/NuGet.Deterministic.Package/NuGet.Deterministic.Package.nuproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ProjectReference Include="..\NuGet.Deterministic\NuGet.Deterministic.csproj">
<TargetDir>build\tasks\</TargetDir>
</ProjectReference>
<Content Include="build\**\*" />
<Content Include="build\NuGet.Deterministic.targets" />
<None Include="version.json" />
</ItemGroup>
<Import Project="$(NuProjPath)\NuProj.targets" Condition="Exists('$(NuProjPath)\NuProj.targets')" />
Expand Down
22 changes: 0 additions & 22 deletions src/NuGet.Deterministic.Package/build/NuGet.Deterministic.props
View file
Open in desktop

This file was deleted.

Loading