Merge pull request #2970 from microsoft/staging

Release - 5/19/24

.editorconfig

@@ -206,3 +206,9 @@ dotnet_style_prefer_simplified_interpolation = true:suggestion
 # Spelling
 
 spelling_exclusion_path = .\exclusion.dic
+
+# Diagnostic configuration
+
+# CS8305: Type is for evaluation purposes only and is subject to change or removal in future updates.
+dotnet_diagnostic.CS8305.severity = suggestion
+

.github/ISSUE_TEMPLATE/Feature_Request_Windows_Customization.yml

@@ -0,0 +1,71 @@
+name: "Suggest a new setting/feature within Windows Customization"
+description: Suggest a new feature or improvement within Windows Customization (this does not mean you have to implement
+  it)
+labels:
+- Issue-Feature
+- Area-Windows-Customization
+body:
+- id: minwindowsversion
+  type: input
+  attributes:
+    label: Minimum Supported Windows Version
+    placeholder: "10.0.23400.0"
+    description: What is the minimum version of Windows that should support this feature?
+  validations:
+    required: true
+
+- id: maxwindowsversion 
+  type: input 
+  attributes: 
+    label: Maximum Supported Windows Version 
+    placeholder: "10.0.23400.0" 
+    description: Did this feature stop working on a specific version of Windows? If so, what version? If you are unsure please put "Unknown".
+  validations:
+    required: false
+
+- id: registrykeys
+  type: textarea
+  attributes:
+    label: Registry Keys
+    placeholder: What registry keys are needed to enable this feature? Please provide the full path and value. If not applicable, please enter "None".
+  validations:
+    required: true 
+
+- id: ispublic
+  type: dropdown
+  attributes:
+    label: Is this feature publicly documented?
+    options:
+      - "Yes"
+      - "No"
+    description: Is this feature publicly documented? Is there a public API or documentation available?
+  validations:
+    required: true
+
+- id: publicdocumentation
+  type: textarea
+  attributes:
+    label: Public Documentation
+    placeholder: If there is public documentation for this feature, please provide the link here. If not applicable, please enter "None".
+  validations:
+    required: true 
+
+- id: scenario
+  type: textarea
+  attributes:
+    label: Scenario
+    placeholder: How could this new feature be used? Feel free to provide examples.
+  validations:
+    required: true
+
+- id: supportinginfo
+  type: textarea
+  attributes:
+    label: Additional details
+    placeholder: Enter more info or links to give us more details. 
+  validations:
+    required: false
+
+- type: markdown
+  attributes:
+    value: Please limit one request per issue.

.github/workflows/DevHome-CI.yml

@@ -67,21 +67,21 @@ jobs:
 
     - name: Build_DevSetupAgent_x86
       if: ${{ matrix.platform != 'arm64' }}
-      run: cmd /c "$env:VSDevCmd" "&" msbuild /p:Configuration=${{ matrix.configuration }},Platform=x86 HyperVExtension\\DevSetupAgent.sln
+      run: cmd /c "$env:VSDevCmd" "&" msbuild /p:Configuration=${{ matrix.configuration }},Platform=x86 extensions\HyperVExtension\\DevSetupAgent.sln
 
     - name: Compress_DevSetupAgent_x86
       if: ${{ matrix.platform != 'arm64' }}
       shell: pwsh
-      run: Compress-Archive -Force -Path HyperVExtension\src\DevSetupAgent\bin\x86\${{ matrix.configuration }}\net8.0-windows10.0.22621.0\win-x86\* -DestinationPath "HyperVExtension\src\DevSetupAgent\bin\x86\${{ matrix.configuration }}\DevSetupAgent_x86.zip"
+      run: Compress-Archive -Force -Path extensions\HyperVExtension\src\DevSetupAgent\bin\x86\${{ matrix.configuration }}\net8.0-windows10.0.22621.0\win-x86\* -DestinationPath "extensions\HyperVExtension\src\DevSetupAgent\bin\x86\${{ matrix.configuration }}\DevSetupAgent_x86.zip"
 
     - name: Build_DevSetupAgent_arm64
       if: ${{ matrix.platform == 'arm64' }}
-      run: cmd /c "$env:VSDevCmd" "&" msbuild /p:Configuration=${{ matrix.configuration }},Platform=arm64 HyperVExtension\\DevSetupAgent.sln
+      run: cmd /c "$env:VSDevCmd" "&" msbuild /p:Configuration=${{ matrix.configuration }},Platform=arm64 extensions\HyperVExtension\\DevSetupAgent.sln
 
     - name: Compress_DevSetupAgent_arm64
       if: ${{ matrix.platform == 'arm64' }}
       shell: pwsh
-      run: Compress-Archive -Force -Path HyperVExtension\src\DevSetupAgent\bin\arm64\${{ matrix.configuration }}\net8.0-windows10.0.22621.0\win-arm64\* -DestinationPath "HyperVExtension\src\DevSetupAgent\bin\arm64\${{ matrix.configuration }}\DevSetupAgent_arm64.zip"
+      run: Compress-Archive -Force -Path extensions\HyperVExtension\src\DevSetupAgent\bin\arm64\${{ matrix.configuration }}\net8.0-windows10.0.22621.0\win-arm64\* -DestinationPath "extensions\HyperVExtension\src\DevSetupAgent\bin\arm64\${{ matrix.configuration }}\DevSetupAgent_arm64.zip"
 
     - name: Build_DevHome
       run: cmd /c "$env:VSDevCmd" "&" msbuild /p:Configuration=${{ matrix.configuration }},Platform=${{ matrix.platform }} DevHome.sln

Build.ps1

