Simplify code and increase test coverage

novotnyllc · Apr 3, 2020 · 7151d79 · 7151d79
1 parent 2a0ed07
commit 7151d79
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 60 deletions.
diff --git a/Source/MSBuild.Sdk.Extras/Build/RIDs.targets b/Source/MSBuild.Sdk.Extras/Build/RIDs.targets
@@ -85,10 +85,8 @@
           DependsOnTargets="_SdkPrepareProjectFlavorMatrix;$(_WalkEachTargetPerFrameworkCoreDependsOn)">
 
     <PropertyGroup>
-      <ExtrasDisableRidSpecificOutputMetadataReleaseOptimization Condition="'$(ExtrasDisableRidSpecificOutputMetadataReleaseOptimization)' == ''">false</ExtrasDisableRidSpecificOutputMetadataReleaseOptimization>
-      <ExtrasRidSpecificOutputKeepMetadata Condition="'$(ExtrasRidSpecificOutputKeepMetadata)' == '' and '$(ExtrasDisableRidSpecificOutputMetadataReleaseOptimization)' == 'false'">TargetFramework;Rid</ExtrasRidSpecificOutputKeepMetadata>
-      <_ExtrasRidSpecificOutputKeepDuplicates Condition="'$(_ExtrasRidSpecificOutputKeepDuplicates)' == '' and '$(ExtrasDisableRidSpecificOutputMetadataReleaseOptimization)' == 'false'">false</_ExtrasRidSpecificOutputKeepDuplicates>
-      <_ExtrasRidSpecificOutputKeepDuplicates Condition="'$(_ExtrasRidSpecificOutputKeepDuplicates)' == '' and '$(ExtrasDisableRidSpecificOutputMetadataReleaseOptimization)' != 'false'">true</_ExtrasRidSpecificOutputKeepDuplicates>
+      <ExtrasRidSpecificOutputNoKeepMetadata Condition="'$(ExtrasRidSpecificOutputNoKeepMetadata)' == ''">false</ExtrasRidSpecificOutputNoKeepMetadata>
+      <ExtrasRidSpecificOutputKeepMetadata Condition="'$(ExtrasRidSpecificOutputKeepMetadata)' == '' and '$(ExtrasRidSpecificOutputNoKeepMetadata)' == 'false'">TargetFramework;Rid</ExtrasRidSpecificOutputKeepMetadata>
     </PropertyGroup>
 
     <MSBuild
@@ -167,8 +165,8 @@
       <_TargetPathsToSymbolsWithRid Remove="@(_TargetPathsToSymbolsWithRid)" Condition="'%(Rid)' == ''" />
       <_BuildOutputInPackage Remove="@(_BuildOutputInPackageWithRid)" />
       <_TargetPathsToSymbols Remove="@(_TargetPathsToSymbolsWithRid)" />
-      <RidSpecificOutput Include="@(_BuildOutputInPackageWithRid->'%(FinalOutputPath)')" KeepDuplicates="$(_ExtrasRidSpecificOutputKeepDuplicates)" KeepMetadata="$(ExtrasRidSpecificOutputKeepMetadata)" />
-      <RidSpecificOutput Include="@(_TargetPathsToSymbolsWithRid->'%(FinalOutputPath)')" KeepDuplicates="$(_ExtrasRidSpecificOutputKeepDuplicates)" KeepMetadata="$(ExtrasRidSpecificOutputKeepMetadata)" />
+      <RidSpecificOutput Include="@(_BuildOutputInPackageWithRid->'%(FinalOutputPath)')" KeepMetadata="$(ExtrasRidSpecificOutputKeepMetadata)" />
+      <RidSpecificOutput Include="@(_TargetPathsToSymbolsWithRid->'%(FinalOutputPath)')" KeepMetadata="$(ExtrasRidSpecificOutputKeepMetadata)" />
     </ItemGroup>
 
   </Target>

diff --git a/Tests/ClasslibPackNonRidSpecificCustom/Class1.cs b/Tests/ClasslibPackNonRidSpecificCustom/Class1.cs
diff --git a/Tests/ClasslibPackNonRidSpecificCustom/ClasslibPackNonRidSpecificCustom.csproj b/Tests/ClasslibPackNonRidSpecificCustom/ClasslibPackNonRidSpecificCustom.csproj
@@ -12,7 +12,8 @@
   <Target Name="GenerateNuspec" DependsOnTargets="ClasslibPackNonRidSpecificGenerateNuspec" />
 
   <Target Name="Test" DependsOnTargets="Pack">
-    <Error Text="GenerateNuspec must be called" Condition="'$(GenerateNuspecCalled)' != 'true'"/>
+    <Error Text="GenerateNuspec must be called" Condition="'$(GenerateNuspecCalled)' != 'true'" />
+    <Error Text="IncludeDefaultProjectBuildOutputInPack must be called" Condition="'$(IncludeDefaultProjectBuildOutputInPackCalled)' != 'true'" />
   </Target>
 
 </Project>
diff --git a/Tests/ClasslibPackNonRidSpecificDefault/Class1.cs b/Tests/ClasslibPackNonRidSpecificDefault/Class1.cs
diff --git a/Tests/ClasslibPackNonRidSpecificDefault/ClasslibPackNonRidSpecificDefault.csproj b/Tests/ClasslibPackNonRidSpecificDefault/ClasslibPackNonRidSpecificDefault.csproj
@@ -11,7 +11,8 @@
   <Target Name="GenerateNuspec" DependsOnTargets="ClasslibPackNonRidSpecificGenerateNuspec" />
 
   <Target Name="Test" DependsOnTargets="Pack">
