From 9f4dbaa05591031f30c541bf68d5c90ee81fd855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=BE=D1=80=D0=BE=D0=B4=D0=B8=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=28Gorodilov=5FMA=29?= <34789335+gorodilov-directum@users.noreply.github.com> Date: Fri, 31 Jan 2025 15:32:28 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=90=D0=BA=D1=82=D1=83=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=BF=D0=B0=D0=B9?= =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D0=B9=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 10 +++++----- .github/workflows/tests.yml | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 972fd40..cd59a3b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,20 +13,20 @@ jobs: runs-on: windows-2019 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v2 - - id: get_version + - id: get_version uses: battila7/get-version-action@v2 - name: Build run: msbuild /v:m /p:Configuration=Release /t:Restore,Clean,Build,Pack /p:Version=${{ steps.get_version.outputs.version-without-v }} src/ConfigSettings.sln - - uses: actions/setup-dotnet@v1 + - uses: actions/setup-dotnet@v4 with: - dotnet-version: 3.1.x + dotnet-version: 6.0.x - name: Publish the package to nuget.org shell: cmd diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5a6ff30..978dd3f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,17 +15,17 @@ jobs: runs-on: windows-2019 strategy: matrix: - framework: [ 'netcoreapp2.0', 'net45' ] + framework: [ 'net8.0', 'net45' ] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v2 - - uses: actions/setup-dotnet@v1 + - uses: actions/setup-dotnet@v4 with: - dotnet-version: 2.1.x + dotnet-version: 8.0.x - name: Install dependencies shell: cmd @@ -36,7 +36,7 @@ jobs: run: dotnet test --logger trx --framework ${{ matrix.framework }} --results-directory "TestResults-${{ matrix.framework }}" src/Tests/ConfigSettingsTests.csproj - name: Upload dotnet test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: dotnet-results-${{ matrix.framework }} path: src/Tests/TestResults-${{ matrix.framework }} From 7bb7ec0b9dec0e1e42327859e8574d2b1691292d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=BE=D1=80=D0=BE=D0=B4=D0=B8=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=28Gorodilov=5FMA=29?= Date: Fri, 31 Jan 2025 16:09:21 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BD=D1=8F=D0=BB=20Targ?= =?UTF-8?q?etFrameworks=20=D1=83=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 2 +- .github/workflows/tests.yml | 2 +- src/Tests/ConfigSettingsTests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cd59a3b..abee611 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/setup-dotnet@v4 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Publish the package to nuget.org shell: cmd diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 978dd3f..bedee00 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: runs-on: windows-2019 strategy: matrix: - framework: [ 'net8.0', 'net45' ] + framework: [ 'net6.0', 'net45' ] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/src/Tests/ConfigSettingsTests.csproj b/src/Tests/ConfigSettingsTests.csproj index dad983d..1dceb36 100644 --- a/src/Tests/ConfigSettingsTests.csproj +++ b/src/Tests/ConfigSettingsTests.csproj @@ -1,6 +1,6 @@  - netcoreapp2.0;net45 + net6.0;net45 ConfigSettingsTests ConfigSettingsTests win7-x64 From f2c339e35257ec7f8ed50e765d3e2f0a89189913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=BE=D1=80=D0=BE=D0=B4=D0=B8=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=28Gorodilov=5FMA=29?= Date: Fri, 31 Jan 2025 16:24:35 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D1=85=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bedee00..3e9bfd6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -33,7 +33,7 @@ jobs: - name: Test with dotnet shell: cmd - run: dotnet test --logger trx --framework ${{ matrix.framework }} --results-directory "TestResults-${{ matrix.framework }}" src/Tests/ConfigSettingsTests.csproj + run: dotnet test --logger trx --framework ${{ matrix.framework }} --results-directory "src/Tests/TestResults-${{ matrix.framework }}" src/Tests/ConfigSettingsTests.csproj - name: Upload dotnet test results uses: actions/upload-artifact@v4