Skip to content
This repository was archived by the owner on Feb 14, 2025. It is now read-only.

Commit c3bc7a9

Browse files
robmenrobmen
committed
Merge pull request #21 from drolevar/vs2022
Completes wixtoolset/issues#6493
2 parents 82c9548 + 7e246ca commit c3bc7a9

File tree

278 files changed

+787
-1030
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+787
-1030
lines changed

‎Votive.sln

Lines changed: 71 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26206.0
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31702.278
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "v3schemas", "src\Schemas\v3\v3schemas.csproj", "{D0DD12D1-3455-43A9-9173-E465DA045897}"
77
EndProject
@@ -31,7 +31,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
3131
version.json = version.json
3232
EndProjectSection
3333
EndProject
34+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "votive.shared", "src\votive.shared\votive.shared.shproj", "{72A14880-EC19-43B4-A4F0-DC9DDAE2C763}"
35+
EndProject
36+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Votive2022", "src\Votive2022\Votive2022.csproj", "{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}"
37+
EndProject
3438
Global
39+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
40+
src\votive.shared\votive.shared.projitems*{24a98296-9d58-42c1-95c0-cc36736409e2}*SharedItemsImports = 4
41+
src\votive.shared\votive.shared.projitems*{29a5bbf6-aedb-4867-92f6-c0f560f3aabf}*SharedItemsImports = 4
42+
src\votive.shared\votive.shared.projitems*{72a14880-ec19-43b4-a4f0-dc9ddae2c763}*SharedItemsImports = 13
43+
EndGlobalSection
3544
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3645
Debug|Any CPU = Debug|Any CPU
3746
Debug|arm = Debug|arm
@@ -80,6 +89,36 @@ Global
8089
{D0DD12D1-3455-43A9-9173-E465DA045897}.Release|x64.Build.0 = Release|x64
8190
{D0DD12D1-3455-43A9-9173-E465DA045897}.Release|x86.ActiveCfg = Release|x86
8291
{D0DD12D1-3455-43A9-9173-E465DA045897}.Release|x86.Build.0 = Release|x86
92+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
93+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Any CPU.Build.0 = Debug|Any CPU
94+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|arm.ActiveCfg = Debug|arm
95+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|arm.Build.0 = Debug|arm
96+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Win32.ActiveCfg = Debug|Win32
97+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Win32.Build.0 = Debug|Win32
98+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x64.ActiveCfg = Debug|x64
99+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x64.Build.0 = Debug|x64
100+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x86.ActiveCfg = Debug|x86
101+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x86.Build.0 = Debug|x86
102+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Any CPU.ActiveCfg = Debug|Any CPU
103+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Any CPU.Build.0 = Debug|Any CPU
104+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|arm.ActiveCfg = Debug|arm
105+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|arm.Build.0 = Debug|arm
106+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Win32.ActiveCfg = Debug|Win32
107+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Win32.Build.0 = Debug|Win32
108+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x64.ActiveCfg = Debug|x64
109+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x64.Build.0 = Debug|x64
110+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x86.ActiveCfg = Debug|x86
111+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x86.Build.0 = Debug|x86
112+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Any CPU.ActiveCfg = Release|Any CPU
113+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Any CPU.Build.0 = Release|Any CPU
114+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|arm.ActiveCfg = Release|arm
115+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|arm.Build.0 = Release|arm
116+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Win32.ActiveCfg = Release|Win32
117+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Win32.Build.0 = Release|Win32
118+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x64.ActiveCfg = Release|x64
119+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x64.Build.0 = Release|x64
120+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x86.ActiveCfg = Release|x86
121+
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x86.Build.0 = Release|x86
83122
{3C09CD7D-CA0F-4BB0-A1BE-0622645E93CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84123
{3C09CD7D-CA0F-4BB0-A1BE-0622645E93CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
85124
{3C09CD7D-CA0F-4BB0-A1BE-0622645E93CB}.Debug|arm.ActiveCfg = Debug|arm
@@ -350,36 +389,36 @@ Global
350389
{B97AB81C-BE5B-4757-B2CC-96D92EB84182}.Release|x64.Build.0 = Release|x64
351390
{B97AB81C-BE5B-4757-B2CC-96D92EB84182}.Release|x86.ActiveCfg = Release|x86
352391
{B97AB81C-BE5B-4757-B2CC-96D92EB84182}.Release|x86.Build.0 = Release|x86
353-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
354-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Any CPU.Build.0 = Debug|Any CPU
355-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|arm.ActiveCfg = Debug|arm
356-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|arm.Build.0 = Debug|arm
357-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Win32.ActiveCfg = Debug|Win32
358-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Win32.Build.0 = Debug|Win32
359-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x64.ActiveCfg = Debug|x64
360-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x64.Build.0 = Debug|x64
361-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x86.ActiveCfg = Debug|x86
362-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x86.Build.0 = Debug|x86
363-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Any CPU.ActiveCfg = Debug|Any CPU
364-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Any CPU.Build.0 = Debug|Any CPU
365-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|arm.ActiveCfg = Debug|arm
366-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|arm.Build.0 = Debug|arm
367-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Win32.ActiveCfg = Debug|Win32
368-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Win32.Build.0 = Debug|Win32
369-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x64.ActiveCfg = Debug|x64
370-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x64.Build.0 = Debug|x64
371-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x86.ActiveCfg = Debug|x86
372-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x86.Build.0 = Debug|x86
373-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Any CPU.ActiveCfg = Release|Any CPU
374-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Any CPU.Build.0 = Release|Any CPU
375-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|arm.ActiveCfg = Release|arm
376-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|arm.Build.0 = Release|arm
377-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Win32.ActiveCfg = Release|Win32
378-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Win32.Build.0 = Release|Win32
379-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x64.ActiveCfg = Release|x64
380-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x64.Build.0 = Release|x64
381-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x86.ActiveCfg = Release|x86
382-
{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x86.Build.0 = Release|x86
392+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
393+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
394+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|arm.ActiveCfg = Debug|Any CPU
395+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|arm.Build.0 = Debug|Any CPU
396+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|Win32.ActiveCfg = Debug|x86
397+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|Win32.Build.0 = Debug|x86
398+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|x64.ActiveCfg = Debug|Any CPU
399+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|x64.Build.0 = Debug|Any CPU
400+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|x86.ActiveCfg = Debug|x86
401+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|x86.Build.0 = Debug|x86
402+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|Any CPU.ActiveCfg = Debug|Any CPU
403+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|Any CPU.Build.0 = Debug|Any CPU
404+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|arm.ActiveCfg = Debug|Any CPU
405+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|arm.Build.0 = Debug|Any CPU
406+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|Win32.ActiveCfg = Debug|x86
407+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|Win32.Build.0 = Debug|x86
408+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|x64.ActiveCfg = Debug|Any CPU
409+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|x64.Build.0 = Debug|Any CPU
410+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|x86.ActiveCfg = Debug|x86
411+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|x86.Build.0 = Debug|x86
412+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
413+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|Any CPU.Build.0 = Release|Any CPU
414+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|arm.ActiveCfg = Release|Any CPU
415+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|arm.Build.0 = Release|Any CPU
416+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|Win32.ActiveCfg = Release|x86
417+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|Win32.Build.0 = Release|x86
418+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|x64.ActiveCfg = Release|Any CPU
419+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|x64.Build.0 = Release|Any CPU
420+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|x86.ActiveCfg = Release|x86
421+
{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|x86.Build.0 = Release|x86
383422
EndGlobalSection
384423
GlobalSection(SolutionProperties) = preSolution
385424
HideSolutionNode = FALSE

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ branches:
55
- master
66
- develop
77

8-
image: Visual Studio 2015
8+
image: Visual Studio 2019
99

1010
version: 0.0.0.{build}
1111
configuration: Release

‎src/Schemas/v3/packages.config

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

‎src/Schemas/v3/v3schemas.csproj

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,31 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
3-
<Import Project="..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" />
43
<PropertyGroup>
54
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
65
<ProjectGuid>{D0DD12D1-3455-43A9-9173-E465DA045897}</ProjectGuid>
76
<OutputType>Library</OutputType>
87
<AssemblyName>Schemas3</AssemblyName>
98
<ShouldSignOutput>true</ShouldSignOutput>
10-
119
<VsixType>v3</VsixType>
12-
1310
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
1411
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
15-
1612
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
1713
<GeneratePkgDefFile>false</GeneratePkgDefFile>
1814
<CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
1915
<DeployExtension>false</DeployExtension>
2016
<DeployVSTemplates>false</DeployVSTemplates>
17+
<NuGetPackageImportStamp>
18+
</NuGetPackageImportStamp>
2119
</PropertyGroup>
22-
2320
<Import Project="..\..\..\tools\WixBuild.csproj.props" />
24-
2521
<ItemGroup>
26-
<None Include="packages.config" />
2722
<None Include="source.extension.vsixmanifest" />
2823
</ItemGroup>
29-
3024
<ItemGroup>
3125
<Content Include="WixLogo.png">
3226
<IncludeInVSIX>true</IncludeInVSIX>
3327
</Content>
3428
</ItemGroup>
35-
3629
<ItemGroup>
3730
<Content Include="redirects\wix.ca.targets">
3831
<IncludeInVSIX>true</IncludeInVSIX>
@@ -50,7 +43,6 @@
5043
<VSIXSubPath>Microsoft\WiX\v3.x\</VSIXSubPath>
5144
</Content>
5245
</ItemGroup>
53-
5446
<ItemGroup>
5547
<Content Include="schemas\bal.xsd">
5648
<InstallRoot>Schemas</InstallRoot>
@@ -148,19 +140,19 @@
148140
<IncludeInVSIX>true</IncludeInVSIX>
149141
</Content>
150142
</ItemGroup>
151-
143+
<ItemGroup>
144+
<PackageReference Include="Microsoft.VSSDK.BuildTools">
145+
<Version>15.0.26201</Version>
146+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
147+
<PrivateAssets>all</PrivateAssets>
148+
</PackageReference>
149+
<PackageReference Include="Nerdbank.GitVersioning">
150+
<Version>2.2.33</Version>
151+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
152+
<PrivateAssets>all</PrivateAssets>
153+
</PackageReference>
154+
</ItemGroup>
152155
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
153156
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
154157
<Import Project="..\..\..\Tools\WixBuild.csproj.targets" />
155-
156-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
157-
<PropertyGroup>
158-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
159-
</PropertyGroup>
160-
<Error Condition="!Exists('..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props'))" />
161-
<Error Condition="!Exists('..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets'))" />
162-
<Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets'))" />
163-
</Target>
164-
<Import Project="..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" />
165-
<Import Project="..\..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets')" />
166158
</Project>

‎src/Schemas/v4/packages.config

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

‎src/Schemas/v4/v4schemas.csproj

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,32 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
3-
<Import Project="..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" />
43
<PropertyGroup>
54
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
65
<ProjectGuid>{587D2A86-66CF-46B4-98C8-C01E20F1076D}</ProjectGuid>
76
<OutputType>Library</OutputType>
87
<AssemblyName>Schemas4</AssemblyName>
98
<ShouldSignOutput>true</ShouldSignOutput>
10-
119
<VsixType>v3</VsixType>
12-
1310
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
1411
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
15-
1612
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
1713
<GeneratePkgDefFile>false</GeneratePkgDefFile>
1814
<CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
1915
<DeployExtension>false</DeployExtension>
2016
<DeployVSTemplates>false</DeployVSTemplates>
17+
<NuGetPackageImportStamp>
18+
</NuGetPackageImportStamp>
2119
</PropertyGroup>
22-
2320
<Import Project="..\..\..\tools\WixBuild.csproj.props" />
24-
2521
<ItemGroup>
26-
<None Include="packages.config" />
2722
<None Include="source.extension.vsixmanifest" />
2823
</ItemGroup>
29-
3024
<ItemGroup>
3125
<Content Include="WixLogo.png">
3226
<IncludeInVSIX>true</IncludeInVSIX>
3327
</Content>
3428
</ItemGroup>
35-
<!--
29+
<!--
3630
<ItemGroup>
3731
<Content Include="redirects\v3\wix.ca.targets">
3832
<IncludeInVSIX>true</IncludeInVSIX>
@@ -51,7 +45,7 @@
5145
</Content>
5246
</ItemGroup>
5347
-->
54-
<ItemGroup>
48+
<ItemGroup>
5549
<Content Include="schemas\bal4.xsd">
5650
<IncludeInVSIX>true</IncludeInVSIX>
5751
<InstallRoot>Schemas</InstallRoot>
@@ -153,19 +147,19 @@
153147
<VSIXSubPath>.</VSIXSubPath>
154148
</Content>
155149
</ItemGroup>
156-
150+
<ItemGroup>
151+
<PackageReference Include="Microsoft.VSSDK.BuildTools">
152+
<Version>15.0.26201</Version>
153+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
154+
<PrivateAssets>all</PrivateAssets>
155+
</PackageReference>
156+
<PackageReference Include="Nerdbank.GitVersioning">
157+
<Version>2.2.33</Version>
158+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
159+
<PrivateAssets>all</PrivateAssets>
160+
</PackageReference>
161+
</ItemGroup>
157162
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
158163
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
159164
<Import Project="..\..\..\Tools\WixBuild.csproj.targets" />
160-
161-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
162-
<PropertyGroup>
163-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
164-
</PropertyGroup>
165-
<Error Condition="!Exists('..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props'))" />
166-
<Error Condition="!Exists('..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets'))" />
167-
<Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets'))" />
168-
</Target>
169-
<Import Project="..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" />
170-
<Import Project="..\..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets')" />
171165
</Project>

‎src/Templates/v3/packages.config

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

0 commit comments

Comments
 (0)