未验证 提交 fb2b438c 编写于 作者: J Jacques Eloff 提交者: GitHub

[release/6.0] wasm-tools: Fix workload manifest MSI ProductVersion generation (#90994)

* Fix manifest MSI version

* Add GetAssemblyVersion back
上级 762f4379
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" /> <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
<Target Name="Build" DependsOnTargets="GetAssemblyVersion;_GetVersionProps;_GenerateMsiVersionString"> <Target Name="Build" DependsOnTargets="GetAssemblyVersion;_GenerateMsiVersionString">
<ItemGroup> <ItemGroup>
<!-- Overrides for Visual Studio setup generation. If the workload definition IDs change, <!-- Overrides for Visual Studio setup generation. If the workload definition IDs change,
these must be updated. --> these must be updated. -->
...@@ -181,15 +181,6 @@ ...@@ -181,15 +181,6 @@
<MSBuild Projects="@(SwixProjects)" BuildInParallel="true" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VisualStudioSetupInsertionPath)" /> <MSBuild Projects="@(SwixProjects)" BuildInParallel="true" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VisualStudioSetupInsertionPath)" />
</Target> </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"> <Target Name="_GenerateMsiVersionString">
<PropertyGroup> <PropertyGroup>
<VersionPadding Condition="'$(VersionPadding)'==''">5</VersionPadding> <VersionPadding Condition="'$(VersionPadding)'==''">5</VersionPadding>
...@@ -207,9 +198,9 @@ ...@@ -207,9 +198,9 @@
</GenerateCurrentVersion> </GenerateCurrentVersion>
<GenerateMsiVersion <GenerateMsiVersion
Major="$(_MajorVersion)" Major="$(MajorVersion)"
Minor="$(_MinorVersion)" Minor="$(MinorVersion)"
Patch="$(_PatchVersion)" Patch="$(PatchVersion)"
BuildNumberMajor="$(BuildNumberMajor)" BuildNumberMajor="$(BuildNumberMajor)"
BuildNumberMinor="$(BuildNumberMinor)"> BuildNumberMinor="$(BuildNumberMinor)">
<Output TaskParameter="MsiVersion" PropertyName="MsiVersion" /> <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册