Skip to content

Commit cf3c710

Browse files
lauren-cihahaonantttHaonan TangCopilotDreynor87
authored
Update Visual Studio templates to VS 2026 (#5949)
* Add .Experimental for Standalone install on VS 2022 * Update VS version in vsixmanifest * Remove experimental from Standalone vsixmanifests for pipeline * Update component vsixmanifests * Remove Nuget.config * IsOfficial = false, add Generate Sbom Manifest * Remove Generate Manifest step in BuildVSIX-Steps because it didn't work * Update Display name to include VS 2026 * Update Description to include VS 2026 * Reset Preview tag to false in standalone vsixmanifests * Add 2026 to title and description * Add back NuGet.config * Remove extra newlines at end of vsixmanifest * Update PlatformToolset to v145 * Add VS 2026 support for C++ Unit Test template * Add VS 2026 support for C++ Unit Test template - updated * Fix typo in ItemGroup Condition * Add UnitTestPlatformVersion so Test Explorer can identify tests * Update ToolsVersion from 15.0 to Current * Lowering Build Sample Apps and Test Sample Apps from Aggregator to Foundation (#5783) * Lowering Build Sample Apps and Test Sample Apps from Aggregator to Foundation * resolve comments: clean up code, modify pipeline param and variables, remove FallbackSource, and add back comments * modify variables * update variables * add back FallbackSource * Add comments for test sample apps * update the method for getting removal list * update naming * update order for NuGetAuthenticate * update comment * renaming param and modify comment * update typo * update scripts * update script * Update test/ModifySampleAppsReferences.ps1 Co-authored-by: Copilot <[email protected]> --------- Co-authored-by: Haonan Tang <[email protected]> Co-authored-by: Copilot <[email protected]> * PackageDeployment API Progress status bug #5532 (#5846) * Set package deployment status to InProgress * Add progress verification in deployment tests * Enabling deployment tests (#5792) * fix packageFamilyName * fix format * Enabling deployment tests * Update DeploymentManager.cpp address PR comments * Fixing packages names * Deploying agent with package * Fixing framework package name * Fixing framework package name in all tests * Fixing applifecycle test app bootstrap initialization * Cleanup code --------- Co-authored-by: ssparach <[email protected]> * Enabling app notification tests (#5781) * Adding basic stuff * adding try catch on method uninit * Removing toast verification from unpackaged * Revert "Removing toast verification from unpackaged" This reverts commit 0368799. * Removing unpackaged self contained * Revert "Removing unpackaged self contained" This reverts commit e97e184. * Revert "adding try catch on method uninit" This reverts commit 413ca91. * Disabling unpackaged tests * Nit changes * Testing on Win10 rs5 * Revert "Testing on Win10 rs5" This reverts commit 345d65c. * Fixing message * Increasing timeout * Revert "Increasing timeout" This reverts commit 2a5ec5b. * Enabling only x64 * Revert "Enabling only x64" This reverts commit 7d8c0b6. * Testing with error expected * Refactoring test method * Trying with error not found * Revert "Trying with error not found" This reverts commit 417686d. * Reenabling unpackaged * Keeping manager reference * Trying log instead of throwing * Revert "Trying log instead of throwing" This reverts commit daa049e. * Trying try catch * Testing supported thing * Revert "Testing supported thing" This reverts commit c2eda3a. * Trying removing static variable * Revert "Trying removing static variable" This reverts commit e03a455. * Forcing is supported * Revert "Trying try catch" This reverts commit 63ba13e. * Revert "Keeping manager reference" This reverts commit 5beb012. * Forcing run as restricted user in commandline * Revert "Forcing is supported" This reverts commit a90be93. * Reapply "Forcing is supported" This reverts commit 3933960. * Revert "Forcing run as restricted user in commandline" This reverts commit 7fb3f7a. * Running as LowIL * Revert "Reapply "Forcing is supported"" This reverts commit 38f06ed. * Removing static * debugging il level * Using custom runas * Using medium IL and method level runas * Reorganizing code * Adding static * Trying normal restricted user * Removing debug logging * Disabling all tests for old windows 10 versions * Removing unused include * Removing arm64 to not be misleading * Installing VCLibs from tests in pipeline (#5816) * Manually copying vclibs * Removing from bypass list * Installing VCLibs on pipeline * Revert "Manually copying vclibs" This reverts commit 620e238. * Cleaning bypass list 2 * Cleaning powershell script * Revert "Cleaning powershell script" This reverts commit a94b7fd. * Fix script * Simplifying script * Adding failing tests to bypass * Addinf PushNotification and AppLifecycle tests to all platforms * Reverting push notification back to x64 only * Adding windows server image to bypass for app lifecycle * Update bug-report.yaml for 1.8.1 (#5859) * DynamicDependency: Expanded powershell cmdlets (#5854) * Extended DynamicDependencies' Powershell * Fixed some bugs * New: Get-PackageDependency [-All | -PackageDependencyId <pdi> | -PackageFamilyName <pkgfamilyname>] * Improved docs * Removed debugging code * Added ResolvedPackage (packagefullname) to output * Disabling app notification tests (#5866) * Small fix on reset locations (#5865) * Update dependencies from https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP build 20250919.1 (#5850) On relative base path root Microsoft.FrameworkUdk , Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage From Version 2.0.0-experimental-26108.1822.250909-1635.2 -> To Version 2.0.0-experimental-27200.1825.250918-1810.0 Microsoft.WindowsAppSDK.InteractiveExperiences From Version 2.0.250910002-experimental -> To Version 2.0.250919001-experimental Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * [main] Update dependencies from microsoft/ProjectReunion/WindowsAppSDKAggregator (#5843) * Update dependencies from https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator build 2.0.250917001-experimental On relative base path root Microsoft.WindowsAppSDK.Base From Version 2.0.250829002-experimental -> To Version 2.0.250917001-experimental * Update dependencies from https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator build 2.0.250919001-experimental On relative base path root Microsoft.WindowsAppSDK.Base From Version 2.0.250829002-experimental -> To Version 2.0.250919001-experimental --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Fix the Sample Tests failure caused by ModifySampleAppsReferences.ps1 (#5877) * Fix WASDKNugetDependencies value * update script * update arg * Fix WASDKNugetDependencies value * update script * update arg * update script * update script --------- Co-authored-by: Haonan Tang <[email protected]> * Disabling app notification tests (#5880) * Null checking instead of throwing and catching allows packages to be installed * Add UpdateStatusBar method to alert the user of errors * Add error infobar when package install fails * Update error infobar message to include error messages * Set up for Dev (do not push) * Add check for C++ wapproj duplicate package install * Prepare for release * Remove unused UpdateStatusBar * Rearrange double install check comments * Move NuGetInfoBarUIEvents into its own class file * Windows Forms Message Box on vcxproj * Shorten general message and add detailedMessage output on infobar click * Add detailedMessage support for vcxproj projects * InfoBar and MessageBox messages, details logged to output window * Sync of latest Detours source - commit 9764cebcb1a75940e68fa83d6730ffaf0f669401 on Sat Jun 21 09:29:16 2025 +0800 Sync of latest Detours source - their last commit was 9764cebcb1a75940e68fa83d6730ffaf0f669401 on Sat Jun 21 09:29:16 2025 +0800 (Latest published build is still 4.0.1 from 2018 :-( so we're still a source copy from their repo) Reviewing commits the past 5 years (!) there's the usual bug fixes. Otherwise the notable change is official ARM64EC support * Removing pch dependency and adding direct headers (#5928) * add -Dev pipeline yaml file because of MaestroPublish need to turnoff (#5905) Co-authored-by: Qiutong Shen <[email protected]> * [main] Update dependencies from microsoft/LiftedIXP/DCPP (#5872) [main] Update dependencies from microsoft/LiftedIXP/DCPP * Change 'Failed package install' to 'Missing package reference' to better reflect the error condition * Update CreateInfoBarUI * Update Single-project MSIX Packaging Tools VSIX label to updated name (2022-26) * Refactor ShowErrorOutput into OutputWindowHelper * Update PlatformToolset conditional to use greater than and less than operators * Consolidate failedPackages dictionary to one that stores the exception * Revert "Update ToolsVersion from 15.0 to Current" This reverts commit 00ec8b0. * Add back TestExplorer capability for C++ unit test project template * Update conditional in UnitTestApp/ProjectTemplate.vcxproj * Update conditional in PackagedApp/BlankApp.vcxproj * Remove WinUISDKReferences property from cpp unit test template (defaults to true) * Remove UnitTestPlatform property from cpp unit test template * Set LanguageStandard to C++ 20 for VS 2026 * Add copyright headers to WizardInforBarEvents.cs and OutputWindowHelper.cs --------- Co-authored-by: haonanttt <[email protected]> Co-authored-by: Haonan Tang <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: Dreynor87 <[email protected]> Co-authored-by: Felipe G <[email protected]> Co-authored-by: ssparach <[email protected]> Co-authored-by: Mike Crider <[email protected]> Co-authored-by: Howard Kapustein <[email protected]> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: shisan <[email protected]> Co-authored-by: Qiutong Shen <[email protected]>
1 parent 05a3957 commit cf3c710

17 files changed

Lines changed: 406 additions & 87 deletions

Directory.Packages.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88
<ItemGroup>
99
<PackageVersion Include="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="$(MicrosoftProjectReunionInteractiveExperiencesTransportPackagePackageVersion)" />
1010
<PackageVersion Include="Microsoft.FrameworkUDK" Version="$(MicrosoftFrameworkUDKVersion)" />
11+
<PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.8.55" />
1112
<PackageVersion Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftWindowsCsWinRTPackageVersion)" />
1213
<PackageVersion Include="Microsoft.SourceLink.Common" Version="$(MicrosoftSourceLinkCommonVersion)" />
1314
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" />
1415
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.3.32804.24" />
1516
<PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
1617
<PackageVersion Include="NuGet.VisualStudio" Version="17.6.1" />
1718
<PackageVersion Include="Microsoft.VisualStudio.TemplateWizardInterface" Version="17.5.33428.366" />
19+
<PackageVersion Include="NuGet.VisualStudio.Contracts" Version="17.14.0" />
1820
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
1921
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
2022
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.4.2118" />
@@ -23,4 +25,4 @@
2325
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="$(WindowsSDKBuildToolsVersion)" Condition=" '$(WindowsSDKBuildToolsVersion)' != '' " />
2426
<PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="$(WILVersion)" Condition=" '$(WILVersion)' != '' " />
2527
</ItemGroup>
26-
</Project>
28+
</Project>

dev/VSIX/Extension/Cpp/Dev17/Component/source.extension.vsixmanifest

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
44
<Identity Id="Microsoft.WindowsAppSDK.Cpp.Dev17" Version="|%CurrentProject%;GetVSIXVersion|" Language="en-US" Publisher="Microsoft" />
5-
<DisplayName>Windows App SDK C++ VS2022 Templates</DisplayName>
6-
<Description xml:space="preserve">The Microsoft Windows App SDK Visual Studio extension adds C++ project and item templates to support building Windows apps and components in VS 2022.</Description>
5+
<DisplayName>Windows App SDK C++ VS 2022-2026 Templates</DisplayName>
6+
<Description xml:space="preserve">The Microsoft Windows App SDK Visual Studio extension adds C++ project and item templates to support building Windows apps and components in VS 2022-2026.</Description>
77
<MoreInfo>https://github.com/microsoft/WindowsAppSDK/</MoreInfo>
88
<License>LICENSE</License>
99
<GettingStartedGuide>https://github.com/microsoft/WindowsAppSDK/</GettingStartedGuide>
@@ -14,27 +14,27 @@
1414
<Preview>false</Preview>
1515
</Metadata>
1616
<Installation AllUsers="true">
17-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 18.0)">
17+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 19.0)">
1818
<ProductArchitecture>amd64</ProductArchitecture>
1919
</InstallationTarget>
20-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 18.0)">
20+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 19.0)">
2121
<ProductArchitecture>amd64</ProductArchitecture>
2222
</InstallationTarget>
23-
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 18.0)">
23+
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 19.0)">
2424
<ProductArchitecture>amd64</ProductArchitecture>
2525
</InstallationTarget>
26-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 18.0)">
26+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 19.0)">
2727
<ProductArchitecture>arm64</ProductArchitecture>
2828
</InstallationTarget>
29-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 18.0)">
29+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 19.0)">
3030
<ProductArchitecture>arm64</ProductArchitecture>
3131
</InstallationTarget>
32-
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 18.0)">
32+
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 19.0)">
3333
<ProductArchitecture>arm64</ProductArchitecture>
3434
</InstallationTarget>
3535
</Installation>
3636
<Prerequisites>
37-
<Prerequisite Id="Microsoft.VisualStudio.Component.VC.CoreBuildTools" Version="[17.0,18.0)" DisplayName="C++ Build Tools core features" />
37+
<Prerequisite Id="Microsoft.VisualStudio.Component.VC.CoreBuildTools" Version="[17.0,19.0)" DisplayName="C++ Build Tools core features" />
3838
</Prerequisites>
3939
<Reference Id="NuPackToolsVsix.Microsoft.67e54e40-0ae3-42c5-a949-fddf5739e7a5" MinVersion="1.7.30402.9028">
4040
<Name>NuGet Package Manager</Name>

