diff --git a/build_vsix.cmd b/build_vsix.cmd
index ef9c9d870..ba2f75f31 100644
--- a/build_vsix.cmd
+++ b/build_vsix.cmd
@@ -33,4 +33,4 @@ rem Build nuget
.nuget\nuget.exe pack nuget\Microsoft.Windows.CppWinRT.nuspec -NonInteractive -OutputDirectory %this_dir%_build -Properties Configuration=%target_configuration%;cppwinrt_exe=%this_dir%_build\x86\%target_configuration%\cppwinrt.exe;cppwinrt_fast_fwd_x86=%this_dir%_build\x86\%target_configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=%this_dir%_build\x64\%target_configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm=%this_dir%_build\arm\%target_configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=%this_dir%_build\arm64\%target_configuration%\cppwinrt_fast_forwarder.lib -version %target_version% -Verbosity Detailed
rem Build vsix
-call msbuild /restore /p:Configuration=%target_configuration%,Platform=x86,Deployment=%target_deployment%,CppWinRTVersion=%target_version%,NatvisDirx86=%this_dir%natvis\x86\%target_configuration%\%target_deployment%,NatvisDirx64=%this_dir%natvis\x64\%target_configuration%\%target_deployment%,NupkgDir=%this_dir%_build vsix\vsix.sln
+call msbuild /restore /p:Configuration=%target_configuration%,Platform="Any CPU",Deployment=%target_deployment%,CppWinRTVersion=%target_version%,NatvisDirx86=%this_dir%natvis\x86\%target_configuration%\%target_deployment%,NatvisDirx64=%this_dir%natvis\x64\%target_configuration%\%target_deployment%,NupkgDir=%this_dir%_build vsix\vsix.sln
diff --git a/vsix/Application Type/Windows Store/10.0/Platforms/ARM/ImportAfter/Microsoft.Cpp.CppWinRT.props b/vsix/Application Type/Windows Store/10.0/Platforms/ARM/ImportAfter/Microsoft.Cpp.CppWinRT.props
deleted file mode 100644
index 75cb347b7..000000000
--- a/vsix/Application Type/Windows Store/10.0/Platforms/ARM/ImportAfter/Microsoft.Cpp.CppWinRT.props
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
diff --git a/vsix/Application Type/Windows Store/10.0/Platforms/ARM64/ImportAfter/Microsoft.Cpp.CppWinRT.props b/vsix/Application Type/Windows Store/10.0/Platforms/ARM64/ImportAfter/Microsoft.Cpp.CppWinRT.props
deleted file mode 100644
index 75cb347b7..000000000
--- a/vsix/Application Type/Windows Store/10.0/Platforms/ARM64/ImportAfter/Microsoft.Cpp.CppWinRT.props
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
diff --git a/vsix/Application Type/Windows Store/10.0/Platforms/Win32/ImportAfter/Microsoft.Cpp.CppWinRT.props b/vsix/Application Type/Windows Store/10.0/Platforms/Win32/ImportAfter/Microsoft.Cpp.CppWinRT.props
deleted file mode 100644
index 75cb347b7..000000000
--- a/vsix/Application Type/Windows Store/10.0/Platforms/Win32/ImportAfter/Microsoft.Cpp.CppWinRT.props
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
diff --git a/vsix/Application Type/Windows Store/10.0/Platforms/x64/ImportAfter/Microsoft.Cpp.CppWinRT.props b/vsix/Application Type/Windows Store/10.0/Platforms/x64/ImportAfter/Microsoft.Cpp.CppWinRT.props
deleted file mode 100644
index 75cb347b7..000000000
--- a/vsix/Application Type/Windows Store/10.0/Platforms/x64/ImportAfter/Microsoft.Cpp.CppWinRT.props
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
diff --git a/vsix/Dev16/Component/source.extension.vsixmanifest b/vsix/Dev16/Component/source.extension.vsixmanifest
index 31e70dda2..afd96cf1f 100644
--- a/vsix/Dev16/Component/source.extension.vsixmanifest
+++ b/vsix/Dev16/Component/source.extension.vsixmanifest
@@ -22,6 +22,9 @@
+
+
+
diff --git a/vsix/Dev16/Standalone/source.extension.vsixmanifest b/vsix/Dev16/Standalone/source.extension.vsixmanifest
index 83eebd662..e3c2ac995 100644
--- a/vsix/Dev16/Standalone/source.extension.vsixmanifest
+++ b/vsix/Dev16/Standalone/source.extension.vsixmanifest
@@ -22,6 +22,9 @@
+
+
+
diff --git a/vsix/Dev16/VSPackage.cs b/vsix/Dev16/VSPackage.cs
new file mode 100644
index 000000000..1a29a4908
--- /dev/null
+++ b/vsix/Dev16/VSPackage.cs
@@ -0,0 +1,55 @@
+using Microsoft.VisualStudio.Shell;
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Task = System.Threading.Tasks.Task;
+
+namespace Microsoft.Windows.CppWinRT
+{
+ ///
+ /// This is the class that implements the package exposed by this assembly.
+ ///
+ ///
+ ///
+ /// The minimum requirement for a class to be considered a valid package for Visual Studio
+ /// is to implement the IVsPackage interface and register itself with the shell.
+ /// This package uses the helper classes defined inside the Managed Package Framework (MPF)
+ /// to do it: it derives from the Package class that provides the implementation of the
+ /// IVsPackage interface and uses the registration attributes defined in the framework to
+ /// register itself and its components with the shell. These attributes tell the pkgdef creation
+ /// utility what data to put into .pkgdef file.
+ ///
+ ///
+ /// To get loaded into VS, the package must be referred by <Asset Type="Microsoft.VisualStudio.VsPackage" ...> in .vsixmanifest file.
+ ///
+ ///
+ [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
+ [Guid(VSPackage.PackageGuidString)]
+ public sealed class VSPackage : AsyncPackage
+ {
+ ///
+ /// VSPackage GUID string.
+ ///
+ /// NOTE: This MUST match the MSBuild property 'PackageGuidString' defined in the .csproj
+ ///
+ public const string PackageGuidString = "65AB6475-E73B-40DB-B2B2-2DDACC320433";
+
+ #region Package Members
+
+ ///
+ /// Initialization of the package; this method is called right after the package is sited, so this is the place
+ /// where you can put all the initialization code that rely on services provided by VisualStudio.
+ ///
+ /// A cancellation token to monitor for initialization cancellation, which can occur when VS is shutting down.
+ /// A provider for progress updates.
+ /// A task representing the async work of package initialization, or an already completed task if there is none. Do not return null from this method.
+ protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress progress)
+ {
+ // When initialized asynchronously, the current thread may be a background thread at this point.
+ // Do any initialization that requires the UI thread after switching to the UI thread.
+ await this.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
+ }
+
+ #endregion
+ }
+}
diff --git a/vsix/Dev16/vsix.Dev16.csproj b/vsix/Dev16/vsix.Dev16.csproj
index 84500cc26..6c1c2f1eb 100644
--- a/vsix/Dev16/vsix.Dev16.csproj
+++ b/vsix/Dev16/vsix.Dev16.csproj
@@ -1,102 +1,46 @@
-
+
+
- 15.0
-
-
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
- true
+ 2.0
+ {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ false
+ {2F0C4AFA-FEFA-4D37-B824-0426CEB32DBA}
+ Library
+ Properties
+ Microsoft.Windows.CppWinRT
+ Microsoft.Windows.CppWinRT
+ net472
+ true
+ true
+ false
+ false
+ true
+
+ {65AB6475-E73B-40DB-B2B2-2DDACC320433}
+ $(Deployment)\source.extension.vsixmanifest
-
+
true
- bin\x86\Debug\$(Deployment)\
+ bin\Debug\$(Deployment)\
DEBUG;TRACE
full
- x86
prompt
MinimumRecommendedRules.ruleset
-
- bin\x86\Release\$(Deployment)\
+
+ bin\Release\$(Deployment)\
TRACE
true
pdbonly
- x86
prompt
MinimumRecommendedRules.ruleset
-
-
- Release
- x86
- 2.0
- {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- false
- Standalone
- {2F0C4AFA-FEFA-4D37-B824-0426CEB32DBA}
- Library
- Properties
- Microsoft.Windows.CppWinRT
- Microsoft.Windows.CppWinRT
- v4.5.2
- false
- false
- false
- false
- false
- false
- true
-
%(Filename)%(Extension)
true
-
- Microsoft\VC\v160
- MSBuild
- true
-
-
- Microsoft\VC\v160\Platforms\ARM\ImportBefore
- MSBuild
- true
-
-
- Microsoft\VC\v160\Platforms\ARM64\ImportBefore
- MSBuild
- true
-
-
- Microsoft\VC\v160\Platforms\Win32\ImportBefore
- MSBuild
- true
-
-
- Microsoft\VC\v160\Platforms\x64\ImportBefore
- MSBuild
- true
-
-
- Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter
- MSBuild
- true
-
-
- Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter
- MSBuild
- true
-
-
- Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter
- MSBuild
- true
-
-
- Application Type\Windows Store\10.0\Platforms\x64\ImportAfter
- MSBuild
- true
-
Packages\Microsoft.Windows.CppWinRT.$(CppWinRTVersion).nupkg
true
@@ -135,40 +79,89 @@
+
+ 16.10.31321.278
+ compile; build; native; contentfiles; analyzers; buildtransitive
+
17.0.1619-preview1
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
+
+ Resources\VSPackage.resx
+
+
+
+
+ Resources\VSPackage.cs-CZ.resx
+
+
+
+
+ Resources\VSPackage.de-DE.resx
+
+
+
+
+ Resources\VSPackage.es-ES.resx
+
+
+
+
+ Resources\VSPackage.fr-FR.resx
+
+
+
+
+ Resources\VSPackage.it-IT.resx
+
+
+
+
+ Resources\VSPackage.ja-JP.resx
+
+
+
+
+ Resources\VSPackage.ko-KR.resx
+
+
+
+
+ Resources\VSPackage.pl-PL.resx
+
+
+
+
+ Resources\VSPackage.pt-BR.resx
+
+
+
+
+ Resources\VSPackage.ru-RU.resx
+
+
+
+
+ Resources\VSPackage.tr-TR.resx
+
+
+
+
+ Resources\VSPackage.zh-CN.resx
+
+
+
+
+ Resources\VSPackage.zh-TW.resx
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- $(MSBuildProjectDirectory)\$(OutDir)%(RecursiveDir)
-
-
-
-
-
-
-
- true
- false
- %(RecursiveDir)
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/vsix/Dev17/Component/source.extension.vsixmanifest b/vsix/Dev17/Component/source.extension.vsixmanifest
index fcb101d54..bcbfa9c8b 100644
--- a/vsix/Dev17/Component/source.extension.vsixmanifest
+++ b/vsix/Dev17/Component/source.extension.vsixmanifest
@@ -28,6 +28,9 @@
+
+
+
diff --git a/vsix/Dev17/Standalone/source.extension.vsixmanifest b/vsix/Dev17/Standalone/source.extension.vsixmanifest
index 687d34172..56ea4b86f 100644
--- a/vsix/Dev17/Standalone/source.extension.vsixmanifest
+++ b/vsix/Dev17/Standalone/source.extension.vsixmanifest
@@ -28,6 +28,9 @@
+
+
+
diff --git a/vsix/Dev17/VSPackage.cs b/vsix/Dev17/VSPackage.cs
new file mode 100644
index 000000000..12ffe0348
--- /dev/null
+++ b/vsix/Dev17/VSPackage.cs
@@ -0,0 +1,55 @@
+using Microsoft.VisualStudio.Shell;
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Task = System.Threading.Tasks.Task;
+
+namespace Microsoft.Windows.CppWinRT
+{
+ ///
+ /// This is the class that implements the package exposed by this assembly.
+ ///
+ ///
+ ///
+ /// The minimum requirement for a class to be considered a valid package for Visual Studio
+ /// is to implement the IVsPackage interface and register itself with the shell.
+ /// This package uses the helper classes defined inside the Managed Package Framework (MPF)
+ /// to do it: it derives from the Package class that provides the implementation of the
+ /// IVsPackage interface and uses the registration attributes defined in the framework to
+ /// register itself and its components with the shell. These attributes tell the pkgdef creation
+ /// utility what data to put into .pkgdef file.
+ ///
+ ///
+ /// To get loaded into VS, the package must be referred by <Asset Type="Microsoft.VisualStudio.VsPackage" ...> in .vsixmanifest file.
+ ///
+ ///
+ [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
+ [Guid(VSPackage.PackageGuidString)]
+ public sealed class VSPackage : AsyncPackage
+ {
+ ///
+ /// VSPackage GUID string.
+ ///
+ /// NOTE: This MUST match the MSBuild property 'PackageGuidString' defined in the .csproj
+ ///
+ public const string PackageGuidString = "680FA95B-2E0E-4526-8531-F7450D7FE317";
+
+ #region Package Members
+
+ ///
+ /// Initialization of the package; this method is called right after the package is sited, so this is the place
+ /// where you can put all the initialization code that rely on services provided by VisualStudio.
+ ///
+ /// A cancellation token to monitor for initialization cancellation, which can occur when VS is shutting down.
+ /// A provider for progress updates.
+ /// A task representing the async work of package initialization, or an already completed task if there is none. Do not return null from this method.
+ protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress progress)
+ {
+ // When initialized asynchronously, the current thread may be a background thread at this point.
+ // Do any initialization that requires the UI thread after switching to the UI thread.
+ await this.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
+ }
+
+ #endregion
+ }
+}
diff --git a/vsix/Dev17/vsix.Dev17.csproj b/vsix/Dev17/vsix.Dev17.csproj
index ecc1d615c..22c7fc2f2 100644
--- a/vsix/Dev17/vsix.Dev17.csproj
+++ b/vsix/Dev17/vsix.Dev17.csproj
@@ -1,31 +1,26 @@
-
+
+
- 16.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- Debug
- AnyCPU
2.0
{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
{3D56768C-78A5-4340-99AE-C728F3C75C1D}
Library
Properties
- Microsoft.Windows.CppWinRT.Dev17
+ Microsoft.Windows.CppWinRT
Microsoft.Windows.CppWinRT.Dev17
- v4.7.2
- false
- false
+ net472
+ true
+ true
false
false
- false
- false
Program
$(DevEnvDir)devenv.exe
/rootsuffix Exp
true
+
+ {680FA95B-2E0E-4526-8531-F7450D7FE317}
+ $(Deployment)\source.extension.vsixmanifest
true
@@ -49,51 +44,6 @@
%(Filename)%(Extension)
true
-
- Microsoft\VC\v160
- MSBuild
- true
-
-
- Microsoft\VC\v160\Platforms\ARM\ImportBefore
- MSBuild
- true
-
-
- Microsoft\VC\v160\Platforms\ARM64\ImportBefore
- MSBuild
- true
-
-
- Microsoft\VC\v160\Platforms\Win32\ImportBefore
- MSBuild
- true
-
-
- Microsoft\VC\v160\Platforms\x64\ImportBefore
- MSBuild
- true
-
-
- Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter
- MSBuild
- true
-
-
- Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter
- MSBuild
- true
-
-
- Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter
- MSBuild
- true
-
-
- Application Type\Windows Store\10.0\Platforms\x64\ImportAfter
- MSBuild
- true
-
Packages\Microsoft.Windows.CppWinRT.$(CppWinRTVersion).nupkg
true
@@ -129,6 +79,7 @@
+
@@ -140,38 +91,80 @@
all
+
-
+
+ Resources\VSPackage.resx
+
+
+
+
+ Resources\VSPackage.cs-CZ.resx
+
+
+
+
+ Resources\VSPackage.de-DE.resx
+
+
+
+
+ Resources\VSPackage.es-ES.resx
+
+
+
+
+ Resources\VSPackage.fr-FR.resx
+
+
+
+
+ Resources\VSPackage.it-IT.resx
+
+
+
+
+ Resources\VSPackage.ja-JP.resx
+
+
+
+
+ Resources\VSPackage.ko-KR.resx
+
+
+
+
+ Resources\VSPackage.pl-PL.resx
+
+
+
+
+ Resources\VSPackage.pt-BR.resx
+
+
+
+
+ Resources\VSPackage.ru-RU.resx
+
+
+
+
+ Resources\VSPackage.tr-TR.resx
+
+
+
+
+ Resources\VSPackage.zh-CN.resx
+
+
+
+
+ Resources\VSPackage.zh-TW.resx
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
- $(MSBuildProjectDirectory)\$(OutDir)%(RecursiveDir)
-
-
-
-
-
-
-
- true
- false
- %(RecursiveDir)
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/vsix/Directory.Build.Props b/vsix/Directory.Build.Props
index 43dc9c92d..4bd0f8a6f 100644
--- a/vsix/Directory.Build.Props
+++ b/vsix/Directory.Build.Props
@@ -1,10 +1,26 @@
-
-
- $(MSBuildThisFileDirectory)..\
- $(MSBuildThisFileDirectory)
-
+
+ Standalone
+
+
+
+
+ $(MSBuildThisFileDirectory)..\
+ $(MSBuildThisFileDirectory)
+
+
+
+ Release
+ AnyCPU
+ false
+ 15.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ true
+ win
+ true
+ false
+
\ No newline at end of file
diff --git a/vsix/Extension.targets b/vsix/Extension.targets
new file mode 100644
index 000000000..7a7b6c2b8
--- /dev/null
+++ b/vsix/Extension.targets
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(MSBuildProjectDirectory)\$(OutDir)%(RecursiveDir)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ false
+ %(RecursiveDir)
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vsix/ItemTemplates/BlankPage/cppwinrt_BlankPage.vstemplate b/vsix/ItemTemplates/BlankPage/cppwinrt_BlankPage.vstemplate
index 325ce0b2c..672d43b2f 100644
--- a/vsix/ItemTemplates/BlankPage/cppwinrt_BlankPage.vstemplate
+++ b/vsix/ItemTemplates/BlankPage/cppwinrt_BlankPage.vstemplate
@@ -1,8 +1,8 @@
BlankPage
- Blank Page (C++/WinRT)
- A single page with no predefined layout, for a C++/WinRT Universal Windows Platform (UWP) app
+
+
VC
10
microsoft.Windows.CppWinRT.BlankPage
diff --git a/vsix/ItemTemplates/BlankUserControl/cppwinrt_BlankUserControl.vstemplate b/vsix/ItemTemplates/BlankUserControl/cppwinrt_BlankUserControl.vstemplate
index 2e271ff86..e872ae3e0 100644
--- a/vsix/ItemTemplates/BlankUserControl/cppwinrt_BlankUserControl.vstemplate
+++ b/vsix/ItemTemplates/BlankUserControl/cppwinrt_BlankUserControl.vstemplate
@@ -1,8 +1,8 @@
BlankUserControl
- Blank User Control (C++/WinRT)
- A blank user control with no predefined layout, for a C++/WinRT Universal Windows Platform (UWP) app
+
+
VC
10
microsoft.Windows.CppWinRT.BlankUserControl
diff --git a/vsix/ItemTemplates/ViewModel/cppwinrt_ViewModel.vstemplate b/vsix/ItemTemplates/ViewModel/cppwinrt_ViewModel.vstemplate
index 47699df6d..5e5a5dbdd 100644
--- a/vsix/ItemTemplates/ViewModel/cppwinrt_ViewModel.vstemplate
+++ b/vsix/ItemTemplates/ViewModel/cppwinrt_ViewModel.vstemplate
@@ -1,8 +1,8 @@
ViewModel
- View Model (C++/WinRT)
- An empty interface definition suitable for XAML data binding, for a C++/WinRT Universal Windows Platform (UWP) app
+
+
VC
10
microsoft.Windows.CppWinRT.ViewModel
diff --git a/vsix/Microsoft.Cpp.CppWinRT.props b/vsix/Microsoft.Cpp.CppWinRT.props
deleted file mode 100644
index 7bb7adb6a..000000000
--- a/vsix/Microsoft.Cpp.CppWinRT.props
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
- false
- true
- false
-
-
-
-
-
-
-
diff --git a/vsix/Platforms/ARM/ImportAfter/Microsoft.Cpp.CppWinRT.props b/vsix/Platforms/ARM/ImportAfter/Microsoft.Cpp.CppWinRT.props
deleted file mode 100644
index 75cb347b7..000000000
--- a/vsix/Platforms/ARM/ImportAfter/Microsoft.Cpp.CppWinRT.props
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
diff --git a/vsix/Platforms/ARM64/ImportAfter/Microsoft.Cpp.CppWinRT.props b/vsix/Platforms/ARM64/ImportAfter/Microsoft.Cpp.CppWinRT.props
deleted file mode 100644
index 75cb347b7..000000000
--- a/vsix/Platforms/ARM64/ImportAfter/Microsoft.Cpp.CppWinRT.props
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
diff --git a/vsix/Platforms/Win32/ImportAfter/Microsoft.Cpp.CppWinRT.props b/vsix/Platforms/Win32/ImportAfter/Microsoft.Cpp.CppWinRT.props
deleted file mode 100644
index 75cb347b7..000000000
--- a/vsix/Platforms/Win32/ImportAfter/Microsoft.Cpp.CppWinRT.props
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
diff --git a/vsix/Platforms/x64/ImportAfter/Microsoft.Cpp.CppWinRT.props b/vsix/Platforms/x64/ImportAfter/Microsoft.Cpp.CppWinRT.props
deleted file mode 100644
index 75cb347b7..000000000
--- a/vsix/Platforms/x64/ImportAfter/Microsoft.Cpp.CppWinRT.props
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
diff --git a/vsix/ProjectTemplates/VC/Windows Desktop/ConsoleApplication/cppwinrt_ConsoleApplication.vstemplate b/vsix/ProjectTemplates/VC/Windows Desktop/ConsoleApplication/cppwinrt_ConsoleApplication.vstemplate
index 07ff29751..747463a4a 100644
--- a/vsix/ProjectTemplates/VC/Windows Desktop/ConsoleApplication/cppwinrt_ConsoleApplication.vstemplate
+++ b/vsix/ProjectTemplates/VC/Windows Desktop/ConsoleApplication/cppwinrt_ConsoleApplication.vstemplate
@@ -1,7 +1,7 @@
- Windows Console Application (C++/WinRT)
- A project for creating a C++/WinRT Windows console application
+
+
VC
4000
microsoft.Windows.CppWinRT.ConsoleApplication
diff --git a/vsix/ProjectTemplates/VC/Windows Desktop/WindowsApplication/cppwinrt_WindowsApplication.vstemplate b/vsix/ProjectTemplates/VC/Windows Desktop/WindowsApplication/cppwinrt_WindowsApplication.vstemplate
index 04023bb11..881e36cf6 100644
--- a/vsix/ProjectTemplates/VC/Windows Desktop/WindowsApplication/cppwinrt_WindowsApplication.vstemplate
+++ b/vsix/ProjectTemplates/VC/Windows Desktop/WindowsApplication/cppwinrt_WindowsApplication.vstemplate
@@ -1,7 +1,7 @@
- Windows Desktop Application (C++/WinRT)
- A project for creating a C++/WinRT Windows desktop application
+
+
VC
4000
microsoft.Windows.CppWinRT.WindowsApplication
diff --git a/vsix/ProjectTemplates/VC/Windows Universal/BlankApp/cppwinrt_BlankApp.vstemplate b/vsix/ProjectTemplates/VC/Windows Universal/BlankApp/cppwinrt_BlankApp.vstemplate
index a77c8a043..9fb9bec42 100644
--- a/vsix/ProjectTemplates/VC/Windows Universal/BlankApp/cppwinrt_BlankApp.vstemplate
+++ b/vsix/ProjectTemplates/VC/Windows Universal/BlankApp/cppwinrt_BlankApp.vstemplate
@@ -1,7 +1,7 @@
- Blank App (C++/WinRT)
- A project for a single page C++/WinRT Universal Windows Platform (UWP) app with no predefined layout
+
+
VC
1000
microsoft.Windows.CppWinRT.BlankApp
diff --git a/vsix/ProjectTemplates/VC/Windows Universal/CoreApp/cppwinrt_CoreApp.vstemplate b/vsix/ProjectTemplates/VC/Windows Universal/CoreApp/cppwinrt_CoreApp.vstemplate
index c896067e2..f218c3342 100644
--- a/vsix/ProjectTemplates/VC/Windows Universal/CoreApp/cppwinrt_CoreApp.vstemplate
+++ b/vsix/ProjectTemplates/VC/Windows Universal/CoreApp/cppwinrt_CoreApp.vstemplate
@@ -1,7 +1,7 @@
- Core App (C++/WinRT)
- A project for a C++/WinRT Universal Windows Platform (UWP) app directly implementing CoreApplication
+
+
VC
2000
microsoft.Windows.CppWinRT.CoreApp
diff --git a/vsix/ProjectTemplates/VC/Windows Universal/StaticLibrary/cppwinrt_StaticLibrary.vstemplate b/vsix/ProjectTemplates/VC/Windows Universal/StaticLibrary/cppwinrt_StaticLibrary.vstemplate
index 7eda1ca29..8dbe05d86 100644
--- a/vsix/ProjectTemplates/VC/Windows Universal/StaticLibrary/cppwinrt_StaticLibrary.vstemplate
+++ b/vsix/ProjectTemplates/VC/Windows Universal/StaticLibrary/cppwinrt_StaticLibrary.vstemplate
@@ -1,7 +1,7 @@
- Static Library (C++/WinRT)
- A project for a C++/WinRT Static Library that can be used by a Universal Windows Platform app
+
+
VC
3000
microsoft.Windows.CppWinRT.StaticLibrary
diff --git a/vsix/ProjectTemplates/VC/Windows Universal/WindowsRuntimeComponent/cppwinrt_WindowsRuntimeComponent.vstemplate b/vsix/ProjectTemplates/VC/Windows Universal/WindowsRuntimeComponent/cppwinrt_WindowsRuntimeComponent.vstemplate
index ed111f821..7c72a64c8 100644
--- a/vsix/ProjectTemplates/VC/Windows Universal/WindowsRuntimeComponent/cppwinrt_WindowsRuntimeComponent.vstemplate
+++ b/vsix/ProjectTemplates/VC/Windows Universal/WindowsRuntimeComponent/cppwinrt_WindowsRuntimeComponent.vstemplate
@@ -1,7 +1,7 @@
- Windows Runtime Component (C++/WinRT)
- A project for a C++/WinRT Windows Runtime component that can be used by a Universal Windows Platform app
+
+
VC
3000
microsoft.Windows.CppWinRT.WindowsRuntimeComponent
diff --git a/vsix/Resources/VSPackage.cs-CZ.resx b/vsix/Resources/VSPackage.cs-CZ.resx
new file mode 100644
index 000000000..c3d2f10dc
--- /dev/null
+++ b/vsix/Resources/VSPackage.cs-CZ.resx
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
diff --git a/vsix/Resources/VSPackage.de-DE.resx b/vsix/Resources/VSPackage.de-DE.resx
new file mode 100644
index 000000000..c3d2f10dc
--- /dev/null
+++ b/vsix/Resources/VSPackage.de-DE.resx
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
diff --git a/vsix/Resources/VSPackage.en-US.resx b/vsix/Resources/VSPackage.en-US.resx
new file mode 100644
index 000000000..c3d2f10dc
--- /dev/null
+++ b/vsix/Resources/VSPackage.en-US.resx
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
diff --git a/vsix/Resources/VSPackage.es-ES.resx b/vsix/Resources/VSPackage.es-ES.resx
new file mode 100644
index 000000000..c3d2f10dc
--- /dev/null
+++ b/vsix/Resources/VSPackage.es-ES.resx
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
diff --git a/vsix/Resources/VSPackage.fr-FR.resx b/vsix/Resources/VSPackage.fr-FR.resx
new file mode 100644
index 000000000..c3d2f10dc
--- /dev/null
+++ b/vsix/Resources/VSPackage.fr-FR.resx
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
diff --git a/vsix/Resources/VSPackage.it-IT.resx b/vsix/Resources/VSPackage.it-IT.resx
new file mode 100644
index 000000000..c3d2f10dc
--- /dev/null
+++ b/vsix/Resources/VSPackage.it-IT.resx
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
diff --git a/vsix/Resources/VSPackage.ja-JP.resx b/vsix/Resources/VSPackage.ja-JP.resx
new file mode 100644
index 000000000..c3d2f10dc
--- /dev/null
+++ b/vsix/Resources/VSPackage.ja-JP.resx
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
diff --git a/vsix/Resources/VSPackage.ko-KR.resx b/vsix/Resources/VSPackage.ko-KR.resx
new file mode 100644
index 000000000..c3d2f10dc
--- /dev/null
+++ b/vsix/Resources/VSPackage.ko-KR.resx
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
diff --git a/vsix/Resources/VSPackage.pl-PL.resx b/vsix/Resources/VSPackage.pl-PL.resx
new file mode 100644
index 000000000..c3d2f10dc
--- /dev/null
+++ b/vsix/Resources/VSPackage.pl-PL.resx
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
diff --git a/vsix/Resources/VSPackage.pt-BR.resx b/vsix/Resources/VSPackage.pt-BR.resx
new file mode 100644
index 000000000..c3d2f10dc
--- /dev/null
+++ b/vsix/Resources/VSPackage.pt-BR.resx
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
diff --git a/vsix/Resources/VSPackage.resx b/vsix/Resources/VSPackage.resx
new file mode 100644
index 000000000..731c40309
--- /dev/null
+++ b/vsix/Resources/VSPackage.resx
@@ -0,0 +1,185 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Windows Console Application (C++/WinRT)
+
+
+ A project for creating a C++/WinRT Windows console application.
+
+
+ Windows Desktop Application (C++/WinRT)
+
+
+ A project for creating a C++/WinRT Windows desktop application.
+
+
+ Blank App (C++/WinRT)
+
+
+ A project for a single page C++/WinRT Universal Windows Platform (UWP) app with no predefined layout.
+
+
+ Core App (C++/WinRT)
+
+
+ A project for a C++/WinRT Universal Windows Platform (UWP) app directly implementing CoreApplication.
+
+
+ Static Library (C++/WinRT)
+
+
+ A project for a C++/WinRT Static Library that can be used by a Universal Windows Platform app.
+
+
+ Windows Runtime Component (C++/WinRT)
+
+
+ A project for a C++/WinRT Windows Runtime component that can be used by a Universal Windows Platform app.
+
+
+ Blank Page (C++/WinRT)
+
+
+ A single page with no predefined layout, for a C++/WinRT Universal Windows Platform (UWP) app.
+
+
+ Blank User Control (C++/WinRT)
+
+
+ A blank user control with no predefined layout, for a C++/WinRT Universal Windows Platform (UWP) app.
+
+
+ View Model (C++/WinRT)
+
+
+ An empty interface definition suitable for XAML data binding, for a C++/WinRT Universal Windows Platform (UWP) app.
+
+
diff --git a/vsix/Resources/VSPackage.ru-RU.resx b/vsix/Resources/VSPackage.ru-RU.resx
new file mode 100644
index 000000000..c3d2f10dc
--- /dev/null
+++ b/vsix/Resources/VSPackage.ru-RU.resx
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
diff --git a/vsix/Resources/VSPackage.tr-TR.resx b/vsix/Resources/VSPackage.tr-TR.resx
new file mode 100644
index 000000000..c3d2f10dc
--- /dev/null
+++ b/vsix/Resources/VSPackage.tr-TR.resx
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
diff --git a/vsix/Resources/VSPackage.zh-CN.resx b/vsix/Resources/VSPackage.zh-CN.resx
new file mode 100644
index 000000000..c3d2f10dc
--- /dev/null
+++ b/vsix/Resources/VSPackage.zh-CN.resx
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
diff --git a/vsix/Resources/VSPackage.zh-TW.resx b/vsix/Resources/VSPackage.zh-TW.resx
new file mode 100644
index 000000000..c3d2f10dc
--- /dev/null
+++ b/vsix/Resources/VSPackage.zh-TW.resx
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
diff --git a/vsix/vsix.sln b/vsix/vsix.sln
index 53a11fdc3..d10f26424 100644
--- a/vsix/vsix.sln
+++ b/vsix/vsix.sln
@@ -17,12 +17,12 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2F0C4AFA-FEFA-4D37-B824-0426CEB32DBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2F0C4AFA-FEFA-4D37-B824-0426CEB32DBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2F0C4AFA-FEFA-4D37-B824-0426CEB32DBA}.Debug|x86.ActiveCfg = Debug|x86
- {2F0C4AFA-FEFA-4D37-B824-0426CEB32DBA}.Debug|x86.Build.0 = Debug|x86
+ {2F0C4AFA-FEFA-4D37-B824-0426CEB32DBA}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {2F0C4AFA-FEFA-4D37-B824-0426CEB32DBA}.Debug|x86.Build.0 = Debug|Any CPU
{2F0C4AFA-FEFA-4D37-B824-0426CEB32DBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2F0C4AFA-FEFA-4D37-B824-0426CEB32DBA}.Release|Any CPU.Build.0 = Release|Any CPU
- {2F0C4AFA-FEFA-4D37-B824-0426CEB32DBA}.Release|x86.ActiveCfg = Release|x86
- {2F0C4AFA-FEFA-4D37-B824-0426CEB32DBA}.Release|x86.Build.0 = Release|x86
+ {2F0C4AFA-FEFA-4D37-B824-0426CEB32DBA}.Release|x86.ActiveCfg = Release|Any CPU
+ {2F0C4AFA-FEFA-4D37-B824-0426CEB32DBA}.Release|x86.Build.0 = Release|Any CPU
{3D56768C-78A5-4340-99AE-C728F3C75C1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3D56768C-78A5-4340-99AE-C728F3C75C1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3D56768C-78A5-4340-99AE-C728F3C75C1D}.Debug|x86.ActiveCfg = Debug|Any CPU