diff --git a/.config/configuration.vsEnterprise.winget b/.config/configuration.vsEnterprise.winget index 800729d111..b88b68afbd 100644 --- a/.config/configuration.vsEnterprise.winget +++ b/.config/configuration.vsEnterprise.winget @@ -13,11 +13,11 @@ properties: - resource: Microsoft.WinGet.DSC/WinGetPackage id: vsPackage directives: - description: Install Visual Studio 2022 Enterprise + description: Install Visual Studio 2026 Enterprise # Requires elevation for the set operation securityContext: elevated settings: - id: Microsoft.VisualStudio.2022.Enterprise + id: Microsoft.VisualStudio.Enterprise source: winget - resource: Microsoft.VisualStudio.DSC/VSComponents dependsOn: @@ -29,6 +29,6 @@ properties: allowPrerelease: true settings: productId: Microsoft.VisualStudio.Product.Enterprise - channelId: VisualStudio.17.Release + channelId: VisualStudio.18.Release vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig' configurationVersion: 0.2.0 diff --git a/.config/configuration.vsProfessional.winget b/.config/configuration.vsProfessional.winget index 19475a618e..c82b8c1bf7 100644 --- a/.config/configuration.vsProfessional.winget +++ b/.config/configuration.vsProfessional.winget @@ -13,11 +13,11 @@ properties: - resource: Microsoft.WinGet.DSC/WinGetPackage id: vsPackage directives: - description: Install Visual Studio 2022 Professional + description: Install Visual Studio 2026 Professional # Requires elevation for the set operation securityContext: elevated settings: - id: Microsoft.VisualStudio.2022.Professional + id: Microsoft.VisualStudio.Professional source: winget - resource: Microsoft.VisualStudio.DSC/VSComponents dependsOn: @@ -29,6 +29,6 @@ properties: allowPrerelease: true settings: productId: Microsoft.VisualStudio.Product.Professional - channelId: VisualStudio.17.Release + channelId: VisualStudio.18.Release vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig' configurationVersion: 0.2.0 diff --git a/.config/configuration.winget b/.config/configuration.winget index 01654421a7..4e4ddfac94 100644 --- a/.config/configuration.winget +++ b/.config/configuration.winget @@ -13,11 +13,11 @@ properties: - resource: Microsoft.WinGet.DSC/WinGetPackage id: vsPackage directives: - description: Install Visual Studio 2022 Community + description: Install Visual Studio 2026 Community # Requires elevation for the set operation securityContext: elevated settings: - id: Microsoft.VisualStudio.2022.Community + id: Microsoft.VisualStudio.Community source: winget - resource: Microsoft.VisualStudio.DSC/VSComponents dependsOn: @@ -29,6 +29,6 @@ properties: allowPrerelease: true settings: productId: Microsoft.VisualStudio.Product.Community - channelId: VisualStudio.17.Release + channelId: VisualStudio.18.Release vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig' configurationVersion: 0.2.0 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index de3fbcfdc3..5ea9203738 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,7 +15,7 @@ pr: - schemas/JSON/manifests/* pool: - vmImage: 'windows-2025' + vmImage: 'windows-2025-vs2026' variables: solution: 'src\AppInstallerCLI.sln' @@ -447,7 +447,7 @@ jobs: TargetFolder: '$(artifactsDir)\PackagedLog' condition: succeededOrFailed() - - task: VSTest@2 + - task: VSTest@3 displayName: 'Run tests: Microsoft.WinGet.UnitTests' inputs: testSelector: 'testAssemblies' @@ -459,7 +459,7 @@ jobs: diagnosticsEnabled: true condition: succeededOrFailed() - - task: VSTest@2 + - task: VSTest@3 displayName: 'Run tests: WinGetUtilInterop.UnitTests' inputs: testSelector: 'testAssemblies' @@ -471,7 +471,7 @@ jobs: diagnosticsEnabled: true condition: succeededOrFailed() - - task: VSTest@2 + - task: VSTest@3 displayName: 'Run tests: Microsoft.Management.Configuration.UnitTests (InProc)' inputs: testRunTitle: Microsoft.Management.Configuration.UnitTests (InProc) @@ -492,7 +492,7 @@ jobs: arguments: '-BuildOutputPath $(buildOutDir) -PackageLayoutPath $(packageLayoutDir)' condition: succeededOrFailed() - - task: VSTest@2 + - task: VSTest@3 displayName: 'Run tests: Microsoft.Management.Configuration.UnitTests (OutOfProc)' inputs: testRunTitle: Microsoft.Management.Configuration.UnitTests (OutOfProc) diff --git a/doc/Developing.md b/doc/Developing.md index 9ecf93037e..d35e1e6878 100644 --- a/doc/Developing.md +++ b/doc/Developing.md @@ -4,7 +4,7 @@ * Windows 10 1809 (17763) or later * [Developer Mode enabled](https://docs.microsoft.com/windows/uwp/get-started/enable-your-device-for-development) -* [Visual Studio 2022](https://visualstudio.microsoft.com/downloads/) +* [Visual Studio 2026](https://visualstudio.microsoft.com/downloads/) * Or use WinGet to install it ;) (although you may need to adjust the workloads via Tools->Get Tools and Features...) * The following workloads: * .NET Desktop Development @@ -19,7 +19,7 @@ * The following extensions: - * [Microsoft Visual Studio Installer Projects](https://marketplace.visualstudio.com/items?itemName=VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects) + * [Microsoft Visual Studio Installer Projects 2022](https://marketplace.visualstudio.com/items?itemName=VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects) (Works with Visual Studio 2026) ## Building the client @@ -28,7 +28,7 @@ - For VS Community: `winget configure .config/configuration.winget` - For VS Professional: `winget configure .config/configuration.vsProfessional.winget` - For VS Enterprise: `winget configure .config/configuration.vsEnterprise.winget` -3. Run `vcpkg integrate install` from the Developer Command Prompt / Developer PowerShell for VS 2022. This is a one-time setup step until the configuration file in step 2 is updated to work with vcpkg setup. +3. Run `vcpkg integrate install` from the Developer Command Prompt / Developer PowerShell for VS. This is a one-time setup step until the configuration file in step 2 is updated to work with vcpkg setup. Open `winget-cli\src\AppInstallerCLI.sln` in Visual Studio and build. We currently only build using the solution; command-line methods of building a VS solution should work as well. diff --git a/src/AppInstallerCLIE2ETests/TestData/README.md b/src/AppInstallerCLIE2ETests/TestData/README.md index 5a6564d1a4..29d2af92e4 100644 --- a/src/AppInstallerCLIE2ETests/TestData/README.md +++ b/src/AppInstallerCLIE2ETests/TestData/README.md @@ -3,7 +3,7 @@ Due to MSI projects requiring a special extension, we have simply checked in a b 1. Ensure that the extension is installed locally - a. [Microsoft Visual Studio Installer Projects 2022](https://marketplace.visualstudio.com/items?itemName=VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects) + a. [Microsoft Visual Studio Installer Projects 2022](https://marketplace.visualstudio.com/items?itemName=VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects) (Works with Visual Studio 2026) 2. Set configuration to "Release|x86" 3. Build AppInstallerTestMsiInstaller project 4. Check in new MSI over the one in TestData \ No newline at end of file diff --git a/templates/e2e-test.template.yml b/templates/e2e-test.template.yml index 9a2e9720f6..b62fdfba73 100644 --- a/templates/e2e-test.template.yml +++ b/templates/e2e-test.template.yml @@ -16,7 +16,7 @@ steps: inputs: script: 'wpr -start $(Build.SourcesDirectory)\tools\COMTrace\ComTrace.wprp -filemode' - - task: VSTest@2 + - task: VSTest@3 displayName: Run ${{ parameters.title }} condition: succeededOrFailed() inputs: