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

Merging from AmpForge to Mtolly LibForge #4

Open
wants to merge 55 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
56bef79
Merge and Fork
FluffyOMC Sep 12, 2022
c6fad4a
Delete Dependencies directory
FluffyOMC Sep 12, 2022
3c1ee30
Fix Dependency links
FluffyOMC Sep 12, 2022
2a962af
Retry
FluffyOMC Sep 12, 2022
3972a6a
Update LibForge-main.yml
FluffyOMC Sep 12, 2022
f6e3680
Update LibForge-EXT.yml
FluffyOMC Sep 12, 2022
039cb89
Clear and reboot.
FluffyOMC Sep 12, 2022
128fdd7
Bring back old repo
FluffyOMC Sep 12, 2022
cca32fb
Bump Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers
dependabot[bot] Sep 12, 2022
b2ce1ce
Bump Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers
dependabot[bot] Sep 12, 2022
c4a8895
Bump Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers
dependabot[bot] Sep 12, 2022
da483fe
Bump Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers
dependabot[bot] Sep 12, 2022
6540188
Update ArkPackage.cs
FluffyOMC Sep 12, 2022
96e2909
Update LibForge-main.yml
FluffyOMC Sep 12, 2022
124bb5b
Update LibForge-EXT.yml
FluffyOMC Sep 12, 2022
4bf5ff3
Delete LibForge-PR.yml
FluffyOMC Sep 12, 2022
00432e9
Merge pull request #5 from Mou-Ikkai/dependabot/nuget/LibForge/ForgeT…
FluffyOMC Sep 13, 2022
95dd87e
Merge pull request #2 from Mou-Ikkai/dependabot/nuget/LibForge/LibFor…
FluffyOMC Sep 13, 2022
29721f6
Merge pull request #3 from Mou-Ikkai/dependabot/nuget/LibForge/LibFor…
FluffyOMC Sep 13, 2022
730e1df
Merge pull request #1 from Mou-Ikkai/dependabot/nuget/LibForge/ForgeT…
FluffyOMC Sep 13, 2022
141bd61
Merge branch 'master' into master
FluffyOMC Sep 13, 2022
fb40214
Update README.md
FluffyOMC Sep 13, 2022
1a1cb70
Update appveyor.yml
FluffyOMC Sep 13, 2022
0e14f75
I love Github merging.
FluffyOMC Sep 13, 2022
9e491ca
Resolved issues when merging.
FluffyOMC Sep 13, 2022
3a3a88b
Updated path for builds
FluffyOMC Sep 13, 2022
b469cb9
Fixed Appveyor's excessive file paths.
FluffyOMC Sep 13, 2022
aa7183a
Forgot that ReadME and License is included in builds.
FluffyOMC Sep 13, 2022
946a8df
Fixed Submodule downloading
FluffyOMC Sep 13, 2022
9808930
Same as above.
FluffyOMC Sep 13, 2022
e69284d
Can we export with all files without a folder embed?
FluffyOMC Sep 13, 2022
72cda93
Added Ignore for CA1416 spam.
FluffyOMC Sep 14, 2022
53fed8c
Attempt to fix ReadInt32LE
FluffyOMC Sep 15, 2022
c186e44
Use the much more readable BinaryPrimitive lib.
FluffyOMC Sep 16, 2022
ac6fa44
Use BinaryPrimitives
FluffyOMC Sep 19, 2022
b6c30f8
Bump NuGet/setup-nuget from 1.0.7 to 1.1.1
dependabot[bot] Oct 13, 2022
5c3de6b
Bump Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers
dependabot[bot] Nov 9, 2022
a8a5e93
Bump Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers
dependabot[bot] Nov 9, 2022
99b992e
Bump microsoft/setup-msbuild from 1.1 to 1.3
dependabot[bot] Dec 14, 2022
b58c889
Bump MSTest.TestAdapter from 2.2.10 to 3.0.2 in /LibForge/LibForgeTests
dependabot[bot] Dec 28, 2022
7a761df
Bump MSTest.TestFramework in /LibForge/LibForgeTests
dependabot[bot] Dec 28, 2022
6031598
Merge pull request #28 from Mou-Ikkai/dependabot/nuget/LibForge/LibFo…
FluffyOMC Jan 16, 2023
b9e7caa
Merge pull request #27 from Mou-Ikkai/dependabot/nuget/LibForge/LibFo…
FluffyOMC Jan 16, 2023
9cfaef8
Merge pull request #24 from Mou-Ikkai/dependabot/github_actions/micro…
FluffyOMC Jan 16, 2023
2b09ca0
Merge pull request #20 from Mou-Ikkai/dependabot/nuget/LibForge/Forge…
FluffyOMC Jan 16, 2023
2e2a2c4
Merge pull request #18 from Mou-Ikkai/dependabot/nuget/LibForge/LibFo…
FluffyOMC Jan 16, 2023
985d1a1
Bump Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers
dependabot[bot] Jan 16, 2023
7d6cbdb
Bump Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers
dependabot[bot] Jan 16, 2023
1ed1680
Bump System.Drawing.Common from 6.0.0 to 7.0.0 in /LibForge/LibForge
dependabot[bot] Jan 16, 2023
9be17d2
Bump Microsoft.Windows.Compatibility in /LibForge/ForgeToolGUI
dependabot[bot] Jan 16, 2023
bffca73
Merge pull request #16 from Mou-Ikkai/dependabot/nuget/LibForge/Forge…
FluffyOMC Jan 16, 2023
5c0c49c
Merge pull request #19 from Mou-Ikkai/dependabot/nuget/LibForge/Forge…
FluffyOMC Jan 16, 2023
347055d
Merge pull request #17 from Mou-Ikkai/dependabot/nuget/LibForge/LibFo…
FluffyOMC Jan 16, 2023
89a31c8
Merge pull request #15 from Mou-Ikkai/dependabot/nuget/LibForge/LibFo…
FluffyOMC Jan 16, 2023
3f11cb6
Merge pull request #10 from Mou-Ikkai/dependabot/github_actions/NuGet…
FluffyOMC Jan 16, 2023
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
42 changes: 42 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: nuget
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 999

