Staging - 10/3/24

.github/workflows/DevHome-CI.yml

@@ -28,19 +28,19 @@ jobs:
       MSIX_VERSION: "0.1"
       SDK_VERSION: "0.1"
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         clean: true
 
     - name: Setup .NET SDK ${{ matrix.dotnet-version }}
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: ${{ matrix.dotnet-version }}
       env:
         NUGET_AUTH_TOKEN: ${{ secrets.GPR_READ_TOKEN }}
 
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v1.1
+      uses: microsoft/setup-msbuild@v2
       with:
         vs-version: '17.5'
 

CONTRIBUTING.md

@@ -101,7 +101,7 @@ If you don't have any additional info/context to add but would like to indicate
 
 If you're able & willing to help fix issues and/or implement features, we'd love your contribution!
 
-The best place to start is the list of ["good first issue"](https://github.com/microsoft/devhome/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22++label%3A%22good+first+issue%22+)s. These are bugs or tasks that we on the team believe would be easier to implement for someone without any prior experience in the codebase. Once you're feeling more comfortable in the codebase, feel free to just use the ["Help Wanted"](https://github.com/microsoft/devhome/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22+) label, or just find an issue you're interested in and hop in!
+The best place to start is the list of ["good first issue"](https://github.com/microsoft/devhome/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help-Wanted%22++label%3A%22good-first-issue%22+)s. These are bugs or tasks that we on the team believe would be easier to implement for someone without any prior experience in the codebase. Once you're feeling more comfortable in the codebase, feel free to just use the ["Help Wanted"](https://github.com/microsoft/devhome/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help-Wanted%22+) label, or just find an issue you're interested in and hop in!
 
 Generally, we categorize issues in the following way, which is largely derived from our old internal work tracking system:
 * ["Bugs"](https://github.com/microsoft/devhome/issues?q=is%3Aopen+is%3Aissue+label%3A%22Issue-Bug%22+) are parts of Dev Home that are not quite working the right way. There's code to already support some scenario, but it's not quite working right. Fixing these is generally a matter of debugging the broken functionality and fixing the wrong code.
@@ -146,7 +146,7 @@ Team members will be happy to help review specs and guide them to completion.
 
 ### Help wanted
 
-Once the team has approved an issue/spec, development can proceed. If no developers are immediately available, the spec can be parked ready for a developer to get started. Parked specs' issues will be labeled "Help Wanted". To find a list of development opportunities waiting for developer involvement, visit the Issues and filter on [the Help-Wanted label](https://github.com/microsoft/devhome/labels/Help%20Wanted).
+Once the team has approved an issue/spec, development can proceed. If no developers are immediately available, the spec can be parked ready for a developer to get started. Parked specs' issues will be labeled "Help Wanted". To find a list of development opportunities waiting for developer involvement, visit the Issues and filter on [the Help-Wanted label](https://github.com/microsoft/devhome/labels/Help-Wanted).
 
 ---
 
@@ -206,4 +206,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-Wanted)? 😜

DevHome.sln

@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.vsconfig = .vsconfig
 		Directory.Build.props = Directory.Build.props
 		Solution.props = Solution.props
+		ToolingVersions.props = ToolingVersions.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHome", "src\DevHome.csproj", "{60E0FD98-5396-436D-BAB7-187A853A5DC6}"
@@ -201,6 +202,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NTService", "NTService", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Telemetry", "Telemetry", "{70D3F826-0057-4EAF-AA6D-09479075B056}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHome.IfeoTool", "tools\Utilities\IfeoTool\DevHome.IfeoTool.csproj", "{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}"
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnableLocalCabCollection", "tools\DevDiagnostics\Utilities\EnableLocalCabCollection\EnableLocalCabCollection.csproj", "{A382B448-A1F3-4D87-A674-736D2987E613}"
 EndProject
 Global
@@ -1353,6 +1355,24 @@ Global
 		{82BD8133-F1D4-4383-BC4F-12EFAE1AFF91}.Release|x64.Build.0 = Release|x64
 		{82BD8133-F1D4-4383-BC4F-12EFAE1AFF91}.Release|x86.ActiveCfg = Release|x86
 		{82BD8133-F1D4-4383-BC4F-12EFAE1AFF91}.Release|x86.Build.0 = Release|x86
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Debug_FailFast|arm64.ActiveCfg = Debug_FailFast|arm64
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Debug_FailFast|arm64.Build.0 = Debug_FailFast|arm64
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Debug_FailFast|x64.ActiveCfg = Debug_FailFast|x64
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Debug_FailFast|x64.Build.0 = Debug_FailFast|x64
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Debug_FailFast|x86.ActiveCfg = Debug_FailFast|x86
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Debug_FailFast|x86.Build.0 = Debug_FailFast|x86
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Debug|arm64.ActiveCfg = Debug|arm64
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Debug|arm64.Build.0 = Debug|arm64
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Debug|x64.ActiveCfg = Debug|x64
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Debug|x64.Build.0 = Debug|x64
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Debug|x86.ActiveCfg = Debug|x86
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Debug|x86.Build.0 = Debug|x86
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Release|arm64.ActiveCfg = Release|arm64
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Release|arm64.Build.0 = Release|arm64
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Release|x64.ActiveCfg = Release|x64
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Release|x64.Build.0 = Release|x64
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Release|x86.ActiveCfg = Release|x86
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C}.Release|x86.Build.0 = Release|x86
 		{A382B448-A1F3-4D87-A674-736D2987E613}.Debug_FailFast|arm64.ActiveCfg = Debug_FailFast|ARM64
 		{A382B448-A1F3-4D87-A674-736D2987E613}.Debug_FailFast|arm64.Build.0 = Debug_FailFast|ARM64
 		{A382B448-A1F3-4D87-A674-736D2987E613}.Debug_FailFast|x64.ActiveCfg = Debug_FailFast|x64
@@ -1451,6 +1471,7 @@ Global
 		{024CB70C-3449-4204-9171-A25C6C25783D} = {7857275B-7970-4C26-B092-FF62EA890B1E}
 		{567A82BE-7E9E-4D95-AF45-4EE8D57FE16D} = {A972EC5B-FC61-4964-A6FF-F9633EB75DFD}
 		{82BD8133-F1D4-4383-BC4F-12EFAE1AFF91} = {567A82BE-7E9E-4D95-AF45-4EE8D57FE16D}
+		{A9B2E87D-540F-4B4C-A4AA-EF3BDDC4171C} = {FAB6FAA7-ADF4-4B65-9831-0C819915E6E1}
 		{A382B448-A1F3-4D87-A674-736D2987E613} = {81AB1B86-AE3C-4E5B-8918-CA6CCED95266}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

build/azure-pipelines.yml

@@ -18,10 +18,20 @@ parameters:
   default:
   - Debug
   - Release
+- name: "holdTrigger"
+  displayName: CloudTest HoldTrigger setting
+  type: string
+  default: None
+  values:
+  - None
+  - Completion
+  - Execution
+  - Failure
+  - Timeout
 
 variables:
  # MSIXVersion's second part should always be odd to account for stub app's version
-  MSIXVersion: '0.1801'
+  MSIXVersion: '0.1901'
   VersionOfSDK: '0.700'
   solution: '**/DevHome.sln'
   appxPackageDir: 'AppxPackages'
@@ -42,6 +52,9 @@ extends:
   template: v1/M365.Official.PipelineTemplate.yml@m365Pipelines
   parameters:
     sdl:
+      binskim:
+        break: false
+        scanOutputDirectoryOnly: true
       roslyn:
         enabled: true
       arrow:
@@ -122,10 +135,7 @@ extends:
             targetPath: DevHomeStub\DevHomeStubPackage\AppxPackages
 
     - stage: Build_DevHome
-      dependsOn: Build_SDK
-      condition: in(dependencies.Build_SDK.result, 'Succeeded')
-      variables:
-        VersionOfSDK: $[stageDependencies.Build_SDK.Build_SDK.outputs['BuildSDKCommand.VersionOfSDK']]
+      dependsOn: []
       jobs:
       - ${{ each configuration in parameters.Configurations }}:
         - ${{ each platform in parameters.Platforms }}:
@@ -141,12 +151,6 @@ extends:
               inputs:
                 filePath: 'build/scripts/Unstub.ps1'
 
-            - task: DownloadPipelineArtifact@2
-              inputs:
-                buildType: 'current'
-                artifactName: 'SdkNugetPackage'
-                targetPath: '$(Pipeline.Workspace)\sdkArtifacts\'
-
             - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@4
               displayName: Send and Download Localization Files for Artifacts
               condition: and(eq(variables['EnableLocalization'], 'true'), eq(variables['UpdateLocalization'], 'true'))
@@ -295,35 +299,54 @@ extends:
             #   env:
             #     AzureServicesAuthConnectionString: $(ApiScanConnectionString)
 
-            - task: Windows Application Driver@0
-              condition: and(always(), ne('${{ platform}}', 'arm64'))
+            - task: CopyFiles@2
+              displayName: Copy Unit Test DLLs
               inputs:
-                OperationType: 'Start'
+                #SourceFolder: # string. Source Folder.
+                Contents: 'test/bin/**/*' # string. Required. Contents. Default: *
+                targetFolder: '$(Build.ArtifactStagingDirectory)\unittest'
 
-            - task: PowerShell@2
-              displayName: 'Run Unittests'
-              condition: ne('${{ platform}}', 'arm64')
+            - task: CopyFiles@2
+              displayName: Copy Tools Unit Test DLLs
+              inputs:
+                #SourceFolder: # string. Source Folder.
+                Contents: 'tools/*/*UnitTest/bin/**/*' # string. Required. Contents. Default: *
+                targetFolder: '$(Build.ArtifactStagingDirectory)\unittest'
+
+            - task: CopyFiles@2
+              displayName: Copy UI Test DLLs
+              inputs:
+                #SourceFolder: # string. Source Folder.
+                Contents: 'uitest/bin/**/*' # string. Required. Contents. Default: *
+                targetFolder: '$(Build.ArtifactStagingDirectory)\unittest'
+
+            - task: CopyFiles@2
+              displayName: Copy Tools UI Test DLLs
+              inputs:
+                #SourceFolder: # string. Source Folder.
+                Contents: 'tools/*/*UITest/bin/**/*' # string. Required. Contents. Default: *
+                targetFolder: '$(Build.ArtifactStagingDirectory)\unittest'
+
+            - task: CopyFiles@2
+              displayName: Copy TestMap and TestGroup xmls
               inputs:
-                filePath: 'Test.ps1'
-                arguments: -Platform "${{ platform }}" -Configuration "${{ configuration }}" -IsAzurePipelineBuild
+                #SourceFolder: # string. Source Folder.
+                Contents: 'uitest/*.xml' # string. Required. Contents. Default: *
+                targetFolder: '$(Build.ArtifactStagingDirectory)\unittest'
 
-            - task: Windows Application Driver@0
-              condition: and(always(), ne('${{ platform}}', 'arm64'))
+            - task: CopyFiles@2
+              displayName: Copy run settings
               inputs:
-                OperationType: 'Stop'
+                #SourceFolder: # string. Source Folder.
+                Contents: 'uitest/Test.runsettings' # string. Required. Contents. Default: *
+                targetFolder: '$(Build.ArtifactStagingDirectory)\unittest'
 
-            - task: PublishTestResults@2
-              displayName: 'Add Test Results to ADO'
-              condition: and(always(), ne('${{ platform}}', 'arm64'))
+            - task: CopyFiles@2
+              displayName: Copy Setup and Cleanup scripts
               inputs:
-                testResultsFormat: 'VSTest'
-                testResultsFiles: '*.trx'
-                searchFolder: '$(testOutputArtifactDir)'
-                mergeTestResults: true
-                failTaskOnFailedTests: true
-                testRunTitle: '$(Agent.JobName)'
-                buildPlatform: '${{ platform }}'
-                buildConfiguration: '${{ configuration }}'
+                #SourceFolder: # string. Source Folder.
+                Contents: 'uitest/UITest*.ps1' # string. Required. Contents. Default: *
+                targetFolder: '$(Build.ArtifactStagingDirectory)\unittest'
 
             templateContext:
               outputs:
@@ -340,19 +363,60 @@ extends:
                 targetPath: LocArchive
                 sbomPackageName: devhome.locoutput
                 sbomPackageVersion: $(MSIXVersion)
-              - output: pipelineArtifact
-                displayName: 'Publish Test Results'
-                condition: and(always(), ne('${{ platform}}', 'arm64'))
-                artifactName: TestResults_${{ platform }}_${{ configuration }}
-                targetPath: $(testOutputArtifactDir)
-                sbomPackageName: devhome.testresults
-                sbomPackageVersion: $(MSIXVersion)
               - output: pipelineArtifact
                 displayName: Publish MSIX Artifact
                 artifactName: msix_${{ platform }}_${{ configuration }}
                 targetPath: $(appxPackageDir)\${{ configuration }}
                 sbomPackageName: devhome.msixpackage
                 sbomPackageVersion: $(MSIXVersion)
+              - output: pipelineArtifact
+                displayName: Publish Test Artifacts
+                artifactName: DevHomeUITests_${{ platform }}_${{ configuration }}
+                targetPath: $(Build.ArtifactStagingDirectory)\unittest
+                sbomPackageName: devhome.msixpackage
+                sbomPackageVersion: $(MSIXVersion)
+
+    - stage: Test
+      dependsOn: [Build_DevHome]
+      condition: and(in(dependencies.Build_DevHome.result, 'Succeeded'), ${{ containsValue(parameters.Configurations, 'release') }})
+      jobs:
+      - job: DevHomeWin11x64Test
+        pool: server
+        displayName: 'Dev Home Windows 11 Tests'
+        condition: ${{ containsValue(parameters.Platforms, 'x64') }}
+        timeoutInMinutes: 120
+        steps:
+        - task: asg-cloudtest.asg-cloudtest-servertasks.1ED2E272-8122-4964-9A8B-E1112FC306AA.CloudTestServerBuildTask@1
+          displayName: 'CloudTest Agentless Task'
+          inputs:
+            connectedServiceName: 'DevHomeCloudTest'
+            cloudTestTenant: devhomecloudtest
+            testMapLocation: '[BuildRoot]\uitest\TestMapWin11x64.xml'
+            pipelineArtifactName: DevHomeUITests_x64_Release
+            pipelineArtifactBuildUrl: '$(System.TaskDefinitionsUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId)'
+            buildDropArtifactName: ''
+            parserProperties: 'worker:VsTestVersion=V150;session:HoldTrigger=${{ parameters.holdTrigger }};VstsTestResultAttachmentUploadBehavior=Always;Provider:[MsixArtifacts]:PipelineArtifactBuildUrl=$(System.TaskDefinitionsUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId);'
+            notificationSubscribers: 'dream'
+            scheduleBuildRequesterAlias: 'dream'
+
+      - job: DevHomeWin10x64Test
+        pool: server
+        displayName: 'Dev Home Windows 10 Tests'
+        condition: ${{ containsValue(parameters.Platforms, 'x64') }}
+        timeoutInMinutes: 120
+        steps:
+        - task: asg-cloudtest.asg-cloudtest-servertasks.1ED2E272-8122-4964-9A8B-E1112FC306AA.CloudTestServerBuildTask@1
+          displayName: 'CloudTest Agentless Task'
+          inputs:
+            connectedServiceName: 'DevHomeCloudTest'
+            cloudTestTenant: devhomecloudtest
+            testMapLocation: '[BuildRoot]\uitest\TestMapWin10x64.xml'
+            pipelineArtifactName: DevHomeUITests_x64_Release
+            pipelineArtifactBuildUrl: '$(System.TaskDefinitionsUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId)'
+            buildDropArtifactName: ''
+            parserProperties: 'worker:VsTestVersion=V150;session:HoldTrigger=${{ parameters.holdTrigger }};VstsTestResultAttachmentUploadBehavior=Always;Provider:[MsixArtifacts]:PipelineArtifactBuildUrl=$(System.TaskDefinitionsUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId);'
+            notificationSubscribers: 'dream'
+            scheduleBuildRequesterAlias: 'dream'
 
     - stage: Build_MsixBundle
       dependsOn: [Build_DevHome, Build_StubPackages]
@@ -490,8 +554,7 @@ extends:
             targetPath: AppxBundles\Debug
 
     - stage: Store_Publish
-      dependsOn:
-      - Build_MsixBundle
+      dependsOn: [Build_MsixBundle, Test]
       condition: |
         and
         (

build/scripts/CreateBuildInfo.ps1

@@ -6,7 +6,7 @@ Param(
 )
 
 $Major = "0"
-$Minor = "18"
+$Minor = "19"
 $Patch = "99" # default to 99 for local builds
 
 $versionSplit = $Version.Split(".");

common/DevHome.Common.csproj

@@ -46,7 +46,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.4" />
     <PackageReference Include="Microsoft.Windows.DevHome.SDK" Version="0.700.544" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240802000" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageReference Include="Serilog" Version="4.0.1" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />

common/Environments/Styles/HorizontalCardStyles.xaml

@@ -239,12 +239,12 @@
         <Setter Property="Padding" Value="20,8,15,8" />
     </Style>
 
-    <Style
-        x:Key="CardBodyLaunchButtonStyle"
-        TargetType="Button">
-        <Setter Property="HorizontalAlignment" Value="Right" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-        <Setter Property="Padding" Value="34,7,34,7" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+    <Style
+        x:Key="CardBodyLaunchButtonStyle"
+        TargetType="Button">
+        <Setter Property="HorizontalAlignment" Value="Right" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="Padding" Value="34,7,34,7" />
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
     </Style>
 </ResourceDictionary>