Skip to content
This repository was archived by the owner on Jun 5, 2025. It is now read-only.

Conversation

@sshilov7
Copy link
Member

@sshilov7 sshilov7 commented Mar 5, 2024

Summary of the pull request

  • Fix DevSetupAgent deployment PS script to not fail when registering release version of DevSetupEngine.
  • Fix progress reporting to show configuration unit intent correctly instead of "Assert".
  • Fix marshaling of configuration unit settings between host and guest devices (by changing ValueSet to Dictionary to make Json deserialization work)
  • Fix GitHub build of DevSetupAgent:
    • Modify build script to move DevSetupAgent zip file under HyperVExtension\src\DevSetupAgent\bin$Platform$configuration.
    • Add new teps to DevHome-CI.yml to build and compress DevSetupAgent during GitHub build.

Validation steps performed

Verified with a new release build
Ran manual E2E configuration test.

PR checklist

  • Closes #xxx
  • Tests added/passed
  • Documentation updated

@sshilov7 sshilov7 requested a review from bbonaby March 5, 2024 20:15
@sshilov7 sshilov7 self-assigned this Mar 5, 2024
@sshilov7 sshilov7 requested a review from EricJohnson327 March 6, 2024 08:50
@sshilov7 sshilov7 requested a review from huzaifa-d March 6, 2024 19:21
@sshilov7 sshilov7 changed the title [Hyper-V extension]: Fixes for DevSetupEngine registration and Configure progress reporting [Hyper-V extension]: Fixes for DevSetupEngine registration, Configure progress reporting, and GitHub build. Mar 6, 2024
Copy link
Contributor

@EricJohnson327 EricJohnson327 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yml changes look good

@sshilov7 sshilov7 merged commit 0c11642 into microsoftfeature/dev-environments Mar 6, 2024
Comment on lines +51 to +54
<None Include="..\DevSetupAgent\bin\x86\$(Configuration)\DevSetupAgent_x86.zip" Condition="('$(Platform)'=='x64' or '$(Platform)'=='x86') and ('$(BuildingInsideVisualStudio)' != 'True' or Exists('..\HyperVExtension\src\DevSetupAgent\bin\x86\($Configuration)\DevSetupAgent_x86.zip'))">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\DevSetupAgent\bin\DevSetupAgent_arm64.zip" Condition="'$(Platform)'=='arm64' and ('$(BuildingInsideVisualStudio)' != 'True' or Exists('..\HyperVExtension\src\DevSetupAgent\bin\DevSetupAgent_arm64.zip'))">
<None Include="..\DevSetupAgent\bin\arm64\($Configuration)\DevSetupAgent_arm64.zip" Condition="'$(Platform)'=='arm64' and ('$(BuildingInsideVisualStudio)' != 'True' or Exists('..\HyperVExtension\src\DevSetupAgent\bin\arm64\($Configuration)\DevSetupAgent_arm64.zip'))">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this possibly be why we're getting the build error for arm64. looks like we're using ($Configuration)\ and not $(Configuration)\ for arm64 and also for the or Exists(... part of both these items.

bbonaby added a commit that referenced this pull request Mar 7, 2024
* add initial SDK changes (#2209)

* Add UX code from private ADO branch to public feature branch (#2241)

* Add initial code from private branch that will be shared between the setup flow and the Dev environments tool page. PRs: from private ADO repo: https://dev.azure.com/microsoft/Dart/_git/DevHome?version=GBDevEnv

* add changes to the setup flow for dev environment configuration PRS: from private ADO repo: https://dev.azure.com/microsoft/Dart/_git/DevHome?version=GBDevEnv

* Add dev environments management tool page from private ADO repo: https://dev.azure.com/microsoft/Dart/_git/DevHome?version=GBDevEnv

* fix conflicts and stylecop errors due to update from merge with main

---------

Co-authored-by: Huzaifa Danish <[email protected]>

* Move Hyper-V extension code from private repository to public dev environments feature branch (#2246)

* Add Hyper-v extension to Dev Home from Private Hyper-v extension branch: PRS https://github.com/microsoft/DevHomeHyperVExtension

* Merge changes from Dev Home main and fix style cop errors

* Initial implementation of IComputeSystem::ApplyConfiguration for HyperV extension. (#2258)

* Add environments to experimentation (#2260)

* Add PowerShell script and a helper class to deploy DevSetupAgent service to a Hyper-V VM. (#2261)

* Hyper-V extension: Add "Ask for VM credentials" and "Wait for logon" Adaptive Cards to Hyper-V Configure command. (#2289)

* Changes to make DevSetupEngine work with .NET 8 (#2308)

* Build DevSetupAgent separately from the main Dev Home solution and add DevSetupAgent_*.zip to MSIX package. (#2325)

* Add WaitForLogin and Credentials Adaptive Cards

* Address review comments.

* New VS solution for DevSetupAgent

* Add BuildDevSetupAgentHelper script

* Fix x86 DevSetupAgent to work on x64 OS.
Create DevSetupAgent zip for different VM architectures.
Fixed build scripts and HyperVExtension.csproj to include DevSetupAgent zip file into Dev Home MSIX package.

* Remove old comment.

* Fix a comment.

* Update setup target flow to allow for configuration of a dev environment. (#2321)

* initial code

* update messaging and adaptive cards

* remove added method

* update strings and names

* update based on initial comments and update IsHyperVModuleLoaded with new work around that doesn't involve installing using Install-Module which installs from PsGallery

* improve wording

* fix merge conflicts

* update dev environments feature branch with latest idl changes (#2334)

* update feature branch to latest sdk

* update InputJson to inputJson

* update with latest changes

* Update environments page UX (#2320)

* add updates to ui

* fix crashes due to resource name mismatch

* update feature branch to latest sdk

* update InputJson to inputJson

* update with latest changes

* update

* update to remove duplicate, resize shimmer, remove id from winget file since its not needed, and add comments

* Re-add correct adaptive host file for correct theming, address some initial comments, update loading page to allow scrolling when there are tasks and actions in the action center. Fix error message spelling.

* improve setup target loading page progress messaging

* Fix git clone's dependsOn Id to match our new Ids for setup target flow

* Update build scripts to build DevSetupAgent in Azure official build. (#2339)

* update dev home to use new SDK version and other projects to use win app sdk v1.5 to prevent build issues (#2344)

* Fix PS DevSetupAgent deployment script. (#2345)

* remove classes that don't need to be added

* Change all tabs to spaces

* Update tools directory to use crlf

* Update HyperVExtension directory to use crlf

* Update common/Environments directory to use crlf

* Update more in common directory to use crlf

* [Hyper-V extension]: Fixes for DevSetupEngine registration, Configure progress reporting, and GitHub build. (#2348)

* remove s that was added from a previous commit causing build to fail

* fix tests for build

* update malformed configuration string to allow arm64 to build

---------

Co-authored-by: Huzaifa Danish <[email protected]>
Co-authored-by: sshilov7 <[email protected]>
Co-authored-by: Kristen Schau <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants