From 3956e1c36cf513f44047d4b69c87ec7dd3278196 Mon Sep 17 00:00:00 2001 From: Terje Sandstrom Date: Thu, 18 Jul 2024 18:35:04 +0200 Subject: [PATCH 1/2] prepare 4.6 --- build.cake | 2 +- src/Directory.Build.props | 2 +- .../NUnit.TestAdapter.Tests.Acceptance.csproj | 10 +--------- .../NUnit3AdapterExternalTests.csproj | 8 -------- src/NUnitTestAdapter/NUnit.TestAdapter.csproj | 16 ++++------------ .../NUnit.TestAdapter.Tests.csproj | 16 ++++------------ src/empty-assembly/empty-assembly.csproj | 8 -------- src/mock-assembly/mock-assembly.csproj | 8 -------- 8 files changed, 11 insertions(+), 59 deletions(-) diff --git a/build.cake b/build.cake index dd5a7501..4d6391ce 100644 --- a/build.cake +++ b/build.cake @@ -15,7 +15,7 @@ var configuration = Argument("configuration", "Release"); var version = "4.6.0"; -var modifier = "-beta.7"; +var modifier = "-beta.8"; var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : ""; var packageVersion = version + modifier + dbgSuffix; diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ab0483da..8bbc8c51 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -10,7 +10,7 @@ - + diff --git a/src/NUnit.TestAdapter.Tests.Acceptance/NUnit.TestAdapter.Tests.Acceptance.csproj b/src/NUnit.TestAdapter.Tests.Acceptance/NUnit.TestAdapter.Tests.Acceptance.csproj index 7a41f152..788486e0 100644 --- a/src/NUnit.TestAdapter.Tests.Acceptance/NUnit.TestAdapter.Tests.Acceptance.csproj +++ b/src/NUnit.TestAdapter.Tests.Acceptance/NUnit.TestAdapter.Tests.Acceptance.csproj @@ -12,19 +12,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - diff --git a/src/NUnit3AdapterExternalTests/NUnit3AdapterExternalTests.csproj b/src/NUnit3AdapterExternalTests/NUnit3AdapterExternalTests.csproj index 853892ab..4726d338 100644 --- a/src/NUnit3AdapterExternalTests/NUnit3AdapterExternalTests.csproj +++ b/src/NUnit3AdapterExternalTests/NUnit3AdapterExternalTests.csproj @@ -15,12 +15,4 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - \ No newline at end of file diff --git a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj index bd04ae78..64119783 100644 --- a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj +++ b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj @@ -10,11 +10,11 @@ true https://github.com/nunit/nunit3-vs-adapter true - 4.5.0.0 - 4.5.0.0 + 4.6.0.0 + 4.6.0.0 en NUnit3 Test Adapter for Visual Studio - Copyright © 2011-2021 Charlie Poole, 2014-2023 Terje Sandstrom + Copyright © 2011-2021 Charlie Poole, 2014-2024 Terje Sandstrom A package containing the NUnit3 TestAdapter for Visual Studio 2012 onwards. The package works with Visual Studio 2012 and newer, dotnet test and VSTest.Console. NUnit Project @@ -33,7 +33,7 @@ - + @@ -49,14 +49,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - diff --git a/src/NUnitTestAdapterTests/NUnit.TestAdapter.Tests.csproj b/src/NUnitTestAdapterTests/NUnit.TestAdapter.Tests.csproj index 07a2dab9..8b4e3f16 100644 --- a/src/NUnitTestAdapterTests/NUnit.TestAdapter.Tests.csproj +++ b/src/NUnitTestAdapterTests/NUnit.TestAdapter.Tests.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -30,12 +30,12 @@ - + - - + + @@ -51,14 +51,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - diff --git a/src/empty-assembly/empty-assembly.csproj b/src/empty-assembly/empty-assembly.csproj index 404caae7..cd29ed19 100644 --- a/src/empty-assembly/empty-assembly.csproj +++ b/src/empty-assembly/empty-assembly.csproj @@ -15,12 +15,4 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - \ No newline at end of file diff --git a/src/mock-assembly/mock-assembly.csproj b/src/mock-assembly/mock-assembly.csproj index bf98d6ee..9feaf8e5 100644 --- a/src/mock-assembly/mock-assembly.csproj +++ b/src/mock-assembly/mock-assembly.csproj @@ -15,12 +15,4 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - \ No newline at end of file From d69f805dfe7b490085adf0e314ae4e67ba99f0b6 Mon Sep 17 00:00:00 2001 From: Terje Sandstrom Date: Thu, 18 Jul 2024 18:50:01 +0200 Subject: [PATCH 2/2] Updated yaml files --- .github/workflows/NUnit3TestAdapter.CI.yml | 2 +- .github/workflows/NUnit3TestAdapter.Myget.Publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/NUnit3TestAdapter.CI.yml b/.github/workflows/NUnit3TestAdapter.CI.yml index 58e260dd..96119f9b 100644 --- a/.github/workflows/NUnit3TestAdapter.CI.yml +++ b/.github/workflows/NUnit3TestAdapter.CI.yml @@ -9,7 +9,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - uses: actions/setup-dotnet@v4 with: dotnet-version: | diff --git a/.github/workflows/NUnit3TestAdapter.Myget.Publish.yml b/.github/workflows/NUnit3TestAdapter.Myget.Publish.yml index 7093e7c8..cda17828 100644 --- a/.github/workflows/NUnit3TestAdapter.Myget.Publish.yml +++ b/.github/workflows/NUnit3TestAdapter.Myget.Publish.yml @@ -20,7 +20,7 @@ jobs: steps: - name: ⤵Checkout Source - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.7 - name: 🛠️ Setup .NET uses: actions/setup-dotnet@v4