Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit 42a4a7a

Browse files
Hexer10Hexer10
authored
Merge pull request #21 from Hexer10/1.4.0.0
1.4.0.0
2 parents 08d086e + 223a4df commit 42a4a7a

File tree

108 files changed

+1022
-708
lines changed

Some content is hidden

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

108 files changed

+1022
-708
lines changed

‎.github/workflows/compile.yaml‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,47 @@ jobs:
1919

2020
# Nuget
2121
- uses: nuget/setup-nuget@v1
22-
- run: nuget restore Spedit.sln
22+
- run: nuget restore Spcode.sln
2323

2424
# Setup MSBuild
2525
- name: Setup MSBuild.exe
2626
uses: microsoft/[email protected]
2727

2828

29-
# Build Project
30-
- name: Build Project
31-
run: msbuild /p:Configuration=Release
29+
# Build Spcode
30+
- name: Build Spcode
31+
run: msbuild Spcode.csproj /p:Configuration=Release
32+
33+
# Build Installer
34+
- name: Build Installer (NSIS)
35+
uses: joncloud/makensis-action@v1
36+
with:
37+
script-file: .\bin\Release\SPCode.nsi
38+
39+
- name: Artifact Installer
40+
uses: actions/upload-artifact@v1
41+
with:
42+
name: SPCode.Installer.exe
43+
path: .\bin\Release\SPCode.Installer.exe
44+
45+
46+
# Compress Portable Version
47+
- name: Compress Portable Version
48+
run: .\bin\Release\Compress.ps1
49+
shell: powershell
50+
51+
- name: Artifact Portable
52+
uses: actions/upload-artifact@v1
53+
with:
54+
name: SPCode.Portable.zip
55+
path: .\bin\Release\SPCode.Portable.zip
56+
57+
# Build Updater
58+
- name: Build Updater
59+
run: msbuild Deploy\SpcodeUpdater\SpcodeUpdater.csproj /p:Configuration=Release
60+
61+
- name: Artifact Updater
62+
uses: actions/upload-artifact@v1
63+
with:
64+
name: SpcodeUpdater.exe
65+
path: .\Deploy\SpcodeUpdater\bin\Release\SpcodeUpdater.exe

‎.github/workflows/release.yml‎

Lines changed: 85 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -3,79 +3,94 @@ name: Publish Release
33
on:
44
push:
55
tags:
6-
- '*'
6+
- '*'
77

88
jobs:
99
build:
1010

1111
runs-on: windows-latest
12-
12+
1313
steps:
14-
- name: Checkout
15-
uses: actions/checkout@v2
16-
17-
# Install the .NET Core workload
18-
- name: Install .NET Core
19-
uses: actions/setup-dotnet@v1
20-
with:
21-
dotnet-version: 3.1.100
22-
23-
# Nuget
24-
- uses: nuget/setup-nuget@v1
25-
with:
26-
nuget-version: '5.x'
27-
- run: nuget restore Spedit.sln
28-
29-
# Setup MSBuild
30-
- name: Setup MSBuild.exe
31-
uses: microsoft/[email protected]
32-
33-
34-
# Build Project
35-
- name: Build Project
36-
run: msbuild /p:Configuration=Release
37-
38-
# Build Installer
39-
- name: Build Installer (NSIS)
40-
uses: joncloud/makensis-action@v1
41-
with:
42-
script-file: .\bin\Release\SPEdit.nsi
43-
44-
# Compress Portable Version
45-
- name: Compress Portable Version
46-
run: .\bin\Release\Compress.ps1
47-
shell: powershell
48-
49-
- name: Create Release
50-
id: create_release
51-
uses: actions/create-release@v1
52-
env:
53-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
54-
with:
55-
tag_name: ${{ github.ref }}
56-
release_name: Release ${{ github.ref }}
57-
draft: false
58-
prerelease: false
59-
60-
61-
- name: Upload Installer
62-
id: upload-installer
63-
uses: actions/upload-release-asset@v1
64-
env:
65-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
66-
with:
67-
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
68-
asset_path: .\bin\Release\SPEdit.Installer.exe
69-
asset_name: SPEdit.Installer.exe
70-
asset_content_type: application/octet-stream
71-
72-
- name: Upload Portable
73-
id: upload-portable
74-
uses: actions/upload-release-asset@v1
75-
env:
76-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
77-
with:
78-
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
79-
asset_path: .\bin\Release\SPEdit.Portable.zip
80-
asset_name: SPEdit.Portable.zip
81-
asset_content_type: application/zip
14+
- name: Checkout
15+
uses: actions/checkout@v2
16+
17+
# Install the .NET Core workload
18+
- name: Install .NET Core
19+
uses: actions/setup-dotnet@v1
20+
with:
21+
dotnet-version: 3.1.100
22+
23+
# Nuget
24+
- uses: nuget/setup-nuget@v1
25+
with:
26+
nuget-version: '5.x'
27+
- run: nuget restore Spcode.sln
28+
29+
# Setup MSBuild
30+
- name: Setup MSBuild.exe
31+
uses: microsoft/[email protected]
32+
33+
34+
# Build Spcode
35+
- name: Build Spcode
36+
run: msbuild Spcode.csproj /p:Configuration=Release
37+
38+
# Build Installer
39+
- name: Build Installer (NSIS)
40+
uses: joncloud/makensis-action@v1
41+
with:
42+
script-file: .\bin\Release\SPCode.nsi
43+
44+
# Compress Portable Version
45+
- name: Compress Portable Version
46+
run: .\bin\Release\Compress.ps1
47+
shell: powershell
48+
49+
# Build Updater
50+
- name: Build Updater
51+
run: msbuild Deploy\SpcodeUpdater\SpcodeUpdater.csproj /p:Configuration=Release
52+
53+
- name: Create Release
54+
id: create_release
55+
uses: actions/create-release@v1
56+
env:
57+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58+
with:
59+
tag_name: ${{ github.ref }}
60+
release_name: Release ${{ github.ref }}
61+
draft: false
62+
prerelease: false
63+
64+
65+
- name: Upload Installer
66+
id: upload-installer
67+
uses: actions/upload-release-asset@v1
68+
env:
69+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
70+
with:
71+
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
72+
asset_path: .\bin\Release\SPCode.Installer.exe
73+
asset_name: SPCode.Installer.exe
74+
asset_content_type: application/octet-stream
75+
76+
- name: Upload Portable
77+
id: upload-portable
78+
uses: actions/upload-release-asset@v1
79+
env:
80+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
81+
with:
82+
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
83+
asset_path: .\bin\Release\SPCode.Portable.zip
84+
asset_name: SPCode.Portable.zip
85+
asset_content_type: application/zip
86+
87+
- name: Upload Updater
88+
id: upload-updater
89+
uses: actions/upload-release-asset@v1
90+
env:
91+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
92+
with:
93+
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
94+
asset_path: .\Deploy\SpcodeUpdater\bin\Release\SpcodeUpdater.exe
95+
asset_name: SpcodeUpdater.exe
96+
asset_content_type: application/octet-stream

