Merge pull request #21 from drolevar/vs2022

Completes wixtoolset/issues#6493
wixtoolset · Nov 14, 2021 · c3bc7a9 · c3bc7a9
2 parents 82c9548 + 7e246ca
commit c3bc7a9
Show file tree

Hide file tree

Showing 278 changed files with 787 additions and 1,030 deletions.
diff --git a/Votive.sln b/Votive.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26206.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31702.278
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "v3schemas", "src\Schemas\v3\v3schemas.csproj", "{D0DD12D1-3455-43A9-9173-E465DA045897}"
 EndProject
@@ -31,7 +31,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
 		version.json = version.json
 	EndProjectSection
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "votive.shared", "src\votive.shared\votive.shared.shproj", "{72A14880-EC19-43B4-A4F0-DC9DDAE2C763}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Votive2022", "src\Votive2022\Votive2022.csproj", "{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}"
+EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		src\votive.shared\votive.shared.projitems*{24a98296-9d58-42c1-95c0-cc36736409e2}*SharedItemsImports = 4
+		src\votive.shared\votive.shared.projitems*{29a5bbf6-aedb-4867-92f6-c0f560f3aabf}*SharedItemsImports = 4
+		src\votive.shared\votive.shared.projitems*{72a14880-ec19-43b4-a4f0-dc9ddae2c763}*SharedItemsImports = 13
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|arm = Debug|arm
@@ -80,6 +89,36 @@ Global
 		{D0DD12D1-3455-43A9-9173-E465DA045897}.Release|x64.Build.0 = Release|x64
 		{D0DD12D1-3455-43A9-9173-E465DA045897}.Release|x86.ActiveCfg = Release|x86
 		{D0DD12D1-3455-43A9-9173-E465DA045897}.Release|x86.Build.0 = Release|x86
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|arm.ActiveCfg = Debug|arm
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|arm.Build.0 = Debug|arm
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Win32.Build.0 = Debug|Win32
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x64.ActiveCfg = Debug|x64
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x64.Build.0 = Debug|x64
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x86.ActiveCfg = Debug|x86
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x86.Build.0 = Debug|x86
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Any CPU.ActiveCfg = Debug|Any CPU
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Any CPU.Build.0 = Debug|Any CPU
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|arm.ActiveCfg = Debug|arm
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|arm.Build.0 = Debug|arm
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Win32.ActiveCfg = Debug|Win32
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Win32.Build.0 = Debug|Win32
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x64.ActiveCfg = Debug|x64
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x64.Build.0 = Debug|x64
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x86.ActiveCfg = Debug|x86
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x86.Build.0 = Debug|x86
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|arm.ActiveCfg = Release|arm
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|arm.Build.0 = Release|arm
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Win32.ActiveCfg = Release|Win32
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Win32.Build.0 = Release|Win32
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x64.ActiveCfg = Release|x64
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x64.Build.0 = Release|x64
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x86.ActiveCfg = Release|x86
+		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x86.Build.0 = Release|x86
 		{3C09CD7D-CA0F-4BB0-A1BE-0622645E93CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3C09CD7D-CA0F-4BB0-A1BE-0622645E93CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3C09CD7D-CA0F-4BB0-A1BE-0622645E93CB}.Debug|arm.ActiveCfg = Debug|arm
@@ -350,36 +389,36 @@ Global
 		{B97AB81C-BE5B-4757-B2CC-96D92EB84182}.Release|x64.Build.0 = Release|x64
 		{B97AB81C-BE5B-4757-B2CC-96D92EB84182}.Release|x86.ActiveCfg = Release|x86
 		{B97AB81C-BE5B-4757-B2CC-96D92EB84182}.Release|x86.Build.0 = Release|x86
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|arm.ActiveCfg = Debug|arm
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|arm.Build.0 = Debug|arm
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|Win32.Build.0 = Debug|Win32
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x64.ActiveCfg = Debug|x64
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x64.Build.0 = Debug|x64
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x86.ActiveCfg = Debug|x86
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Debug|x86.Build.0 = Debug|x86
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Any CPU.ActiveCfg = Debug|Any CPU
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Any CPU.Build.0 = Debug|Any CPU
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|arm.ActiveCfg = Debug|arm
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|arm.Build.0 = Debug|arm
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Win32.ActiveCfg = Debug|Win32
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|Win32.Build.0 = Debug|Win32
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x64.ActiveCfg = Debug|x64
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x64.Build.0 = Debug|x64
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x86.ActiveCfg = Debug|x86
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.DebugDev12|x86.Build.0 = Debug|x86
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|arm.ActiveCfg = Release|arm
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|arm.Build.0 = Release|arm
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Win32.ActiveCfg = Release|Win32
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|Win32.Build.0 = Release|Win32
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x64.ActiveCfg = Release|x64
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x64.Build.0 = Release|x64
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x86.ActiveCfg = Release|x86
-		{587D2A86-66CF-46B4-98C8-C01E20F1076D}.Release|x86.Build.0 = Release|x86
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|arm.ActiveCfg = Debug|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|arm.Build.0 = Debug|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|Win32.ActiveCfg = Debug|x86
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|Win32.Build.0 = Debug|x86
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|x64.Build.0 = Debug|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|x86.ActiveCfg = Debug|x86
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Debug|x86.Build.0 = Debug|x86
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|Any CPU.ActiveCfg = Debug|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|Any CPU.Build.0 = Debug|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|arm.ActiveCfg = Debug|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|arm.Build.0 = Debug|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|Win32.ActiveCfg = Debug|x86
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|Win32.Build.0 = Debug|x86
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|x64.ActiveCfg = Debug|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|x64.Build.0 = Debug|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|x86.ActiveCfg = Debug|x86
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.DebugDev12|x86.Build.0 = Debug|x86
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|arm.ActiveCfg = Release|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|arm.Build.0 = Release|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|Win32.ActiveCfg = Release|x86
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|Win32.Build.0 = Release|x86
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|x64.ActiveCfg = Release|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|x64.Build.0 = Release|Any CPU
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|x86.ActiveCfg = Release|x86
+		{29A5BBF6-AEDB-4867-92F6-C0F560F3AABF}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/appveyor.yml b/appveyor.yml
@@ -5,7 +5,7 @@ branches:
     - master
     - develop
 
-image: Visual Studio 2015
+image: Visual Studio 2019
 
 version: 0.0.0.{build}
 configuration: Release

diff --git a/src/Schemas/v3/packages.config b/src/Schemas/v3/packages.config
diff --git a/src/Schemas/v3/v3schemas.csproj b/src/Schemas/v3/v3schemas.csproj
@@ -1,38 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
-  <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')" />
   <PropertyGroup>
     <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectGuid>{D0DD12D1-3455-43A9-9173-E465DA045897}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>Schemas3</AssemblyName>
     <ShouldSignOutput>true</ShouldSignOutput>
-
     <VsixType>v3</VsixType>
-
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
     <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
     <DeployExtension>false</DeployExtension>
     <DeployVSTemplates>false</DeployVSTemplates>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
-
   <Import Project="..\..\..\tools\WixBuild.csproj.props" />
-
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="source.extension.vsixmanifest" />
   </ItemGroup>
-
   <ItemGroup>
     <Content Include="WixLogo.png">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
   </ItemGroup>
-
   <ItemGroup>
     <Content Include="redirects\wix.ca.targets">
       <IncludeInVSIX>true</IncludeInVSIX>
@@ -50,7 +43,6 @@
       <VSIXSubPath>Microsoft\WiX\v3.x\</VSIXSubPath>
     </Content>
   </ItemGroup>
-
   <ItemGroup>
     <Content Include="schemas\bal.xsd">
       <InstallRoot>Schemas</InstallRoot>
@@ -148,19 +140,19 @@
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
   </ItemGroup>
-
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VSSDK.BuildTools">
+      <Version>15.0.26201</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Nerdbank.GitVersioning">
+      <Version>2.2.33</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="..\..\..\Tools\WixBuild.csproj.targets" />
-
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <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>
-    </PropertyGroup>
-    <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'))" />
-    <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'))" />
-    <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'))" />
-  </Target>
-  <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')" />
-  <Import Project="..\..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets')" />
 </Project>
diff --git a/src/Schemas/v4/packages.config b/src/Schemas/v4/packages.config
diff --git a/src/Schemas/v4/v4schemas.csproj b/src/Schemas/v4/v4schemas.csproj
@@ -1,38 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
-  <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')" />
   <PropertyGroup>
     <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectGuid>{587D2A86-66CF-46B4-98C8-C01E20F1076D}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>Schemas4</AssemblyName>
     <ShouldSignOutput>true</ShouldSignOutput>
-
     <VsixType>v3</VsixType>
-
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
     <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
     <DeployExtension>false</DeployExtension>
     <DeployVSTemplates>false</DeployVSTemplates>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
-
   <Import Project="..\..\..\tools\WixBuild.csproj.props" />
-
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="source.extension.vsixmanifest" />
   </ItemGroup>
-
   <ItemGroup>
     <Content Include="WixLogo.png">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
   </ItemGroup>
-<!--
+  <!--
   <ItemGroup>
     <Content Include="redirects\v3\wix.ca.targets">
       <IncludeInVSIX>true</IncludeInVSIX>
@@ -51,7 +45,7 @@
     </Content>
   </ItemGroup>
  -->
-   <ItemGroup>
+  <ItemGroup>
     <Content Include="schemas\bal4.xsd">
       <IncludeInVSIX>true</IncludeInVSIX>
       <InstallRoot>Schemas</InstallRoot>
@@ -153,19 +147,19 @@
       <VSIXSubPath>.</VSIXSubPath>
     </Content>
   </ItemGroup>
-
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VSSDK.BuildTools">
+      <Version>15.0.26201</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Nerdbank.GitVersioning">
+      <Version>2.2.33</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="..\..\..\Tools\WixBuild.csproj.targets" />
-
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <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>
-    </PropertyGroup>
-    <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'))" />
-    <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'))" />
-    <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'))" />
-  </Target>
-  <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')" />
-  <Import Project="..\..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\packages\Nerdbank.GitVersioning.2.2.33\build\Nerdbank.GitVersioning.targets')" />
 </Project>
diff --git a/src/Templates/v3/packages.config b/src/Templates/v3/packages.config