Skip to content

[release/6.0] Tweak workload build to use _GenerateMsiVersionString target #60695

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
mmitche merged 4 commits into from
Oct 20, 2021
Merged

[release/6.0] Tweak workload build to use _GenerateMsiVersionString target #60695

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7078a78
Tweak workload build to use _GenerateMsiVersionString target
Oct 19, 2021
c71141e
Pulled in arcade target that will be removed at a later date
Oct 19, 2021
7768868
More tweaks
Oct 19, 2021
e41aba5
Forget dependsontargets
Oct 19, 2021
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
Prev Previous commit
Next Next commit
More tweaks
  • Loading branch information
Steve Pfister authored and github-actions committed Oct 20, 2021
commit 77688680366f9361902661b83f7c624ea08d94e1
27 changes: 14 additions & 13 deletions src/workloads/workloads.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

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

<Target Name="Build" DependsOnTargets="_GenerateMsiVersionString">
<Target Name="Build" DependsOnTargets="_GetVersionProps;_GenerateMsiVersionString">
<ItemGroup>
<!-- Overrides for Visual Studio setup generation. If the workload definition IDs change,
these must be updated. -->
Expand Down Expand Up @@ -94,14 +94,6 @@
<ManifestPackages Include="$(PackageSource)Microsoft.NET.Workload.Mono.ToolChain.Manifest-*.nupkg" />
</ItemGroup>

<GenerateMsiVersion
Major="$([System.Version]::Parse('$(SDKBundleVersion)').Major)"
Minor="$([System.Version]::Parse('$(SDKBundleVersion)').Minor)"
Patch="$([System.Version]::Parse('$(SDKBundleVersion)').Build)"
BuildNumber="$([System.Version]::Parse('$(SDKBundleVersion)').Revision)" >
<Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
</GenerateMsiVersion>

<GenerateManifestMsi
IntermediateBaseOutputPath="$(IntermediateOutputPath)"
OutputPath="$(OutputPath)"
Expand Down Expand Up @@ -183,6 +175,15 @@
<MSBuild Projects="@(VisualStudioManifestProjects)" BuildInParallel="true" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VersionedVisualStudioSetupInsertionPath);OutputPath=$(VersionedVisualStudioSetupInsertionPath)" />
</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 @@ -200,12 +201,12 @@
</GenerateCurrentVersion>

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