‎App/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
55
</startup>
66
<runtime>
77
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

‎App/AssemblyInfo1.cs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
8-
[assembly: AssemblyTitle("Spedit")]
9-
[assembly: AssemblyDescription("SPEdit - a lightweight sourcepawn editor")]
8+
[assembly: AssemblyTitle("Spcode")]
9+
[assembly: AssemblyDescription("SPCode - a lightweight sourcepawn editor")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("SPEdit")]
13-
[assembly: AssemblyCopyright("Copyright © Julien Kluge 2015")]
12+
[assembly: AssemblyProduct("SPCode")]
13+
[assembly: AssemblyCopyright("Copyright © Julien Kluge 2015 - Hexah 2020")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616
[assembly: NeutralResourcesLanguage("en-US")]
@@ -30,8 +30,4 @@
3030
// Build Number
3131
// Revision
3232
//
33-
#if (DEBUG)
34-
[assembly: AssemblyVersion("1.12.*")]
35-
#else
36-
[assembly: AssemblyVersion("1.3.6.1")]
37-
#endif
33+
[assembly: AssemblyVersion("1.4.0.0")]

‎Deploy/Compress.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
$loc = Get-Location
22
Set-Location 'bin\Release\'
33
$compress = @{
4-
LiteralPath= "sourcepawn/", "Spedit.exe", "MahApps.Metro.dll", "ICSharpCode.AvalonEdit.dll", "System.Windows.Interactivity.dll", "Xceed.Wpf.AvalonDock.dll", "Xceed.Wpf.AvalonDock.Themes.Metro.dll", "smxdasm.dll", "LysisForSpedit.dll", "QueryMaster.dll", "Ionic.BZip2.dll", "SourcepawnCondenser.dll", "Renci.SshNet.dll", "Newtonsoft.Json.dll", "DiscordRPC.dll", "ControlzEx.dll", "lang_0_spedit.xml", "GPLv3.txt"
4+
LiteralPath= "sourcepawn/", "Spcode.exe", "MahApps.Metro.dll", "ICSharpCode.AvalonEdit.dll", "System.Windows.Interactivity.dll", "Xceed.Wpf.AvalonDock.dll", "Xceed.Wpf.AvalonDock.Themes.Metro.dll", "smxdasm.dll", "LysisForSpedit.dll", "QueryMaster.dll", "Ionic.BZip2.dll", "SourcepawnCondenser.dll", "Renci.SshNet.dll", "Newtonsoft.Json.dll", "DiscordRPC.dll", "ControlzEx.dll", "Octokit.dll", "lang_0_spcode.xml", "GPLv3.txt"
55
#Path= "sourcepawn/"
66
#CompressionLevel = "Fastest"
7-
DestinationPath = "SPEdit.Portable.zip"
7+
DestinationPath = "SPCode.Portable.zip"
88

99
}
1010
Compress-Archive -Force @compress

0 commit comments

Comments
 (0)