diff --git a/Directory.Build.targets b/Directory.Build.targets index 227c0a7590..9a164d0bcd 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -231,6 +231,7 @@ <_ProjectName>%(_PublishProjectReference.ProjectName) <_ProjectTargetPath>%(_PublishProjectReference.ProjectTargetPath) <_ProjectPackagePath>%(_PublishProjectReference.ProjectPackagePath) + <_Pack>%(_PublishProjectReference.Pack) <_PublishProjectReferenceItemsInput Include="$(_PublishProjectReferencePublishDir)\**\*" /> @@ -239,6 +240,7 @@ $(_ProjectTargetPath) $(_ProjectPackagePath) %(RecursiveDir)%(Filename)%(Extension) + $(_Pack) @@ -248,6 +250,7 @@ PreserveNewest $([MSBuild]::MakeRelative('.', '%(_PublishProjectReferenceItems.ProjectTargetPath)%(_PublishProjectReferenceItems.TargetPath)')) + false @@ -268,10 +271,9 @@ - + contentFiles\any\$(TargetFramework)\%(_PublishProjectReferenceItems.ProjectTargetPath) contentFiles\any\$(TargetFramework)\%(_PublishProjectReferenceItems.ProjectPackagePath) - true 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 index 338dc440a2..b7db2a0f11 100644 --- 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 @@ TargetFramework=$(TargetFramework) RuntimeIdentifier=linux-x64 ikvm\linux-x64\bin + false 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 index 0a26874162..a46bf87fe7 100644 --- 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 @@ TargetFramework=$(TargetFramework) RuntimeIdentifier=win7-x64 ikvm\win7-x64\bin + false 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 index cb054414c5..a4e598e7b1 100644 --- 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 @@ TargetFramework=$(TargetFramework) RuntimeIdentifier=win7-x86 ikvm\win7-x86\bin + false 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 index 685d444022..0b4cbc6acc 100644 --- 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 @@ TargetFramework=$(TargetFramework) RuntimeIdentifier=linux-x64 ikvm\linux-x64\bin + false 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 index 0182704322..9e4fbbb28e 100644 --- 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 @@ TargetFramework=$(TargetFramework) RuntimeIdentifier=win7-x64 ikvm\win7-x64\bin + false 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 index ece2c273c4..6f1d89a5f8 100644 --- 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 @@ TargetFramework=$(TargetFramework) RuntimeIdentifier=win7-x86 ikvm\win7-x86\bin + false