dev/VSIX/Extension/Cpp/Dev17/ExtensionPack.vsext

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"extensions": [
55
{
66
"vsixId": "Microsoft.SingleProjectMSIXPackagingTools.Dev17",
7-
"name": "Single-project MSIX Packaging Tools for VS 2022"
7+
"name": "Single-project MSIX Packaging Tools for VS 2022-26"
88
}
99
]
1010
}

dev/VSIX/Extension/Cpp/Dev17/Standalone/source.extension.vsixmanifest

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
44
<Identity Id="Microsoft.WindowsAppSDK.Cpp.Dev17" Version="|%CurrentProject%;GetVSIXVersion|" Language="en-US" Publisher="Microsoft" />
5-
<DisplayName>Windows App SDK C++ VS2022 Templates</DisplayName>
6-
<Description xml:space="preserve">The Microsoft Windows App SDK Visual Studio extension adds C++ project and item templates to support building Windows apps and components in VS 2022.</Description>
5+
<DisplayName>Windows App SDK C++ VS 2022-2026 Templates</DisplayName>
6+
<Description xml:space="preserve">The Microsoft Windows App SDK Visual Studio extension adds C++ project and item templates to support building Windows apps and components in VS 2022-2026.</Description>
77
<MoreInfo>https://github.com/microsoft/WindowsAppSDK/</MoreInfo>
88
<License>LICENSE</License>
99
<GettingStartedGuide>https://github.com/microsoft/WindowsAppSDK/</GettingStartedGuide>
@@ -14,29 +14,29 @@
1414
<Preview>false</Preview>
1515
</Metadata>
1616
<Installation AllUsers="true">
17-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 18.0)">
17+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 19.0)">
1818
<ProductArchitecture>amd64</ProductArchitecture>
1919
</InstallationTarget>
20-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 18.0)">
20+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 19.0)">
2121
<ProductArchitecture>amd64</ProductArchitecture>
2222
</InstallationTarget>
23-
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 18.0)">
23+
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 19.0)">
2424
<ProductArchitecture>amd64</ProductArchitecture>
2525
</InstallationTarget>
26-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 18.0)">
26+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 19.0)">
2727
<ProductArchitecture>arm64</ProductArchitecture>
2828
</InstallationTarget>
29-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 18.0)">
29+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 19.0)">
3030
<ProductArchitecture>arm64</ProductArchitecture>
3131
</InstallationTarget>
32-
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 18.0)">
32+
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 19.0)">
3333
<ProductArchitecture>arm64</ProductArchitecture>
3434
</InstallationTarget>
3535
</Installation>
3636
<Prerequisites>
37-
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,18.0)" DisplayName="Visual Studio core editor" />
38-
<Prerequisite Id="Microsoft.VisualStudio.ComponentGroup.UWP.Support" Version="[16.2.29003.222,18.0)" DisplayName="Universal Windows Platform tools" />
39-
<Prerequisite Id="Microsoft.VisualStudio.ComponentGroup.UWP.VC" Version="[16.0,18.0)" DisplayName="C++ (v143) Universal Windows Platform tools" />
37+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,19.0)" DisplayName="Visual Studio core editor" />
38+
<Prerequisite Id="Microsoft.VisualStudio.ComponentGroup.UWP.Support" Version="[16.2.29003.222,19.0)" DisplayName="Universal Windows Platform tools" />
39+
<Prerequisite Id="Microsoft.VisualStudio.ComponentGroup.UWP.VC" Version="[16.0,19.0)" DisplayName="C++ (v143) Universal Windows Platform tools" />
4040
</Prerequisites>
4141
<Reference Id="NuPackToolsVsix.Microsoft.67e54e40-0ae3-42c5-a949-fddf5739e7a5" MinVersion="1.7.30402.9028">
4242
<Name>NuGet Package Manager</Name>
@@ -55,4 +55,4 @@
5555
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="WinUI.Neutral.CppWinRT.ResourceDictionary" d:TargetPath="|WinUI.Neutral.CppWinRT.ResourceDictionary;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
5656
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="WinUI.Neutral.CppWinRT.RuntimeComponent" d:TargetPath="|WinUI.Neutral.CppWinRT.RuntimeComponent;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
5757
</Assets>
58-
</PackageManifest>
58+
</PackageManifest>

dev/VSIX/Extension/Cpp/Dev17/WindowsAppSDK.Cpp.Extension.Dev17.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@
8080
<ItemGroup>
8181
<ExtensionDependencies Condition=" '$(ExcludeRestorePackageImports)' != 'true' " Include="$(PkgNuget_VisualStudio)\**\NuGet.VisualStudio.dll" />
8282
<Compile Include="..\..\..\Shared\WizardImplementation.cs" Link="WizardImplementation.cs" />
83+
<Compile Include="..\..\..\Shared\WizardInfoBarEvents.cs" Link="WizardInfoBarEvents.cs" />
84+
<Compile Include="..\..\..\Shared\OutputWindowHelper.cs" Link="OutputWindowHelper.cs" />
8385
<Content Include="@(ExtensionDependencies)">
8486
<VSIXSubPath>.</VSIXSubPath>
8587
<IncludeInVSIX>true</IncludeInVSIX>

dev/VSIX/Extension/Cs/Dev17/Component/source.extension.vsixmanifest

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
44
<Identity Id="Microsoft.WindowsAppSDK.Cs.Dev17" Version="|%CurrentProject%;GetVSIXVersion|" Language="en-US" Publisher="Microsoft" />
5-
<DisplayName>Windows App SDK C# VS2022 Templates</DisplayName>
6-
<Description xml:space="preserve">The Microsoft Windows App SDK Visual Studio extension adds C# project and item templates to support building Windows apps and components in VS 2022.</Description>
5+
<DisplayName>Windows App SDK C# VS 2022-2026 Templates</DisplayName>
6+
<Description xml:space="preserve">The Microsoft Windows App SDK Visual Studio extension adds C# project and item templates to support building Windows apps and components in VS 2022-2026.</Description>
77
<MoreInfo>https://github.com/microsoft/WindowsAppSDK/</MoreInfo>
88
<License>LICENSE</License>
99
<GettingStartedGuide>https://github.com/microsoft/WindowsAppSDK/</GettingStartedGuide>
@@ -14,30 +14,30 @@
1414
<Preview>false</Preview>
1515
</Metadata>
1616
<Installation AllUsers="true">
17-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 18.0)">
17+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 19.0)">
1818
<ProductArchitecture>amd64</ProductArchitecture>
1919
</InstallationTarget>
20-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 18.0)">
20+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 19.0)">
2121
<ProductArchitecture>amd64</ProductArchitecture>
2222
</InstallationTarget>
23-
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 18.0)">
23+
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 19.0)">
2424
<ProductArchitecture>amd64</ProductArchitecture>
2525
</InstallationTarget>
26-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 18.0)">
26+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 19.0)">
2727
<ProductArchitecture>arm64</ProductArchitecture>
2828
</InstallationTarget>
29-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 18.0)">
29+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 19.0)">
3030
<ProductArchitecture>arm64</ProductArchitecture>
3131
</InstallationTarget>
32-
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 18.0)">
32+
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 19.0)">
3333
<ProductArchitecture>arm64</ProductArchitecture>
3434
</InstallationTarget>
3535
</Installation>
3636
<Dependencies>
3737
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
3838
</Dependencies>
3939
<Prerequisites>
40-
<Prerequisite Id="Microsoft.Component.MSBuild" Version="[17.0,18.0)" DisplayName="MSBuild" />
40+
<Prerequisite Id="Microsoft.Component.MSBuild" Version="[17.0,19.0)" DisplayName="MSBuild" />
4141
</Prerequisites>
4242
<Reference Id="NuPackToolsVsix.Microsoft.67e54e40-0ae3-42c5-a949-fddf5739e7a5" MinVersion="1.7.30402.9028">
4343
<Name>NuGet Package Manager</Name>

dev/VSIX/Extension/Cs/Dev17/ExtensionPack.vsext

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"extensions": [
55
{
66
"vsixId": "Microsoft.SingleProjectMSIXPackagingTools.Dev17",
7-
"name": "Single-project MSIX Packaging Tools for VS 2022"
7+
"name": "Single-project MSIX Packaging Tools for VS 2022-26"
88
}
99
]
1010
}

dev/VSIX/Extension/Cs/Dev17/Standalone/source.extension.vsixmanifest

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
44
<Identity Id="Microsoft.WindowsAppSDK.Cs.Dev17" Version="|%CurrentProject%;GetVSIXVersion|" Language="en-US" Publisher="Microsoft" />
5-
<DisplayName>Windows App SDK C# VS2022 Templates</DisplayName>
6-
<Description xml:space="preserve">The Microsoft Windows App SDK Visual Studio extension adds C# project and item templates to support building Windows apps and components in VS 2022.</Description>
5+
<DisplayName>Windows App SDK C# VS 2022-2026 Templates</DisplayName>
6+
<Description xml:space="preserve">The Microsoft Windows App SDK Visual Studio extension adds C# project and item templates to support building Windows apps and components in VS 2022-2026.</Description>
77
<MoreInfo>https://github.com/microsoft/WindowsAppSDK/</MoreInfo>
88
<License>LICENSE</License>
99
<GettingStartedGuide>https://github.com/microsoft/WindowsAppSDK/</GettingStartedGuide>
@@ -14,31 +14,31 @@
1414
<Preview>false</Preview>
1515
</Metadata>
1616
<Installation AllUsers="true">
17-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 18.0)">
17+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 19.0)">
1818
<ProductArchitecture>amd64</ProductArchitecture>
1919
</InstallationTarget>
20-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 18.0)">
20+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 19.0)">
2121
<ProductArchitecture>amd64</ProductArchitecture>
2222
</InstallationTarget>
23-
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 18.0)">
23+
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 19.0)">
2424
<ProductArchitecture>amd64</ProductArchitecture>
2525
</InstallationTarget>
26-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 18.0)">
26+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 19.0)">
2727
<ProductArchitecture>arm64</ProductArchitecture>
2828
</InstallationTarget>
29-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 18.0)">
29+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0, 19.0)">
3030
<ProductArchitecture>arm64</ProductArchitecture>
3131
</InstallationTarget>
32-
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 18.0)">
32+
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0, 19.0)">
3333
<ProductArchitecture>arm64</ProductArchitecture>
3434
</InstallationTarget>
3535
</Installation>
3636
<Dependencies>
3737
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
3838
</Dependencies>
3939
<Prerequisites>
40-
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,18.0)" DisplayName="Visual Studio core editor" />
41-
<Prerequisite Id="Microsoft.VisualStudio.ComponentGroup.UWP.Support" Version="[16.2.29003.222,18.0)" DisplayName="Universal Windows Platform tools" />
40+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,19.0)" DisplayName="Visual Studio core editor" />
41+
<Prerequisite Id="Microsoft.VisualStudio.ComponentGroup.UWP.Support" Version="[16.2.29003.222,19.0)" DisplayName="Universal Windows Platform tools" />
4242
</Prerequisites>
4343
<Reference Id="NuPackToolsVsix.Microsoft.67e54e40-0ae3-42c5-a949-fddf5739e7a5" MinVersion="1.7.30402.9028">
4444
<Name>NuGet Package Manager</Name>
@@ -57,4 +57,4 @@
5757
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="WinUI.Desktop.Cs.PackagedApp" d:TargetPath="|WinUI.Desktop.Cs.PackagedApp;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
5858
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="WinUI.Neutral.Cs.ResourceDictionary" d:TargetPath="|WinUI.Neutral.Cs.ResourceDictionary;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
5959
</Assets>
60-
</PackageManifest>
60+
</PackageManifest>

