Skip to content

Commit

Permalink
Properly completed Nuke update to v8
Browse files Browse the repository at this point in the history
In an earlier PR, Nuke was updated but somehow not totally (bootstraping scripts and .Net runtime)
  • Loading branch information
valadas committed Mar 1, 2024
1 parent db83804 commit 5aaeac9
Show file tree
Hide file tree
Showing 10 changed files with 75 additions and 125 deletions.
2 changes: 1 addition & 1 deletion _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 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
121 changes: 52 additions & 69 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion packages/react-library/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dnncommunity/dnn-elements-react",
"version": "0.18.0-alpha.61",
"version": "0.23.3-alpha.7",
"description": "Dnn themed custom elements with react wrappers.",
"homepage": "https://github.com/valadas/dnn-elements",
"license": "MIT",
Expand Down
47 changes: 1 addition & 46 deletions packages/stencil-library/licenses.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"path": "node_modules\\@babel\\code-frame",
"licenseFile": "D:\\dnn-elements\\dnn-elements\\packages\\stencil-library\\node_modules\\@babel\\code-frame\\LICENSE"
},
"@dnncommunity/dnn-elements@0.18.0-alpha.61": {
"@dnncommunity/dnn-elements@0.23.3-alpha.7": {
"licenses": "MIT",
"repository": "https://github.com/dnncommunity/dnn-elements",
"path": "",
Expand All @@ -33,36 +33,6 @@
"path": "node_modules\\@stencil\\eslint-plugin",
"licenseFile": "D:\\dnn-elements\\dnn-elements\\packages\\stencil-library\\node_modules\\@stencil\\eslint-plugin\\LICENSE.md"
},
"@typescript-eslint/parser@4.33.0": {
"licenses": "BSD-2-Clause",
"repository": "https://github.com/typescript-eslint/typescript-eslint",
"path": "node_modules\\@typescript-eslint\\parser",
"licenseFile": "D:\\dnn-elements\\dnn-elements\\packages\\stencil-library\\node_modules\\@typescript-eslint\\parser\\LICENSE"
},
"@typescript-eslint/scope-manager@4.33.0": {
"licenses": "MIT",
"repository": "https://github.com/typescript-eslint/typescript-eslint",
"path": "node_modules\\@typescript-eslint\\scope-manager",
"licenseFile": "D:\\dnn-elements\\dnn-elements\\packages\\stencil-library\\node_modules\\@typescript-eslint\\scope-manager\\LICENSE"
},
"@typescript-eslint/types@4.33.0": {
"licenses": "MIT",
"repository": "https://github.com/typescript-eslint/typescript-eslint",
"path": "node_modules\\@typescript-eslint\\types",
"licenseFile": "D:\\dnn-elements\\dnn-elements\\packages\\stencil-library\\node_modules\\@typescript-eslint\\types\\LICENSE"
},
"@typescript-eslint/typescript-estree@4.33.0": {
"licenses": "BSD-2-Clause",
"repository": "https://github.com/typescript-eslint/typescript-eslint",
"path": "node_modules\\@typescript-eslint\\typescript-estree",
"licenseFile": "D:\\dnn-elements\\dnn-elements\\packages\\stencil-library\\node_modules\\@typescript-eslint\\typescript-estree\\LICENSE"
},
"@typescript-eslint/visitor-keys@4.33.0": {
"licenses": "MIT",
"repository": "https://github.com/typescript-eslint/typescript-eslint",
"path": "node_modules\\@typescript-eslint\\visitor-keys",
"licenseFile": "D:\\dnn-elements\\dnn-elements\\packages\\stencil-library\\node_modules\\@typescript-eslint\\visitor-keys\\LICENSE"
},
"eslint-utils@2.1.0": {
"licenses": "MIT",
"repository": "https://github.com/mysticatea/eslint-utils",
Expand Down Expand Up @@ -100,14 +70,6 @@
"path": "node_modules\\ignore",
"licenseFile": "D:\\dnn-elements\\dnn-elements\\packages\\stencil-library\\node_modules\\ignore\\LICENSE-MIT"
},
"jodit@3.24.9": {
"licenses": "MIT",
"repository": "https://github.com/xdan/jodit",
"publisher": "Chupurnov",
"email": "chupurnov@gmail.com",
"path": "node_modules\\jodit",
"licenseFile": "D:\\dnn-elements\\dnn-elements\\packages\\stencil-library\\node_modules\\jodit\\LICENSE.txt"
},
"tslib@1.14.1": {
"licenses": "0BSD",
"repository": "https://github.com/Microsoft/tslib",
Expand All @@ -122,13 +84,6 @@
"path": "node_modules\\tsutils",
"licenseFile": "D:\\dnn-elements\\dnn-elements\\packages\\stencil-library\\node_modules\\tsutils\\LICENSE"
},
"tsutils@3.21.0": {
"licenses": "MIT",
"repository": "https://github.com/ajafff/tsutils",
"publisher": "Klaus Meinhardt",
"path": "node_modules\\@typescript-eslint\\typescript-estree\\node_modules\\tsutils",
"licenseFile": "D:\\dnn-elements\\dnn-elements\\packages\\stencil-library\\node_modules\\@typescript-eslint\\typescript-estree\\node_modules\\tsutils\\LICENSE"
},
"typescript@4.9.5": {
"licenses": "Apache-2.0",
"repository": "https://github.com/Microsoft/TypeScript",
Expand Down
Loading

0 comments on commit 5aaeac9

Please sign in to comment.