Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix two VSIX issues stemming from Reunion -> WindowsAppSDK rename #1192

Merged
merged 7 commits into from
Aug 7, 2021
Merged

Fix two VSIX issues stemming from Reunion -> WindowsAppSDK rename #1192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c3fdca3
Fix two VSIX issues stemming from Reunion -> WindowsAppSDK rename
DefaultRyan Aug 6, 2021
bade632
Merge branch 'main' into user/defaultryan/fix_vsix_rename_issues
DefaultRyan Aug 6, 2021
57dfec2
Fixed a couple more missed cases
DefaultRyan Aug 6, 2021
da779dc
Merge branch 'user/defaultryan/fix_vsix_rename_issues' of https://git…
DefaultRyan Aug 6, 2021
238dc03
Temporarily remove the Single-project MSIX Packaging project template…
Aug 6, 2021
18f6a8c
Add missing IXP package to project templates, and use an obvious plac…
Aug 7, 2021
1656f6d
Merge branch 'main' into user/defaultryan/fix_vsix_rename_issues
DefaultRyan Aug 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions dev/VSIX/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<OriginalNugetRepositoryId>$(_tempVsTemplateNugetRepositoryId)</OriginalNugetRepositoryId>
<!-- 'ExperimentalNugetRepositoryId' needs to match the value set by the XmlPoke query for
"/ns:PackageManifest/ns:Metadata/ns:Identity/@Id" in Extension\WindowsAppSDK.Extension.csproj -->
<ExperimentalNugetRepositoryId>$(_tempVsTemplateNugetRepositoryId).Experimental</ExperimentalNugetRepositoryId>
<ExperimentalNugetRepositoryId>$(_tempVsTemplateNugetRepositoryId).Preview</ExperimentalNugetRepositoryId>
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this make it so the name of the vsix file now has preview in it instead of experimental?

Copy link
Member Author

Choose a reason for hiding this comment

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

I thought that VS used the VSIX Id, not the filename. I'm going to try testing it now.

Copy link
Contributor

Choose a reason for hiding this comment

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

It needs to match the VSIX ID, as I noted in the comment. :)

</AllVSTemplates>
</ItemGroup>

Expand Down Expand Up @@ -108,6 +108,9 @@
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:WizardData/ns:packages/ns:package[@id='Microsoft.WindowsAppSDK.WinUI']/@version"
Value="$(WindowsAppSDKVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:WizardData/ns:packages/ns:package[@id='Microsoft.WindowsAppSDK.InteractiveExperiences']/@version"
Value="$(WindowsAppSDKVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />

<!-- Update Assets manifest with actual Nuget package filenames -->
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Expand All @@ -125,22 +128,28 @@
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:WizardData/ns:Assets/ns:Asset[@Type='Microsoft.WindowsAppSDK.WinUI.nupkg']/@Path"
Value="Microsoft.WindowsAppSDK.WinUI.$(WindowsAppSDKVersion).nupkg" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:WizardData/ns:Assets/ns:Asset[@Type='Microsoft.WindowsAppSDK.InteractiveExperiences.nupkg']/@Path"
Value="Microsoft.WindowsAppSDK.InteractiveExperiences.$(WindowsAppSDKVersion).nupkg" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />

<!-- Update custom parameters passed into subtemplates -->
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$CppWinRTVersion$']/@Value"
Value="$(CppWinRTVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSdkNupkgVersion$']/@Value"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSDKNupkgVersion$']/@Value"
Value="$(WindowsAppSDKVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSDKFoundationNupkgVersion$']/@Value"
Value="$(WindowsAppSDKVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSdkFoundationNupkgVersion$']/@Value"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSDKDWriteNupkgVersion$']/@Value"
Value="$(WindowsAppSDKVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSdkDWriteNupkgVersion$']/@Value"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSDKWinUINupkgVersion$']/@Value"
Value="$(WindowsAppSDKVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSdkWinUINupkgVersion$']/@Value"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSDKInteractiveExperiencesNupkgVersion$']/@Value"
Value="$(WindowsAppSDKVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />

