Skip to content
This repository has been archived by the owner on Dec 8, 2023. It is now read-only.

Commit

Permalink
fix: fixes #1
Browse files Browse the repository at this point in the history
  • Loading branch information
Richard Edwards committed Mar 16, 2018
1 parent dd9bde7 commit 6c2059a
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 39 deletions.
4 changes: 2 additions & 2 deletions AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ Option Explicit On
Assembly: System.Reflection.AssemblyCopyright("Copyright (c) DNNStuff 2017"), _
Assembly: System.Runtime.InteropServices.ComVisible(false), _
Assembly: System.CLSCompliant(true), _
Assembly: System.Reflection.AssemblyVersion("06.05.02"), _
Assembly: System.Reflection.AssemblyFileVersion("06.05.02")>
Assembly: System.Reflection.AssemblyVersion("06.05.03"), _
Assembly: System.Reflection.AssemblyFileVersion("06.05.03")>

7 changes: 6 additions & 1 deletion Build/Build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ mkdir logs

set buildconfig=Release
set dnnversion=DNN7

REM restore packages
nuget.exe restore ..\

REM build install zip file
Msbuild.exe ModuleSpecific.targets /p:VisualStudioVersion=14.0;DNNVersion=%dnnversion%;Version=%version%;Configuration=%buildconfig%;TargetFrameworkVersion=v4.0 /t:Install /l:FileLogger,Microsoft.Build.Engine;logfile=logs\Build_%buildconfig%_%dnnversion%.log;verbosity=diagnostic
if ERRORLEVEL 1 goto end

