microsoft · sylveon · Apr 5, 2021
diff --git a/vsix/ItemTemplates/BlankPage/BlankPage.cpp b/vsix/ItemTemplates/BlankPage/BlankPage.cpp
@@ -7,7 +7,7 @@
 using namespace winrt;
 using namespace Windows::UI::Xaml;
 
-namespace winrt::$rootnamespace$::implementation
+namespace winrt::$cpprootnamespace$::implementation
 {
     $safeitemname$::$safeitemname$()
     {

diff --git a/vsix/ItemTemplates/BlankPage/BlankPage.h b/vsix/ItemTemplates/BlankPage/BlankPage.h
@@ -2,7 +2,7 @@
 
 #include "$safeitemname$.g.h"
 
-namespace winrt::$rootnamespace$::implementation
+namespace winrt::$cpprootnamespace$::implementation
 {
     struct $safeitemname$ : $safeitemname$T<$safeitemname$>
     {
@@ -15,7 +15,7 @@ namespace winrt::$rootnamespace$::implementation
     };
 }
 
-namespace winrt::$rootnamespace$::factory_implementation
+namespace winrt::$cpprootnamespace$::factory_implementation
 {
     struct $safeitemname$ : $safeitemname$T<$safeitemname$, implementation::$safeitemname$>
     {

diff --git a/vsix/ItemTemplates/BlankPage/cppwinrt_BlankPage.vstemplate b/vsix/ItemTemplates/BlankPage/cppwinrt_BlankPage.vstemplate
@@ -17,8 +17,8 @@
     <ProjectItem SubType="Code" TargetFileName="$fileinputname$.xaml\$fileinputname$.idl" ReplaceParameters="true">BlankPage.idl</ProjectItem>
   </TemplateContent>
   <WizardExtension>
-    <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
-    <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
+    <Assembly>Microsoft.Windows.CppWinRT, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
+    <FullClassName>Microsoft.Windows.CppWinRT.WizardExtension</FullClassName>
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Microsoft.Windows.CppWinRT">

diff --git a/vsix/ItemTemplates/BlankUserControl/BlankUserControl.cpp b/vsix/ItemTemplates/BlankUserControl/BlankUserControl.cpp
@@ -7,7 +7,7 @@
 using namespace winrt;
 using namespace Windows::UI::Xaml;
 
-namespace winrt::$rootnamespace$::implementation
+namespace winrt::$cpprootnamespace$::implementation
 {
     $safeitemname$::$safeitemname$()
     {

diff --git a/vsix/ItemTemplates/BlankUserControl/BlankUserControl.h b/vsix/ItemTemplates/BlankUserControl/BlankUserControl.h
@@ -6,7 +6,7 @@
 #include "winrt/Windows.UI.Xaml.Controls.Primitives.h"
 #include "$safeitemname$.g.h"
 
-namespace winrt::$rootnamespace$::implementation
+namespace winrt::$cpprootnamespace$::implementation
 {
     struct $safeitemname$ : $safeitemname$T<$safeitemname$>
     {
@@ -19,7 +19,7 @@ namespace winrt::$rootnamespace$::implementation
     };
 }
 
-namespace winrt::$rootnamespace$::factory_implementation
+namespace winrt::$cpprootnamespace$::factory_implementation
 {
     struct $safeitemname$ : $safeitemname$T<$safeitemname$, implementation::$safeitemname$>
     {

diff --git a/vsix/ItemTemplates/BlankUserControl/cppwinrt_BlankUserControl.vstemplate b/vsix/ItemTemplates/BlankUserControl/cppwinrt_BlankUserControl.vstemplate
@@ -17,8 +17,8 @@
     <ProjectItem SubType="Code" TargetFileName="$fileinputname$.xaml\$fileinputname$.idl" ReplaceParameters="true">BlankUserControl.idl</ProjectItem>
   </TemplateContent>
   <WizardExtension>
-    <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
-    <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
+    <Assembly>Microsoft.Windows.CppWinRT, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
+    <FullClassName>Microsoft.Windows.CppWinRT.WizardExtension</FullClassName>
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Microsoft.Windows.CppWinRT">

diff --git a/vsix/ItemTemplates/ViewModel/ViewModel.cpp b/vsix/ItemTemplates/ViewModel/ViewModel.cpp
@@ -4,7 +4,7 @@
 #include "$safeitemname$.g.cpp"
 #endif
 
-namespace winrt::$rootnamespace$::implementation
+namespace winrt::$cpprootnamespace$::implementation
 {
     int32_t $safeitemname$::MyProperty()
     {

diff --git a/vsix/ItemTemplates/ViewModel/ViewModel.h b/vsix/ItemTemplates/ViewModel/ViewModel.h
@@ -2,7 +2,7 @@
 
 #include "$safeitemname$.g.h"
 
-namespace winrt::$rootnamespace$::implementation
+namespace winrt::$cpprootnamespace$::implementation
 {
     struct $safeitemname$ : $safeitemname$T<$safeitemname$>
     {
@@ -13,7 +13,7 @@ namespace winrt::$rootnamespace$::implementation
     };
 }
 
-namespace winrt::$rootnamespace$::factory_implementation
+namespace winrt::$cpprootnamespace$::factory_implementation
 {
     struct $safeitemname$ : $safeitemname$T<$safeitemname$, implementation::$safeitemname$>
     {

diff --git a/vsix/ItemTemplates/ViewModel/cppwinrt_ViewModel.vstemplate b/vsix/ItemTemplates/ViewModel/cppwinrt_ViewModel.vstemplate
@@ -16,8 +16,8 @@
     <ProjectItem SubType="Code" TargetFileName="$fileinputname$.idl\$fileinputname$.h" ReplaceParameters="true">ViewModel.h</ProjectItem>
   </TemplateContent>
   <WizardExtension>
-    <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
-    <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
+    <Assembly>Microsoft.Windows.CppWinRT, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
+    <FullClassName>Microsoft.Windows.CppWinRT.WizardExtension</FullClassName>
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="Microsoft.Windows.CppWinRT">

diff --git a/vsix/WizardExtension.cs b/vsix/WizardExtension.cs
@@ -0,0 +1,70 @@
+using EnvDTE;
+using Microsoft.VisualStudio.ComponentModelHost;
+using Microsoft.VisualStudio.OLE.Interop;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.TemplateWizard;
+using NuGet.VisualStudio;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.ComponentModel.Composition.Hosting;
+
+namespace Microsoft.Windows.CppWinRT
+{
+    internal sealed class WizardExtension : IWizard
+    {
+        [Import]
+        internal IVsTemplateWizard Wizard { get; set; }
+
+        private void Initialize(object automationObject)
+        {
+            ThreadHelper.ThrowIfNotOnUIThread();
+            using (var serviceProvider = new ServiceProvider((IServiceProvider)automationObject))
+            {
+                var componentModel = (IComponentModel)serviceProvider.GetService(typeof(SComponentModel));
+                Assumes.Present(componentModel);
+                using (var container = new CompositionContainer(componentModel.DefaultExportProvider))
+                {
+                    container.ComposeParts(this);
+                }
+            }
+        }
+
+        void IWizard.BeforeOpeningFile(ProjectItem projectItem)
+        {
+            Wizard.BeforeOpeningFile(projectItem);
+        }
+
+        void IWizard.ProjectFinishedGenerating(Project project)
+        {
+            Wizard.ProjectFinishedGenerating(project);
+        }
+
+        void IWizard.ProjectItemFinishedGenerating(ProjectItem projectItem)
+        {
+            Wizard.ProjectItemFinishedGenerating(projectItem);
+        }
+
+        void IWizard.RunFinished()
+        {
+            Wizard.RunFinished();
+        }
+
+        void IWizard.RunStarted(object automationObject, Dictionary<string, string> replacementsDictionary, WizardRunKind runKind, object[] customParams)
+        {
+            ThreadHelper.ThrowIfNotOnUIThread();
+            Initialize(automationObject);
+
+            if (replacementsDictionary.TryGetValue("$rootnamespace$", out var rootNamespace))
+            {
+                replacementsDictionary.Add("$cpprootnamespace$", rootNamespace.Replace(".", "::"));
+            }
+
+            Wizard.RunStarted(automationObject, replacementsDictionary, runKind, customParams);
+        }
+
+        bool IWizard.ShouldAddProjectItem(string filePath)
+        {
+            return Wizard.ShouldAddProjectItem(filePath);
+        }
+    }
+}
diff --git a/vsix/packages.config b/vsix/packages.config
diff --git a/vsix/source.extension.vsixmanifest b/vsix/source.extension.vsixmanifest
@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-  <Metadata>
-    <Identity Id="Microsoft.Windows.CppWinRT" Version="|%CurrentProject%;GetCppWinRTVersion|" Language="en-US" Publisher="Microsoft" />
-    <PackageId>Microsoft.Windows.CppWinRT</PackageId>
-    <DisplayName>C++/WinRT</DisplayName>
-    <Description xml:space="preserve">Tools for authoring and consuming Windows Runtime classes in standard C++.</Description>
-    <MoreInfo>https://go.microsoft.com/fwlink/?linkid=869449</MoreInfo>
-    <License>LICENSE</License>
-    <GettingStartedGuide>https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/intro-to-using-cpp-with-winrt</GettingStartedGuide>
-    <ReleaseNotes>https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/faq</ReleaseNotes>
-    <Icon>cppwinrt.ico</Icon>
-    <PreviewImage>cppwinrt.png</PreviewImage>
-    <Tags>WinRT, C++, cppwinrt, native</Tags>
-  </Metadata>
-  <Installation AllUsers="true">
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,17.0)" />
-    <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[15.0,17.0)" />
-    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[15.0,17.0)" />
-  </Installation>
-  <Dependencies>
-    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
-  </Dependencies>
-  <Assets>
-    <Asset Type="NativeVisualizer" Path="cppwinrt.natvis" />
-    <Asset Type="DebuggerEngineExtension" Path="CppWinrtVisualizer.vsdconfig" />
-    <Asset Type="Microsoft.VisualStudio.ItemTemplate" Path="ItemTemplates" />
-    <Asset Type="Microsoft.VisualStudio.ProjectTemplate" Path="ProjectTemplates" />
-    <Asset Type="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetCppWinRTVersion|.nupkg" Source="File" Path="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetCppWinRTVersion|.nupkg" VsixSubPath="Packages" />
-  </Assets>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />
-    <Prerequisite Id="Microsoft.VisualStudio.ComponentGroup.UWP.VC" Version="[15.0,)" DisplayName="C++ Universal Windows Platform tools" />
-  </Prerequisites>
+    <Metadata>
+        <Identity Id="Microsoft.Windows.CppWinRT" Version="|%CurrentProject%;GetCppWinRTVersion|" Language="en-US" Publisher="Microsoft" />
+        <PackageId>Microsoft.Windows.CppWinRT</PackageId>
+        <DisplayName>C++/WinRT</DisplayName>
+        <Description xml:space="preserve">Tools for authoring and consuming Windows Runtime classes in standard C++.</Description>
+        <MoreInfo>https://go.microsoft.com/fwlink/?linkid=869449</MoreInfo>
+        <License>LICENSE</License>
+        <GettingStartedGuide>https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/intro-to-using-cpp-with-winrt</GettingStartedGuide>
+        <ReleaseNotes>https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/faq</ReleaseNotes>
+        <Icon>cppwinrt.ico</Icon>
+        <PreviewImage>cppwinrt.png</PreviewImage>
+        <Tags>WinRT, C++, cppwinrt, native</Tags>
+    </Metadata>
+    <Installation AllUsers="true">
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,17.0)" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[15.0,17.0)" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[15.0,17.0)" />
+    </Installation>
+    <Dependencies>
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+    </Dependencies>
+    <Assets>
+        <Asset Type="NativeVisualizer" Path="cppwinrt.natvis" />
+        <Asset Type="DebuggerEngineExtension" Path="CppWinrtVisualizer.vsdconfig" />
+        <Asset Type="Microsoft.VisualStudio.ItemTemplate" Path="ItemTemplates" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" Path="ProjectTemplates" />
+        <Asset Type="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetCppWinRTVersion|.nupkg" Source="File" Path="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetCppWinRTVersion|.nupkg" VsixSubPath="Packages" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" AssemblyName="|%CurrentProject%;AssemblyName|" />
+    </Assets>
+    <Prerequisites>
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />
+        <Prerequisite Id="Microsoft.VisualStudio.ComponentGroup.UWP.VC" Version="[15.0,)" DisplayName="C++ Universal Windows Platform tools" />
+    </Prerequisites>
 </PackageManifest>