Merge pull request #4 from messerli-informatik-ag/funcky3

Update change-case to Funcky 3
messerli-informatik-ag · Sep 14, 2022 · 606d6fa · 606d6fa
2 parents 6dfc7d4 + 590822b
commit 606d6fa
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,3 +22,19 @@ jobs:
       run: dotnet build --configuration Release --no-restore /p:FodyGenerateXsd=false /p:TreatWarningsAsErrors=true
     - name: Run Tests
       run: dotnet test --configuration Release --no-build
+
+  nupkg:
+      name: Generate NuGet Packages
+      runs-on: ubuntu-latest
+      steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-dotnet@v1
+        name: Install Current .NET SDK
+      - name: Generate NuGet Packages
+        run: dotnet pack --configuration Release --output nupkg
+      - uses: actions/upload-artifact@v2
+        if: success() && github.ref == 'refs/heads/main'
+        with:
+            name: nupkg
+            path: nupkg/*
+            retention-days: 1
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
+    <PropertyGroup Label="Common Settings">
+        <LangVersion>10.0</LangVersion>
+        <Nullable>enable</Nullable>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
     <PropertyGroup Label="Shared NuGet Metadata">
         <Authors>Messerli Informatik AG</Authors>
         <PackageLicenseExpression>MIT OR Apache-2.0</PackageLicenseExpression>
@@ -9,4 +16,12 @@
     <ItemGroup>
         <PackageReference Include="Messerli.CodeStyle" PrivateAssets="all" />
     </ItemGroup>
+    <PropertyGroup Label="Deterministic Builds and Source Link">
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    </PropertyGroup>
+    <ItemGroup Label="Deterministic Builds and Source Link">
+        <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" VersionOverride="1.1.1" />
+    </ItemGroup>
 </Project>
diff --git a/Messerli.ChangeCase.Test/Messerli.ChangeCase.Test.csproj b/Messerli.ChangeCase.Test/Messerli.ChangeCase.Test.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk; Microsoft.Build.CentralPackageVersions">
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <IsPackable>false</IsPackable>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" />

diff --git a/Messerli.ChangeCase.sln b/Messerli.ChangeCase.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30907.101
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{50491EE5-F685-4F7B-ABC3-FAF5D7E46F99}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/Messerli.ChangeCase/Messerli.ChangeCase.csproj b/Messerli.ChangeCase/Messerli.ChangeCase.csproj
@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk; Microsoft.Build.CentralPackageVersions">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
-        <LangVersion>9.0</LangVersion>
-        <Nullable>enable</Nullable>
+        <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
         <Product>Messerli.ChangeCase</Product>
+        <IsPackable>true</IsPackable>
         <Description>Transform a string between different casings.</Description>
         <PackageTags>Utility Casing</PackageTags>
-        <Version>1.1.0</Version>
+        <Version>1.2.0</Version>
         <IncludeSymbols>true</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     </PropertyGroup>

diff --git a/Messerli.ChangeCase/StringCaseExtensions.Private.cs b/Messerli.ChangeCase/StringCaseExtensions.Private.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Funcky;
+using Funcky;
 using Funcky.Extensions;
 using Funcky.Monads;
 
@@ -30,7 +27,7 @@ private static ExtractElement SelectSplitStrategy(string identifier)
 
         private static Option<SplitResult> SplitOnCasing(string identifier, int startIndex)
             => startIndex >= identifier.Length
-                ? Option<SplitResult>.None()
+                ? Option<SplitResult>.None
                 : ExtractByCasing(identifier, startIndex);
 
         private static Option<SplitResult> ExtractByCasing(string identifier, int startIndex)
@@ -78,7 +75,7 @@ private static bool NextIsAbbreviation(string identifier, int startIndex)
 
         private static Option<SplitResult> SplitOnSeparators(string identifier, int startIndex)
             => startIndex > identifier.Length
-                ? Option<SplitResult>.None()
+                ? Option<SplitResult>.None
                 : ExtractBySeparator(identifier, startIndex);
 
         private static SplitResult ExtractBySeparator(string identifier, int startIndex)
@@ -105,7 +102,7 @@ private static string JoinStrings(this IEnumerable<string> strings, string separ
 
         private static IEnumerable<string> SplitBy(this string text, ExtractElement extractNext)
             => Sequence
-                .Generate(new SplitResult(0, string.Empty), previous => extractNext(text, previous.NextStartIndex))
+                .Successors(extractNext(text, 0), previous => extractNext(text, previous.NextStartIndex))
                 .Select(r => r.Result);
 
         private static int GetIndex(ValueWithIndex<char> value)

diff --git a/Messerli.ChangeCase/StringCaseExtensions.SplitResult.cs b/Messerli.ChangeCase/StringCaseExtensions.SplitResult.cs
@@ -1,6 +1,4 @@
-using Funcky.Monads;
-
-namespace Messerli.ChangeCase
+namespace Messerli.ChangeCase
 {
     public static partial class StringCaseExtensions
     {

diff --git a/Packages.props b/Packages.props
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
     <ItemGroup Label="Runtime Dependencies">
-        <PackageReference Update="Funcky" Version="[2.4.0, 3)" />
+        <PackageReference Update="Funcky" Version="[3.0.0, 4)" />
     </ItemGroup>
     <ItemGroup Label="Build Dependencies">
-        <PackageReference Update="Messerli.CodeStyle" Version="2.0.1" />
+        <PackageReference Update="Messerli.CodeStyle" Version="2.1.3" />
     </ItemGroup>
     <ItemGroup Label="Test Dependencies">
-        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-        <PackageReference Update="xunit" Version="2.4.0" />
-        <PackageReference Update="xunit.runner.visualstudio" Version="2.4.0" />
-        <PackageReference Update="Funcky.Xunit" Version="0.1.3" />
-        <PackageReference Update="coverlet.collector" Version="3.0.2" />
+        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.1" />
+        <PackageReference Update="xunit" Version="2.4.2" />
+        <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" />
+        <PackageReference Update="Funcky.Xunit" Version="2.0.0" />
+        <PackageReference Update="coverlet.collector" Version="3.1.2" />
     </ItemGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "5.0.100",
+    "version": "6.0.400",
     "rollForward": "feature"
   },
   "msbuild-sdks": {
-    "Microsoft.Build.CentralPackageVersions" : "2.0.79"
+    "Microsoft.Build.CentralPackageVersions" : "2.1.3"
   }
 }