dev/VSIX/Extension/Cs/Dev17/WindowsAppSDK.Cs.Extension.Dev17.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@
5757
<ItemGroup>
5858
<ExtensionDependencies Condition=" '$(ExcludeRestorePackageImports)' != 'true' " Include="$(PkgNuget_VisualStudio)\**\NuGet.VisualStudio.dll" />
5959
<Compile Include="..\..\..\Shared\WizardImplementation.cs" Link="WizardImplementation.cs" />
60+
<Compile Include="..\..\..\Shared\WizardInfoBarEvents.cs" Link="WizardInfoBarEvents.cs" />
61+
<Compile Include="..\..\..\Shared\OutputWindowHelper.cs" Link="OutputWindowHelper.cs" />
6062
<Content Include="@(ExtensionDependencies)">
6163
<VSIXSubPath>.</VSIXSubPath>
6264
<IncludeInVSIX>true</IncludeInVSIX>

dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup Label="Globals">
44
<CppWinRTOptimized>true</CppWinRTOptimized>
@@ -52,7 +52,8 @@
5252
</ItemGroup>
5353
<PropertyGroup Label="Configuration">
5454
<ConfigurationType>Application</ConfigurationType>
55-
<PlatformToolset>v143</PlatformToolset>
55+
<PlatformToolset Condition="'$(VisualStudioVersion)' &gt;= '18.0'">v145</PlatformToolset>
56+
<PlatformToolset Condition="'$(VisualStudioVersion)' &lt; '18.0'">v143</PlatformToolset>
5657
<CharacterSet>Unicode</CharacterSet>
5758
<DesktopCompatible>true</DesktopCompatible>
5859
</PropertyGroup>
@@ -78,6 +79,8 @@
7879
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
7980
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
8081
<WarningLevel>Level4</WarningLevel>
82+
<LanguageStandard Condition="'$(VisualStudioVersion)' &gt;= '18.0'">stdcpp20</LanguageStandard>
83+
<LanguageStandard Condition="'$(VisualStudioVersion)' &lt; '18.0'">stdcpp17</LanguageStandard>
8184
<AdditionalOptions>%(AdditionalOptions) /bigobj</AdditionalOptions>
8285
</ClCompile>
8386
</ItemDefinitionGroup>

0 commit comments

Comments
 (0)