Skip to content

Commit 2683808

Browse files
authored
Use Microsoft.AspNetCore.InternalTesting.csproj for _GetPackageVersionInfo (#53152)
* Fix return value in _GetPackageVersionInfo * Update Publishing.props * Update Npm.Workspace.nodeproj * Update Publishing.props * Update Publishing.props
1 parent 150c087 commit 2683808

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

eng/Publishing.props

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,16 @@
4343
DependsOnTargets="_WriteProductVersionFile">
4444
<!--
4545
This target is defined in eng/targets/Packaging.targets and Npm.Common.targets and included in every C#, F#,
46-
and npm project. We use SignalR.Npm.FunctionalTests.nodeproj because it is non-shipping (we need a non-stable
47-
version string to use as our publish location), non-packed (won't be shipped in the future), and it is _not_ a
48-
C# or F# project. For now at least, C# and F# projects should not be referenced when using desktop msbuild.
46+
and npm project. We use Microsoft.AspNetCore.InternalTesting.csproj because it is non-shipping (we need a non-stable
47+
version string to use as our publish location) non-packed (won't be shipped in the future).
4948
-->
50-
<MSBuild Projects="$(RepoRoot)eng\Npm.Workspace.nodeproj"
49+
<MSBuild Projects="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.InternalTesting.csproj"
5150
Properties="ExcludeFromBuild=false"
5251
Targets="_GetPackageVersionInfo">
5352
<Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageVersionInfo" />
5453
</MSBuild>
5554

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

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

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

0 commit comments

Comments
 (0)