diff --git a/eng/TraversalSdk.AfterTargets.targets b/eng/TraversalSdk.AfterTargets.targets
index 7ae0b789b9b5c7..34df3765df95d9 100644
--- a/eng/TraversalSdk.AfterTargets.targets
+++ b/eng/TraversalSdk.AfterTargets.targets
@@ -19,11 +19,9 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(FilterTraversalProjectReferences)' == 'true'">
-    <!-- Override the Traversal SDK setting as filtering relies on the TargetFrameworkProperties being fetched
-         and don't flow the BuildTargetFramework property down. -->
+    <!-- Override the Traversal SDK setting as filtering relies on the TargetFrameworkProperties being fetched. -->
     <ProjectReference Update="@(ProjectReference)"
-                      SkipGetTargetFrameworkProperties="false"
-                      UndefineProperties="%(UndefineProperties);BuildTargetFramework"  />
+                      SkipGetTargetFrameworkProperties="false"  />
   </ItemGroup>
 
 </Project>
diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index 9bb4a5387df06c..1de45098a8fa0a 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -122,11 +122,13 @@
     </PropertyGroup>
   </Target>
 
+  <!-- Skip the PNSE doc-source self-reference when not building a .NETCoreApp vertical. -->
   <Target Name="AddProjectReferenceToPNSEDocSource"
           DependsOnTargets="GetPNSEDocTargetFramework"
           BeforeTargets="PrepareForBuild"
           Condition="'$(IsPlatformNotSupportedAssembly)' == 'true' and
-                    '$(UseCompilerGeneratedDocXmlFile)' == 'true'">
+                    '$(UseCompilerGeneratedDocXmlFile)' == 'true' and
+                    ('$(BuildTargetFramework)' == '' or '$(TargetFrameworkIdentifier)' == '.NETCoreApp')">
     
     <Error Condition="'$(PNSEDocTargetFramework)' == ''"
            Text="Could not find a compatible TargetFramework to use as the documentation source for this PNSE build. Set 'PNSEDocTargetFramework' to the desired target framework." />
diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/ErrObjectTests.cs b/src/libraries/Microsoft.VisualBasic.Core/tests/ErrObjectTests.cs
index 3a7ae775ea5620..d04cfa38c504ca 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/tests/ErrObjectTests.cs
+++ b/src/libraries/Microsoft.VisualBasic.Core/tests/ErrObjectTests.cs
@@ -28,8 +28,10 @@ public void Clear()
             Assert.Equal(0, errObj.HelpContext);
             Assert.Equal("", errObj.HelpFile);
             Assert.Equal("", errObj.Source);
+#if NET
             Marshal.SetLastPInvokeError(42);
             Assert.Equal(42, errObj.LastDllError);
+#endif
             Assert.Equal(0, errObj.Number);
             Assert.Equal("", errObj.Description);
             Assert.Null(errObj.GetException());