Skip to content

Commit fb2b438

Browse files
authored
[release/6.0] wasm-tools: Fix workload manifest MSI ProductVersion generation (#90994)
* Fix manifest MSI version * Add GetAssemblyVersion back
1 parent 762f437 commit fb2b438

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

src/workloads/workloads.csproj

+4-13
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

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

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

184-
<Target Name="_GetVersionProps">
185-
<PropertyGroup>
186-
<_MajorVersion>$([System.Version]::Parse('$(AssemblyVersion)').Major)</_MajorVersion>
187-
<_MinorVersion>$([System.Version]::Parse('$(AssemblyVersion)').Minor)</_MinorVersion>
188-
<_PatchVersion>$([System.Version]::Parse('$(AssemblyVersion)').Build)</_PatchVersion>
189-
<_BuildNumber>$([System.Version]::Parse('$(AssemblyVersion)').Revision)</_BuildNumber>
190-
</PropertyGroup>
191-
</Target>
192-
193184
<Target Name="_GenerateMsiVersionString">
194185
<PropertyGroup>
195186
<VersionPadding Condition="'$(VersionPadding)'==''">5</VersionPadding>
@@ -207,9 +198,9 @@
207198
</GenerateCurrentVersion>
208199

209200
<GenerateMsiVersion
210-
Major="$(_MajorVersion)"
211-
Minor="$(_MinorVersion)"
212-
Patch="$(_PatchVersion)"
201+
Major="$(MajorVersion)"
202+
Minor="$(MinorVersion)"
203+
Patch="$(PatchVersion)"
213204
BuildNumberMajor="$(BuildNumberMajor)"
214205
BuildNumberMinor="$(BuildNumberMinor)">
215206
<Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />

0 commit comments

Comments
 (0)