Skip to content

Commit

Permalink
Missed commits from build testing
Browse files Browse the repository at this point in the history
  • Loading branch information
WillStrohl committed Jun 2, 2020
1 parent 90894af commit e3738c9
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 6 deletions.
26 changes: 21 additions & 5 deletions .build/ModulePackage.targets
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<WebsiteBuildFolder>$(RootFolder)\_Build\_Website</WebsiteBuildFolder>
<CoreBuildFolder>$(RootFolder)\_Build\_Website\_Core</CoreBuildFolder>
<ViewSetBuildFolder>$(RootFolder)\_Build\_Website\_ViewSet</ViewSetBuildFolder>
<Bs4ViewSetBuildFolder>$(RootFolder)\_Build\_Website\_ViewSet-BootStrap4</Bs4ViewSetBuildFolder>
<LegacyViewSetBuildFolder>$(RootFolder)\_Build\_Website\_ViewSet-Legacy</LegacyViewSetBuildFolder>
<ModulesBuildFolder>$(RootFolder)\_Build\_Website\_Modules</ModulesBuildFolder>
<DebugBuildFolder>$(RootFolder)\_Build\_Website\_Debug</DebugBuildFolder>
<InstallFolder>$(RootFolder)\_Install</InstallFolder>
Expand Down Expand Up @@ -70,10 +72,9 @@
</ItemGroup>

<ItemGroup>
<HotcakesViewsInclude
Include="..\..\Portals\_default\HotcakesViews\_default\**\*.*"
Exclude="..\..\**\*.uk-UA.resx;..\..\**\*.manifest"
/>
<HotcakesViewsInclude Include="..\..\Portals\_default\HotcakesViews\_default\**\*.*" Exclude="..\..\**\*.uk-UA.resx;..\..\**\*.manifest" />
<Bootstrap4ViewsInclude Include="..\..\Portals\_default\HotcakesViews\Bootstrap4\**\*.*" Exclude="..\..\**\*.uk-UA.resx;..\..\**\*.manifest" />
<LegacyViewsInclude Include="..\..\Portals\_default\HotcakesViews\_default-Legacy\**\*.*" Exclude="..\..\**\*.uk-UA.resx;..\..\**\*.manifest" />
<PackageTxtInclude Include="**\License.txt;**\ReleaseNotes.txt" />
</ItemGroup>

Expand Down Expand Up @@ -102,6 +103,8 @@

<!-- Copy file to ViewSet Build Folder -->
<Copy SourceFiles="@(HotcakesViewsInclude)" DestinationFolder="$(ViewSetBuildFolder)\%(RecursiveDir)" />
<Copy SourceFiles="@(Bootstrap4ViewsInclude)" DestinationFolder="$(Bs4ViewSetBuildFolder)\%(RecursiveDir)" />
<Copy SourceFiles="@(LegacyViewsInclude)" DestinationFolder="$(LegacyViewSetBuildFolder)\%(RecursiveDir)" />

<!-- Copy file to Modules Build Folder -->
<Copy SourceFiles="@(InstallInclude)" DestinationFolder="$(ModulesBuildFolder)\%(RecursiveDir)" />
Expand Down Expand Up @@ -138,8 +141,19 @@
<CreateItem Include="$(ViewSetBuildFolder)\**\*.*">
<Output TaskParameter="Include" ItemName="HotcakesViewsContent" />
</CreateItem>
<Zip Files="@(HotcakesViewsContent)" WorkingDirectory="$(ViewSetBuildFolder)" ZipFileName="$(ModulesBuildFolder)\HotcakesViews.$(Extension)" ParallelCompression="False" />

<Zip Files="@(HotcakesViewsContent)" WorkingDirectory="$(ViewSetBuildFolder)" ZipFileName="$(ModulesBuildFolder)\HotcakesViews.$(Extension)" ParallelCompression="False" />
<!-- Create Bootstrap4Views zip -->
<CreateItem Include="$(Bs4ViewSetBuildFolder)\**\*.*">
<Output TaskParameter="Include" ItemName="HotcakesBs4ViewsContent" />
</CreateItem>
<Zip Files="@(HotcakesBs4ViewsContent)" WorkingDirectory="$(Bs4ViewSetBuildFolder)" ZipFileName="$(ModulesBuildFolder)\Bootstrap4Views.$(Extension)" ParallelCompression="False" />

