From 7f128d8a399b58f6d0768c38ce0341646e7568f0 Mon Sep 17 00:00:00 2001 From: Diesel-neon Date: Tue, 10 Jun 2025 17:08:23 +1000 Subject: [PATCH 01/14] Create build.yml --- .github/workflows/build.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..4fe50cd --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,30 @@ +name: .NET Build + +on: + push: + branches: [ "master" ] + workflow_dispatch: + +jobs: + build: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v3 + + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 6.0.x + + - name: Restore dependencies + run: dotnet restore + + - name: Build + run: dotnet build --no-restore --configuration Release + + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: OBD.NET-dll + path: OBD.NET/bin/Release/ From 37997c215ebb90e072a387b3e06e96adae0ad9a6 Mon Sep 17 00:00:00 2001 From: Diesel-neon Date: Tue, 10 Jun 2025 17:41:32 +1000 Subject: [PATCH 02/14] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4fe50cd..5f15de7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: run: dotnet build --no-restore --configuration Release - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: OBD.NET-dll path: OBD.NET/bin/Release/ From 9c7671f4829839608856e2f19890d28bbdf2df2a Mon Sep 17 00:00:00 2001 From: Diesel-neon Date: Tue, 10 Jun 2025 17:45:32 +1000 Subject: [PATCH 03/14] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f15de7..f006d5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,10 +18,10 @@ jobs: dotnet-version: 6.0.x - name: Restore dependencies - run: dotnet restore + run: dotnet restore OBD.NET - name: Build - run: dotnet build --no-restore --configuration Release + run: dotnet build OBD.NET --no-restore --configuration Release - name: Upload artifact uses: actions/upload-artifact@v4 From 2ee2289e4e87b5b93b140c3fdd5cc84d46329319 Mon Sep 17 00:00:00 2001 From: Diesel-neon Date: Tue, 10 Jun 2025 17:49:00 +1000 Subject: [PATCH 04/14] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f006d5a..763424f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,10 +18,10 @@ jobs: dotnet-version: 6.0.x - name: Restore dependencies - run: dotnet restore OBD.NET + run: dotnet restore OBD.NET/OBD.NET.sln - name: Build - run: dotnet build OBD.NET --no-restore --configuration Release + run: dotnet build OBD.NET/OBD.NET.sln --no-restore --configuration Release - name: Upload artifact uses: actions/upload-artifact@v4 From 1100219c62387d684c802c52cef30271c298f2c7 Mon Sep 17 00:00:00 2001 From: Diesel-neon Date: Tue, 10 Jun 2025 17:56:17 +1000 Subject: [PATCH 05/14] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 763424f..f71c936 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,4 +27,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: OBD.NET-dll - path: OBD.NET/bin/Release/ + path: OBD.NET/bin/Release/**/*.dll From e11fef58697b86f2fde563a56fe22f1b5a0052d0 Mon Sep 17 00:00:00 2001 From: Diesel-neon Date: Tue, 10 Jun 2025 18:00:54 +1000 Subject: [PATCH 06/14] Update build.yml --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f71c936..305e067 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,4 +27,5 @@ jobs: uses: actions/upload-artifact@v4 with: name: OBD.NET-dll - path: OBD.NET/bin/Release/**/*.dll + # ここが真の宝の場所です！ + path: OBD.NET/OBD.NET/bin/Release/**/*.dll From 32d15dd9de5eea6ec582b052ea4f14c45ad55773 Mon Sep 17 00:00:00 2001 From: Diesel-neon Date: Tue, 10 Jun 2025 18:04:04 +1000 Subject: [PATCH 07/14] Update build.yml --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 305e067..8aa1732 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,9 +23,13 @@ jobs: - name: Build run: dotnet build OBD.NET/OBD.NET.sln --no-restore --configuration Release + # === ここが新しい偵察ステップです！ === + - name: List files after build + run: dir /s + # ==================================== + - name: Upload artifact uses: actions/upload-artifact@v4 with: name: OBD.NET-dll - # ここが真の宝の場所です！ path: OBD.NET/OBD.NET/bin/Release/**/*.dll From b7cd708b27c519bee1a0119108d4b9f448810d6b Mon Sep 17 00:00:00 2001 From: Diesel-neon Date: Tue, 10 Jun 2025 18:09:52 +1000 Subject: [PATCH 08/14] Update build.yml --- .github/workflows/build.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8aa1732..85f8fcc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,8 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v3 - name: Setup .NET uses: actions/setup-dotnet@v3 @@ -18,18 +19,16 @@ jobs: dotnet-version: 6.0.x - name: Restore dependencies - run: dotnet restore OBD.NET/OBD.NET.sln + # slnファイルは一番上の階層にあるので、パスを修正します + run: dotnet restore OBD.NET.sln - - name: Build - run: dotnet build OBD.NET/OBD.NET.sln --no-restore --configuration Release - - # === ここが新しい偵察ステップです！ === - - name: List files after build - run: dir /s - # ==================================== + - name: Build project + # こちらもslnファイルのパスを修正します + run: dotnet build OBD.NET.sln --no-restore --configuration Release - name: Upload artifact uses: actions/upload-artifact@v4 with: name: OBD.NET-dll - path: OBD.NET/OBD.NET/bin/Release/**/*.dll + # 完成したDLLを探しに行く正しい住所に修正します + path: OBD.NET/bin/Release/**/*.dll From 60cb8285a72d97efef08924a1dbc7203e2f59e38 Mon Sep 17 00:00:00 2001 From: Diesel-neon Date: Tue, 10 Jun 2025 18:12:24 +1000 Subject: [PATCH 09/14] Update build.yml --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 85f8fcc..2c2779a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,16 +19,16 @@ jobs: dotnet-version: 6.0.x - name: Restore dependencies - # slnファイルは一番上の階層にあるので、パスを修正します - run: dotnet restore OBD.NET.sln + # ファイル名を指定せず、自動で探してもらうように変更。これが一番確実です。 + run: dotnet restore - name: Build project - # こちらもslnファイルのパスを修正します - run: dotnet build OBD.NET.sln --no-restore --configuration Release + # こちらもファイル名を指定せず、自動でビルドさせます。 + run: dotnet build --no-restore --configuration Release - name: Upload artifact uses: actions/upload-artifact@v4 with: name: OBD.NET-dll - # 完成したDLLを探しに行く正しい住所に修正します + # 完成したDLLを探しに行くパス（これは前回の修正でOKでした） path: OBD.NET/bin/Release/**/*.dll From 11699224579fa1e903351994c8641d11dd2a727c Mon Sep 17 00:00:00 2001 From: Diesel-neon Date: Tue, 10 Jun 2025 18:13:20 +1000 Subject: [PATCH 10/14] Update build.yml --- .github/workflows/build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c2779a..afcf912 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,16 +19,18 @@ jobs: dotnet-version: 6.0.x - name: Restore dependencies - # ファイル名を指定せず、自動で探してもらうように変更。これが一番確実です。 + # ここが重要！ OBD.NETフォルダの中で作業するように指定します run: dotnet restore + working-directory: ./OBD.NET - name: Build project - # こちらもファイル名を指定せず、自動でビルドさせます。 + # こちらもOBD.NETフォルダの中で作業します run: dotnet build --no-restore --configuration Release + working-directory: ./OBD.NET - name: Upload artifact uses: actions/upload-artifact@v4 with: name: OBD.NET-dll - # 完成したDLLを探しに行くパス（これは前回の修正でOKでした） + # 完成品を探しに行くパスはこれでOKです path: OBD.NET/bin/Release/**/*.dll From 4251e248f22ec18d6ec31033e35e59e68acf9b0c Mon Sep 17 00:00:00 2001 From: Diesel-neon Date: Tue, 10 Jun 2025 18:17:46 +1000 Subject: [PATCH 11/14] Update build.yml --- .github/workflows/build.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index afcf912..92132c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,18 +19,16 @@ jobs: dotnet-version: 6.0.x - name: Restore dependencies - # ここが重要！ OBD.NETフォルダの中で作業するように指定します + # これが一番シンプルで正しい方法でした。私が余計な指定をしていました。 run: dotnet restore - working-directory: ./OBD.NET - - name: Build project - # こちらもOBD.NETフォルダの中で作業します + - name: Build + # こちらも、これが一番シンプルで正しい方法でした。 run: dotnet build --no-restore --configuration Release - working-directory: ./OBD.NET - name: Upload artifact + # ここだけが、最初に直すべき唯一のポイントでした。 uses: actions/upload-artifact@v4 with: name: OBD.NET-dll - # 完成品を探しに行くパスはこれでOKです path: OBD.NET/bin/Release/**/*.dll From f5595bcbacd1970d7f8f59e5d49c620d64a75506 Mon Sep 17 00:00:00 2001 From: Diesel-neon Date: Tue, 10 Jun 2025 18:20:03 +1000 Subject: [PATCH 12/14] Update build.yml --- .github/workflows/build.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92132c1..9fbdd8e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,15 +19,14 @@ jobs: dotnet-version: 6.0.x - name: Restore dependencies - # これが一番シンプルで正しい方法でした。私が余計な指定をしていました。 - run: dotnet restore + # 事実1,2,3をすべて満たす唯一のコマンド + run: dotnet restore OBD.NET/OBD.NET.sln - - name: Build - # こちらも、これが一番シンプルで正しい方法でした。 - run: dotnet build --no-restore --configuration Release + - name: Build project + # こちらも同様 + run: dotnet build OBD.NET/OBD.NET.sln --no-restore --configuration Release - name: Upload artifact - # ここだけが、最初に直すべき唯一のポイントでした。 uses: actions/upload-artifact@v4 with: name: OBD.NET-dll From 183b95db66263f7bcad9e27505bb1d1842cfa6f2 Mon Sep 17 00:00:00 2001 From: Diesel-neon Date: Tue, 10 Jun 2025 18:24:15 +1000 Subject: [PATCH 13/14] Update build.yml --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9fbdd8e..b73261d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,15 +19,14 @@ jobs: dotnet-version: 6.0.x - name: Restore dependencies - # 事実1,2,3をすべて満たす唯一のコマンド run: dotnet restore OBD.NET/OBD.NET.sln - name: Build project - # こちらも同様 run: dotnet build OBD.NET/OBD.NET.sln --no-restore --configuration Release - name: Upload artifact uses: actions/upload-artifact@v4 with: name: OBD.NET-dll - path: OBD.NET/bin/Release/**/*.dll + # ここが最後の修正点です！正しいパスに直しました。 + path: OBD.NET/OBD.NET/bin/Release/**/*.dll From 4850501288be40315a7f4e3bcc00e970c35b447c Mon Sep 17 00:00:00 2001 From: Diesel-neon Date: Tue, 10 Jun 2025 18:28:17 +1000 Subject: [PATCH 14/14] Update build.yml --- .github/workflows/build.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b73261d..80ae1f4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: .NET Build +name: .NET Framework Build on: push: @@ -7,26 +7,36 @@ on: jobs: build: + # .NET FrameworkはWindows専用なので、実行環境をWindowsに指定 runs-on: windows-latest steps: + # 1. ソースコードをダウンロード - name: Checkout repository uses: actions/checkout@v3 - - name: Setup .NET - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 6.0.x + # 2. .NET Framework用の正しいビルドツールを準備 + - name: Setup NuGet + uses: NuGet/setup-nuget@v2 + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v1.1 - - name: Restore dependencies - run: dotnet restore OBD.NET/OBD.NET.sln + # 3. 正しいコマンドでビルド準備とビルドを実行 + - name: Restore NuGet packages + run: nuget restore OBD.NET/OBD.NET.sln + - name: Build with MSBuild + run: msbuild OBD.NET/OBD.NET.sln /p:Configuration=Release - - name: Build project - run: dotnet build OBD.NET/OBD.NET.sln --no-restore --configuration Release + # 4. 【最重要】ビルド後の全ファイルをリストアップして場所を特定する + - name: List all files after build + run: dir /s /b + # エラーが出ても処理を続行させる設定 + continue-on-error: true + # 5. 完成品をZIPにまとめる（これは失敗しても今はOK） - name: Upload artifact uses: actions/upload-artifact@v4 with: name: OBD.NET-dll - # ここが最後の修正点です！正しいパスに直しました。 - path: OBD.NET/OBD.NET/bin/Release/**/*.dll + # このパスは偵察結果を見てから直します + path: "**/bin/Release/**/*.dll"