Skip to content

Use Microsoft.AspNetCore.InternalTesting.csproj for _GetPackageVersionInfo #53152

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 5 commits into from
Jan 5, 2024
Merged

Use Microsoft.AspNetCore.InternalTesting.csproj for _GetPackageVersionInfo #53152

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ce78a2
Fix return value in _GetPackageVersionInfo
wtgodbe Jan 4, 2024
5eb85b5
Update Publishing.props
wtgodbe Jan 4, 2024
7e70c04
Update Npm.Workspace.nodeproj
wtgodbe Jan 4, 2024
f056695
Update Publishing.props
wtgodbe Jan 4, 2024
4ed2c8f
Update Publishing.props
wtgodbe Jan 4, 2024
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
24 changes: 7 additions & 17 deletions eng/Publishing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,16 @@
DependsOnTargets="_WriteProductVersionFile">
<!--
This target is defined in eng/targets/Packaging.targets and Npm.Common.targets and included in every C#, F#,
and npm project. We use SignalR.Npm.FunctionalTests.nodeproj because it is non-shipping (we need a non-stable
version string to use as our publish location), non-packed (won't be shipped in the future), and it is _not_ a
C# or F# project. For now at least, C# and F# projects should not be referenced when using desktop msbuild.
and npm project. We use Microsoft.AspNetCore.InternalTesting.csproj because it is non-shipping (we need a non-stable
version string to use as our publish location) non-packed (won't be shipped in the future).
-->
<MSBuild Projects="$(RepoRoot)eng\Npm.Workspace.nodeproj"
<MSBuild Projects="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.InternalTesting.csproj"
Properties="ExcludeFromBuild=false"
Targets="_GetPackageVersionInfo">
<Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageVersionInfo" />
</MSBuild>

<PropertyGroup>
<!-- _GetPackageVersionInfo will return all the versions for all public/shipping packages.
They are all the same, so we just take the last one.
If this changes in the future, we'll have to update this logic.
-->
<_PackageVersion>@(_ResolvedPackageVersionInfo->'%(PackageVersion)')</_PackageVersion>
</PropertyGroup>

Expand Down Expand Up @@ -105,22 +100,17 @@
Name="_WriteProductVersionFile"
Condition=" '$(PublishInstallerBaseVersion)' == 'true'">
<!--
This target is defined in eng/targets/Packaging.targets and Npm.Workspace.nodeproj and included in every C#, F#,
and JS project. We use Microsoft.JSInterop.JS.nodeproj because it is shipping (we need a stable
version string to use for productVersion.txt), and because it won't break when the SDK requires a newer
desktop MSBuild than exists on the build machine.
This target is defined in eng/targets/Packaging.targets and Npm.Common.targets and included in every C#, F#,
and npm project. We use Microsoft.AspNetCore.InternalTesting.csproj because it is non-shipping (we need a non-stable
version string to use as our publish location) non-packed (won't be shipped in the future).
-->
<MSBuild Projects="$(RepoRoot)eng\Npm.Workspace.nodeproj"
<MSBuild Projects="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.InternalTesting.csproj"
Properties="ExcludeFromBuild=false"
Targets="_GetPackageVersionInfo">
<Output TaskParameter="TargetOutputs" ItemName="_ResolvedProductVersionInfo" />
</MSBuild>

<PropertyGroup>
<!-- _GetPackageVersionInfo will return all the versions for all public/shipping packages.
They are all the same, so we just take the last one.
If this changes in the future, we'll have to update this logic.
-->
<_ProductVersion>%(_ResolvedProductVersionInfo.PackageVersion)</_ProductVersion>
</PropertyGroup>

Expand Down