updates to manifest to cleanup for VS22 support

ChrisHammond · Jan 5, 2022 · abcf374 · abcf374
1 parent 2874ce1
commit abcf374
Show file tree

Hide file tree

Showing 6 changed files with 473 additions and 45 deletions.
diff --git a/DNNTemplates.vsix b/DNNTemplates.vsix
diff --git a/VSIX/DNNTemplates/DNNTemplates.csproj b/VSIX/DNNTemplates/DNNTemplates.csproj
@@ -148,7 +148,6 @@
     </Content>
     <None Include="app.config" />
     <None Include="bin\Release\DNNTemplates.vsix" />
-    <None Include="packages.config" />
     <None Include="packages\msbuildtasks.1.5.0.214.nupkg" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
@@ -239,18 +238,21 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="EnvDTE">
+      <Version>16.7.30508.193</Version>
+    </PackageReference>
+    <PackageReference Include="MSBuildTasks">
+      <Version>1.5.0.235</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup>
     <UseCodebase>true</UseCodebase>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets" Condition="Exists('..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.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\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/VSIX/DNNTemplates/source.extension.vsixmanifest b/VSIX/DNNTemplates/source.extension.vsixmanifest
@@ -1,47 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-    <Metadata>
-        <Identity Id="e48e838a-c708-4d43-b822-4d5de0d13eed" Version="11.0" Language="en-US" Publisher="Chris Hammond" />
-        <DisplayName>DNN Project Templates</DisplayName>
-        <Description xml:space="preserve">This Visual Studio Package contains Project Templates to aid in your (DNN) DotNetNuke Extension development of Themes and Modules. These templates require that you're running IIS locally and starting Visual Studio as an administrator. Fore more information visit https://www.christoc.com/Products/Module-Development-Templates
+	<Metadata>
+		<Identity Id="e48e838a-c708-4d43-b822-4d5de0d13eed" Version="11.0" Language="en-US" Publisher="Chris Hammond" />
+		<DisplayName>DNN Project Templates</DisplayName>
+		<Description xml:space="preserve">This Visual Studio Package contains Project Templates to aid in your (DNN) DotNetNuke Extension development of Themes and Modules. These templates require that you're running IIS locally and starting Visual Studio as an administrator. Fore more information visit https://www.christoc.com/Products/Module-Development-Templates
 
 </Description>
-        <MoreInfo>https://christoc.com/Products/DNN-Development-Templates</MoreInfo>
-        <License>License.txt</License>
-        <GettingStartedGuide>https://christoc.com/Tutorials/All-Tutorials/Visual-Studio-Gallery-DotNetNuke-Template-Information</GettingStartedGuide>
-        <ReleaseNotes>ReleaseNotes.txt</ReleaseNotes>
-        <Icon>Resources\Package.ico</Icon>
-        <PreviewImage>Resources\Package.ico</PreviewImage>
-        <Tags>DotNetNuke, DNN, CMS, "Content Management System", "Open Source", OpenSource,Skin,Theme,DNNCMS, Evoq, Module, Extension,</Tags>
-    </Metadata>
-    <Installation>
-        <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Community">
-            <ProductArchitecture>x86</ProductArchitecture>
-        </InstallationTarget>
+		<MoreInfo>https://christoc.com/Products/DNN-Development-Templates</MoreInfo>
+		<License>License.txt</License>
+		<GettingStartedGuide>https://christoc.com/Tutorials/All-Tutorials/Visual-Studio-Gallery-DotNetNuke-Template-Information</GettingStartedGuide>
+		<ReleaseNotes>ReleaseNotes.txt</ReleaseNotes>
+		<Icon>Resources\Package.ico</Icon>
+		<PreviewImage>Resources\Package.ico</PreviewImage>
+		<Tags>DotNetNuke, DNN, CMS, "Content Management System", "Open Source", OpenSource,Skin,Theme,DNNCMS, Evoq, Module, Extension,</Tags>
+	</Metadata>
+	<Installation>
+		<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Pro">
+			<ProductArchitecture>x86</ProductArchitecture>
+		</InstallationTarget>
+		<InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Pro">
+			<ProductArchitecture>amd64</ProductArchitecture>
+		</InstallationTarget>
 
-    </Installation>
-    <Dependencies>
-        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.0" />
-        <!--
+	</Installation>
+	<Dependencies>
+		<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.0" />
+		<!--
         <Dependency Id="Microsoft.VisualStudio.MPF.15.0" DisplayName="Visual Studio MPF 15.0" d:Source="Installed" Version="[15.0,16.0)" />
         -->
-    </Dependencies>
-    <Assets>
-        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CS-Mod" d:TargetPath="|CS-Mod;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
-        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="VB-Mod" d:TargetPath="|VB-Mod;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
-        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="VB-DAL2-Mod" d:TargetPath="|VB-DAL2-Mod;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
-        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CS-DAL2-Mod" d:TargetPath="|CS-DAL2-Mod;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
-        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CS-Theme" d:TargetPath="|CS-Theme;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
-        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CS-DAL2-SPA-Mod" d:TargetPath="|CS-DAL2-SPA-Mod;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
-        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CS-DAL2-MVC-Mod" d:TargetPath="|CS-DAL2-MVC-Mod;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
-        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
-        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="SetupWizard" Path="|SetupWizard|" AssemblyName="|SetupWizard;AssemblyName|" />
-        <!--
+	</Dependencies>
+	<Assets>
+		<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CS-Mod" d:TargetPath="|CS-Mod;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+		<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="VB-Mod" d:TargetPath="|VB-Mod;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+		<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="VB-DAL2-Mod" d:TargetPath="|VB-DAL2-Mod;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+		<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CS-DAL2-Mod" d:TargetPath="|CS-DAL2-Mod;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+		<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CS-Theme" d:TargetPath="|CS-Theme;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+		<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CS-DAL2-SPA-Mod" d:TargetPath="|CS-DAL2-SPA-Mod;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+		<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CS-DAL2-MVC-Mod" d:TargetPath="|CS-DAL2-MVC-Mod;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+		<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+		<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="SetupWizard" Path="|SetupWizard|" AssemblyName="|SetupWizard;AssemblyName|" />
+		<!--
     <CustomExtension Type="Company.Product.Type">Path\File.ext</CustomExtension>
     -->
-    </Assets>
-    <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,18.0)" />
-        <!--    <Prerequisite Id="Microsoft.VisualStudio.Shell.12.0" Version="[12.0]" />-->
-    </Prerequisites>
+	</Assets>
+	<Prerequisites>
+		<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,18.0)" />
+		<!--    <Prerequisite Id="Microsoft.VisualStudio.Shell.12.0" Version="[12.0]" />-->
+	</Prerequisites>
 </PackageManifest>