Skip to content

Commit c07461f

Browse files
DefaultRyanDefaultRyan
authored
Fix VSIX pipeline build breaks (#1046)
* Fix some VSIX build breaks in pipeline * Work around untracked LICENSE file
1 parent d85ad86 commit c07461f

File tree

10 files changed

+64
-97
lines changed

10 files changed

+64
-97
lines changed

‎build_vsix.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ rem Build nuget
3333
.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
3434

3535
rem Build vsix
36-
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
36+
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

‎vsix/Dev16/Component/source.extension.vsixmanifest‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<DisplayName>C++/WinRT templates and visualizer for VS2019</DisplayName>
77
<Description xml:space="preserve">Project and Item templates and the debug visualizer for C++/WinRT in Visual Studio 2019.</Description>
88
<MoreInfo>https://go.microsoft.com/fwlink/?linkid=869449</MoreInfo>
9-
<License>..\LICENSE</License>
9+
<License>LICENSE</License>
1010
<GettingStartedGuide>https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/intro-to-using-cpp-with-winrt</GettingStartedGuide>
1111
<ReleaseNotes>https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/faq</ReleaseNotes>
12-
<Icon>..\cppwinrt.ico</Icon>
13-
<PreviewImage>..\cppwinrt.png</PreviewImage>
12+
<Icon>cppwinrt.ico</Icon>
13+
<PreviewImage>cppwinrt.png</PreviewImage>
1414
<Tags>WinRT, C++, cppwinrt, native</Tags>
1515
</Metadata>
1616
<Installation AllUsers="true">

‎vsix/Dev16/LICENSE‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎vsix/Dev16/Standalone/source.extension.vsixmanifest‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,17 @@
66
<DisplayName>C++/WinRT templates and visualizer for VS2019</DisplayName>
77
<Description xml:space="preserve">Project and Item templates and the debug visualizer for C++/WinRT in Visual Studio 2019.</Description>
88
<MoreInfo>https://go.microsoft.com/fwlink/?linkid=869449</MoreInfo>
9-
<License>..\LICENSE</License>
9+
<License>LICENSE</License>
1010
<GettingStartedGuide>https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/intro-to-using-cpp-with-winrt</GettingStartedGuide>
1111
<ReleaseNotes>https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/faq</ReleaseNotes>
12-
<Icon>..\cppwinrt.ico</Icon>
13-
<PreviewImage>..\cppwinrt.png</PreviewImage>
12+
<Icon>cppwinrt.ico</Icon>
13+
<PreviewImage>cppwinrt.png</PreviewImage>
1414
<Tags>WinRT, C++, cppwinrt, native</Tags>
1515
</Metadata>
1616
<Installation AllUsers="true">
17-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0, 17.0)">
18-
<ProductArchitecture>x86</ProductArchitecture>
19-
</InstallationTarget>
20-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[16.0, 17.0)">
21-
<ProductArchitecture>x86</ProductArchitecture>
22-
</InstallationTarget>
23-
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[16.0, 17.0)">
24-
<ProductArchitecture>x86</ProductArchitecture>
25-
</InstallationTarget>
17+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0,17.0)" />
18+
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[16.0,17.0)" />
19+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[16.0,17.0)" />
2620
</Installation>
2721
<Dependencies>
2822
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />

‎vsix/Dev16/vsix.Dev16.csproj‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
55
<NuGetPackageImportStamp>
66
</NuGetPackageImportStamp>
7+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
78
<UseCodebase>true</UseCodebase>
89
</PropertyGroup>
910
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
@@ -47,50 +48,51 @@
4748
<IsProductComponent Condition="'$(Deployment)' == 'Component'">true</IsProductComponent>
4849
</PropertyGroup>
4950
<ItemGroup>
50-
<Content Include="..\LICENSE">
51+
<Content Include="$(RepoRoot)LICENSE">
52+
<Link>%(Filename)%(Extension)</Link>
5153
<IncludeInVSIX>true</IncludeInVSIX>
5254
</Content>
53-
<Content Include="..\Microsoft.Cpp.CppWinRT.props">
55+
<Content Include="$(VSIXRootDir)Microsoft.Cpp.CppWinRT.props">
5456
<VSIXSubPath>Microsoft\VC\v160</VSIXSubPath>
5557
<InstallRoot>MSBuild</InstallRoot>
5658
<IncludeInVSIX>true</IncludeInVSIX>
5759
</Content>
58-
<Content Include="..\Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
60+
<Content Include="$(VSIXRootDir)Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
5961
<VSIXSubPath>Microsoft\VC\v160\Platforms\ARM\ImportBefore</VSIXSubPath>
6062
<InstallRoot>MSBuild</InstallRoot>
6163
<IncludeInVSIX>true</IncludeInVSIX>
6264
</Content>
63-
<Content Include="..\Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
65+
<Content Include="$(VSIXRootDir)Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
6466
<VSIXSubPath>Microsoft\VC\v160\Platforms\ARM64\ImportBefore</VSIXSubPath>
6567
<InstallRoot>MSBuild</InstallRoot>
6668
<IncludeInVSIX>true</IncludeInVSIX>
6769
</Content>
68-
<Content Include="..\Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
70+
<Content Include="$(VSIXRootDir)Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
6971
<VSIXSubPath>Microsoft\VC\v160\Platforms\Win32\ImportBefore</VSIXSubPath>
7072
<InstallRoot>MSBuild</InstallRoot>
7173
<IncludeInVSIX>true</IncludeInVSIX>
7274
</Content>
73-
<Content Include="..\Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
75+
<Content Include="$(VSIXRootDir)Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
7476
<VSIXSubPath>Microsoft\VC\v160\Platforms\x64\ImportBefore</VSIXSubPath>
7577
<InstallRoot>MSBuild</InstallRoot>
7678
<IncludeInVSIX>true</IncludeInVSIX>
7779
</Content>
78-
<Content Include="..\Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
80+
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
7981
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter</VSIXSubPath>
8082
<InstallRoot>MSBuild</InstallRoot>
8183
<IncludeInVSIX>true</IncludeInVSIX>
8284
</Content>
83-
<Content Include="..\Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
85+
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
8486
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter</VSIXSubPath>
8587
<InstallRoot>MSBuild</InstallRoot>
8688
<IncludeInVSIX>true</IncludeInVSIX>
8789
</Content>
88-
<Content Include="..\Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
90+
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
8991
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter</VSIXSubPath>
9092
<InstallRoot>MSBuild</InstallRoot>
9193
<IncludeInVSIX>true</IncludeInVSIX>
9294
</Content>
93-
<Content Include="..\Application Type\Windows Store\10.0\Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
95+
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
9496
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\x64\ImportAfter</VSIXSubPath>
9597
<InstallRoot>MSBuild</InstallRoot>
9698
<IncludeInVSIX>true</IncludeInVSIX>
@@ -99,7 +101,7 @@
99101
<Link>Packages\Microsoft.Windows.CppWinRT.$(CppWinRTVersion).nupkg</Link>
100102
<IncludeInVSIX>true</IncludeInVSIX>
101103
</Content>
102-
<Content Include="..\..\natvis\cppwinrt.natvis">
104+
<Content Include="$(VSIXRootDir)..\natvis\cppwinrt.natvis">
103105
<Link>%(Filename)%(Extension)</Link>
104106
<IncludeInVSIX>true</IncludeInVSIX>
105107
</Content>
@@ -120,10 +122,12 @@
120122
</None>
121123
</ItemGroup>
122124
<ItemGroup>
123-
<Content Include="..\cppwinrt.ico">
125+
<Content Include="$(VSIXRootDir)cppwinrt.ico">
126+
<Link>%(Filename)%(Extension)</Link>
124127
<IncludeInVSIX>true</IncludeInVSIX>
125128
</Content>
126-
<Content Include="..\cppwinrt.png">
129+
<Content Include="$(VSIXRootDir)cppwinrt.png">
130+
<Link>%(Filename)%(Extension)</Link>
127131
<IncludeInVSIX>true</IncludeInVSIX>
128132
</Content>
129133
</ItemGroup>
@@ -145,10 +149,9 @@
145149
<Error Condition="'$(NatvisDirx86)' == ''" Text="The project must be supplied with a NatvisDirx86 property value" />
146150
<Error Condition="'$(NatvisDirx64)' == ''" Text="The project must be supplied with a NatvisDirx64 property value" />
147151
<Error Condition="'$(NupkgDir)' == ''" Text="The project must be supplied with a NupkgDir property value" />
148-
<Copy SourceFiles="..\LICENSE" DestinationFolder="$(MSBuildProjectDirectory)" />
149152
<ItemGroup>
150-
<VSTemplateFiles Include="..\*Templates\*\**\*.vstemplate" />
151-
<OtherTemplateFiles Include="..\*Templates\*\**\*" />
153+
<VSTemplateFiles Include="$(VSIXRootDir)*Templates\*\**\*.vstemplate" />
154+
<OtherTemplateFiles Include="$(VSIXRootDir)*Templates\*\**\*" />
152155
<OtherTemplateFiles Remove="@(OtherTemplateFiles)" Condition="'%(Extension)' == '.vstemplate'" />
153156
<Templates Include="@(VSTemplateFiles)">
154157
<StagingFolder>$(MSBuildProjectDirectory)\$(OutDir)%(RecursiveDir)</StagingFolder>

