Skip to content

Fix .NETFramework build breaks #127200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericstj merged 6 commits into from
Apr 22, 2026
+7 −5
Merged

Fix .NETFramework build breaks #127200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8d4990d
Skip PNSE doc-source P2P when local targeting pack is unavailable
danmoseley Apr 21, 2026
98b2a6c
Also check bootstrap ref-pack location for FrameworkList.xml
danmoseley Apr 21, 2026
5f85f61
Apply suggestions from code review
ericstj Apr 21, 2026
fce9c80
Don't undefine BuildTargetFramework
ericstj Apr 21, 2026
6b04c4c
Fix break in ErrObjectTests on netfx
ericstj Apr 21, 2026
b66396e
Apply suggestion from @jkotas
jkotas Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions eng/TraversalSdk.AfterTargets.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 3 additions & 1 deletion eng/intellisense.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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." />
Expand Down
2 changes: 2 additions & 0 deletions src/libraries/Microsoft.VisualBasic.Core/tests/ErrObjectTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ public void Clear()
Assert.Equal(0, errObj.HelpContext);
Assert.Equal("", errObj.HelpFile);
Assert.Equal("", errObj.Source);
#if NET
Comment thread
ericstj marked this conversation as resolved.
Marshal.SetLastPInvokeError(42);
Assert.Equal(42, errObj.LastDllError);
#endif
Comment thread
ericstj marked this conversation as resolved.
Assert.Equal(0, errObj.Number);
Assert.Equal("", errObj.Description);
Assert.Null(errObj.GetException());
Expand Down
Loading