Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 6 deletions eng/SourceBuildPrebuiltBaseline.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
<UsageData>
<IgnorePatterns>
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />

<!-- Ignoring the following prebuilts. net7.0 targeting is still needed
due to https://github.com/dotnet/razor/issues/8293#issuecomment-1454042002
net7.0 targeting removal is tracked in https://github.com/dotnet/razor/issues/8531 -->
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0.2" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0.2" />
</IgnorePatterns>
</UsageData>
1 change: 1 addition & 0 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<DefaultNetFxTargetFramework>net472</DefaultNetFxTargetFramework>
<DefaultNetCoreTargetFramework>net8.0</DefaultNetCoreTargetFramework>
<DefaultNetCoreTargetFrameworks>$(DefaultNetCoreTargetFramework);net7.0</DefaultNetCoreTargetFrameworks>
<DefaultNetCoreTargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</DefaultNetCoreTargetFrameworks>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this going to break when it merges into dotnet/sdk for 7.0 releases? Basically doesn't this have the exact same problem roslyn had that forced us to multi-target net7.0;net8.0 when '$(DotNetBuildFromSourceFlavor)' != 'Product'?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I overlooked that this flows into multiple releases. Thanks for the catch. I will open another PR.

<DefaultNetCoreWindowsTargetFrameworks>net8.0-windows;net7.0-windows</DefaultNetCoreWindowsTargetFrameworks>
</PropertyGroup>
<!--
Expand Down