diff --git a/.github/workflows/build-ed64-example-rom.yml b/.github/workflows/build-ed64-example-rom.yml
index 1525fa4c..bb54863b 100644
--- a/.github/workflows/build-ed64-example-rom.yml
+++ b/.github/workflows/build-ed64-example-rom.yml
@@ -10,7 +10,11 @@ jobs:
- name: Install Libdragon container
run: |
- sudo npm install -g libdragon
+ # TODO: the sample needs updating. This is the last known compatible version!
+ # Remove the @1.3.15 to run at latest.
+ # And, this would also involve having a git subtree of the libdragon version.
+ # which would make it easier to show "custom" changes to source.
+ sudo npm install -g libdragon@1.3.15
libdragon download
- name: Setup Build environment
diff --git a/.github/workflows/build-usb64-linux.yml b/.github/workflows/build-usb64-linux.yml
index 74687111..4060c296 100644
--- a/.github/workflows/build-usb64-linux.yml
+++ b/.github/workflows/build-usb64-linux.yml
@@ -6,20 +6,22 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- dotnet: [ 'netcoreapp3.1', 'net5.0' ]
+ dotnet: [ 'netcoreapp3.1', 'net6.0' ]
name: Build ${{ matrix.dotnet }} usb64 Linux
steps:
- uses: actions/checkout@v2
name: Checkout Code
- name: Setup .NET Core 3.1
- uses: actions/setup-dotnet@v1
+ if: matrix.dotnet == 'netcoreapp3.1'
+ uses: actions/setup-dotnet@v2
with:
dotnet-version: 3.1.x
- - name: Setup .NET Core 5.0
- uses: actions/setup-dotnet@v1
+ - name: Setup .NET Core 6.0
+ if: matrix.dotnet == 'net6.0'
+ uses: actions/setup-dotnet@v2
with:
- dotnet-version: 5.0.x
+ dotnet-version: 6.0.x
- name: Setup NuGet
uses: NuGet/setup-nuget@v1.0.5
@@ -29,11 +31,10 @@ jobs:
- name: Build App
run: dotnet build ./usb64/usb64.sln --configuration Release --no-restore --framework ${{ matrix.dotnet }}
- #- name: Test App
- # run: dotnet test
- name: Upload Artifact
- uses: actions/upload-artifact@v1.0.0
+ uses: actions/upload-artifact@v2
with:
name: usb64-${{ matrix.dotnet }}-app-linux
- path: ${{ github.workspace }}/usb64/usb64/bin/Release/${{ matrix.dotnet }}/usb64.dll
\ No newline at end of file
+ path: |
+ ${{ github.workspace }}/usb64/usb64/bin/Release/${{ matrix.dotnet }}/usb64.dll
\ No newline at end of file
diff --git a/.github/workflows/build-usb64-windows.yml b/.github/workflows/build-usb64-windows.yml
index 79743e3f..2ab523e6 100644
--- a/.github/workflows/build-usb64-windows.yml
+++ b/.github/workflows/build-usb64-windows.yml
@@ -6,23 +6,22 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
- dotnet: [ 'net40', 'net45', 'netcoreapp3.1', 'net5.0' ]
+ dotnet: [ 'net40', 'net45', 'netcoreapp3.1', 'net6.0' ]
name: Build ${{ matrix.dotnet }} usb64 App
steps:
- uses: actions/checkout@v2
name: Checkout Code
-
+
- name: Setup .NET Core 3.1
- uses: actions/setup-dotnet@v1
+ if: matrix.dotnet == 'netcoreapp3.1'
+ uses: actions/setup-dotnet@v2
with:
dotnet-version: 3.1.x
- - name: Setup .NET Core 5.0
- uses: actions/setup-dotnet@v1
+ - name: Setup .NET 6.0
+ if: matrix.dotnet == 'net6.0'
+ uses: actions/setup-dotnet@v2
with:
- dotnet-version: 5.0.x
-
- # - name: Setup MSBuild Path
- # uses: microsoft/setup-msbuild@v1.0.2
+ dotnet-version: 6.0.x
- name: Setup NuGet
uses: NuGet/setup-nuget@v1.0.5
@@ -30,16 +29,13 @@ jobs:
- name: Restore NuGet Packages
run: nuget restore ./usb64/usb64.sln
- # - name: Build App
- # run: msbuild ./usb64/usb64.sln /p:Configuration=Release /p:framework=${{ matrix.dotnet }}
-
- name: Build App
run: dotnet build ./usb64/usb64.sln --configuration Release --no-restore --framework ${{ matrix.dotnet }}
- #- name: Test App
- # run: dotnet test
- name: Upload Artifact
- uses: actions/upload-artifact@v1.0.0
+ uses: actions/upload-artifact@v2
with:
name: usb64-${{ matrix.dotnet }}-app-windows
- path: ${{ github.workspace }}\usb64\usb64\bin\Release\${{ matrix.dotnet }}\usb64.exe
\ No newline at end of file
+ path: |
+ ${{ github.workspace }}\usb64\usb64\bin\Release\${{ matrix.dotnet }}\usb64.exe
+ ${{ github.workspace }}\usb64\usb64\bin\Release\${{ matrix.dotnet }}\usb64.dll
\ No newline at end of file
diff --git a/README.md b/README.md
index 3a3d1382..e8a221fa 100644
--- a/README.md
+++ b/README.md
@@ -15,4 +15,5 @@ Provides the reference source for USB communication between PC and ED64 developm
### [ED64-XIO](ED64-XIO)
-Provides the reference source that can be used by homebrew developers to utilise hardware functions including SD card and USB capabilities from an N64 ROM
+Provides the reference source that can be used by homebrew developers to utilise hardware functions including SD card and USB capabilities from an N64 ROM.
+Note that the current sample relies on libDragon built earlier than 2021.
diff --git a/usb64/usb64/usb64.csproj b/usb64/usb64/usb64.csproj
index 00b6951c..571dba46 100644
--- a/usb64/usb64/usb64.csproj
+++ b/usb64/usb64/usb64.csproj
@@ -2,17 +2,20 @@
Exe
- netcoreapp3.1;net5.0;net45;net40
- netcoreapp3.1;net5.0
- Krikzz / NetworkFusion
- Krikzz
- Copyright © Krikzz, NetworkFusion 2020-2021
+ netcoreapp3.1;net5.0;net6.0;net45;net40
+ netcoreapp3.1;net5.0;net6.0
+ I. Golubovskiy, Robin Jones
+ Krikzz / NetworkFusion
+ Copyright © Krikzz, NetworkFusion - 2020
https://github.com/krikzz/ED64/
- 2.0.0.3
- 2.0.0.3
+ 2.0.0.4
+ 2.0.0.4
ed64usb
-
+
+
+
+
@@ -20,10 +23,16 @@
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
NET45;NETFULL
-
NET40;NETFULL