|
43 | 43 | DependsOnTargets="_WriteProductVersionFile"> |
44 | 44 | <!-- |
45 | 45 | 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). |
49 | 48 | --> |
50 | | - <MSBuild Projects="$(RepoRoot)eng\Npm.Workspace.nodeproj" |
| 49 | + <MSBuild Projects="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.InternalTesting.csproj" |
51 | 50 | Properties="ExcludeFromBuild=false" |
52 | 51 | Targets="_GetPackageVersionInfo"> |
53 | 52 | <Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageVersionInfo" /> |
54 | 53 | </MSBuild> |
55 | 54 |
|
56 | 55 | <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 | | - --> |
61 | 56 | <_PackageVersion>@(_ResolvedPackageVersionInfo->'%(PackageVersion)')</_PackageVersion> |
62 | 57 | </PropertyGroup> |
63 | 58 |
|
|
105 | 100 | Name="_WriteProductVersionFile" |
106 | 101 | Condition=" '$(PublishInstallerBaseVersion)' == 'true'"> |
107 | 102 | <!-- |
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). |
112 | 106 | --> |
113 | | - <MSBuild Projects="$(RepoRoot)eng\Npm.Workspace.nodeproj" |
| 107 | + <MSBuild Projects="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.InternalTesting.csproj" |
114 | 108 | Properties="ExcludeFromBuild=false" |
115 | 109 | Targets="_GetPackageVersionInfo"> |
116 | 110 | <Output TaskParameter="TargetOutputs" ItemName="_ResolvedProductVersionInfo" /> |
117 | 111 | </MSBuild> |
118 | 112 |
|
119 | 113 | <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 | | - --> |
124 | 114 | <_ProductVersion>%(_ResolvedProductVersionInfo.PackageVersion)</_ProductVersion> |
125 | 115 | </PropertyGroup> |
126 | 116 |
|
|
0 commit comments