:end
:end
25 changes: 7 additions & 18 deletions DNNStuff.Aggregator.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<Use64BitIISExpress />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\sites\dnn7.dnndev.me\bin\</OutputPath>
<OutputPath>bin\</OutputPath>
<DocumentationFile>DNNStuff.Aggregator.xml</DocumentationFile>
<BaseAddress>285212672</BaseAddress>
<ConfigurationOverrideFile>
Expand All @@ -67,7 +67,7 @@
<WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>..\..\sites\dnn7.dnndev.me\bin\</OutputPath>
<OutputPath>bin\</OutputPath>
<DocumentationFile>DNNStuff.Aggregator.xml</DocumentationFile>
<BaseAddress>285212672</BaseAddress>
<ConfigurationOverrideFile>
Expand All @@ -88,7 +88,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Trial|AnyCPU' ">
<DefineTrace>true</DefineTrace>
<OutputPath>..\..\sites\dnn7.dnndev.me\bin\</OutputPath>
<OutputPath>bin\</OutputPath>
<DefineConstants>
</DefineConstants>
<BaseAddress>285212672</BaseAddress>
Expand All @@ -114,17 +114,16 @@
</Reference>
<Reference Include="SharpZipLib, Version=0.81.0.1407, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">J:\TOOLING\BIN\DotNetNuke7\SharpZipLib.dll</HintPath>
<HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">J:\TOOLING\BIN\DotNetNuke8\SharpZipLib.dll</HintPath>
<HintPath>.\refs\RssToolkit.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RssToolkit, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>J:\TOOLING\BIN\Various\RssToolkit.dll</HintPath>
<HintPath>.\refs\RssToolkit.dll</HintPath>
</Reference>
<Reference Include="DNNStuff.Utilities, Version=1.0.0.14263, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>J:\TOOLING\BIN\Various\DNNStuff.Utilities.dll</HintPath>
<HintPath>.\refs\DNNStuff.Utilities.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic">
<Name>Microsoft.VisualBasic</Name>
Expand Down Expand Up @@ -1637,17 +1636,7 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>1124</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://dnn7.dnndev.me/DesktopModules/DNNStuff - Aggregator</IISUrl>
<OverrideIISAppRootUrl>True</OverrideIISAppRootUrl>
<IISAppRootUrl>http://dnn7.dnndev.me</IISAppRootUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>http://dnn7.dnndev.me/</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
<SaveServerSettingsInUserFile>True</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,13 @@
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\..\sites\dnn7.dnndev.me\bin\</OutputPath>
<OutputPath>bin\</OutputPath>
<DocumentationFile>DNNStuff.Aggregator.SqlDataProvider.xml</DocumentationFile>
<BaseAddress>285212672</BaseAddress>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants></DefineConstants>
<DefineConstants>
</DefineConstants>
<DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace>
<DebugSymbols>true</DebugSymbols>
Expand All @@ -65,12 +66,13 @@
<WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>..\..\..\..\sites\dnn7.dnndev.me\bin\</OutputPath>
<OutputPath>bin\</OutputPath>
<DocumentationFile>DNNStuff.Aggregator.SqlDataProvider.xml</DocumentationFile>
<BaseAddress>285212672</BaseAddress>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants></DefineConstants>
<DefineConstants>
</DefineConstants>
<DefineDebug>false</DefineDebug>
<DefineTrace>true</DefineTrace>
<DebugSymbols>false</DebugSymbols>
Expand All @@ -86,9 +88,10 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Trial|AnyCPU' ">
<DefineTrace>true</DefineTrace>
<OutputPath>..\..\..\..\sites\dnn7.dnndev.me\bin\</OutputPath>
<OutputPath>bin\</OutputPath>
<DocumentationFile>DNNStuff.Aggregator.SqlDataProvider.xml</DocumentationFile>
<DefineConstants></DefineConstants>
<DefineConstants>
</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<Optimize>true</Optimize>
<WarningLevel>1</WarningLevel>
Expand All @@ -97,17 +100,11 @@
<WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetNuke">
<Name>DotNetNuke</Name>
<HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">J:\TOOLING\BIN\DotNetNuke7\DotNetNuke.dll</HintPath>
<HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">J:\TOOLING\BIN\DotNetNuke8\DotNetNuke.dll</HintPath>
<Private>False</Private>
<Reference Include="DotNetNuke, Version=7.2.0.613, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Core.7.2.0.613\lib\net40\DotNetNuke.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">J:\TOOLING\BIN\DotNetNuke7\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">J:\TOOLING\BIN\DotNetNuke8\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<Private>False</Private>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.ApplicationBlocks.Data.2.0.0\lib\net40\Microsoft.ApplicationBlocks.Data.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>
Expand Down Expand Up @@ -145,6 +142,9 @@
<ItemGroup>
<Folder Include="My Project\" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
<PreBuildEvent>
Expand Down
5 changes: 5 additions & 0 deletions Providers/SqlDataProvider/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DotNetNuke.Core" version="7.2.0.613" targetFramework="net40" />
<package id="Microsoft.ApplicationBlocks.Data" version="2.0.0" targetFramework="net40" />
</packages>
21 changes: 20 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,23 @@ A DNN module that allows you to display tabbed content on your page
Current releases support DNN 7.2.0 and later

## Documentation
[Documentation](https://redtempo.github.io/dnnstuff.aggregator/)
[Documentation](https://redtempo.github.io/dnnstuff.aggregator/)

## Building Extension Package

To build a package for installing with the DNN extension installer do the following:

Drop to a command line and go into the build folder

Run ```build.bat [version] [configuration]```

where:

- version is the version formatted as major.minor.patch (ie. 01.04.05)
- configuration is the build configuration to use (Debug or Release)

Example:

- ```build.bat 01.04.05 Release``` will created a release build with version 01.04.05

All builds are written into the Build\Deploy folder
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ internal DNN search mechanism as well.
* [Skins & Templates & Tokens](templates)
* [Selecting Tabs](selectingtabs)
* [Token Replacement in Content and Captions](tabcaptionreplacement)
* [Localization](]localization)
* [Localization](localization)
* [Module Wrapping](modulewrapping)

## How Tos
Expand Down

0 comments on commit 6c2059a

Please sign in to comment.