Skip to content

Commit ae00a15

Browse files
committed
Merge branch 'develop' into MVCPL
# Conflicts: # DNN Platform/DotNetNuke.Web.Client/packages.config
2 parents 4476348 + 6411bbf commit ae00a15

File tree

218 files changed

+3464
-2405
lines changed

Some content is hidden

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

218 files changed

+3464
-2405
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ 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-
- 10.0.1 (latest v10 release)
75+
- 10.1.0 (latest v10 release)
7676
- Current development branch (unreleased)
7777
validations:
7878
required: true

.github/ISSUE_TEMPLATE/enhancement-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ body:
5151
- type: checkboxes
5252
id: contribution-interest
5353
attributes:
54-
label: Do you be plan to contribute code for this enhancement?
54+
label: Do you plan to contribute code for this enhancement?
5555
description: We would like to know if you are willing to take ownership of this enhancement.
5656
options:
5757
- label: "Yes"

.github/workflows/browserslist-update-db.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout repository
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1717
with:
1818
fetch-depth: 0
1919
- name: Configure git

.github/workflows/image-actions.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Checkout Repo
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v5
2626

2727
- name: Compress Images
2828
id: compress_images
29-
uses: calibreapp/image-actions@1.1.0
29+
uses: calibreapp/image-actions@1.3.0
3030
with:
31-
githubToken: ${{ secrets.GITHUB_TOKEN }}
31+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3232
compressOnly: ${{ github.event_name != 'pull_request' }} # For non-Pull Requests, run in compressOnly mode and we'll PR after.
3333

3434
- name: Create Pull Request

.github/workflows/open-merged-pr-to-future.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
if: ${{ github.event.pull_request.merged }}
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

1616
- uses: peterjgrainger/action-create-branch@v3.0.0
1717
env:

.github/workflows/updateVersions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
if: ${{ github.event.ref_type == 'branch' && startsWith(github.event.ref, 'release/') }}
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v5
1111

1212
- name: Get the release branch version
1313
uses: valadas/get-release-branch-version@v1.1.0

.nuget/NuGet.Config

Lines changed: 0 additions & 14 deletions
This file was deleted.

.nuget/NuGet.exe

-4.76 MB
Binary file not shown.

.nuget/NuGet.targets

Lines changed: 0 additions & 144 deletions
This file was deleted.

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="10.00.00" >
3+
<package name="DotNetNuke_Symbols" type="Library" version="10.01.00" >
44
<friendlyName>DNN Platform Symbols</friendlyName>
55
<description>This package contains Debug Symbols and Intellisense files for DNN Platform.</description>
66
<owner>

0 commit comments

Comments
 (0)