Skip to content

Commit 6c6a10c

Browse files
authored
Fix manifest MSI version generation (#91015)
1 parent 46989dc commit 6c6a10c

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. -->
@@ -197,15 +197,6 @@
197197
<MSBuild Projects="@(SwixProjects)" BuildInParallel="true" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VisualStudioSetupInsertionPath)" />
198198
</Target>
199199

200-
<Target Name="_GetVersionProps">
201-
<PropertyGroup>
202-
<_MajorVersion>$([System.Version]::Parse('$(AssemblyVersion)').Major)</_MajorVersion>
203-
<_MinorVersion>$([System.Version]::Parse('$(AssemblyVersion)').Minor)</_MinorVersion>
204-
<_PatchVersion>$([System.Version]::Parse('$(AssemblyVersion)').Build)</_PatchVersion>
205-
<_BuildNumber>$([System.Version]::Parse('$(AssemblyVersion)').Revision)</_BuildNumber>
206-
</PropertyGroup>
207-
</Target>
208-
209200
<Target Name="_GenerateMsiVersionString">
210201
<PropertyGroup>
211202
<VersionPadding Condition="'$(VersionPadding)'==''">5</VersionPadding>
@@ -223,9 +214,9 @@
223214
</GenerateCurrentVersion>
224215

225216
<GenerateMsiVersion
226-
Major="$(_MajorVersion)"
227-
Minor="$(_MinorVersion)"
228-
Patch="$(_PatchVersion)"
217+
Major="$(MajorVersion)"
218+
Minor="$(MinorVersion)"
219+
Patch="$(PatchVersion)"
229220
BuildNumberMajor="$(BuildNumberMajor)"
230221
BuildNumberMinor="$(BuildNumberMinor)">
231222
<Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />

0 commit comments

Comments
 (0)