Skip to content

Commit 155c23a

Browse files
valadasvaladas
authored
Merge pull request #5993 from dnnsoftware/release/9.13.3
Merges `release/9.13.3` into `master` to release `v9.13.3`
2 parents 05cef8d + 949cac2 commit 155c23a

File tree

131 files changed

+3982
-3772
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+3982
-3772
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ body:
7272
**NOTE:** _If your version is not listed, please upgrade to the latest version. If you cannot upgrade at this time, please open a [Discussion](https://github.com/dnnsoftware/Dnn.Platform/discussions) instead._
7373
multiple: true
7474
options:
75-
- 9.13.0 (latest release)
76-
- 9.13.1 (alpha)
75+
- 9.13.2 (latest release)
76+
- 9.13.3 (alpha)
7777
- 10.0.0 (alpha)
7878
validations:
7979
required: true

‎.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ updates:
3838
SourceLink:
3939
patterns:
4040
- "Microsoft.SourceLink.*"
41+
- "Microsoft.Build.Tasks.Git"
4142
TestStack-Dossier:
4243
patterns:
4344
- "TestStack.Dossier"
@@ -51,3 +52,6 @@ updates:
5152
DependencyInjection:
5253
patterns:
5354
- "Microsoft.Extensions.DependencyInjection*"
55+
CodeAnalysis:
56+
patterns:
57+
- "Microsoft.CodeAnalysis.*"

‎.github/workflows/image-actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Create Pull Request
3535
if: | # If it's not a Pull Request then commit any changes as a new PR.
3636
github.event_name != 'pull_request' && steps.compress_images.outputs.markdown != ''
37-
uses: peter-evans/create-pull-request@v5
37+
uses: peter-evans/create-pull-request@v6
3838
with:
3939
title: Auto Compress Images
4040
branch-suffix: timestamp

‎.github/workflows/updateVersions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: yarn install --mode=update-lockfile --no-immutable
2929

3030
- name: Create Pull Request
31-
uses: peter-evans/create-pull-request@v5
31+
uses: peter-evans/create-pull-request@v6
3232
with:
3333
commit-message: Updates versions as per release candidate creation
3434
title: Updates versions as per release candidate creation

‎Build/Build.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Cake.BuildSystems.Module" Version="6.1.0" />
18-
<PackageReference Include="Cake.FileHelpers" Version="6.1.3" />
17+
<PackageReference Include="Cake.BuildSystems.Module" Version="7.0.0" />
18+
<PackageReference Include="Cake.FileHelpers" Version="7.0.0" />
1919
<PackageReference Include="Cake.Frosting" Version="4.0.0" />
2020
<PackageReference Include="Cake.Git" Version="3.0.0" />
21-
<PackageReference Include="Cake.Issues" Version="3.0.0" />
22-
<PackageReference Include="Cake.Issues.MsBuild" Version="3.0.0" />
21+
<PackageReference Include="Cake.Issues" Version="4.1.0" />
22+
<PackageReference Include="Cake.Issues.MsBuild" Version="4.1.0" />
2323
<PackageReference Include="Cake.Json" Version="7.0.1" />
2424
<PackageReference Include="Cake.XdtTransform" Version="2.0.0" />
2525
<PackageReference Include="Dnn.CakeUtils" Version="2.0.2" />

‎Build/Context.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private void WriteSettings(ICakeContext context, string settingsFile)
172172
{
173173
context.SerializeJsonToPrettyFile(settingsFile, this.Settings);
174174
context.Information(log => log($"Saved settings to {Path.GetFullPath(settingsFile)}"));
175-
context.Debug(log => log($"Settings: {context.SerializeJson(this.Settings).Replace("{", "{{")}"));
175+
context.Debug(log => log("{0}", $"Settings: {context.SerializeJson(this.Settings)}"));
176176
}
177177
}
178178
}

‎Build/Symbols/DotNetNuke_Symbols.dnn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="DotNetNuke_Symbols" type="Library" version="09.13.00" >
3+
<package name="DotNetNuke_Symbols" type="Library" version="09.13.03" >
44
<friendlyName>DNN Platform Symbols</friendlyName>
55
<description>This package contains Debug Symbols and Intellisense files for DNN Platform.</description>
66
<owner>

‎DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="DotNetNuke.Console" type="Module" version="09.13.00">
3+
<package name="DotNetNuke.Console" type="Module" version="09.13.03">
44
<friendlyName>Console</friendlyName>
55
<description>Display children pages as icon links for navigation.</description>
66
<iconFile>~/DesktopModules/Admin/Console/console.png</iconFile>

‎DNN Platform/Connectors/Azure/AzureConnector.dnn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.13.00">
3+
<package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.13.03">
44
<friendlyName>Dnn Azure Connector</friendlyName>
55
<description>The Azure Connector allows you to create folders mapped to Azure Storage accounts.</description>
66
<iconFile>~/DesktopModules/Connectors/Azure/Images/icon-azure-32px.png</iconFile>

‎DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.13.00">
3+
<package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.13.03">
44
<friendlyName>Google Analytics (Legacy UA) Connector</friendlyName>
55
<description>Configure your site's Google Analytics settings using Universal Analytics.</description>
66
<iconFile>~/DesktopModules/Connectors/GoogleAnalytics/Images/GoogleAnalytics_32X32_Standard.png</iconFile>

‎DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.dnn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="DNN.Connectors.GoogleAnalytics4" type="Connector" isSystem="false" version="09.13.00">
3+
<package name="DNN.Connectors.GoogleAnalytics4" type="Connector" isSystem="false" version="09.13.03">
44
<friendlyName>Google Analytics 4 Connector</friendlyName>
55
<description>Configure your site's Google Analytics 4 settings.</description>
66
<iconFile>~/DesktopModules/Connectors/GoogleAnalytics4/Images/GoogleAnalytics4_32X32_Standard.png</iconFile>

‎DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="DNN.Connectors.GoogleTagManager" type="Connector" isSystem="false" version="09.13.00">
3+
<package name="DNN.Connectors.GoogleTagManager" type="Connector" isSystem="false" version="09.13.03">
44
<friendlyName>Google Tag Manager Connector</friendlyName>
55
<description>Configure your site's Google Tag Manager settings.</description>
66
<iconFile>~/DesktopModules/Connectors/GoogleTagManager/Images/GoogleTagManager_32X32_Standard.png</iconFile>

‎DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="DNNJWT" type="Provider" version="09.13.00">
3+
<package name="DNNJWT" type="Provider" version="09.13.03">
44
<friendlyName>DNN JWT Auth Handler</friendlyName>
55
<description>DNN Json Web Token Authentication (JWT) library for cookie-less Mobile authentication clients</description>
66
<dependencies/>

‎DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.SourceLink.GitHub" version="1.1.1">
16+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>

‎DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<ItemGroup>
1717
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
18-
<PackageReference Include="Microsoft.SourceLink.GitHub" version="1.1.1">
18+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
1919
<PrivateAssets>all</PrivateAssets>
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
</PackageReference>

‎DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.1.1\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.1.1\build\Microsoft.Build.Tasks.Git.props')" />
4-
<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.1.1\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.1.1\build\Microsoft.SourceLink.GitHub.props')" />
5-
<Import Project="..\..\packages\Microsoft.SourceLink.Common.1.1.1\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.1.1\build\Microsoft.SourceLink.Common.props')" />
3+
<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.props')" />
4+
<Import Project="..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.props')" />
5+
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.props')" />
66
<PropertyGroup>
77
<Deterministic>true</Deterministic>
88
<NuGetPackageImportStamp>
@@ -108,14 +108,14 @@
108108
<PropertyGroup>
109109
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
110110
</PropertyGroup>
111-
<Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.1.1\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.1.1\build\Microsoft.Build.Tasks.Git.targets'))" />
112-
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.1.1\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.1.1\build\Microsoft.SourceLink.Common.props'))" />
113-
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.1.1\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.1.1\build\Microsoft.SourceLink.Common.targets'))" />
114-
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.1.1\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.1.1\build\Microsoft.SourceLink.GitHub.props'))" />
115-
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.1.1\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.1.1\build\Microsoft.SourceLink.GitHub.targets'))" />
116-
<Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.1.1\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.1.1\build\Microsoft.Build.Tasks.Git.props'))" />
111+
<Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
112+
<Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.targets'))" />
113+
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.props'))" />
114+
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.targets'))" />
115+
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
116+
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
117117
</Target>
118-
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.1.1\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.1.1\build\Microsoft.Build.Tasks.Git.targets')" />
119-
<Import Project="..\..\packages\Microsoft.SourceLink.Common.1.1.1\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.1.1\build\Microsoft.SourceLink.Common.targets')" />
120-
<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.1.1\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.1.1\build\Microsoft.SourceLink.GitHub.targets')" />
118+
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
119+
<Import Project="..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.targets')" />
120+
<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
121121
</Project>

‎DNN Platform/DotNetNuke.Instrumentation/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Build.Tasks.Git" version="1.1.1" targetFramework="net472" developmentDependency="true" />
4-
<package id="Microsoft.SourceLink.Common" version="1.1.1" targetFramework="net472" developmentDependency="true" />
5-
<package id="Microsoft.SourceLink.GitHub" version="1.1.1" targetFramework="net472" developmentDependency="true" />
3+
<package id="Microsoft.Build.Tasks.Git" version="8.0.0" targetFramework="net472" developmentDependency="true" />
4+
<package id="Microsoft.SourceLink.Common" version="8.0.0" targetFramework="net472" developmentDependency="true" />
5+
<package id="Microsoft.SourceLink.GitHub" version="8.0.0" targetFramework="net472" developmentDependency="true" />
66
<package id="StyleCop.Analyzers" version="1.1.118" targetFramework="net472" developmentDependency="true" />
77
</packages>

0 commit comments

Comments
 (0)