<!-- Create LegacyViews zip -->
<CreateItem Include="$(LegacyViewSetBuildFolder)\**\*.*">
<Output TaskParameter="Include" ItemName="HotcakesLegacyViewsContent" />
</CreateItem>
<Zip Files="@(HotcakesLegacyViewsContent)" WorkingDirectory="$(LegacyViewSetBuildFolder)" ZipFileName="$(ModulesBuildFolder)\LegacyViews.$(Extension)" ParallelCompression="False" />

<!-- Create the Install package -->
<CreateItem Include="$(ModulesBuildFolder)\**\*.*">
Expand All @@ -151,6 +165,8 @@

<RemoveDir Directories ="$(CoreBuildFolder)" />
<RemoveDir Directories ="$(ViewSetBuildFolder)" />
<RemoveDir Directories ="$(Bs4ViewSetBuildFolder)" />
<RemoveDir Directories ="$(LegacyViewSetBuildFolder)" />
<RemoveDir Directories ="$(ModulesBuildFolder)" />

<!-- Create packages with debug symbols -->
Expand Down
18 changes: 18 additions & 0 deletions Website/DesktopModules/Hotcakes/Hotcakes.dnn
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<url>https://hotcakes.org</url>
<email>[email protected]</email>
</owner>
<license src="License.txt" />
<releaseNotes src="ReleaseNotes.txt" />
<azureCompatible>true</azureCompatible>
<dependencies>
<dependency type="CoreVersion">09.02.02</dependency>
Expand Down Expand Up @@ -270,6 +272,22 @@
</resourceFile>
</resourceFiles>
</component>
<component type="ResourceFile">
<resourceFiles>
<basePath>Portals\_default\HotcakesViews\Bootstrap4</basePath>
<resourceFile>
<name>Bootstrap4Views.zip</name>
</resourceFile>
</resourceFiles>
</component>
<component type="ResourceFile">
<resourceFiles>
<basePath>Portals\_default\HotcakesViews\_default-Legacy</basePath>
<resourceFile>
<name>LegacyViews.zip</name>
</resourceFile>
</resourceFiles>
</component>
<component type="Assembly">
<assemblies>
<assembly>
Expand Down
10 changes: 9 additions & 1 deletion Website/DesktopModules/Hotcakes/ReleaseNotes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<p>Sponsorship is <em>Powered by GitHub Sponsors</em> and ensures that this project lives and thrives. <a href="https://github.com/sponsors/hismightiness" target="_blank">Please consider contributing</a> any amount.</p>
<p>THANK YOU to the following rockstars!</p>
<ul>
<li>David Poindexter, <a href="https://nvisionatibe.com/" target="_blank">nvisionative</a></li>
<li>David Poindexter, <a href="https://nvisionative.com/" target="_blank">nvisionative</a></li>
<li>Matt Rutledge, <a href="https://beleivekids.com/" target="_blank">Believe Kids</a></li>
<li>Adam Bernstein, <a href="https://practicewise.com/" target="_blank">PracticeWise</a></li>
</ul>
Expand All @@ -44,6 +44,14 @@
<li>Josh Slaughter, <a href="https://www.clicksandmortarwebsites.com/" target="_blank">Clicks &amp; Mortar Websites</a></li>
<li><a href="https://github.com/moslem7026" target="_blank">Moslem Pasokh (moslem7026)</a></li>
</ul>

<h3>Partners</h3>
<p>THANK YOU to the following partners for participating in this release!</p>
<ul>
<li>
<a href="https://hotcakes.org/Partners/Partner-Detail/id/2106" target="_blank" rel="noopener">Upendo Ventures</a>
</li>
</ul>

<h3><strong>Release Note Prefixes</strong></h3>
<p>The following prefixes are defined as:</p>
Expand Down

0 comments on commit e3738c9

Please sign in to comment.