Commits

Anton Afanasyev  committed a851f7c Merge

merge latest upstream.
note that this really only gives me the <path> on Assembly component. AND it was
working fine without this - looks like DNN were working around the absense
of this in the AssemblyInstaller. oh well.

  • Participants
  • Parent commits d9ff0d7, 161d8d8
  • Branches mydev

Comments (0)

Files changed (5)

File VSIX/CSharp-DAL2-Template/DnnTemplate.dnn

 						<basePath>bin</basePath>
 						<assembly>
 							<name>$safeprojectname$.dll</name>
+							<path>bin</path>
 						</assembly>
 					</assemblies>
 				</component>

File VSIX/CSharp-Template/DnnTemplate.dnn

 						<basePath>bin</basePath>
 						<assembly>
 							<name>$safeprojectname$.dll</name>
+							<path>bin</path>
 						</assembly>
 					</assemblies>
 				</component>

File VSIX/DNNTemplates/source.extension.vsixmanifest

 <?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="6B3D5C35-FD39-404C-9E6F-C85BB38BF0D1" Version="2.2.5" Language="en-US" Publisher="Anton Afanasyev" />
+    <Identity Id="6B3D5C35-FD39-404C-9E6F-C85BB38BF0D1" Version="2.3.1" Language="en-US" Publisher="Anton Afanasyev" />
     <DisplayName>DotNetNuke Project Templates</DisplayName>
     <Description xml:space="preserve">This Visual Studio Package contains Project Templates to aid in your DotNetNuke Extension development.</Description>
     <!--<MoreInfo>http://www.christoc.com/projects/moduledevelopmenttemplates</MoreInfo>-->

File VSIX/VB-DAL2-Template/VBTemplate.dnn

             <basePath>bin</basePath>
             <assembly>
               <name>$safeprojectname$.dll</name>
+              <path>bin</path>
             </assembly>
           </assemblies>
         </component>

File VSIX/VB-Template/VBTemplate.dnn

             <basePath>bin</basePath>
             <assembly>
               <name>$safeprojectname$.dll</name>
+              <path>bin</path>
             </assembly>
           </assemblies>
         </component>