Merge branch 'release/8.3.0'

ikvmnet · Nov 16, 2022 · 43c382f · 43c382f
2 parents 0d59ce5 + 847eeb1
commit 43c382f
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 3 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
@@ -23,7 +23,7 @@
         <PublishProjectReference Include="..\IKVM.Image.JRE-bin\IKVM.Image.JRE-bin.csproj">
             <SetTargetFramework>TargetFramework=net461</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=win7-x86</SetRuntimeIdentifier>
-            <ProjectPackagePath>ikvm\netcoreapp3.1\win7-x86\bin</ProjectPackagePath>
+            <ProjectPackagePath>ikvm\net461\win7-x86\bin</ProjectPackagePath>
         </PublishProjectReference>
         <PublishProjectReference Include="..\IKVM.Image.JRE-bin\IKVM.Image.JRE-bin.csproj">
             <SetTargetFramework>TargetFramework=netcoreapp3.1</SetTargetFramework>
@@ -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.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt
@@ -1589,6 +1589,7 @@ java/security/cert/CertPathBuilder/akiExt/AKISerialNumber.java
 java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java                                                    generic-all
 java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java                                                      generic-all
 java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java                                                 generic-all
+java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java                                       generic-all
 java/security/cert/CertPathValidator/OCSP/FailoverToCRL.java                                                            generic-all
 java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevel.java                                               generic-all
 java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java                                        generic-all
@@ -1603,6 +1604,7 @@ java/security/cert/CertPathValidatorException/Serial.java
 java/security/cert/CertificateFactory/openssl/BadFooter.java                                                            generic-all
 java/security/cert/CertificateFactory/slowstream.sh                                                                     generic-all
 java/security/cert/CertificateRevokedException/Basic.java                                                               generic-all
+java/security/cert/pkix/policyChanges/TestPolicy.java                                                                   generic-all
 java/security/cert/PKIXRevocationChecker/OcspUnauthorized.java                                                          generic-all
 java/security/cert/PKIXRevocationChecker/UnitTest.java                                                                  generic-all
 java/security/cert/PolicyNode/GetPolicyQualifiers.java                                                                  generic-all