Skip to content

Commit

Permalink
Merge pull request #5704 from dnnsoftware/release/9.12.0
Browse files Browse the repository at this point in the history
Merged `Release/9.12.0` into `master` to release `v9.12.0`
  • Loading branch information
valadas authored Jun 21, 2023
2 parents e51caac + 555470d commit 0d7c4a4
Show file tree
Hide file tree
Showing 160 changed files with 2,151 additions and 711 deletions.
3 changes: 2 additions & 1 deletion .github/BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ There are three supported build scenarios:
2. **Build to create a local DNN development website**. You'd typically not do this all the time, but only when you wish to set up a new development site or revert your development website to the current DNN repository state.
3. **Debug build**. You'd use this when changing code and testing your changes on your (previously created) development site. Note you can also "rebuild" just a part of the platform and not the entire solution for this which will speed things up for you.

When contributing to DNN, you'd typically go through steps 2 and 3 at least and maybe 1 if you wish to run more encompassing tests. But before you delve into code, please familiarize yourself with [How to Contribute](CONTRIBUTING.md) first.
When contributing to DNN, you'd typically go through steps 2 and 3 at least and maybe 1 if you wish to run more encompassing tests. But before you delve into code, please familiarize yourself with [How to Contribute](/CONTRIBUTING.md) first.


## External sources

Expand Down
55 changes: 0 additions & 55 deletions .github/ISSUE_TEMPLATE/bug-report.md

This file was deleted.

95 changes: 95 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
name: Bug Report
description: Report a bug
title: "[Bug]: "
labels: ["Status: New"]
assignees:
- dnnsoftware/triage
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: checkboxes
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the existing issues
required: true
- type: textarea
id: what-happened
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
placeholder: Tell us what you see! "A bug happened, but I was expecting this!"
validations:
required: true
- type: textarea
id: steps-to-reproduce
attributes:
label: Steps to reproduce?
description: List the precise steps to reproduce the bug.
placeholder: |
1. Go to '...'
2. Click on '...'
3. Scroll to '...'
4. See error...
validations:
required: true
- type: textarea
attributes:
label: Current Behavior
description: A concise description of what you're experiencing.
validations:
required: false
- type: textarea
attributes:
label: Expected Behavior
description: A concise description of what you expected to happen.
validations:
required: false
- type: textarea
id: logs
attributes:
label: Relevant log output
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
- type: textarea
id: anything-else
attributes:
label: Anything else?
description: |
Links? References? Anything that will give us more context about the issue you are encountering!
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
- type: dropdown
id: affected-versions
attributes:
label: Affected Versions
description: What versions of DNN are you running?
multiple: true
options:
- 10.0.0 (alpha)
- 9.11.2 (latest release)
validations:
required: true
- type: dropdown
id: affected-browsers
attributes:
label: What browsers are you seeing the problem on?
multiple: true
options:
- Firefox
- Chrome
- Safari
- Microsoft Edge
- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](/CODE_OF_CONDUCT.md)
options:
- label: I agree to follow this project's Code of Conduct
required: true
37 changes: 0 additions & 37 deletions .github/ISSUE_TEMPLATE/enhancement-request.md

This file was deleted.

74 changes: 74 additions & 0 deletions .github/ISSUE_TEMPLATE/enhancement-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: Enhancement Request
description: Make an enhancement request
title: "[Enhancement]: "
labels: ["Status: New"]
assignees:
- dnnsoftware/triage
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this enhancement request!
- type: checkboxes
id: existing-issue
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the existing issues
required: true
- type: textarea
id: description-of-problem
attributes:
label: Description of problem
description: Is your enhancement request related to a problem? Provide a clear and concise description of the problem.
validations:
required: true
- type: textarea
id: description-of-solution
attributes:
label: Description of solution
description: Provide a clear and concise description of the solution.
validations:
required: true
- type: textarea
id: alternatives-considered
attributes:
label: Description of alternatives considered
description: Provide a clear and concise description of any alternative solutions considered.
validations:
required: false
- type: textarea
id: anything-else
attributes:
label: Anything else?
description: |
Links? References? Anything that will give us more context about the issue you are encountering!
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
- type: checkboxes
id: contribution-interest
attributes:
label: Do you be plan to contribute code for this enhancement?
description: We would like to know if you are willing to take ownership of this enhancement.
options:
- label: "Yes"
required: false
- type: checkboxes
id: sponsorship-interest
attributes:
label: Would you be interested in sponsoring this enhancement?
description: There are many developers in this community that may be willing to work on this.
options:
- label: "Yes"
required: false
- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](/CODE_OF_CONDUCT.md)
options:
- label: I agree to follow this project's Code of Conduct
required: true
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_PROCESS.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The goal of this document is to set standards for the review, processing, and ap
The following items must all be true prior to a pull request being submitted to the DNN_Platform, if any of the following items are not true the pull request will be returned for edits referencing the specific missing item(s).

