Skip to content

[release/8.0] wasm-tools: Fix workload manifest MSI ProductVersion generation #91023

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
Parent: Merge #91634 into release/8.0-staging
merged 1 commit into from
Aug 24, 2023
Merged

[release/8.0] wasm-tools: Fix workload manifest MSI ProductVersion generation #91023

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 4 additions & 13 deletions src/workloads/workloads.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

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

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

<Target Name="_GetVersionProps">
<PropertyGroup>
<_MajorVersion>$([System.Version]::Parse('$(AssemblyVersion)').Major)</_MajorVersion>
<_MinorVersion>$([System.Version]::Parse('$(AssemblyVersion)').Minor)</_MinorVersion>
<_PatchVersion>$([System.Version]::Parse('$(AssemblyVersion)').Build)</_PatchVersion>
<_BuildNumber>$([System.Version]::Parse('$(AssemblyVersion)').Revision)</_BuildNumber>
</PropertyGroup>
</Target>

<Target Name="_GenerateMsiVersionString">
<PropertyGroup>
<VersionPadding Condition="'$(VersionPadding)'==''">5</VersionPadding>
Expand All @@ -256,9 +247,9 @@
</GenerateCurrentVersion>

<GenerateMsiVersion
Major="$(_MajorVersion)"
Minor="$(_MinorVersion)"
Patch="$(_PatchVersion)"
Major="$(MajorVersion)"
Minor="$(MinorVersion)"
Patch="$(PatchVersion)"
BuildNumberMajor="$(BuildNumberMajor)"
BuildNumberMinor="$(BuildNumberMinor)">
<Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
Expand Down