Skip to content

Commit

Permalink
Merge branch 'release/v00.13.03'
Browse files Browse the repository at this point in the history
  • Loading branch information
skamphuis committed Jul 7, 2022
2 parents f42009b + 02e1ea4 commit 7504ce1
Show file tree
Hide file tree
Showing 11 changed files with 129 additions and 30 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
InstallPackager/
*.user
**/obj/**/*.*
.vs
Binary file added Installs/NewsArticles.00.13.02.zip
Binary file not shown.
4 changes: 2 additions & 2 deletions My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("1.13.01.00")>
<Assembly: AssemblyFileVersion("1.13.01.00")>
<Assembly: AssemblyVersion("1.13.02.00")>
<Assembly: AssemblyFileVersion("1.13.02.00")>
2 changes: 1 addition & 1 deletion My Project/Resources.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions My Project/Settings.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 9 additions & 5 deletions NewsArticles.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="DnnForge - NewsArticles" type="Module" version="00.13.01">
<package name="DnnForge - NewsArticles" type="Module" version="00.13.02">
<friendlyName>News Articles</friendlyName>
<description>
<![CDATA[
Expand Down Expand Up @@ -860,6 +860,10 @@
<name>00.13.00.SqlDataProvider</name>
<version>00.13.00</version>
</script>
<script type="Install">
<name>00.13.02.SqlDataProvider</name>
<version>00.13.02</version>
</script>
<script type="Uninstall">
<name>Uninstall.SqlDataProvider</name>
<version>00.09.06</version>
Expand All @@ -868,7 +872,7 @@
</component>
</components>
</package>
<package name="DnnForge - LatestArticles" type="Module" version="00.13.01">
<package name="DnnForge - LatestArticles" type="Module" version="00.13.02">
<friendlyName>News Articles Latest</friendlyName>
<description>Allows you to display a list of the latest articles.</description>
<iconFile />
Expand Down Expand Up @@ -929,7 +933,7 @@
</component>
</components>
</package>
<package name="DnnForge - LatestComments" type="Module" version="00.13.01">
<package name="DnnForge - LatestComments" type="Module" version="00.13.02">
<friendlyName>News Articles Comments</friendlyName>
<description>Allows you to display a list of the latest comments.</description>
<iconFile />
Expand Down Expand Up @@ -990,7 +994,7 @@
</component>
</components>
</package>
<package name="DnnForge - NewsArchives" type="Module" version="00.13.01">
<package name="DnnForge - NewsArchives" type="Module" version="00.13.02">
<friendlyName>News Articles Archives</friendlyName>
<description>Allows you to display a list of articles by month.</description>
<iconFile />
Expand Down Expand Up @@ -1051,7 +1055,7 @@
</component>
</components>
</package>
<package name="DnnForge - NewsSearch" type="Module" version="00.13.01">
<package name="DnnForge - NewsSearch" type="Module" version="00.13.02">
<friendlyName>News Articles Search</friendlyName>
<description>Allows you to display a list of articles by month.</description>
<iconFile />
Expand Down
83 changes: 83 additions & 0 deletions Providers/DataProvider/SqlDataProvider/00.13.02.SqlDataProvider
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
ALTER TABLE {databaseOwner}{objectQualifier}DnnForge_NewsArticles_Image ALTER COLUMN FileName nvarchar(250) NULL
GO

ALTER PROCEDURE [dbo].[DnnForge_NewsArticles_ImageUpdate]
@ImageID int,
@ArticleID int,
@Title nvarchar(255),
@FileName nvarchar(250),
@Extension nvarchar(100),
@Size int,
@Width int,
@Height int,
@ContentType nvarchar(200),
@Folder nvarchar(200),
@SortOrder int,
@ImageGuid nvarchar(50),
@Description ntext
AS

UPDATE
dbo.DnnForge_NewsArticles_Image
SET
[ArticleID] = @ArticleID,
[Title] = @Title,
[FileName] = @FileName,
[Extension] = @Extension,
[Size] = @Size,
[Width] = @Width,
[Height] = @Height,
[ContentType] = @ContentType,
[Folder] = @Folder,
[SortOrder] = @SortOrder,
[ImageGuid] = @ImageGuid,
[Description] = @Description
WHERE
[ImageID] = @ImageID
GO

ALTER PROCEDURE [dbo].[DnnForge_NewsArticles_ImageAdd]
@ArticleID int,
@Title nvarchar(255),
@FileName nvarchar(250),
@Extension nvarchar(100),
@Size int,
@Width int,
@Height int,
@ContentType nvarchar(200),
@Folder nvarchar(200),
@SortOrder int,
@ImageGuid nvarchar(50),
@Description ntext
AS

INSERT INTO dbo.DnnForge_NewsArticles_Image (
[ArticleID],
[Title],
[FileName],
[Extension],
[Size],
[Width],
[Height],
[ContentType],
[Folder],
[SortOrder],
[ImageGuid],
[Description]
) VALUES (
@ArticleID,
@Title,
@FileName,
@Extension,
@Size,
@Width,
@Height,
@ContentType,
@Folder,
@SortOrder,
@ImageGuid,
@Description
)

select SCOPE_IDENTITY()
GO
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.21022</ProductVersion>
Expand Down Expand Up @@ -33,7 +33,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
Expand Down Expand Up @@ -231,6 +231,7 @@
<None Include="00.07.99.SqlDataProvider" />
<None Include="00.08.00.SqlDataProvider" />
<None Include="00.08.04.SqlDataProvider" />
<None Include="00.13.02.SqlDataProvider" />
<None Include="00.13.00.SqlDataProvider" />
<None Include="00.09.02.SqlDataProvider" />
<None Include="Uninstall.SqlDataProvider" />
Expand Down
5 changes: 3 additions & 2 deletions Ventrian.NewsArticles.vbproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -18,7 +18,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<UseIISExpress>false</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
Expand Down Expand Up @@ -395,6 +395,7 @@
<Compile Include="My Project\Application.Designer.vb">
<AutoGen>True</AutoGen>
<DependentUpon>Application.myapp</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="My Project\Resources.Designer.vb">
<AutoGen>True</AutoGen>
Expand Down
10 changes: 5 additions & 5 deletions Web References/wsStoryFeed/Reference.vb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Imports System.Xml.Serialization
Namespace wsStoryFeed

'''<remarks/>
<System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1087.0"), _
<System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0"), _
System.Diagnostics.DebuggerStepThroughAttribute(), _
System.ComponentModel.DesignerCategoryAttribute("code"), _
System.Web.Services.WebServiceBindingAttribute(Name:="StoryFeedWSSoap", [Namespace]:="http://smart-thinker.com/webservices")> _
Expand Down Expand Up @@ -153,11 +153,11 @@ Namespace wsStoryFeed
End Class

'''<remarks/>
<System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1087.0")> _
<System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")> _
Public Delegate Sub AddActionCompletedEventHandler(ByVal sender As Object, ByVal e As AddActionCompletedEventArgs)

'''<remarks/>
<System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1087.0"), _
<System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0"), _
System.Diagnostics.DebuggerStepThroughAttribute(), _
System.ComponentModel.DesignerCategoryAttribute("code")> _
Partial Public Class AddActionCompletedEventArgs
Expand All @@ -180,11 +180,11 @@ Namespace wsStoryFeed
End Class

'''<remarks/>
<System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1087.0")> _
<System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")> _
Public Delegate Sub AddActionIfNotExistsCompletedEventHandler(ByVal sender As Object, ByVal e As AddActionIfNotExistsCompletedEventArgs)

'''<remarks/>
<System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.6.1087.0"), _
<System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0"), _
System.Diagnostics.DebuggerStepThroughAttribute(), _
System.ComponentModel.DesignerCategoryAttribute("code")> _
Partial Public Class AddActionIfNotExistsCompletedEventArgs
Expand Down
30 changes: 19 additions & 11 deletions web.config
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
<configuration>
<system.web>
<httpHandlers>
<add verb="*" path="RSS.aspx" type="System.Web.UI.PageHandlerFactory" />
</httpHandlers>
</system.web>
<system.webServer>
<handlers>
<remove name="RSSHandler" />
<remove name="RSSJandler" />
</handlers>
</system.webServer>
<!--
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.

The following attributes can be set on the <httpRuntime> tag.
<system.Web>
<httpRuntime targetFramework="4.5.2" />
</system.Web>
-->
<system.web>
<httpHandlers>
<add verb="*" path="RSS.aspx" type="System.Web.UI.PageHandlerFactory"/>
</httpHandlers>
<compilation targetFramework="4.7.2"/></system.web>
<system.webServer>
<handlers>
<remove name="RSSHandler"/>
<remove name="RSSJandler"/>
</handlers>
</system.webServer>
</configuration>

0 comments on commit 7504ce1

Please sign in to comment.