Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build_vsix.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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 /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=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
6 changes: 3 additions & 3 deletions vsix/Dev16/Component/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<DisplayName>C++/WinRT templates and visualizer for VS2019</DisplayName>
<Description xml:space="preserve">Project and Item templates and the debug visualizer for C++/WinRT in Visual Studio 2019.</Description>
<MoreInfo>https://go.microsoft.com/fwlink/?linkid=869449</MoreInfo>
<License>..\LICENSE</License>
<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>
<Icon>cppwinrt.ico</Icon>
<PreviewImage>cppwinrt.png</PreviewImage>
<Tags>WinRT, C++, cppwinrt, native</Tags>
</Metadata>
<Installation AllUsers="true">
Expand Down
21 changes: 0 additions & 21 deletions vsix/Dev16/LICENSE

This file was deleted.

18 changes: 6 additions & 12 deletions vsix/Dev16/Standalone/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,17 @@
<DisplayName>C++/WinRT templates and visualizer for VS2019</DisplayName>
<Description xml:space="preserve">Project and Item templates and the debug visualizer for C++/WinRT in Visual Studio 2019.</Description>
<MoreInfo>https://go.microsoft.com/fwlink/?linkid=869449</MoreInfo>
<License>..\LICENSE</License>
<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>
<Icon>cppwinrt.ico</Icon>
<PreviewImage>cppwinrt.png</PreviewImage>
<Tags>WinRT, C++, cppwinrt, native</Tags>
</Metadata>
<Installation AllUsers="true">
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0, 17.0)">
<ProductArchitecture>x86</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[16.0, 17.0)">
<ProductArchitecture>x86</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[16.0, 17.0)">
<ProductArchitecture>x86</ProductArchitecture>
</InstallationTarget>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0,17.0)" />
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[16.0,17.0)" />
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[16.0,17.0)" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
Expand Down
35 changes: 19 additions & 16 deletions vsix/Dev16/vsix.Dev16.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<UseCodebase>true</UseCodebase>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
Expand Down Expand Up @@ -47,50 +48,51 @@
<IsProductComponent Condition="'$(Deployment)' == 'Component'">true</IsProductComponent>
</PropertyGroup>
<ItemGroup>
<Content Include="..\LICENSE">
<Content Include="$(RepoRoot)LICENSE">
<Link>%(Filename)%(Extension)</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Microsoft\VC\v160</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Microsoft\VC\v160\Platforms\ARM\ImportBefore</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Microsoft\VC\v160\Platforms\ARM64\ImportBefore</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Microsoft\VC\v160\Platforms\Win32\ImportBefore</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Microsoft\VC\v160\Platforms\x64\ImportBefore</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Application Type\Windows Store\10.0\Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\x64\ImportAfter</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
Expand All @@ -99,7 +101,7 @@
<Link>Packages\Microsoft.Windows.CppWinRT.$(CppWinRTVersion).nupkg</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\..\natvis\cppwinrt.natvis">
<Content Include="$(VSIXRootDir)..\natvis\cppwinrt.natvis">
<Link>%(Filename)%(Extension)</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
Expand All @@ -120,10 +122,12 @@
</None>
</ItemGroup>
<ItemGroup>
<Content Include="..\cppwinrt.ico">
<Content Include="$(VSIXRootDir)cppwinrt.ico">
<Link>%(Filename)%(Extension)</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\cppwinrt.png">
<Content Include="$(VSIXRootDir)cppwinrt.png">
<Link>%(Filename)%(Extension)</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
</ItemGroup>
Expand All @@ -145,10 +149,9 @@
<Error Condition="'$(NatvisDirx86)' == ''" Text="The project must be supplied with a NatvisDirx86 property value" />
<Error Condition="'$(NatvisDirx64)' == ''" Text="The project must be supplied with a NatvisDirx64 property value" />
<Error Condition="'$(NupkgDir)' == ''" Text="The project must be supplied with a NupkgDir property value" />
<Copy SourceFiles="..\LICENSE" DestinationFolder="$(MSBuildProjectDirectory)" />
<ItemGroup>
<VSTemplateFiles Include="..\*Templates\*\**\*.vstemplate" />
<OtherTemplateFiles Include="..\*Templates\*\**\*" />
<VSTemplateFiles Include="$(VSIXRootDir)*Templates\*\**\*.vstemplate" />
<OtherTemplateFiles Include="$(VSIXRootDir)*Templates\*\**\*" />
<OtherTemplateFiles Remove="@(OtherTemplateFiles)" Condition="'%(Extension)' == '.vstemplate'" />
<Templates Include="@(VSTemplateFiles)">
<StagingFolder>$(MSBuildProjectDirectory)\$(OutDir)%(RecursiveDir)</StagingFolder>
Expand Down
6 changes: 3 additions & 3 deletions vsix/Dev17/Component/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<DisplayName>C++/WinRT templates and visualizer for VS2022</DisplayName>
<Description xml:space="preserve">Project and Item templates and the debug visualizer for C++/WinRT in Visual Studio 2022.</Description>
<MoreInfo>https://go.microsoft.com/fwlink/?linkid=869449</MoreInfo>
<License>..\LICENSE</License>
<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>
<Icon>cppwinrt.ico</Icon>
<PreviewImage>cppwinrt.png</PreviewImage>
<Tags>WinRT, C++, cppwinrt, native</Tags>
</Metadata>
<Installation AllUsers="true">
Expand Down
21 changes: 0 additions & 21 deletions vsix/Dev17/LICENSE

