From 7f489315608cf95635e6adb790149e00b1d4ed8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E5=B7=9D=E3=80=80=E9=A6=99=E7=B9=94?= Date: Wed, 24 Jan 2024 11:07:53 +0900 Subject: [PATCH 1/2] =?UTF-8?q?.NET=20SDK=20=E3=82=A4=E3=83=B3=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=83=BC=E3=83=AB=E3=82=BF=E3=82=B9=E3=82=AF=E3=81=A7?= =?UTF-8?q?=20global.json=20=E3=82=92=E5=8F=82=E7=85=A7=E3=81=99=E3=82=8B?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=92=E3=81=84=E3=81=A3=E3=81=9F=E3=82=93?= =?UTF-8?q?=E5=89=8A=E9=99=A4=E3=81=97=20.NET=208.x=20=E3=81=AE=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=89=88=E3=82=92=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/samples-console-app-with-di.ci.yml | 2 +- .github/workflows/samples-dressca-backend.ci.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/samples-console-app-with-di.ci.yml b/.github/workflows/samples-console-app-with-di.ci.yml index ccbbf2e53..a59f91f05 100644 --- a/.github/workflows/samples-console-app-with-di.ci.yml +++ b/.github/workflows/samples-console-app-with-di.ci.yml @@ -41,7 +41,7 @@ jobs: - name: .NET SDK のセットアップ uses: actions/setup-dotnet@v3 with: - global-json-file: samples/ConsoleAppWithDI/solution/global.json + dotnet-version: "8.*" - id: application-build name: アプリケーションのビルド diff --git a/.github/workflows/samples-dressca-backend.ci.yml b/.github/workflows/samples-dressca-backend.ci.yml index 8a5e06826..99519b6f2 100644 --- a/.github/workflows/samples-dressca-backend.ci.yml +++ b/.github/workflows/samples-dressca-backend.ci.yml @@ -42,7 +42,7 @@ jobs: - name: .NET SDK のセットアップ uses: actions/setup-dotnet@v3 with: - global-json-file: samples/Dressca/dressca-backend/global.json + dotnet-version: '8.*' - name: NuGet パッケージの復元 run: dotnet restore @@ -74,8 +74,8 @@ jobs: env: APPSETTINGS_FILEPATH: tests/Dressca.IntegrationTest/appsettings.${{ env.TEST_ENVIRONMENT }}.json run: | - connectionString=$(cat ${{env.APPSETTINGS_FILEPATH}} | jq '.ConnectionStrings.DresscaDbContext') - echo "CONNECTION_STRING=${connectionString}" >> "$GITHUB_OUTPUT" + connectionString=$(cat ${{env.APPSETTINGS_FILEPATH}} | jq '.ConnectionStrings.DresscaDbContext') + echo "CONNECTION_STRING=${connectionString}" >> "$GITHUB_OUTPUT" - name: EF Core ツールのインストール(結合テスト用) shell: bash From c1c3647de762e9259df9c8167bc9d5726899c56b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E5=B7=9D=E3=80=80=E9=A6=99=E7=B9=94?= Date: Fri, 26 Jan 2024 09:01:19 +0900 Subject: [PATCH 2/2] =?UTF-8?q?actions/setup-dotnet=20=E3=81=AE=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=20v4=20=E3=81=B8?= =?UTF-8?q?=E5=BC=95=E3=81=8D=E4=B8=8A=E3=81=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/samples-console-app-with-di.ci.yml | 2 +- .github/workflows/samples-dressca-backend.ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/samples-console-app-with-di.ci.yml b/.github/workflows/samples-console-app-with-di.ci.yml index a59f91f05..215948cc4 100644 --- a/.github/workflows/samples-console-app-with-di.ci.yml +++ b/.github/workflows/samples-console-app-with-di.ci.yml @@ -39,7 +39,7 @@ jobs: fetch-depth: 1 - name: .NET SDK のセットアップ - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: "8.*" diff --git a/.github/workflows/samples-dressca-backend.ci.yml b/.github/workflows/samples-dressca-backend.ci.yml index 99519b6f2..314027743 100644 --- a/.github/workflows/samples-dressca-backend.ci.yml +++ b/.github/workflows/samples-dressca-backend.ci.yml @@ -40,7 +40,7 @@ jobs: fetch-depth: 1 - name: .NET SDK のセットアップ - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '8.*'