Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

84 merge the dll and exe backglass features #110

Merged
merged 18 commits into from
Jul 5, 2024
Merged
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
93d875b
All EXE features merged back to the dll version
JockeJarre Mar 1, 2024
12128b7
Catch Exception and log error
JockeJarre Mar 9, 2024
705e362
ci: move github actions to v4 to avoid deprecation warnings
JockeJarre Mar 9, 2024
3e53162
More merges
JockeJarre Mar 22, 2024
612b7d6
More merges
JockeJarre Mar 22, 2024
9be5f55
Update b2s-backglass.yml, remove betterled
JockeJarre Apr 1, 2024
e47e032
"Fantasy" setting in B2STableSettings.xml is ignored #93
JockeJarre Apr 8, 2024
3bc984e
Move old B2SBackglassServerEXE in tmp folder
JockeJarre Jun 19, 2024
5bc37ea
Add new B2SBackglassServerEXE based on the B2SBackglassServerWrapper …
JockeJarre Jun 19, 2024
e5afa56
SteveJones72's Potential New Feature to B2S Snippet x/y translation #71
JockeJarre Jun 21, 2024
84ee7bb
Use conditional compilation directives to split DLL and EXE source
JockeJarre Jun 23, 2024
10b0e06
B2SBackglassServerRegisterApp: re-registering B2S.Server should first…
JockeJarre Jun 25, 2024
ffa1038
2.5.0: Finally a merge of the source code of B2SBackglassServer & B2S…
JockeJarre Jun 26, 2024
66df61a
Potential New Feature to B2S Snippet x/y translation #71: Make only t…
JockeJarre Jun 26, 2024
276e801
Change build script to not include x86 nor x64 in the filename #104
JockeJarre Jun 26, 2024
8a81eb5
A bit more merged / Split
JockeJarre Jun 28, 2024
7ee1970
Add github run number to version
JockeJarre Jul 2, 2024
ce5e8e9
Remodel version into one file Classes/B2SVersionInfo.vb which is then…
JockeJarre Jul 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add github run number to version
JockeJarre committed Jul 2, 2024
commit 7ee19705c815f04bfde007dffafe9cc9a8cefb46
22 changes: 11 additions & 11 deletions .github/workflows/b2s-backglass.yml
Original file line number Diff line number Diff line change
@@ -29,27 +29,27 @@ jobs:
name: Update AssemblyInformationalVersion
run: |
SHA7="${GITHUB_SHA::7}"
: # B2SServerPluginInterface
ASSEMBLY_INFO="B2SServerPluginInterface/B2SServerPluginInterface/Properties/AssemblyInfo.cs"
VERSION=$(grep -Eo "AssemblyVersion\(.*\)" "${ASSEMBLY_INFO}" | grep -Eo "[0-9\.]+" | tail -1)
TAG="${VERSION}-${SHA7}"
echo -e "\n[assembly: AssemblyInformationalVersion(\"${TAG}\")]" >> "${ASSEMBLY_INFO}"
ASSEMBLY_INFO="b2s_screenresidentifier/b2s_screenresidentifier/My Project/AssemblyInfo.vb"
VERSION=$(grep -Eo "AssemblyVersion\(.*\)" "${ASSEMBLY_INFO}" | grep -Eo "[0-9\.]+" | tail -1)
: # b2sbackglassserver
ASSEMBLY_INFO="b2sbackglassserver/b2sbackglassserver/My Project/AssemblyInfo.vb"
VERSION=$(grep -Eo "AssemblyVersion\(.*\)" "${ASSEMBLY_INFO}" | grep -Eo "[0-9\.]+" | tail -1).${{ github.run_number }}
TAG="${VERSION}-${SHA7}"
perl -i -pe"s/AssemblyInformationalVersion\(\".*\"\)/AssemblyInformationalVersion\(\"${TAG}\"\)/g" "${ASSEMBLY_INFO}"
ASSEMBLY_INFO="b2sbackglassserverregisterapp/b2sbackglassserverregisterapp/My Project/AssemblyInfo.vb"
VERSION=$(grep -Eo "AssemblyVersion\(.*\)" "${ASSEMBLY_INFO}" | grep -Eo "[0-9\.]+" | tail -1)
TAG="${VERSION}-${SHA7}"
: # b2s_screenresidentifier
ASSEMBLY_INFO="b2s_screenresidentifier/b2s_screenresidentifier/My Project/AssemblyInfo.vb"
perl -i -pe"s/AssemblyInformationalVersion\(\".*\"\)/AssemblyInformationalVersion\(\"${TAG}\"\)/g" "${ASSEMBLY_INFO}"
ASSEMBLY_INFO="b2sbackglassserver/b2sbackglassserver/My Project/AssemblyInfo.vb"
VERSION=$(grep -Eo "AssemblyVersion\(.*\)" "${ASSEMBLY_INFO}" | grep -Eo "[0-9\.]+" | tail -1)
TAG="${VERSION}-${SHA7}"
: # b2sbackglassserverregisterapp
ASSEMBLY_INFO="b2sbackglassserverregisterapp/b2sbackglassserverregisterapp/My Project/AssemblyInfo.vb"
perl -i -pe"s/AssemblyInformationalVersion\(\".*\"\)/AssemblyInformationalVersion\(\"${TAG}\"\)/g" "${ASSEMBLY_INFO}"
echo "tag=${TAG}" >> $GITHUB_OUTPUT
: # B2SWindowPunch
ASSEMBLY_INFO="B2SWindowPunch/B2SWindowPunch/Properties/AssemblyInfo.cs"
VERSION=$(grep -Eo "AssemblyVersion\(.*\)" "${ASSEMBLY_INFO}" | grep -Eo "[0-9\.]+" | tail -1)
TAG="${VERSION}-${SHA7}"
perl -i -pe"s/AssemblyInformationalVersion\(\".*\"\)/AssemblyInformationalVersion\(\"${TAG}\"\)/g" "${ASSEMBLY_INFO}"
: # Keep the TAG for later
echo "tag=${TAG}" >> $GITHUB_OUTPUT
- uses: microsoft/setup-msbuild@v2
- name: Build B2SServerPluginInterface
run: |