This file was deleted.

6 changes: 3 additions & 3 deletions vsix/Dev17/Standalone/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<DisplayName>C++/WinRT templates and visualizer for VS2022</DisplayName>
<Description xml:space="preserve">Project and Item templates and the debug visualizer for C++/WinRT in Visual Studio 2022.</Description>
<MoreInfo>https://go.microsoft.com/fwlink/?linkid=869449</MoreInfo>
<License>..\LICENSE</License>
<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>
<Icon>cppwinrt.ico</Icon>
<PreviewImage>cppwinrt.png</PreviewImage>
<Tags>WinRT, C++, cppwinrt, native</Tags>
</Metadata>
<Installation AllUsers="true">
Expand Down
36 changes: 19 additions & 17 deletions vsix/Dev17/vsix.Dev17.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,50 +45,51 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Content Include="..\LICENSE">
<Content Include="$(RepoRoot)LICENSE">
<Link>%(Filename)%(Extension)</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Microsoft\VC\v160</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Microsoft\VC\v160\Platforms\ARM\ImportBefore</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Microsoft\VC\v160\Platforms\ARM64\ImportBefore</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Microsoft\VC\v160\Platforms\Win32\ImportBefore</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Microsoft\VC\v160\Platforms\x64\ImportBefore</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Application Type\Windows Store\10.0\Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\x64\ImportAfter</VSIXSubPath>
<InstallRoot>MSBuild</InstallRoot>
<IncludeInVSIX>true</IncludeInVSIX>
Expand All @@ -97,7 +98,7 @@
<Link>Packages\Microsoft.Windows.CppWinRT.$(CppWinRTVersion).nupkg</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\..\natvis\cppwinrt.natvis">
<Content Include="$(VSIXRootDir)..\natvis\cppwinrt.natvis">
<Link>%(Filename)%(Extension)</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
Expand All @@ -118,10 +119,12 @@
</None>
</ItemGroup>
<ItemGroup>
<Content Include="..\cppwinrt.ico">
<Content Include="$(VSIXRootDir)cppwinrt.ico">
<Link>%(Filename)%(Extension)</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\cppwinrt.png">
<Content Include="$(VSIXRootDir)cppwinrt.png">
<Link>%(Filename)%(Extension)</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
</ItemGroup>
Expand All @@ -132,7 +135,7 @@
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.0-previews-4-31709-430" ExcludeAssets="runtime">
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.5232">
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.4207-preview4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand All @@ -148,10 +151,9 @@
<Error Condition="'$(NatvisDirx86)' == ''" Text="The project must be supplied with a NatvisDirx86 property value" />
<Error Condition="'$(NatvisDirx64)' == ''" Text="The project must be supplied with a NatvisDirx64 property value" />
<Error Condition="'$(NupkgDir)' == ''" Text="The project must be supplied with a NupkgDir property value" />
<Copy SourceFiles="..\LICENSE" DestinationFolder="$(MSBuildProjectDirectory)" />
<ItemGroup>
<VSTemplateFiles Include="..\*Templates\*\**\*.vstemplate" />
<OtherTemplateFiles Include="..\*Templates\*\**\*" />
<VSTemplateFiles Include="$(VSIXRootDir)*Templates\*\**\*.vstemplate" />
<OtherTemplateFiles Include="$(VSIXRootDir)*Templates\*\**\*" />
<OtherTemplateFiles Remove="@(OtherTemplateFiles)" Condition="'%(Extension)' == '.vstemplate'" />
<Templates Include="@(VSTemplateFiles)">
<StagingFolder>$(MSBuildProjectDirectory)\$(OutDir)%(RecursiveDir)</StagingFolder>
Expand Down
Loading