From 6c2059abca16569077cce08a2a645f4ced39c975 Mon Sep 17 00:00:00 2001 From: Richard Edwards Date: Fri, 16 Mar 2018 13:21:09 -0400 Subject: [PATCH] fix: fixes #1 --- AssemblyInfo.vb | 4 +-- Build/Build.bat | 7 +++- DNNStuff.Aggregator.vbproj | 25 ++++----------- ...dnnstuff.aggregator.sqldataprovider.vbproj | 32 +++++++++---------- Providers/SqlDataProvider/packages.config | 5 +++ README.md | 21 +++++++++++- docs/index.md | 2 +- 7 files changed, 57 insertions(+), 39 deletions(-) create mode 100644 Providers/SqlDataProvider/packages.config diff --git a/AssemblyInfo.vb b/AssemblyInfo.vb index 63366b7..151cf80 100644 --- a/AssemblyInfo.vb +++ b/AssemblyInfo.vb @@ -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")> diff --git a/Build/Build.bat b/Build/Build.bat index 54bd9e5..ad80fa7 100644 --- a/Build/Build.bat +++ b/Build/Build.bat @@ -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 \ No newline at end of file +:end diff --git a/DNNStuff.Aggregator.vbproj b/DNNStuff.Aggregator.vbproj index db888da..751e458 100644 --- a/DNNStuff.Aggregator.vbproj +++ b/DNNStuff.Aggregator.vbproj @@ -47,7 +47,7 @@ - ..\..\sites\dnn7.dnndev.me\bin\ + bin\ DNNStuff.Aggregator.xml 285212672 @@ -67,7 +67,7 @@ 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 - ..\..\sites\dnn7.dnndev.me\bin\ + bin\ DNNStuff.Aggregator.xml 285212672 @@ -88,7 +88,7 @@ true - ..\..\sites\dnn7.dnndev.me\bin\ + bin\ 285212672 @@ -114,17 +114,16 @@ False - J:\TOOLING\BIN\DotNetNuke7\SharpZipLib.dll - J:\TOOLING\BIN\DotNetNuke8\SharpZipLib.dll + .\refs\RssToolkit.dll False False - J:\TOOLING\BIN\Various\RssToolkit.dll + .\refs\RssToolkit.dll False - J:\TOOLING\BIN\Various\DNNStuff.Utilities.dll + .\refs\DNNStuff.Utilities.dll Microsoft.VisualBasic @@ -1637,17 +1636,7 @@ - True - True - 1124 - / - http://dnn7.dnndev.me/DesktopModules/DNNStuff - Aggregator - True - http://dnn7.dnndev.me - False - False - http://dnn7.dnndev.me/ - False + True diff --git a/Providers/SqlDataProvider/dnnstuff.aggregator.sqldataprovider.vbproj b/Providers/SqlDataProvider/dnnstuff.aggregator.sqldataprovider.vbproj index 42bb850..9081a90 100644 --- a/Providers/SqlDataProvider/dnnstuff.aggregator.sqldataprovider.vbproj +++ b/Providers/SqlDataProvider/dnnstuff.aggregator.sqldataprovider.vbproj @@ -45,12 +45,13 @@ - ..\..\..\..\sites\dnn7.dnndev.me\bin\ + bin\ DNNStuff.Aggregator.SqlDataProvider.xml 285212672 - + + true true true @@ -65,12 +66,13 @@ 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 - ..\..\..\..\sites\dnn7.dnndev.me\bin\ + bin\ DNNStuff.Aggregator.SqlDataProvider.xml 285212672 - + + false true false @@ -86,9 +88,10 @@ true - ..\..\..\..\sites\dnn7.dnndev.me\bin\ + bin\ DNNStuff.Aggregator.SqlDataProvider.xml - + + 285212672 true 1 @@ -97,17 +100,11 @@ 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 - - DotNetNuke - J:\TOOLING\BIN\DotNetNuke7\DotNetNuke.dll - J:\TOOLING\BIN\DotNetNuke8\DotNetNuke.dll - False + + ..\..\packages\DotNetNuke.Core.7.2.0.613\lib\net40\DotNetNuke.dll - - False - J:\TOOLING\BIN\DotNetNuke7\Microsoft.ApplicationBlocks.Data.dll - J:\TOOLING\BIN\DotNetNuke8\Microsoft.ApplicationBlocks.Data.dll - False + + ..\..\packages\Microsoft.ApplicationBlocks.Data.2.0.0\lib\net40\Microsoft.ApplicationBlocks.Data.dll System @@ -145,6 +142,9 @@ + + + diff --git a/Providers/SqlDataProvider/packages.config b/Providers/SqlDataProvider/packages.config new file mode 100644 index 0000000..00bbf94 --- /dev/null +++ b/Providers/SqlDataProvider/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 82ac5ab..7bd8ada 100644 --- a/README.md +++ b/README.md @@ -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/) \ No newline at end of file +[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 diff --git a/docs/index.md b/docs/index.md index 8709f15..4d12d57 100644 --- a/docs/index.md +++ b/docs/index.md @@ -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