Was incorrectly packing content-only files resulting in packages whic…

…h contained contentFiles.
ikvmnet · Nov 15, 2022 · 847eeb1 · 847eeb1
1 parent cd7424b
commit 847eeb1
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 2 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -231,6 +231,7 @@
             <_ProjectName>%(_PublishProjectReference.ProjectName)</_ProjectName>
             <_ProjectTargetPath>%(_PublishProjectReference.ProjectTargetPath)</_ProjectTargetPath>
             <_ProjectPackagePath>%(_PublishProjectReference.ProjectPackagePath)</_ProjectPackagePath>
+            <_Pack>%(_PublishProjectReference.Pack)</_Pack>
         </PropertyGroup>
         <ItemGroup>
             <_PublishProjectReferenceItemsInput Include="$(_PublishProjectReferencePublishDir)\**\*" />
@@ -239,6 +240,7 @@
                 <ProjectTargetPath>$(_ProjectTargetPath)</ProjectTargetPath>
                 <ProjectPackagePath>$(_ProjectPackagePath)</ProjectPackagePath>
                 <TargetPath>%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
+                <Pack>$(_Pack)</Pack>
             </_PublishProjectReferenceItems>
         </ItemGroup>
     </Target>
@@ -248,6 +250,7 @@
             <ContentWithTargetPath Include="@(_PublishProjectReferenceItems)" Condition=" '%(_PublishProjectReferenceItems.ProjectTargetPath)' != '' ">
                 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
                 <TargetPath>$([MSBuild]::MakeRelative('.', '%(_PublishProjectReferenceItems.ProjectTargetPath)%(_PublishProjectReferenceItems.TargetPath)'))</TargetPath>
+                <Pack>false</Pack>
             </ContentWithTargetPath>
         </ItemGroup>
     </Target>
@@ -268,10 +271,9 @@
 
     <Target Name="GetPublishProjectReferenceTfmSpecificContent" DependsOnTargets="GetPublishProjectReferenceItems" Condition=" '$(DesignTimeBuild)' != 'true' and '@(_PublishProjectReferenceItems)' != '' ">
         <ItemGroup>
-            <TfmSpecificPackageFile Include="@(_PublishProjectReferenceItems)" Condition=" '%(_PublishProjectReferenceItems.ProjectTargetPath)' != '' ">
+            <TfmSpecificPackageFile Include="@(_PublishProjectReferenceItems)" Condition=" '%(_PublishProjectReferenceItems.ProjectTargetPath)' != '' And '%(_PublishProjectReferenceItems.Pack)' != 'false' ">
                 <PackagePath>contentFiles\any\$(TargetFramework)\%(_PublishProjectReferenceItems.ProjectTargetPath)</PackagePath>
                 <PackagePath Condition=" '%(_PublishProjectReferenceItems.ProjectPackagePath)' != '' ">contentFiles\any\$(TargetFramework)\%(_PublishProjectReferenceItems.ProjectPackagePath)</PackagePath>
-                <PackageCopyToOutput>true</PackageCopyToOutput>
             </TfmSpecificPackageFile>
         </ItemGroup>
     </Target>

diff --git a/src/IKVM.Image.JDK.runtime.linux-x64/IKVM.Image.JDK.runtime.linux-x64.csproj b/src/IKVM.Image.JDK.runtime.linux-x64/IKVM.Image.JDK.runtime.linux-x64.csproj
@@ -32,6 +32,7 @@
             <SetTargetFramework>TargetFramework=$(TargetFramework)</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=linux-x64</SetRuntimeIdentifier>
             <ProjectTargetPath>ikvm\linux-x64\bin</ProjectTargetPath>
+            <Pack>false</Pack>
         </PublishProjectReference>
     </ItemGroup>
 

diff --git a/src/IKVM.Image.JDK.runtime.win7-x64/IKVM.Image.JDK.runtime.win7-x64.csproj b/src/IKVM.Image.JDK.runtime.win7-x64/IKVM.Image.JDK.runtime.win7-x64.csproj
@@ -37,6 +37,7 @@
             <SetTargetFramework>TargetFramework=$(TargetFramework)</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=win7-x64</SetRuntimeIdentifier>
             <ProjectTargetPath>ikvm\win7-x64\bin</ProjectTargetPath>
+            <Pack>false</Pack>
         </PublishProjectReference>
     </ItemGroup>
 

diff --git a/src/IKVM.Image.JDK.runtime.win7-x86/IKVM.Image.JDK.runtime.win7-x86.csproj b/src/IKVM.Image.JDK.runtime.win7-x86/IKVM.Image.JDK.runtime.win7-x86.csproj
@@ -37,6 +37,7 @@
             <SetTargetFramework>TargetFramework=$(TargetFramework)</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=win7-x86</SetRuntimeIdentifier>
             <ProjectTargetPath>ikvm\win7-x86\bin</ProjectTargetPath>
+            <Pack>false</Pack>
         </PublishProjectReference>
     </ItemGroup>
 

diff --git a/src/IKVM.Image.JRE.runtime.linux-x64/IKVM.Image.JRE.runtime.linux-x64.csproj b/src/IKVM.Image.JRE.runtime.linux-x64/IKVM.Image.JRE.runtime.linux-x64.csproj
@@ -32,6 +32,7 @@
             <SetTargetFramework>TargetFramework=$(TargetFramework)</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=linux-x64</SetRuntimeIdentifier>
             <ProjectTargetPath>ikvm\linux-x64\bin</ProjectTargetPath>
+            <Pack>false</Pack>
         </PublishProjectReference>
     </ItemGroup>
 

diff --git a/src/IKVM.Image.JRE.runtime.win7-x64/IKVM.Image.JRE.runtime.win7-x64.csproj b/src/IKVM.Image.JRE.runtime.win7-x64/IKVM.Image.JRE.runtime.win7-x64.csproj
@@ -37,6 +37,7 @@
             <SetTargetFramework>TargetFramework=$(TargetFramework)</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=win7-x64</SetRuntimeIdentifier>
             <ProjectTargetPath>ikvm\win7-x64\bin</ProjectTargetPath>
+            <Pack>false</Pack>
         </PublishProjectReference>
     </ItemGroup>
 

diff --git a/src/IKVM.Image.JRE.runtime.win7-x86/IKVM.Image.JRE.runtime.win7-x86.csproj b/src/IKVM.Image.JRE.runtime.win7-x86/IKVM.Image.JRE.runtime.win7-x86.csproj
@@ -37,6 +37,7 @@
             <SetTargetFramework>TargetFramework=$(TargetFramework)</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=win7-x86</SetRuntimeIdentifier>
             <ProjectTargetPath>ikvm\win7-x86\bin</ProjectTargetPath>
+            <Pack>false</Pack>
         </PublishProjectReference>
     </ItemGroup>