Skip to content

Commit

Permalink
Merge pull request #1192 from DNNCommunity/release/0.24.0
Browse files Browse the repository at this point in the history
Released v0.24.0
  • Loading branch information
valadas authored Oct 1, 2024
2 parents 9abe06a + 750cf62 commit 21753cb
Show file tree
Hide file tree
Showing 124 changed files with 20,810 additions and 76,947 deletions.
17 changes: 6 additions & 11 deletions .github/workflows/Deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,15 @@ on:
- 'release/*'

jobs:
deploy:
name: deploy
ubuntu-latest:
name: ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v2
- uses: actions/checkout@v4
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: Run './build.sh Deploy'
run: ./build.sh Deploy
fetch-depth: 0
- name: 'Run: Deploy'
run: ./build.cmd Deploy
env:
GithubToken: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
17 changes: 6 additions & 11 deletions .github/workflows/PR_Validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,14 @@ on:
- development

jobs:
pr-validation:
name: pr-validation
ubuntu-latest:
name: ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v2
- uses: actions/checkout@v4
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: Run './build.sh Compile'
run: ./build.sh Compile
fetch-depth: 0
- name: 'Run: Compile'
run: ./build.cmd Compile
env:
GithubToken: ${{ secrets.GITHUB_TOKEN }}
34 changes: 25 additions & 9 deletions .github/workflows/Publish_Site.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,21 @@
# ------------------------------------------------------------------------------
# <auto-generated>
#
# This code was generated.
#
# - To turn off auto-generation set:
#
# [GitHubActions (AutoGenerate = false)]
#
# - To trigger manual generation invoke:
#
# nuke --generate-configuration GitHubActions_Publish_Site --host GitHubActions
#
# </auto-generated>
# ------------------------------------------------------------------------------

name: Publish_Site

on:
push:
branches:
Expand All @@ -7,15 +24,14 @@ on:
- 'release/*'

