Skip to content
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.

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

Fix versioning errors in workloads #10363

Merged
merged 2 commits into from
Aug 11, 2022
Merged

Conversation

joeloff
Copy link
Member

@joeloff joeloff commented Aug 10, 2022

Address multiple versioning issues

  • Manifest version task property should be a string and not Version
  • MSI package IDs in VS manifests should include the pack version, otherwise the component dependencies won't match. We'd end up with
vs.dependency id=Microsoft.Maui.Essentials.Ref.android.6.0.400-preview.1.6511

and a package definition like

package name=Microsoft.Maui.Essentials.Ref.android

dsplaisted
dsplaisted previously approved these changes Aug 10, 2022
pjcollins
pjcollins previously approved these changes Aug 10, 2022
@joeloff joeloff dismissed stale reviews from pjcollins and dsplaisted via d6cc3c6 August 10, 2022 22:59
@joeloff
Copy link
Member Author

joeloff commented Aug 11, 2022

@dsplaisted, @pjcollins need you to re-approve because of an AzDo fix I had to take and that reset your votes.

@MattGal, can you help merge in case MattM can't?

@MattGal MattGal merged commit 778552f into dotnet:release/6.0 Aug 11, 2022
@joeloff joeloff deleted the Versioning branch August 11, 2022 17:22
joeloff added a commit to joeloff/arcade that referenced this pull request Aug 12, 2022
* Fix versioning errors in workloads

* Disable TRX tests while reporting to AZDO is broken (dotnet#10358) (dotnet#10380)

Co-authored-by: Matt Galbraith <MattGal@users.noreply.github.com>
mmitche pushed a commit that referenced this pull request Aug 15, 2022
* Refactoring workload build tasks (#8645)

* Refactoring workload build tasks

* Fix source build and some random cleanup

* Updating tests, code cleanup

* Minor fixes, unit test conversion

* Mark tests as Windows only, fix missing content for Helix

* Hide WiX and test packages from Solution Explorer

* Fix duplicate publish items

* Fix link target for helix

* Fix link metadata for WiX

* Pass ICE suppressions to Light, more cleanup

* Fix file extraction for packs, add unit test for template pack MSI

* Pass ICE suppressions to Light (#9061)

* Create workload pack group installers (#9514)

* Remove duplicate PackageReference

* Create MSIs for workoad pack groups

* Build NuGet wrapper packages for workload pack group MSIs

* Generate WorkloadPackGroups.json in manifest MSIs

* Add swix authoring for workload pack groups

* De-duplicate workload pack group creation

* Put braces around ProductCode and UpgradeCode registry values

* Write registry keys for pack groups

* Fix swix dependencies for pack groups

* Use correct GUID format when setting candle variables

* Add test for creating pack group dependency in SWR file

* Support building with missing workload packs (#9628)

* Support building with missing workload packs

* Include extracted manifest files in manifest MSI payload nupkg

* Fix versioning errors in workloads (#10363)

* Fix versioning errors in workloads

* Disable TRX tests while reporting to AZDO is broken (#10358) (#10380)

Co-authored-by: Matt Galbraith <MattGal@users.noreply.github.com>

* clean up, api changes

Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
Co-authored-by: Matt Galbraith <MattGal@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants