diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f1c0e1f..0b03322 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,8 +33,8 @@ jobs: run: git fetch --tags shell: bash - - name: Setup dotnet 6.0.100 - uses: actions/setup-dotnet@v1 + - name: Setup .NET SDK + uses: actions/setup-dotnet@v3 - name: Build shell: bash diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index a2b99bd..61525a5 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -44,8 +44,8 @@ jobs: run: git fetch --tags shell: bash - - name: Setup dotnet - uses: actions/setup-dotnet@v1 + - name: Setup .NET SDK + uses: actions/setup-dotnet@v3 - name: Build shell: bash @@ -72,8 +72,8 @@ jobs: run: git fetch --tags shell: bash - - name: Setup dotnet 5.0.301 - uses: actions/setup-dotnet@v1 + - name: Setup .NET SDK + uses: actions/setup-dotnet@v3 - name: Publish shell: bash diff --git a/dotnet-tools.json b/dotnet-tools.json index c8bb929..eb8f1d6 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "cake.tool": { - "version": "2.2.0", + "version": "3.1.0", "commands": [ "dotnet-cake" ] diff --git a/global.json b/global.json index a16af1b..35c8187 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "projects": [ "src" ], "sdk": { - "version": "6.0.300", + "version": "7.0.306", "rollForward": "latestPatch" } } diff --git a/src/Cupboard.Core/Cupboard.Core.csproj b/src/Cupboard.Core/Cupboard.Core.csproj index 5981963..d012020 100644 --- a/src/Cupboard.Core/Cupboard.Core.csproj +++ b/src/Cupboard.Core/Cupboard.Core.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable true @@ -11,11 +11,12 @@ - - + + - - + + + diff --git a/src/Cupboard.Providers.Windows/Cupboard.Providers.Windows.csproj b/src/Cupboard.Providers.Windows/Cupboard.Providers.Windows.csproj index f78250d..8c8ec19 100644 --- a/src/Cupboard.Providers.Windows/Cupboard.Providers.Windows.csproj +++ b/src/Cupboard.Providers.Windows/Cupboard.Providers.Windows.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable true @@ -11,7 +11,7 @@ - + diff --git a/src/Cupboard.Providers/Cupboard.Providers.csproj b/src/Cupboard.Providers/Cupboard.Providers.csproj index 4ffd64c..82bf554 100644 --- a/src/Cupboard.Providers/Cupboard.Providers.csproj +++ b/src/Cupboard.Providers/Cupboard.Providers.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable true diff --git a/src/Cupboard.Testing/Cupboard.Testing.csproj b/src/Cupboard.Testing/Cupboard.Testing.csproj index 3beec38..a2f2283 100644 --- a/src/Cupboard.Testing/Cupboard.Testing.csproj +++ b/src/Cupboard.Testing/Cupboard.Testing.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable true @@ -15,8 +15,8 @@ - - + + diff --git a/src/Cupboard.Tests/Cupboard.Tests.csproj b/src/Cupboard.Tests/Cupboard.Tests.csproj index 194b31e..9060361 100644 --- a/src/Cupboard.Tests/Cupboard.Tests.csproj +++ b/src/Cupboard.Tests/Cupboard.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 false @@ -10,13 +10,13 @@ - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Cupboard.Tests/FactCollectionTests.cs b/src/Cupboard.Tests/FactCollectionTests.cs deleted file mode 100644 index 6b02695..0000000 --- a/src/Cupboard.Tests/FactCollectionTests.cs +++ /dev/null @@ -1,60 +0,0 @@ -using Shouldly; -using Xunit; - -namespace Cupboard.Tests -{ - public sealed class FactCollectionTests - { - [Theory] - [InlineData("foo")] - [InlineData("FOO")] - [InlineData("Foo")] - [InlineData("FoO")] - public void Should_Consider_Fact_Name_Case_Insensitive(string name) - { - // Then - var c = new FactCollection - { - { "foo", 1 }, - }; - - // When - int value = c[name]; - - // Then - value.ShouldBe(1); - } - - [Fact] - public void Should_Get_Value_By_Path_Segments() - { - // Then - var c = new FactCollection - { - { "foo.bar.baz", 1 }, - }; - - // When - int value = c["foo"]["bar"]["baz"]; - - // Then - value.ShouldBe(1); - } - - [Fact] - public void Should_Get_Value_By_Full_Path() - { - // Then - var c = new FactCollection - { - { "foo.bar.baz", 1 }, - }; - - // When - int value = c["foo.bar.baz"]; - - // Then - value.ShouldBe(1); - } - } -} diff --git a/src/Cupboard.Tests/FakeProcessRunnerFixture.cs b/src/Cupboard.Tests/Fixtures/FakeProcessRunnerFixture.cs similarity index 100% rename from src/Cupboard.Tests/FakeProcessRunnerFixture.cs rename to src/Cupboard.Tests/Fixtures/FakeProcessRunnerFixture.cs diff --git a/src/Cupboard.Tests/Unit/FactCollectionTests.cs b/src/Cupboard.Tests/Unit/FactCollectionTests.cs index cb2f22b..f91ca43 100644 --- a/src/Cupboard.Tests/Unit/FactCollectionTests.cs +++ b/src/Cupboard.Tests/Unit/FactCollectionTests.cs @@ -5,6 +5,58 @@ namespace Cupboard.Tests.Unit { public sealed class FactCollectionTests { + [Theory] + [InlineData("foo")] + [InlineData("FOO")] + [InlineData("Foo")] + [InlineData("FoO")] + public void Should_Consider_Fact_Name_Case_Insensitive(string name) + { + // Then + var c = new FactCollection + { + { "foo", 1 }, + }; + + // When + int value = c[name]; + + // Then + value.ShouldBe(1); + } + + [Fact] + public void Should_Get_Value_By_Path_Segments() + { + // Then + var c = new FactCollection + { + { "foo.bar.baz", 1 }, + }; + + // When + int value = c["foo"]["bar"]["baz"]; + + // Then + value.ShouldBe(1); + } + + [Fact] + public void Should_Get_Value_By_Full_Path() + { + // Then + var c = new FactCollection + { + { "foo.bar.baz", 1 }, + }; + + // When + int value = c["foo.bar.baz"]; + + // Then + value.ShouldBe(1); + } + public sealed class TheIsArmOrArm64Method { [Fact] diff --git a/src/Cupboard/Cupboard.csproj b/src/Cupboard/Cupboard.csproj index 56d6b22..b03db33 100644 --- a/src/Cupboard/Cupboard.csproj +++ b/src/Cupboard/Cupboard.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable true @@ -11,8 +11,8 @@ - - + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index cf8008f..922428b 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,7 @@ true - 10.0 + 11.0 true embedded true @@ -32,16 +32,16 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + All - + All diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 4b6ff93..68be9d0 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -1,7 +1,7 @@ - preview + preview.0 normal diff --git a/src/Sandbox/Sandbox.csproj b/src/Sandbox/Sandbox.csproj index 17f3982..da0ef30 100644 --- a/src/Sandbox/Sandbox.csproj +++ b/src/Sandbox/Sandbox.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 false enable