‎vsix/Dev17/Component/source.extension.vsixmanifest‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<DisplayName>C++/WinRT templates and visualizer for VS2022</DisplayName>
77
<Description xml:space="preserve">Project and Item templates and the debug visualizer for C++/WinRT in Visual Studio 2022.</Description>
88
<MoreInfo>https://go.microsoft.com/fwlink/?linkid=869449</MoreInfo>
9-
<License>..\LICENSE</License>
9+
<License>LICENSE</License>
1010
<GettingStartedGuide>https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/intro-to-using-cpp-with-winrt</GettingStartedGuide>
1111
<ReleaseNotes>https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/faq</ReleaseNotes>
12-
<Icon>..\cppwinrt.ico</Icon>
13-
<PreviewImage>..\cppwinrt.png</PreviewImage>
12+
<Icon>cppwinrt.ico</Icon>
13+
<PreviewImage>cppwinrt.png</PreviewImage>
1414
<Tags>WinRT, C++, cppwinrt, native</Tags>
1515
</Metadata>
1616
<Installation AllUsers="true">

‎vsix/Dev17/LICENSE‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎vsix/Dev17/Standalone/source.extension.vsixmanifest‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<DisplayName>C++/WinRT templates and visualizer for VS2022</DisplayName>
77
<Description xml:space="preserve">Project and Item templates and the debug visualizer for C++/WinRT in Visual Studio 2022.</Description>
88
<MoreInfo>https://go.microsoft.com/fwlink/?linkid=869449</MoreInfo>
9-
<License>..\LICENSE</License>
9+
<License>LICENSE</License>
1010
<GettingStartedGuide>https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/intro-to-using-cpp-with-winrt</GettingStartedGuide>
1111
<ReleaseNotes>https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/faq</ReleaseNotes>
12-
<Icon>..\cppwinrt.ico</Icon>
13-
<PreviewImage>..\cppwinrt.png</PreviewImage>
12+
<Icon>cppwinrt.ico</Icon>
13+
<PreviewImage>cppwinrt.png</PreviewImage>
1414
<Tags>WinRT, C++, cppwinrt, native</Tags>
1515
</Metadata>
1616
<Installation AllUsers="true">

‎vsix/Dev17/vsix.Dev17.csproj‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,50 +45,51 @@
4545
<WarningLevel>4</WarningLevel>
4646
</PropertyGroup>
4747
<ItemGroup>
48-
<Content Include="..\LICENSE">
48+
<Content Include="$(RepoRoot)LICENSE">
49+
<Link>%(Filename)%(Extension)</Link>
4950
<IncludeInVSIX>true</IncludeInVSIX>
5051
</Content>
51-
<Content Include="..\Microsoft.Cpp.CppWinRT.props">
52+
<Content Include="$(VSIXRootDir)Microsoft.Cpp.CppWinRT.props">
5253
<VSIXSubPath>Microsoft\VC\v160</VSIXSubPath>
5354
<InstallRoot>MSBuild</InstallRoot>
5455
<IncludeInVSIX>true</IncludeInVSIX>
5556
</Content>
56-
<Content Include="..\Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
57+
<Content Include="$(VSIXRootDir)Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
5758
<VSIXSubPath>Microsoft\VC\v160\Platforms\ARM\ImportBefore</VSIXSubPath>
5859
<InstallRoot>MSBuild</InstallRoot>
5960
<IncludeInVSIX>true</IncludeInVSIX>
6061
</Content>
61-
<Content Include="..\Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
62+
<Content Include="$(VSIXRootDir)Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
6263
<VSIXSubPath>Microsoft\VC\v160\Platforms\ARM64\ImportBefore</VSIXSubPath>
6364
<InstallRoot>MSBuild</InstallRoot>
6465
<IncludeInVSIX>true</IncludeInVSIX>
6566
</Content>
66-
<Content Include="..\Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
67+
<Content Include="$(VSIXRootDir)Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
6768
<VSIXSubPath>Microsoft\VC\v160\Platforms\Win32\ImportBefore</VSIXSubPath>
6869
<InstallRoot>MSBuild</InstallRoot>
6970
<IncludeInVSIX>true</IncludeInVSIX>
7071
</Content>
71-
<Content Include="..\Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
72+
<Content Include="$(VSIXRootDir)Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
7273
<VSIXSubPath>Microsoft\VC\v160\Platforms\x64\ImportBefore</VSIXSubPath>
7374
<InstallRoot>MSBuild</InstallRoot>
7475
<IncludeInVSIX>true</IncludeInVSIX>
7576
</Content>
76-
<Content Include="..\Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
77+
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter\Microsoft.Cpp.CppWinRT.props">
7778
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter</VSIXSubPath>
7879
<InstallRoot>MSBuild</InstallRoot>
7980
<IncludeInVSIX>true</IncludeInVSIX>
8081
</Content>
81-
<Content Include="..\Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
82+
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
8283
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter</VSIXSubPath>
8384
<InstallRoot>MSBuild</InstallRoot>
8485
<IncludeInVSIX>true</IncludeInVSIX>
8586
</Content>
86-
<Content Include="..\Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
87+
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter\Microsoft.Cpp.CppWinRT.props">
8788
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter</VSIXSubPath>
8889
<InstallRoot>MSBuild</InstallRoot>
8990
<IncludeInVSIX>true</IncludeInVSIX>
9091
</Content>
91-
<Content Include="..\Application Type\Windows Store\10.0\Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
92+
<Content Include="$(VSIXRootDir)Application Type\Windows Store\10.0\Platforms\x64\ImportAfter\Microsoft.Cpp.CppWinRT.props">
9293
<VSIXSubPath>Application Type\Windows Store\10.0\Platforms\x64\ImportAfter</VSIXSubPath>
9394
<InstallRoot>MSBuild</InstallRoot>
9495
<IncludeInVSIX>true</IncludeInVSIX>
@@ -97,7 +98,7 @@
9798
<Link>Packages\Microsoft.Windows.CppWinRT.$(CppWinRTVersion).nupkg</Link>
9899
<IncludeInVSIX>true</IncludeInVSIX>
99100
</Content>
100-
<Content Include="..\..\natvis\cppwinrt.natvis">
101+
<Content Include="$(VSIXRootDir)..\natvis\cppwinrt.natvis">
101102
<Link>%(Filename)%(Extension)</Link>
102103
<IncludeInVSIX>true</IncludeInVSIX>
103104
</Content>
@@ -118,10 +119,12 @@
118119
</None>
119120
</ItemGroup>
120121
<ItemGroup>
121-
<Content Include="..\cppwinrt.ico">
122+
<Content Include="$(VSIXRootDir)cppwinrt.ico">
123+
<Link>%(Filename)%(Extension)</Link>
122124
<IncludeInVSIX>true</IncludeInVSIX>
123125
</Content>
124-
<Content Include="..\cppwinrt.png">
126+
<Content Include="$(VSIXRootDir)cppwinrt.png">
127+
<Link>%(Filename)%(Extension)</Link>
125128
<IncludeInVSIX>true</IncludeInVSIX>
126129
</Content>
127130
</ItemGroup>
@@ -132,7 +135,7 @@
132135
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.0-previews-4-31709-430" ExcludeAssets="runtime">
133136
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
134137
</PackageReference>
135-
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.5232">
138+
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.4207-preview4">
136139
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
137140
<PrivateAssets>all</PrivateAssets>
138141
</PackageReference>
@@ -148,10 +151,9 @@
148151
<Error Condition="'$(NatvisDirx86)' == ''" Text="The project must be supplied with a NatvisDirx86 property value" />
149152
<Error Condition="'$(NatvisDirx64)' == ''" Text="The project must be supplied with a NatvisDirx64 property value" />
150153
<Error Condition="'$(NupkgDir)' == ''" Text="The project must be supplied with a NupkgDir property value" />
151-
<Copy SourceFiles="..\LICENSE" DestinationFolder="$(MSBuildProjectDirectory)" />
152154
<ItemGroup>
153-
<VSTemplateFiles Include="..\*Templates\*\**\*.vstemplate" />
154-
<OtherTemplateFiles Include="..\*Templates\*\**\*" />
155+
<VSTemplateFiles Include="$(VSIXRootDir)*Templates\*\**\*.vstemplate" />
156+
<OtherTemplateFiles Include="$(VSIXRootDir)*Templates\*\**\*" />
155157
<OtherTemplateFiles Remove="@(OtherTemplateFiles)" Condition="'%(Extension)' == '.vstemplate'" />
156158
<Templates Include="@(VSTemplateFiles)">
157159
<StagingFolder>$(MSBuildProjectDirectory)\$(OutDir)%(RecursiveDir)</StagingFolder>

0 commit comments

Comments
 (0)