Skip to content

Add .Net 7 Check to ClientAssets #572

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
merged 4 commits into from
Jan 12, 2023
Merged

Add .Net 7 Check to ClientAssets #572

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b8ab05
Prevent .NET7 from falling back to old behavior
Nick-Stanton Jan 4, 2023
ec45e3b
change to '<', '>='
Nick-Stanton Jan 5, 2023
6f82d37
Stop comparing strings :(
Nick-Stanton Jan 5, 2023
9b314c5
Add project capability
Nick-Stanton Jan 11, 2023
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
5 changes: 3 additions & 2 deletions ...ft.AspNetCore.ClientAssets/build/netstandard2.0/Microsoft.AspNetCore.ClientAssets.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

<ItemGroup>
<ClientAssetsInputs Include="$(ClientAssetsDirectory)**" Exclude="$(DefaultItemExcludes)" />
<ProjectCapability Include="ClientAssetsAlpha"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

My preference would be to not include Alpha suffix. I wonder if it'll be possible to differentiate telemetry based on the package version itself (@DamianEdwards do you know?)

Copy link
Member

Choose a reason for hiding this comment

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

No we don't get good signal on package versions.

Copy link
Member

Choose a reason for hiding this comment

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

I want a signal for these versions so once we decide to change it, if it becomes a package, we can differentiate usages as @DamianEdwards says.

</ItemGroup>

<Target Name="ClientAssetsRestore" BeforeTargets="$(ClientAssetsRestoreBeforeTargets)" Inputs="$(ClientAssetsRestoreInputs)" Outputs="$(ClientAssetsRestoreOutputs)">
Expand Down Expand Up @@ -47,7 +48,7 @@
<FileWrites Include="$(IntermediateOutputPath)clientassetsbuild.complete.txt" />

<Content
Condition="'$(TargetFramework)' != 'net6.0'"
Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionLessThan('$(TargetFrameworkVersion)', '6.0')) "
Include="@(_ClientAssetsBuildOutput)"
Link="wwwroot\%(_ClientAssetsBuildOutput.RecursiveDir)\%(_ClientAssetsBuildOutput.FileName)%(_ClientAssetsBuildOutput.Extension)" />

Expand All @@ -58,7 +59,7 @@
the ability to consume them from project references. As a workaround, we are using the Task directly on this package, to make sure this scenario works. In a future
release we will address this by aligning DiscoverStaticWebAssets behavior with DefineStaticWebAssets to follow the same heuristics for determining the content root.
-->
<DefineStaticWebAssets Condition="'$(TargetFramework)' == 'net6.0'"
<DefineStaticWebAssets Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '6.0'))"
CandidateAssets="@(_ClientAssetsBuildOutput)"
SourceId="$(PackageId)"
SourceType="Computed"
Expand Down