- package-ecosystem: nuget
directory: "/LibForge/LibForge"
schedule:
interval: daily
open-pull-requests-limit: 999

- package-ecosystem: nuget
directory: "/LibForge/ForgeTool"
schedule:
interval: daily
open-pull-requests-limit: 999

- package-ecosystem: nuget
directory: "/LibForge/ForgeToolGUI"
schedule:
interval: daily
open-pull-requests-limit: 999

- package-ecosystem: nuget
directory: "/LibForge/LibForgeTests"
schedule:
interval: daily
open-pull-requests-limit: 999

- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every day
interval: "daily"
40 changes: 40 additions & 0 deletions .github/workflows/LibForge-EXT.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: External Branch Build

on:
push:
branches-ignore:
- master
pull_request:
branches: [ "master" ]

jobs:
build:

runs-on: windows-latest

steps:
- uses: actions/checkout@v3
with:
submodules: recursive

- name: Add msbuild to PATH
uses: microsoft/[email protected]
with:
vs-version: 17.3.3
msbuild-architecture: x64

- name: Setup NuGet
uses: NuGet/[email protected]
with:
nuget-version: latest

- name: Clear NuGet cache
run: dotnet nuget locals all --clear

- name: Restore NuGet Packages
working-directory: ./LibForge/
run: nuget restore LibForge.sln

- name: Build LibForge
working-directory: ./LibForge/
run: msbuild LibForge.sln /p:Configuration=Release /p:DeployOnBuild=true
70 changes: 70 additions & 0 deletions .github/workflows/LibForge-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: Main Compilation

on:
push:
branches: [ "master" ]

env:
version: 0.1.${{ github.run_number }}

jobs:
build:

runs-on: windows-latest

steps:
- uses: actions/checkout@v3
with:
submodules: recursive

- name: Add msbuild to PATH
uses: microsoft/[email protected]
with:
vs-version: 17.3.3
msbuild-architecture: x64

- name: Setup NuGet
uses: NuGet/[email protected]
with:
nuget-version: latest

- name: Clear NuGet cache
run: dotnet nuget locals all --clear

- name: Restore NuGet Packages
working-directory: ./LibForge/
run: nuget restore LibForge.sln

- name: Build LibForge
working-directory: ./LibForge/
run: msbuild LibForge.sln /p:Configuration=Release /p:DeployOnBuild=true

- name: Zip LibForge
uses: TheDoctor0/zip-release@main
with:
type: 'zip'
path: .\LibForge\LibForge\bin\Release\net6.0\*
filename: LibForge-${{ env.version }}.zip

- name: Zip ForgeTool
uses: TheDoctor0/zip-release@main
with:
type: 'zip'
path: .\LibForge\ForgeTool\bin\Release\net6.0\*
filename: ForgeTool-${{ env.version }}.zip

- name: Zip ForgeToolGUI
uses: TheDoctor0/zip-release@main
with:
type: 'zip'
path: .\LibForge\ForgeToolGUI\bin\Release\net6.0-windows\*
filename: ForgeToolGUI-${{ env.version }}.zip

- name: GH Release
uses: ncipollo/release-action@v1
with:
artifacts: "LibForge-${{ env.version }}.zip,ForgeTool-${{ env.version }}.zip,ForgeToolGUI-${{ env.version }}.zip"
generateReleaseNotes: true
name: Release ${{ env.version }}
tag: ${{ env.version }}
token: ${{ secrets.GITHUB_TOKEN }}
Loading