<!-- Update .vstemplate with Experimental display name if necessary -->
Expand Down Expand Up @@ -176,7 +185,7 @@
DependsOnTargets="PrepareForVsTemplateUpdates"
Condition="'@(AllVSTemplates)' != ''">
<PropertyGroup>
<DefaultVersion>1.0.0</DefaultVersion>
<DefaultVersion>FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries</DefaultVersion>
</PropertyGroup>

<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Expand All @@ -194,6 +203,9 @@
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:WizardData/ns:packages/ns:package[@id='Microsoft.WindowsAppSDK.WinUI']/@version"
Value="$(DefaultVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:WizardData/ns:packages/ns:package[@id='Microsoft.WindowsAppSDK.InteractiveExperiences']/@version"
Value="$(DefaultVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />

<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:WizardData/ns:Assets/ns:Asset[@Type='Microsoft.Windows.CppWinRT.nupkg']/@Path"
Expand All @@ -210,21 +222,27 @@
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:WizardData/ns:Assets/ns:Asset[@Type='Microsoft.WindowsAppSDK.WinUI.nupkg']/@Path"
Value="Microsoft.WindowsAppSDK.WinUI.$(DefaultVersion).nupkg" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:WizardData/ns:Assets/ns:Asset[@Type='Microsoft.WindowsAppSDK.InteractiveExperiences.nupkg']/@Path"
Value="Microsoft.WindowsAppSDK.InteractiveExperiences.$(DefaultVersion).nupkg" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />

<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$CppWinRTVersion$']/@Value"
Value="$(DefaultVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSdkNupkgVersion$']/@Value"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSDKNupkgVersion$']/@Value"
Value="$(DefaultVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSDKFoundationNupkgVersion$']/@Value"
Value="$(DefaultVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSdkFoundationNupkgVersion$']/@Value"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSDKDWriteNupkgVersion$']/@Value"
Value="$(DefaultVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSdkDWriteNupkgVersion$']/@Value"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSDKWinUINupkgVersion$']/@Value"
Value="$(DefaultVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
<XmlPoke XmlInputPath="%(AllVSTemplates.Identity)"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSdkWinUINupkgVersion$']/@Value"
Query="/ns:VSTemplate/ns:TemplateContent/ns:CustomParameters/ns:CustomParameter[@Name='$WindowsAppSDKInteractiveExperiencesNupkgVersion$']/@Value"
Value="$(DefaultVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />

<XmlPoke
Expand Down
12 changes: 8 additions & 4 deletions dev/VSIX/Extension/WindowsAppSDK.Extension.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<ContentNugetPackages Include="$(PkgMicrosoft_WindowsAppSDK_Foundation)\*.nupkg" />
<ContentNugetPackages Include="$(PkgMicrosoft_WindowsAppSDK_DWrite)\*.nupkg" />
<ContentNugetPackages Include="$(PkgMicrosoft_WindowsAppSDK_WinUI)\*.nupkg" />
<ContentNugetPackages Include="$(PkgMicrosoft_WindowsAppSDK_InteractiveExperiences)\*.nupkg" />
<Content Include="@(ContentNugetPackages)">
<IncludeInVSIX>true</IncludeInVSIX>
<VSIXSubPath>Packages</VSIXSubPath>
Expand All @@ -48,9 +49,9 @@
<Content Include="LICENSE">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Condition="'$(EnableExperimentalVSIXFeatures)'=='true'" Include="ExtensionPack.vsext">
<!-- <Content Condition="'$(EnableExperimentalVSIXFeatures)'=='true'" Include="ExtensionPack.vsext">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
</Content> -->
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -79,6 +80,9 @@
<PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="[$(WindowsAppSDKVersion)]" GeneratePathProperty="true">
<ExcludeAssets>All</ExcludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.WindowsAppSDK.InteractiveExperiences" Version="[$(WindowsAppSDKVersion)]" GeneratePathProperty="true">
<ExcludeAssets>All</ExcludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ItemTemplates\Desktop\CSharp\BlankWindow\WinUI.Desktop.Cs.BlankWindow.csproj">
Expand Down Expand Up @@ -223,7 +227,7 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
</ProjectReference>
<ProjectReference Include="..\ProjectTemplates\Desktop\CppWinRT\SingleProjectPackagedApp\WinUI.Desktop.CppWinRT.SingleProjectPackagedApp.csproj">
<!-- <ProjectReference Include="..\ProjectTemplates\Desktop\CppWinRT\SingleProjectPackagedApp\WinUI.Desktop.CppWinRT.SingleProjectPackagedApp.csproj">
<Project>{E54D1AD4-E935-479D-8A69-FC073E4DB33D}</Project>
<Name>WinUI.Desktop.CppWinRT.SingleProjectPackagedApp</Name>
<VSIXSubPath>ProjectTemplates</VSIXSubPath>
Expand All @@ -236,7 +240,7 @@
<VSIXSubPath>ProjectTemplates</VSIXSubPath>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
</ProjectReference>
</ProjectReference> -->
</ItemGroup>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets')" />
Expand Down
2 changes: 1 addition & 1 deletion dev/VSIX/Extension/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@
<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" />
<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" />
</Assets>
</PackageManifest>
</PackageManifest>
12 changes: 6 additions & 6 deletions .../ItemTemplates/Desktop/CppWinRT/BlankWindow/WinUI.Desktop.CppWinRT.BlankWindow.vstemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
<FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Microsoft.WindowsAppSDK">
<package id="Microsoft.Windows.CppWinRT" version="1.0.0" />
<package id="Microsoft.WindowsAppSDK" version="1.0.0" />
<package id="Microsoft.WindowsAppSDK.Foundation" version="1.0.0" />
<package id="Microsoft.WindowsAppSDK.WinUI" version="1.0.0" />
<packages repository="extension" repositoryId="Microsoft.ProjectReunion">
<package id="Microsoft.Windows.CppWinRT" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
<package id="Microsoft.WindowsAppSDK" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
<package id="Microsoft.WindowsAppSDK.Foundation" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
<package id="Microsoft.WindowsAppSDK.WinUI" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
</packages>
</WizardData>
</VSTemplate>
</VSTemplate>
12 changes: 6 additions & 6 deletions ...VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/WinUI.Neutral.CppWinRT.BlankPage.vstemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
<FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Microsoft.WindowsAppSDK">
<package id="Microsoft.Windows.CppWinRT" version="1.0.0" />
<package id="Microsoft.WindowsAppSDK" version="1.0.0" />
<package id="Microsoft.WindowsAppSDK.Foundation" version="1.0.0" />
<package id="Microsoft.WindowsAppSDK.WinUI" version="1.0.0" />
<packages repository="extension" repositoryId="Microsoft.ProjectReunion">
<package id="Microsoft.Windows.CppWinRT" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
<package id="Microsoft.WindowsAppSDK" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
<package id="Microsoft.WindowsAppSDK.Foundation" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
<package id="Microsoft.WindowsAppSDK.WinUI" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
</packages>
</WizardData>
</VSTemplate>
</VSTemplate>
12 changes: 6 additions & 6 deletions ...ates/Neutral/CppWinRT/TemplatedControl/WinUI.Neutral.CppWinRT.TemplatedControl.vstemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
<FullClassName>Microsoft.VisualStudio.WinRT.TemplateWizards.TemplatedControl.Wizard</FullClassName>
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Microsoft.WindowsAppSDK">
<package id="Microsoft.Windows.CppWinRT" version="1.0.0" />
<package id="Microsoft.WindowsAppSDK" version="1.0.0" />
<package id="Microsoft.WindowsAppSDK.Foundation" version="1.0.0" />
<package id="Microsoft.WindowsAppSDK.WinUI" version="1.0.0" />
<packages repository="extension" repositoryId="Microsoft.ProjectReunion">
<package id="Microsoft.Windows.CppWinRT" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
<package id="Microsoft.WindowsAppSDK" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
<package id="Microsoft.WindowsAppSDK.Foundation" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
<package id="Microsoft.WindowsAppSDK.WinUI" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
</packages>
</WizardData>
</VSTemplate>
</VSTemplate>
12 changes: 6 additions & 6 deletions .../ItemTemplates/Neutral/CppWinRT/UserControl/WinUI.Neutral.CppWinRT.UserControl.vstemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
<FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Microsoft.WindowsAppSDK">
<package id="Microsoft.Windows.CppWinRT" version="1.0.0" />
<package id="Microsoft.WindowsAppSDK" version="1.0.0" />
<package id="Microsoft.WindowsAppSDK.Foundation" version="1.0.0" />
<package id="Microsoft.WindowsAppSDK.WinUI" version="1.0.0" />
<packages repository="extension" repositoryId="Microsoft.ProjectReunion">
<package id="Microsoft.Windows.CppWinRT" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
<package id="Microsoft.WindowsAppSDK" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
<package id="Microsoft.WindowsAppSDK.Foundation" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
<package id="Microsoft.WindowsAppSDK.WinUI" version="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
</packages>
</WizardData>
</VSTemplate>
</VSTemplate>
1 change: 1 addition & 0 deletions dev/VSIX/ProjectTemplates/Desktop/CSharp/ClassLibrary/ProjectTemplate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
<PackageReference Include="Microsoft.WindowsAppSDK" Version="$WindowsAppSDKNupkgVersion$" />
<PackageReference Include="Microsoft.WindowsAppSDK.Foundation" Version="$WindowsAppSDKFoundationNupkgVersion$" />
<PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="$WindowsAppSDKWinUINupkgVersion$" />
<PackageReference Include="Microsoft.WindowsAppSDK.InteractiveExperiences" Version="$WindowsAppSDKInteractiveExperiencesNupkgVersion$" />
</ItemGroup>
</Project>
9 changes: 5 additions & 4 deletions ...SIX/ProjectTemplates/Desktop/CSharp/ClassLibrary/WinUI.Desktop.Cs.ClassLibrary.vstemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@
</TemplateData>
<TemplateContent PreferedSolutionConfiguration="Debug|AnyCPU">
<CustomParameters>
<CustomParameter Name="$WindowsAppSDKNupkgVersion$" Value="1.0.0" />
<CustomParameter Name="$WindowsAppSDKFoundationNupkgVersion$" Value="1.0.0" />
<CustomParameter Name="$WindowsAppSDKWinUINupkgVersion$" Value="1.0.0" />
<CustomParameter Name="$WindowsAppSDKNupkgVersion$" Value="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
<CustomParameter Name="$WindowsAppSDKFoundationNupkgVersion$" Value="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
<CustomParameter Name="$WindowsAppSDKWinUINupkgVersion$" Value="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
<CustomParameter Name="$WindowsAppSDKInteractiveExperiencesNupkgVersion$" Value="FIXME-Verify-Directory.Build.Targets-XmlPoke-Queries" />
</CustomParameters>
<Project File="ProjectTemplate.csproj" ReplaceParameters="true">
<ProjectItem ReplaceParameters="true" OpenInEditor="true">Class1.cs</ProjectItem>
</Project>
</TemplateContent>
</VSTemplate>
</VSTemplate>
1 change: 1 addition & 0 deletions dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/ProjectTemplate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<PackageReference Include="Microsoft.WindowsAppSDK" Version="$ext_WindowsAppSDKNupkgVersion$" />
<PackageReference Include="Microsoft.WindowsAppSDK.Foundation" Version="$ext_WindowsAppSDKFoundationNupkgVersion$" />
<PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="$ext_WindowsAppSDKWinUINupkgVersion$" />
<PackageReference Include="Microsoft.WindowsAppSDK.InteractiveExperiences" Version="$ext_WindowsAppSDKInteractiveExperiencesNupkgVersion$" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/WinUI.Desktop.Cs.BlankApp.vstemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@
<ProjectItem ReplaceParameters="true" TargetFileName="MainWindow.xaml.cs">MainWindow.xaml.cs</ProjectItem>
</Project>
</TemplateContent>
</VSTemplate>
</VSTemplate>
Loading