Upgrade dependencies. Update solution to .NET 7.

patriksvensson · Aug 3, 2023 · 4354d4a · 4354d4a
1 parent 12653fd
commit 4354d4a
Show file tree

Hide file tree

Showing 16 changed files with 90 additions and 97 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
@@ -11,11 +11,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CliWrap" Version="3.3.3" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageReference Include="CliWrap" Version="3.6.4" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
-    <PackageReference Include="Spectre.Console" Version="0.41.0" />
-    <PackageReference Include="Spectre.IO" Version="0.8.0" />
+    <PackageReference Include="Spectre.Console" Version="0.47.0" />
+    <PackageReference Include="Spectre.Console.Cli" Version="0.47.0" />
+    <PackageReference Include="Spectre.IO" Version="0.12.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Cupboard.Providers.Windows/Cupboard.Providers.Windows.csproj b/src/Cupboard.Providers.Windows/Cupboard.Providers.Windows.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Management" Version="6.0.0" />
+    <PackageReference Include="System.Management" Version="7.0.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Cupboard.Providers/Cupboard.Providers.csproj b/src/Cupboard.Providers/Cupboard.Providers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>true</IsPackable>
   </PropertyGroup>

diff --git a/src/Cupboard.Testing/Cupboard.Testing.csproj b/src/Cupboard.Testing/Cupboard.Testing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
@@ -15,8 +15,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Spectre.Console.Testing" Version="0.41.0" />
-    <PackageReference Include="Spectre.IO.Testing" Version="0.8.0" />
+    <PackageReference Include="Spectre.Console.Testing" Version="0.47.0" />
+    <PackageReference Include="Spectre.IO.Testing" Version="0.12.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Cupboard.Tests/Cupboard.Tests.csproj b/src/Cupboard.Tests/Cupboard.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -10,13 +10,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="Shouldly" Version="4.0.3" />
-    <PackageReference Include="Spectre.Verify.Extensions" Version="0.3.0" />
-    <PackageReference Include="Verify.Xunit" Version="9.0.0-beta.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="NSubstitute" Version="5.0.0" />
+    <PackageReference Include="Shouldly" Version="4.2.1" />
+    <PackageReference Include="Spectre.Verify.Extensions" Version="18.0.0" />
+    <PackageReference Include="Verify.Xunit" Version="18.0.0" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Cupboard.Tests/FactCollectionTests.cs b/src/Cupboard.Tests/FactCollectionTests.cs
diff --git a/...upboard.Tests/FakeProcessRunnerFixture.cs → ...ests/Fixtures/FakeProcessRunnerFixture.cs b/...upboard.Tests/FakeProcessRunnerFixture.cs → ...ests/Fixtures/FakeProcessRunnerFixture.cs
diff --git 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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
@@ -11,8 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup Label="Settings">
     <Deterministic>true</Deterministic>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>embedded</DebugType>
     <MinVerSkip Condition="'$(Configuration)' == 'Debug'">true</MinVerSkip>
@@ -32,16 +32,16 @@
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="MinVer" PrivateAssets="All" Version="2.5.0" />
+    <PackageReference Include="MinVer" PrivateAssets="All" Version="4.3.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="1.1.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.333">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Roslynator.Analyzers" Version="3.1.0">
+    <PackageReference Include="Roslynator.Analyzers" Version="4.4.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -1,7 +1,7 @@
 <Project>
   <Target Name="Versioning" BeforeTargets="MinVer">
     <PropertyGroup Label="Build">
-      <MinVerDefaultPreReleasePhase>preview</MinVerDefaultPreReleasePhase>
+      <MinVerDefaultPreReleaseIdentifiers>preview.0</MinVerDefaultPreReleaseIdentifiers>
       <MinVerVerbosity>normal</MinVerVerbosity>
     </PropertyGroup>
   </Target>

diff --git a/src/Sandbox/Sandbox.csproj b/src/Sandbox/Sandbox.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
   </PropertyGroup>