-    <Error Text="GenerateNuspec must be called" Condition="'$(GenerateNuspecCalled)' != 'true'"/>
+    <Error Text="GenerateNuspec must be called" Condition="'$(GenerateNuspecCalled)' != 'true'" />
+    <Error Text="IncludeDefaultProjectBuildOutputInPack must not be called" Condition="'$(IncludeDefaultProjectBuildOutputInPackCalled)' != ''" />
   </Target>
 
 </Project>
diff --git a/Tests/ClasslibPackNonRidSpecificSkip/Class1.cs b/Tests/ClasslibPackNonRidSpecificSkip/Class1.cs
diff --git a/Tests/ClasslibPackNonRidSpecificSkip/ClasslibPackNonRidSpecificSkip.csproj b/Tests/ClasslibPackNonRidSpecificSkip/ClasslibPackNonRidSpecificSkip.csproj
@@ -12,7 +12,8 @@
   <Target Name="GenerateNuspec" DependsOnTargets="ClasslibPackNonRidSpecificGenerateNuspec" />
 
   <Target Name="Test" DependsOnTargets="Pack">
-    <Error Text="GenerateNuspec must be called" Condition="'$(GenerateNuspecCalled)' != 'true'"/>
+    <Error Text="GenerateNuspec must be called" Condition="'$(GenerateNuspecCalled)' != 'true'" />
+    <Error Text="IncludeDefaultProjectBuildOutputInPack must not be called" Condition="'$(IncludeDefaultProjectBuildOutputInPackCalled)' != ''" />
   </Target>
 
 </Project>
diff --git a/Tests/ClasslibPackRidSpecificCustom/Class1.cs b/Tests/ClasslibPackRidSpecificCustom/Class1.cs
diff --git a/Tests/ClasslibPackRidSpecificCustom/ClasslibPackRidSpecificCustom.csproj b/Tests/ClasslibPackRidSpecificCustom/ClasslibPackRidSpecificCustom.csproj
@@ -44,7 +44,8 @@
   </Target>
 
   <Target Name="Test" DependsOnTargets="Pack">
-    <Error Text="GenerateNuspec must be called" Condition="'$(GenerateNuspecCalled)' != 'true'"/>
+    <Error Text="GenerateNuspec must be called" Condition="'$(GenerateNuspecCalled)' != 'true'" />
+    <Error Text="IncludeDefaultProjectBuildOutputInPack must be called" Condition="'$(IncludeDefaultProjectBuildOutputInPackCalled)' != 'true'" />
   </Target>
 
 </Project>
diff --git a/Tests/ClasslibPackRidSpecificDefault/Class1.cs b/Tests/ClasslibPackRidSpecificDefault/Class1.cs
diff --git a/Tests/ClasslibPackRidSpecificDefault/ClasslibPackRidSpecificDefault.csproj b/Tests/ClasslibPackRidSpecificDefault/ClasslibPackRidSpecificDefault.csproj
@@ -43,7 +43,8 @@
   </Target>
 
   <Target Name="Test" DependsOnTargets="Pack">
-    <Error Text="GenerateNuspec must be called" Condition="'$(GenerateNuspecCalled)' != 'true'"/>
+    <Error Text="GenerateNuspec must be called" Condition="'$(GenerateNuspecCalled)' != 'true'" />
+    <Error Text="IncludeDefaultProjectBuildOutputInPack must not be called" Condition="'$(IncludeDefaultProjectBuildOutputInPackCalled)' != ''" />
   </Target>
 
 </Project>
diff --git a/Tests/ClasslibPackRidSpecificSkip/Class1.cs b/Tests/ClasslibPackRidSpecificSkip/Class1.cs
diff --git a/Tests/ClasslibPackRidSpecificSkip/ClasslibPackRidSpecificSkip.csproj b/Tests/ClasslibPackRidSpecificSkip/ClasslibPackRidSpecificSkip.csproj
@@ -32,7 +32,8 @@
   </Target>
 
   <Target Name="Test" DependsOnTargets="Pack">
-    <Error Text="GenerateNuspec must be called" Condition="'$(GenerateNuspecCalled)' != 'true'"/>
+    <Error Text="GenerateNuspec must be called" Condition="'$(GenerateNuspecCalled)' != 'true'" />
+    <Error Text="IncludeDefaultProjectBuildOutputInPack must not be called" Condition="'$(IncludeDefaultProjectBuildOutputInPackCalled)' != ''" />
   </Target>
 
 </Project>
diff --git a/Tests/Directory.Build.targets b/Tests/Directory.Build.targets
@@ -5,9 +5,15 @@
   </Target>
 
   <Target Name="IncludeDefaultProjectBuildOutputInPack">
+
+    <PropertyGroup>
+      <IncludeDefaultProjectBuildOutputInPackCalled>true</IncludeDefaultProjectBuildOutputInPackCalled>
+    </PropertyGroup>
+
     <ItemGroup>
       <None Include="@(RidSpecificOutput->'%(Identity)')" PackagePath="tools/%(TargetFramework)/%(Rid)" Pack="true" KeepMetadata="FakeProperty" />
     </ItemGroup>
+
   </Target>
 
   <Target Name="ClasslibPackNonRidSpecificGenerateNuspec" DependsOnTargets="$(GenerateNuspecDependsOn);_CalculateInputsOutputsForPack;_GetProjectReferenceVersions;_InitializeNuspecRepositoryInformationProperties" Condition="$(IsPackable) == 'true'"