Skip to content

Commit 5d92883

Browse files
Fix manifest MSI version generation (#91023)
Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com>
1 parent a94fcd2 commit 5d92883

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

src/workloads/workloads.csproj

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
3939

40-
<Target Name="Build" DependsOnTargets="GetAssemblyVersion;_GetVersionProps;_GenerateMsiVersionString">
40+
<Target Name="Build" DependsOnTargets="GetAssemblyVersion;_GenerateMsiVersionString">
4141
<ItemGroup>
4242
<!-- Overrides for Visual Studio setup generation. If the workload definition IDs change,
4343
these must be updated. -->
@@ -230,15 +230,6 @@
230230
<MSBuild Projects="@(SwixProjects)" BuildInParallel="true" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VisualStudioSetupInsertionPath)" />
231231
</Target>
232232

233-
<Target Name="_GetVersionProps">
234-
<PropertyGroup>
235-
<_MajorVersion>$([System.Version]::Parse('$(AssemblyVersion)').Major)</_MajorVersion>
236-
<_MinorVersion>$([System.Version]::Parse('$(AssemblyVersion)').Minor)</_MinorVersion>
237-
<_PatchVersion>$([System.Version]::Parse('$(AssemblyVersion)').Build)</_PatchVersion>
238-
<_BuildNumber>$([System.Version]::Parse('$(AssemblyVersion)').Revision)</_BuildNumber>
239-
</PropertyGroup>
240-
</Target>
241-
242233
<Target Name="_GenerateMsiVersionString">
243234
<PropertyGroup>
244235
<VersionPadding Condition="'$(VersionPadding)'==''">5</VersionPadding>
@@ -256,9 +247,9 @@
256247
</GenerateCurrentVersion>
257248

258249
<GenerateMsiVersion
259-
Major="$(_MajorVersion)"
260-
Minor="$(_MinorVersion)"
261-
Patch="$(_PatchVersion)"
250+
Major="$(MajorVersion)"
251+
Minor="$(MinorVersion)"
252+
Patch="$(PatchVersion)"
262253
BuildNumberMajor="$(BuildNumberMajor)"
263254
BuildNumberMinor="$(BuildNumberMinor)">
264255
<Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />

0 commit comments

Comments
 (0)