jobs:
publish-site:
name: publish-site
ubuntu-latest:
name: ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: publish-site
run: |
git remote set-url origin https://git:${GITHUB_TOKEN}@github.com/DNNCommunity/dnn-elements.git
- name: Run './build.sh PublishPublishSite'
run: ./build.sh PublishSite
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: 'Run: PublishSite'
run: ./build.cmd PublishSite
env:
GithubToken: ${{ secrets.GITHUB_TOKEN }}
GithubToken: ${{ secrets.GITHUB_TOKEN }}
9 changes: 9 additions & 0 deletions .hintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": [
"development"
],
"hints": {
"axe/name-role-value": "off",
"no-inline-styles": "off"
}
}
134 changes: 66 additions & 68 deletions .nuke/build.schema.json
Original file line number Diff line number Diff line change
@@ -1,51 +1,78 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"$ref": "#/definitions/build",
"title": "Build Schema",
"properties": {
"Configuration": {
"type": "string",
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
"enum": [
"Debug",
"Release"
]
},
"GithubToken": {
"type": "string",
"description": "Github Token"
}
},
"definitions": {
"build": {
"type": "object",
"Host": {
"type": "string",
"enum": [
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitbucket",
"Bitrise",
"GitHubActions",
"GitLab",
"Jenkins",
"Rider",
"SpaceAutomation",
"TeamCity",
"Terminal",
"TravisCI",
"VisualStudio",
"VSCode"
]
},
"ExecutableTarget": {
"type": "string",
"enum": [
"Clean",
"Compile",
"CreateDeployBranch",
"Deploy",
"GenerateReleaseNotes",
"PublishSite",
"Release",
"SetupGithubActor",
"SetupGitHubClient",
"TagRelease"
]
},
"Verbosity": {
"type": "string",
"description": "",
"enum": [
"Verbose",
"Normal",
"Minimal",
"Quiet"
]
},
"NukeBuild": {
"properties": {
"Configuration": {
"type": "string",
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
"enum": [
"Debug",
"Release"
]
},
"Continue": {
"type": "boolean",
"description": "Indicates to continue a previously failed build attempt"
},
"GithubToken": {
"type": "string",
"description": "Github Token"
},
"Help": {
"type": "boolean",
"description": "Shows the help text for this build assembly"
},
"Host": {
"type": "string",
"description": "Host for execution. Default is 'automatic'",
"enum": [
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitbucket",
"Bitrise",
"GitHubActions",
"GitLab",
"Jenkins",
"Rider",
"SpaceAutomation",
"TeamCity",
"Terminal",
"TravisCI",
"VisualStudio",
"VSCode"
]
"$ref": "#/definitions/Host"
},
"NoLogo": {
"type": "boolean",
Expand Down Expand Up @@ -74,51 +101,22 @@
"type": "array",
"description": "List of targets to be skipped. Empty list skips all dependencies",
"items": {
"type": "string",
"enum": [
"Clean",
"Compile",
"CreateDeployBranch",
"Deploy",
"GenerateReleaseNotes",
"PublishSite",
"Release",
"SetupGithubActor",
"SetupGitHubClient",
"TagRelease"
]
"$ref": "#/definitions/ExecutableTarget"
}
},
"Target": {
"type": "array",
"description": "List of targets to be invoked. Default is '{default_target}'",
"items": {
"type": "string",
"enum": [
"Clean",
"Compile",
"CreateDeployBranch",
"Deploy",
"GenerateReleaseNotes",
"PublishSite",
"Release",
"SetupGithubActor",
"SetupGitHubClient",
"TagRelease"
]
"$ref": "#/definitions/ExecutableTarget"
}
},
"Verbosity": {
"type": "string",
"description": "Logging verbosity during build execution. Default is 'Normal'",
"enum": [
"Minimal",
"Normal",
"Quiet",
"Verbose"
]
"$ref": "#/definitions/Verbosity"
}
}
}
}
},
"$ref": "#/definitions/NukeBuild"
}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@ always necessary to create a new ticket in the issue tracker.
## Submitting Changes
* [General GitHub documentation](http://help.github.com/)
* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
* Security issues should be initially submitted to the [Security Team](mailto:security@dnnsoftware.com) email and should never be discussed in any public channel
* Security issues should be initially submitted to the [Security Team](https://github.com/dnnsoftware/Dnn.Platform/security/policy) and should never be discussed in any public channel

21 changes: 15 additions & 6 deletions _build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,29 @@
[GitHubActions(
"PR_Validation",
GitHubActionsImage.UbuntuLatest,
AutoGenerate = false,
ImportSecrets = new[] { nameof(GithubToken) },
OnPullRequestBranches = new[] { "main", "master", "develop", "development" },
InvokedTargets = new[] { nameof(Compile) }
InvokedTargets = new[] { nameof(Compile) },
FetchDepth = 0,
CacheKeyFiles = new string[] {}
)]
[GitHubActions(
"Deploy",
GitHubActionsImage.UbuntuLatest,
AutoGenerate = false,
ImportSecrets = new[] { nameof(GithubToken), "NPM_TOKEN" },
OnPushBranches = new[] { "main", "master", "release/*" },
InvokedTargets = new[] { nameof(Deploy) }
InvokedTargets = new[] { nameof(Deploy) },
FetchDepth = 0,
CacheKeyFiles = new string[] {}
)]
[GitHubActions(
"Publish_Site",
GitHubActionsImage.UbuntuLatest,
AutoGenerate = false,
ImportSecrets = new[] { nameof(GithubToken) },
OnPushBranches = new[] { "main", "master", "release/*" },
InvokedTargets = new[] { nameof(PublishSite) }
InvokedTargets = new[] { nameof(PublishSite) },
FetchDepth = 0,
CacheKeyFiles = new string[] {}
)]
class Build : NukeBuild
{
Expand Down Expand Up @@ -94,6 +97,12 @@ class Build : NukeBuild
DistDirectory.CreateOrCleanDirectory();
WwwDirectory.CreateOrCleanDirectory();
LoaderDirectory.CreateOrCleanDirectory();
if (InvokedTargets.Contains(Deploy))
{
var examplesDirectory = RootDirectory / "packages" / "stencil-library" / "src" / "components" / "examples";
Serilog.Log.Information($"Deleting examples in {examplesDirectory}");
examplesDirectory.DeleteDirectory();
}
});

Target Compile => _ => _
Expand Down
4 changes: 2 additions & 2 deletions _build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace></RootNamespace>
<NoWarn>CS0649;CS0169</NoWarn>
<NukeRootDirectory>..</NukeRootDirectory>
Expand All @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="8.0.0" />
<PackageReference Include="Nuke.Common" Version="8.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ $DotNetGlobalFile = "$PSScriptRoot\\global.json"
$DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"
$DotNetChannel = "STS"

$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
$env:DOTNET_CLI_TELEMETRY_OPTOUT = 1
$env:DOTNET_MULTILEVEL_LOOKUP = 0
$env:DOTNET_NOLOGO = 1

###########################################################################
# EXECUTION
Expand Down Expand Up @@ -61,6 +60,7 @@ else {
ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
}
$env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
$env:PATH = "$DotNetDirectory;$env:PATH"
}

Write-Output "Microsoft (R) .NET SDK version $(& $env:DOTNET_EXE --version)"
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh"
DOTNET_CHANNEL="STS"

export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
export DOTNET_MULTILEVEL_LOOKUP=0
export DOTNET_NOLOGO=1

###########################################################################
# EXECUTION
Expand Down Expand Up @@ -54,6 +53,7 @@ else
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "$DOTNET_VERSION" --no-path
fi
export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet"
export PATH="$DOTNET_DIRECTORY:$PATH"
fi

echo "Microsoft (R) .NET SDK version $("$DOTNET_EXE" --version)"
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"version": "8.0.400",
"rollForward": "latestMajor"
}
}
Loading

0 comments on commit 21753cb

Please sign in to comment.