Skip to content

Commit c2ba55e

Browse files
committed
Merge branch 'develop'
2 parents 9a615ca + be1887c commit c2ba55e

File tree

350 files changed

+22469
-5853
lines changed

Some content is hidden

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

350 files changed

+22469
-5853
lines changed

.github/WikiLinks.exe

1.83 MB
Binary file not shown.

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
uses: actions/setup-dotnet@v4
1818
with:
1919
dotnet-version: |
20+
6.0.x
2021
8.0.x
2122
2223
- name: Build
@@ -32,6 +33,7 @@ jobs:
3233
uses: actions/setup-dotnet@v4
3334
with:
3435
dotnet-version: |
36+
6.0.x
3537
8.0.x
3638
3739
- name: Build

.github/workflows/publish-wiki.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Publish wiki
2+
on:
3+
push:
4+
branches: [electronnet_core, main]
5+
workflow_dispatch:
6+
concurrency:
7+
group: publish-wiki
8+
cancel-in-progress: true
9+
permissions:
10+
contents: write
11+
jobs:
12+
publish-wiki:
13+
runs-on: windows-latest
14+
steps:
15+
- uses: actions/checkout@v3
16+
- name: Remove level 1 headings from Markdown files
17+
shell: bash
18+
run: |
19+
find docs/ -name '*.md' -exec sed -i '1d' {} \;
20+
- name: Move all files to root folder
21+
shell: bash
22+
run: |
23+
mv docs/*/* docs/
24+
- name: Delete unwanted files
25+
shell: bash
26+
run: |
27+
# rm docs/*.xlsm
28+
# rm docs/*.pptx
29+
rm docs/*.shproj
30+
- name: Stripping file extensions....
31+
uses: softworkz/strip-markdown-extensions-from-links-action@main
32+
with:
33+
path: ./docs/
34+
- name: Copy Changelog
35+
shell: bash
36+
run: |
37+
cp Changelog.md docs/RelInfo/ 2>/dev/null || true
38+
- name: Copy images to wiki/wiki folder
39+
shell: bash
40+
run: |
41+
mkdir docs/wiki
42+
cp docs/*.svg docs/wiki/ 2>/dev/null || true
43+
cp docs/*.png docs/wiki/ 2>/dev/null || true
44+
cp docs/*.jpg docs/wiki/ 2>/dev/null || true
45+
cp docs/*.gif docs/wiki/ 2>/dev/null || true
46+
cp docs/*.mp4 docs/wiki/ 2>/dev/null || true
47+
- name: Commit and push changes
48+
run: |
49+
git config --global user.name "GitHub Action"
50+
git config --global user.email "[email protected]"
51+
git add -A
52+
git commit -m "Automatically update Markdown files" || echo "No changes to commit"
53+
- uses: Andrew-Chen-Wang/[email protected]
54+
with:
55+
path: docs/
56+
ignore: |
57+
'**/*.xlsm'
58+
'**/*.pptx'
59+
'**/*.shproj'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,3 +266,4 @@ __pycache__/
266266

267267
# Nuke build tool
268268
.nuke/temp
269+
/publish.cmd

.nuke/build.schema.json

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"title": "Build Schema",
43
"$ref": "#/definitions/build",
4+
"title": "Build Schema",
55
"definitions": {
66
"build": {
77
"type": "object",
88
"properties": {
9+
"CommonPropsFilePath": {
10+
"type": "string",
11+
"description": "common.props file path - to determine the configured version"
12+
},
913
"Configuration": {
1014
"type": "string",
1115
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
@@ -64,7 +68,7 @@
6468
},
6569
"ReleaseNotesFilePath": {
6670
"type": "string",
67-
"description": "ReleaseNotesFilePath - To determine the SemanticVersion"
71+
"description": "ReleaseNotesFilePath - To determine the lates changelog version"
6872
},
6973
"Root": {
7074
"type": "string",
@@ -78,14 +82,8 @@
7882
"enum": [
7983
"Clean",
8084
"Compile",
81-
"CompileSample",
8285
"CreatePackages",
8386
"Default",
84-
"ElectronizeCustomWin7TargetSample",
85-
"ElectronizeGenericTargetSample",
86-
"ElectronizeLinuxTargetSample",
87-
"ElectronizeMacOsTargetSample",
88-
"ElectronizeWindowsTargetSample",
8987
"Package",
9088
"PrePublish",
9189
"Publish",
@@ -109,14 +107,8 @@
109107
"enum": [
110108
"Clean",
111109
"Compile",
112-
"CompileSample",
113110
"CreatePackages",
114111
"Default",
115-
"ElectronizeCustomWin7TargetSample",
116-
"ElectronizeGenericTargetSample",
117-
"ElectronizeLinuxTargetSample",
118-
"ElectronizeMacOsTargetSample",
119-
"ElectronizeWindowsTargetSample",
120112
"Package",
121113
"PrePublish",
122114
"Publish",
@@ -141,4 +133,4 @@
141133
}
142134
}
143135
}
144-
}
136+
}

.nuke/parameters.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "./build.schema.json",
3-
"Solution": "src/ElectronNET.sln"
3+
"Solution": "src/ElectronNET.Lean.sln"
44
}

Changelog.md

Lines changed: 56 additions & 388 deletions
Large diffs are not rendered by default.

NuGet.config

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<packageSources>
3+
<config>
4+
<add key="repositoryPath" value="artifacts" />
5+
</config>
6+
<packageSources>
47
<clear />
58
<add key="LocalDev" value="artifacts" />
69
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
7-
</packageSources>
10+
</packageSources>
811
</configuration>

0 commit comments

Comments
 (0)