* Change should represent an entire solution for the issue at hand. Partial requests will NOT be processed.
* Change should have a supporting issue logged on the DNN_Platform GitHub account, documenting the issue resolved, following the procedures outlined on the [Contribute Page](CONTRIBUTING.md)
* Change should have a supporting issue logged on the DNN_Platform GitHub account, documenting the issue resolved, following the procedures outlined on the [Contribute Page](/CONTRIBUTING.md)
* If your change was to an area that already was covered by tests those tests must be updated. New tests for areas currently un-tested are appreciated
* **Exception**: Security items can be addressed individually, and should be initially communicated to the security@dnnsoftware.com email address for coordination
* Pull request comment should contain at a minimum the following details (When creating, a default template will also prompt you for the proper information)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/image-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Create Pull Request
if: | # If it's not a Pull Request then commit any changes as a new PR.
github.event_name != 'pull_request' && steps.compress_images.outputs.markdown != ''
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v5
with:
title: Auto Compress Images
branch-suffix: timestamp
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/updateVersions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
run: yarn install --mode=update-lockfile --no-immutable

- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v5
with:
commit-message: Updates versions as per release candidate creation
title: Updates versions as per release candidate creation
Expand Down
2 changes: 1 addition & 1 deletion Build/Build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PackageReference Include="Cake.XdtTransform" Version="2.0.0" />
<PackageReference Include="Cake.Yarn" Version="0.4.8" />
<PackageReference Include="Dnn.CakeUtils" Version="2.0.2" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.787" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.820" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
Expand Down
9 changes: 4 additions & 5 deletions Build/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
namespace DotNetNuke.Build
{
using System;
using System.Reflection;

using Cake.AzurePipelines.Module;
using Cake.Frosting;
Expand All @@ -13,10 +12,10 @@ namespace DotNetNuke.Build
public class Program
{
/// <summary>The version of the Microsoft.TestPlatform NuGet package.</summary>
internal const string MicrosoftTestPlatformVersion = "17.4.1";
internal const string MicrosoftTestPlatformVersion = "17.6.2";

/// <summary>The version of the NUnit3TestAdapter NuGet package.</summary>
internal const string NUnit3TestAdapterVersion = "4.3.1";
internal const string NUnit3TestAdapterVersion = "4.5.0";

/// <summary>Runs the build process.</summary>
/// <param name="args">The arguments from the command line.</param>
Expand All @@ -28,10 +27,10 @@ public static int Main(string[] args)
.UseLifetime<Lifetime>()
.UseWorkingDirectory("..")
.UseModule<AzurePipelinesModule>()
.InstallTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.11.1"))
.InstallTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.12.0"))
.InstallTool(new Uri("nuget:?package=Microsoft.TestPlatform&version=" + MicrosoftTestPlatformVersion))
.InstallTool(new Uri("nuget:?package=NUnit3TestAdapter&version=" + NUnit3TestAdapterVersion))
.InstallTool(new Uri("nuget:?package=NuGet.CommandLine&version=6.4.0"))
.InstallTool(new Uri("nuget:?package=NuGet.CommandLine&version=6.5.0"))
.Run(args);
}
}
Expand Down
2 changes: 1 addition & 1 deletion Build/Symbols/DotNetNuke_Symbols.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke_Symbols" type="Library" version="09.11.01" >
<package name="DotNetNuke_Symbols" type="Library" version="09.12.00" >
<friendlyName>DNN Platform Symbols</friendlyName>
<description>This package contains Debug Symbols and Intellisense files for DNN Platform.</description>
<owner>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Console" type="Module" version="09.11.01">
<package name="DotNetNuke.Console" type="Module" version="09.12.00">
<friendlyName>Console</friendlyName>
<description>Display children pages as icon links for navigation.</description>
<iconFile>~/DesktopModules/Admin/Console/console.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Connectors/Azure/AzureConnector.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.11.01">
<package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.12.00">
<friendlyName>Dnn Azure Connector</friendlyName>
<description>The Azure Connector allows you to integrate Azure as your commenting solution with the Publisher module.</description>
<iconFile>~/DesktopModules/Connectors/Azure/Images/icon-azure-32px.png</iconFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.11.01">
<package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.12.00">
<friendlyName>Google Analytics Connector</friendlyName>
<description>Configure your sites Google Analytics settings.</description>
<iconFile>~/DesktopModules/Connectors/GoogleAnalytics/Images/GoogleAnalytics_32X32_Standard.png</iconFile>
Expand Down
Loading

0 comments on commit 0d7c4a4

Please sign in to comment.