@@ -63,14 +63,14 @@ if (($BuildStep -ieq "all") -Or ($BuildStep -ieq "sdk")) {
 
 if (($BuildStep -ieq "all") -Or ($BuildStep -ieq "DevSetupAgent") -Or ($BuildStep -ieq "fullMsix")) {
   foreach ($configuration in $env:Build_Configuration.Split(",")) {
-    # We use x86 DevSetupAgent for x64 and x86 Dev Home build. Only need to build it once if we are building multiple platforms. 
+    # We use x86 DevSetupAgent for x64 and x86 Dev Home build. Only need to build it once if we are building multiple platforms.
     $builtX86 = $false
     foreach ($platform in $env:Build_Platform.Split(",")) {
-      if ($Platform -ieq "arm64") {
-        HyperVExtension\BuildDevSetupAgentHelper.ps1 -Platform $Platform -Configuration $configuration -VersionOfSDK $env:sdk_version -SDKNugetSource $SDKNugetSource -AzureBuildingBranch $AzureBuildingBranch -IsAzurePipelineBuild $IsAzurePipelineBuild -BypassWarning
+      if ($platform -ieq "arm64") {
+        extensions\HyperVExtension\BuildDevSetupAgentHelper.ps1 -Platform $Platform -Configuration $configuration -VersionOfSDK $env:sdk_version -SDKNugetSource $SDKNugetSource -AzureBuildingBranch $AzureBuildingBranch -IsAzurePipelineBuild $IsAzurePipelineBuild -BypassWarning
       }
       elseif (-not $builtX86) {
-        HyperVExtension\BuildDevSetupAgentHelper.ps1 -Platform "x86" -Configuration $configuration -VersionOfSDK $env:sdk_version -SDKNugetSource $SDKNugetSource -AzureBuildingBranch $AzureBuildingBranch -IsAzurePipelineBuild $IsAzurePipelineBuild -BypassWarning
+        extensions\HyperVExtension\BuildDevSetupAgentHelper.ps1 -Platform "x86" -Configuration $configuration -VersionOfSDK $env:sdk_version -SDKNugetSource $SDKNugetSource -AzureBuildingBranch $AzureBuildingBranch -IsAzurePipelineBuild $IsAzurePipelineBuild -BypassWarning
         $builtX86 = $true
       }
     }
@@ -133,7 +133,7 @@ Try {
     $appxmanifest.Root.Element($xIdentity).Attribute("Version").Value = $env:msix_version
     if (-not ([string]::IsNullOrEmpty($newPackageName))) {
       $appxmanifest.Root.Element($xIdentity).Attribute("Name").Value = $newPackageName
-    } 
+    }
     if (-not ([string]::IsNullOrEmpty($newPackageDisplayName))) {
       $appxmanifest.Root.Element($xProperties).Element($xDisplayName).Value = $newPackageDisplayName
     }
@@ -144,9 +144,6 @@ Try {
         if ($extension.Attribute("Category").Value -eq "windows.appExtension") {
           $appExtension = $extension.Element($uapAppExtension)
           switch ($appExtension.Attribute("Name").Value) {
-            "com.microsoft.devhome" {
-              $appExtension.Attribute("DisplayName").Value = $newAppDisplayNameResource
-            }
             "com.microsoft.windows.widgets" {
               $appExtension.Attribute("DisplayName").Value = $newWidgetProviderDisplayName
             }
@@ -162,6 +159,7 @@ Try {
     foreach ($platform in $env:Build_Platform.Split(",")) {
       foreach ($configuration in $env:Build_Configuration.Split(",")) {
         $appxPackageDir = (Join-Path $env:Build_RootDirectory "AppxPackages\$configuration")
+        Write-Host "Building DevHome for EnvPlatform: $env:Build_Platform Platform: $platform Configuration: $configuration BundlePlatforms: $appxBundlePlatform Dir: $appxPackageDir Ring: $buildRing"
         $msbuildArgs = @(
             ("DevHome.sln"),
             ("/p:Platform="+$platform),
@@ -181,6 +179,7 @@ Try {
         }
 
         & $msbuildPath $msbuildArgs
+
         if (-not($IsAzurePipelineBuild) -And $isAdmin) {
           Invoke-SignPackage "$appxPackageDir\DevHome-$platform.msix"
         }
@@ -198,9 +197,6 @@ Try {
       if ($extension.Attribute("Category").Value -eq "windows.appExtension") {
         $appExtension = $extension.Element($uapAppExtension)
         switch ($appExtension.Attribute("Name").Value) {
-          "com.microsoft.devhome" {
-            $appExtension.Attribute("DisplayName").Value = "ms-resource:AppDisplayNameDev"
-          }
           "com.microsoft.windows.widgets" {
             $appExtension.Attribute("DisplayName").Value = "ms-resource:WidgetProviderDisplayNameDev"
           }

CONTRIBUTING.md

@@ -112,6 +112,14 @@ Bugs and tasks are obviously the easiest to get started with, but don't feel afr
 
 Generally, we like to assign issues that generally belong to somebody's area of expertise to the team member that owns that area. This doesn't mean the community can't jump in -- they should reach out and have a chat with the assignee to see if it'd okay to take. If an issue was assigned more than a month ago, there's a good chance it's fair game to try yourself.
 
+### Contributing to Windows Customization
+
+If you'd like to suggest a new feature/improvement to Windows Customization, **you must first file an issue with the provided `Windows Customization` [template](https://github.com/microsoft/devhome/issues/new?template=feature_request_windows_customization.yml)**. This will help us understand what you're looking for and why, and will help us ensure that the feature is something that we can support in the long run. For changes that rely on registry key behaviors that are undocumented, we will first have to review with internal stakeholders how to support the desired functionality and may not be able to support them in the long term. In these cases, we may have to modify your PR with a different approach after chatting with the internal teams.
+
+We will not accept or review PRs that add new features to Windows Customization without an associated issue that follows the `Windows Customization` template.
+
+For bug fixes, please still use the existing [bug template](https://github.com/microsoft/devhome/issues/new?template=Bug_Report.yml). If you are able to fix the bug, please indicate that in the issue and we'll be happy to review your PR.
+
 ### To spec or not to spec
 
 Some issues/features may be quick and simple to describe and understand. For such scenarios, once a team member has agreed with your approach, skip ahead to the section headed "Fork, Branch, and Create your PR", below.
@@ -178,7 +186,7 @@ Alternatively,
 ### Rules
 
 - **Follow the pattern of what you already see in the code.**
-- [Coding style](style.md).
+- [Coding style](./docs/style.md).
 - Try to package new ideas/components into libraries that have nicely defined interfaces.
 - Package new ideas into classes or refactor existing ideas into a class as you extend.
 - When adding new classes/methods/changing existing code: add new unit tests or update the existing tests.
@@ -195,4 +203,4 @@ Once your code has been reviewed and approved by the requisite number of team me
 
 ## Thank you
 
-Thank you in advance for your contribution! Now, [what's next on the list](https://github.com/microsoft/devhome/labels/Help%20Wanted)? 😜
+Thank you in advance for your contribution! Now, [what's next on the list](https://github.com/microsoft/devhome/labels/Help%20Wanted)? 😜