Skip to content

Commit

Permalink
Update NuGet packages (#58)
Browse files Browse the repository at this point in the history
* Make it easier to update .NET target framework

* Update all NuGet packages

* More NuGet version dependency fixing

* More fixes for latest package versions

* More compilation fixes for analyzer warnings
  • Loading branch information
hach-que authored Nov 29, 2024
1 parent a50c85d commit ee43c03
Show file tree
Hide file tree
Showing 74 changed files with 248 additions and 163 deletions.
15 changes: 9 additions & 6 deletions .github/actions/download-artifact/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ inputs:
UET_ARTIFACT_NAME:
description: "The known name of the artifact."
required: true
UET_FRAMEWORK_TARGET:
description: "The .NET framework identifier."
required: true
runs:
using: 'composite'
steps:
Expand Down Expand Up @@ -42,21 +45,21 @@ runs:
uses: actions/download-artifact@v4
with:
name: shim-win
path: UET/uet.shim/bin/Release/net8.0/win-x64/publish/
path: UET/uet.shim/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/
merge-multiple: true
- name: Download Pass 1 Win
if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-1-win' }}
uses: actions/download-artifact@v4
with:
name: pass-1-win
path: UET/uet/bin/Release/net8.0/win-x64/publish/
path: UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/
merge-multiple: true
- name: Download Pass 2 Win
if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-2-win' }}
uses: actions/download-artifact@v4
with:
name: pass-2-win
path: UET/uet/bin/Release/net8.0/win-x64/publish/
path: UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/
merge-multiple: true

- name: Download UEFS Mac
Expand All @@ -71,21 +74,21 @@ runs:
uses: actions/download-artifact@v4
with:
name: shim-mac
path: UET/uet.shim/bin/Release/net8.0/osx-arm64/publish/
path: UET/uet.shim/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/
merge-multiple: true
- name: Download Pass 1 Mac
if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-1-mac' }}
uses: actions/download-artifact@v4
with:
name: pass-1-mac
path: UET/uet/bin/Release/net8.0/osx-arm64/publish/
path: UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/
merge-multiple: true
- name: Download Pass 2 Mac
if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-2-mac' }}
uses: actions/download-artifact@v4
with:
name: pass-2-mac
path: UET/uet/bin/Release/net8.0/osx-arm64/publish/
path: UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/
merge-multiple: true

- name: Download Libs Win
Expand Down
22 changes: 11 additions & 11 deletions .github/actions/upload-artifact/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ inputs:
description: "The known name of the artifact."
required: true
UET_FRAMEWORK_TARGET:
description: "The target framework."
description: "The .NET framework identifier."
required: true
runs:
using: 'composite'
Expand Down Expand Up @@ -49,32 +49,32 @@ runs:
name: uefs-win
if-no-files-found: error
path: |
UET/Redpoint.Uefs.Client/bin/Release/net8.0/win-x64/publish/uefs.exe
UET/Redpoint.Uefs.Daemon/bin/Release/net8.0/win-x64/publish/uefs-daemon.exe
UET/Redpoint.Uefs.Client/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/uefs.exe
UET/Redpoint.Uefs.Daemon/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/uefs-daemon.exe
- name: Upload Shim Win
if: ${{ inputs.UET_ARTIFACT_NAME == 'shim-win' }}
uses: actions/upload-artifact@v4
with:
name: shim-win
if-no-files-found: error
path: |
UET/uet.shim/bin/Release/net8.0/win-x64/publish/uet.exe
UET/uet.shim/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/uet.exe
- name: Upload Pass 1 Win
if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-1-win' }}
uses: actions/upload-artifact@v4
with:
name: pass-1-win
if-no-files-found: error
path: |
UET/uet/bin/Release/net8.0/win-x64/publish/uet.exe
UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/uet.exe
- name: Upload Pass 2 Win
if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-2-win' }}
uses: actions/upload-artifact@v4
with:
name: pass-2-win
if-no-files-found: error
path: |
UET/uet/bin/Release/net8.0/win-x64/publish/uet.exe
UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/uet.exe
- name: Upload UEFS Mac
if: ${{ inputs.UET_ARTIFACT_NAME == 'uefs-mac' }}
Expand All @@ -83,32 +83,32 @@ runs:
name: uefs-mac
if-no-files-found: error
path: |
UET/Redpoint.Uefs.Client/bin/Release/net8.0/osx-arm64/publish/uefs
UET/Redpoint.Uefs.Daemon/bin/Release/net8.0/osx-arm64/publish/uefs-daemon
UET/Redpoint.Uefs.Client/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uefs
UET/Redpoint.Uefs.Daemon/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uefs-daemon
- name: Upload Shim Mac
if: ${{ inputs.UET_ARTIFACT_NAME == 'shim-mac' }}
uses: actions/upload-artifact@v4
with:
name: shim-mac
if-no-files-found: error
path: |
UET/uet.shim/bin/Release/net8.0/osx-arm64/publish/uet
UET/uet.shim/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uet
- name: Upload Pass 1 Mac
if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-1-mac' }}
uses: actions/upload-artifact@v4
with:
name: pass-1-mac
if-no-files-found: error
path: |
UET/uet/bin/Release/net8.0/osx-arm64/publish/uet
UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uet
- name: Upload Pass 2 Mac
if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-2-mac' }}
uses: actions/upload-artifact@v4
with:
name: pass-2-mac
if-no-files-found: error
path: |
UET/uet/bin/Release/net8.0/osx-arm64/publish/uet
UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uet
- name: Upload Libs Win
if: ${{ inputs.UET_ARTIFACT_NAME == 'libs-win' }}
Expand Down
Loading

0 comments on commit ee43c03

Please sign in to comment.