diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000..6c12d416 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,40 @@ + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Funcky.Analyzers/Funcky.Analyzers.CodeFixes/Funcky.Analyzers.CodeFixes.csproj b/Funcky.Analyzers/Funcky.Analyzers.CodeFixes/Funcky.Analyzers.CodeFixes.csproj index 8e109d2c..da7ac03b 100644 --- a/Funcky.Analyzers/Funcky.Analyzers.CodeFixes/Funcky.Analyzers.CodeFixes.csproj +++ b/Funcky.Analyzers/Funcky.Analyzers.CodeFixes/Funcky.Analyzers.CodeFixes.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 diff --git a/Funcky.Analyzers/Funcky.Analyzers.Package/Funcky.Analyzers.Package.csproj b/Funcky.Analyzers/Funcky.Analyzers.Package/Funcky.Analyzers.Package.csproj index c60ebdd6..5a68e21e 100644 --- a/Funcky.Analyzers/Funcky.Analyzers.Package/Funcky.Analyzers.Package.csproj +++ b/Funcky.Analyzers/Funcky.Analyzers.Package/Funcky.Analyzers.Package.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 preview diff --git a/Funcky.Analyzers/Funcky.Analyzers.Test/Funcky.Analyzers.Test.csproj b/Funcky.Analyzers/Funcky.Analyzers.Test/Funcky.Analyzers.Test.csproj index 3de269aa..46e6f408 100644 --- a/Funcky.Analyzers/Funcky.Analyzers.Test/Funcky.Analyzers.Test.csproj +++ b/Funcky.Analyzers/Funcky.Analyzers.Test/Funcky.Analyzers.Test.csproj @@ -1,4 +1,4 @@ - + net7.0 diff --git a/Funcky.Analyzers/Funcky.Analyzers.Vsix/Funcky.Analyzers.Vsix.csproj b/Funcky.Analyzers/Funcky.Analyzers.Vsix/Funcky.Analyzers.Vsix.csproj index 85f8f0f6..f8da78e0 100644 --- a/Funcky.Analyzers/Funcky.Analyzers.Vsix/Funcky.Analyzers.Vsix.csproj +++ b/Funcky.Analyzers/Funcky.Analyzers.Vsix/Funcky.Analyzers.Vsix.csproj @@ -1,7 +1,6 @@ - netstandard2.0 @@ -47,6 +46,4 @@ - - - \ No newline at end of file + diff --git a/Funcky.Analyzers/Funcky.Analyzers/Funcky.Analyzers.csproj b/Funcky.Analyzers/Funcky.Analyzers/Funcky.Analyzers.csproj index 1548cf21..2e7bb035 100644 --- a/Funcky.Analyzers/Funcky.Analyzers/Funcky.Analyzers.csproj +++ b/Funcky.Analyzers/Funcky.Analyzers/Funcky.Analyzers.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 diff --git a/Funcky.Analyzers/Funcky.BuiltinAnalyzers/Funcky.BuiltinAnalyzers.csproj b/Funcky.Analyzers/Funcky.BuiltinAnalyzers/Funcky.BuiltinAnalyzers.csproj index 7acdd331..b84f0879 100644 --- a/Funcky.Analyzers/Funcky.BuiltinAnalyzers/Funcky.BuiltinAnalyzers.csproj +++ b/Funcky.Analyzers/Funcky.BuiltinAnalyzers/Funcky.BuiltinAnalyzers.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 false diff --git a/Funcky.Async.Test/Extensions/AsyncEnumerableExtensions/ChunkTest.cs b/Funcky.Async.Test/Extensions/AsyncEnumerableExtensions/ChunkTest.cs index 309e4001..dedef74a 100644 --- a/Funcky.Async.Test/Extensions/AsyncEnumerableExtensions/ChunkTest.cs +++ b/Funcky.Async.Test/Extensions/AsyncEnumerableExtensions/ChunkTest.cs @@ -75,20 +75,21 @@ public async Task GivenAnEnumerableNotAMultipleOfSizeWeHaveASmallerLastSlice() const int chunkSize = 4; var chunked = numbers.Chunk(chunkSize); + var count = await numbers.CountAsync(); await AsyncAssert.Collection( chunked, a => { - Assert.Equal(a.Count, chunkSize); + Assert.Equal(chunkSize, a.Count); }, b => { - Assert.Equal(b.Count, chunkSize); + Assert.Equal(chunkSize, b.Count); }, - async c => + c => { - Assert.Equal(c.Count, await numbers.CountAsync() % chunkSize); + Assert.Equal(count % chunkSize, c.Count); }); } diff --git a/Funcky.Async.Test/Funcky.Async.Test.csproj b/Funcky.Async.Test/Funcky.Async.Test.csproj index 7790edb2..3eb49017 100644 --- a/Funcky.Async.Test/Funcky.Async.Test.csproj +++ b/Funcky.Async.Test/Funcky.Async.Test.csproj @@ -1,4 +1,4 @@ - + net7.0 preview diff --git a/Funcky.Async/Funcky.Async.csproj b/Funcky.Async/Funcky.Async.csproj index 361db122..dcd5e175 100644 --- a/Funcky.Async/Funcky.Async.csproj +++ b/Funcky.Async/Funcky.Async.csproj @@ -1,4 +1,4 @@ - + net5.0;netstandard2.1;netstandard2.0 preview diff --git a/Funcky.FsCheck/Funcky.FsCheck.fsproj b/Funcky.FsCheck/Funcky.FsCheck.fsproj index d53009b1..baa292b3 100644 --- a/Funcky.FsCheck/Funcky.FsCheck.fsproj +++ b/Funcky.FsCheck/Funcky.FsCheck.fsproj @@ -1,4 +1,4 @@ - + netstandard2.0;net6.0 false @@ -13,5 +13,9 @@ + + + + diff --git a/Funcky.SourceGenerator.Test/Funcky.SourceGenerator.Test.csproj b/Funcky.SourceGenerator.Test/Funcky.SourceGenerator.Test.csproj index 29b1d4da..e101447b 100644 --- a/Funcky.SourceGenerator.Test/Funcky.SourceGenerator.Test.csproj +++ b/Funcky.SourceGenerator.Test/Funcky.SourceGenerator.Test.csproj @@ -1,4 +1,4 @@ - + Funcky.SourceGenerator.Test diff --git a/Funcky.SourceGenerator/Funcky.SourceGenerator.csproj b/Funcky.SourceGenerator/Funcky.SourceGenerator.csproj index b0957ff2..75fb469d 100644 --- a/Funcky.SourceGenerator/Funcky.SourceGenerator.csproj +++ b/Funcky.SourceGenerator/Funcky.SourceGenerator.csproj @@ -1,4 +1,4 @@ - + Funcky.SourceGenerator Funcky.SourceGenerator diff --git a/Funcky.Test.Internal/Funcky.Test.Internal.csproj b/Funcky.Test.Internal/Funcky.Test.Internal.csproj index 21a8bf9a..29334abf 100644 --- a/Funcky.Test.Internal/Funcky.Test.Internal.csproj +++ b/Funcky.Test.Internal/Funcky.Test.Internal.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 preview diff --git a/Funcky.Test/Extensions/EnumerableExtensions/ChunkTest.cs b/Funcky.Test/Extensions/EnumerableExtensions/ChunkTest.cs index e09e753f..7f3ffd2b 100644 --- a/Funcky.Test/Extensions/EnumerableExtensions/ChunkTest.cs +++ b/Funcky.Test/Extensions/EnumerableExtensions/ChunkTest.cs @@ -86,15 +86,15 @@ public void GivenAnEnumerableNotAMultipleOfSizeWeHaveASmallerLastSlice() chunked, a => { - Assert.Equal(a.Count, chunkSize); + Assert.Equal(chunkSize, a.Count); }, b => { - Assert.Equal(b.Count, chunkSize); + Assert.Equal(chunkSize, b.Count); }, c => { - Assert.Equal(c.Count, numbers.Count() % chunkSize); + Assert.Equal(numbers.Count % chunkSize, c.Count); }); } diff --git a/Funcky.Test/Extensions/ParseExtensionsTest.cs b/Funcky.Test/Extensions/ParseExtensionsTest.cs index c65922cd..4a4b6092 100644 --- a/Funcky.Test/Extensions/ParseExtensionsTest.cs +++ b/Funcky.Test/Extensions/ParseExtensionsTest.cs @@ -88,7 +88,7 @@ public void GivenAStringParseEnumOrNoneReturnsTheCorrectValue(Option exp Assert.Equal(expected, input.ParseEnumOrNone()); } - private static TheoryData, string> BooleanStrings() + public static TheoryData, string> BooleanStrings() => new() { { Option.None, string.Empty }, @@ -105,7 +105,7 @@ private static TheoryData, string> BooleanStrings() { Option.None, "none" }, }; - private static TheoryData, string> ByteStrings() + public static TheoryData, string> ByteStrings() => new() { { Option.None, string.Empty }, @@ -119,7 +119,7 @@ private static TheoryData, string> ByteStrings() { Option.None, "1337E+02" }, }; - private static TheoryData, string> ShortStrings() + public static TheoryData, string> ShortStrings() => new() { { Option.None, string.Empty }, @@ -134,7 +134,7 @@ private static TheoryData, string> ShortStrings() { Option.None, "1337E+02" }, }; - private static TheoryData, string> IntStrings() + public static TheoryData, string> IntStrings() => new() { { Option.None, string.Empty }, @@ -149,7 +149,7 @@ private static TheoryData, string> IntStrings() { Option.None, "1337E+02" }, }; - private static TheoryData, string> LongStrings() + public static TheoryData, string> LongStrings() => new() { { Option.None, string.Empty }, @@ -164,7 +164,7 @@ private static TheoryData, string> LongStrings() { Option.None, "1337E+02" }, }; - private static TheoryData, string> FloatStrings() + public static TheoryData, string> FloatStrings() => new() { { Option.None, string.Empty }, @@ -180,7 +180,7 @@ private static TheoryData, string> FloatStrings() { Option.None, "1337F" }, }; - private static TheoryData, string> DoubleStrings() + public static TheoryData, string> DoubleStrings() => new() { { Option.None, string.Empty }, @@ -196,8 +196,8 @@ private static TheoryData, string> DoubleStrings() { Option.None, "1337D" }, }; - private static TheoryData, string> DecimalStrings() - => new() + public static TheoryData, string> DecimalStrings() + => new() { { Option.None, string.Empty }, { Option.None, "no number" }, @@ -212,7 +212,7 @@ private static TheoryData, string> DecimalStrings() { Option.None, "1337M" }, }; - private static TheoryData, string> DateTimeStrings() + public static TheoryData, string> DateTimeStrings() => new() { { Option.None, string.Empty }, @@ -224,7 +224,7 @@ private static TheoryData, string> DateTimeStrings() { Option.None, "MCMI" }, }; - private static TheoryData, string> EnumStrings() + public static TheoryData, string> EnumStrings() => new() { { Option.None, string.Empty }, diff --git a/Funcky.Test/Funcky.Test.csproj b/Funcky.Test/Funcky.Test.csproj index 4c32b169..e931dc42 100644 --- a/Funcky.Test/Funcky.Test.csproj +++ b/Funcky.Test/Funcky.Test.csproj @@ -1,4 +1,4 @@ - + net7.0;net6.0;net5.0;netcoreapp3.1 $(TargetFrameworks);net4.8 diff --git a/Funcky.TrimmingTest/Funcky.TrimmingTest.csproj b/Funcky.TrimmingTest/Funcky.TrimmingTest.csproj index 2f3afdde..49af8a7e 100644 --- a/Funcky.TrimmingTest/Funcky.TrimmingTest.csproj +++ b/Funcky.TrimmingTest/Funcky.TrimmingTest.csproj @@ -1,4 +1,4 @@ - + Exe net7.0 diff --git a/Funcky.Xunit.Test/Funcky.Xunit.Test.csproj b/Funcky.Xunit.Test/Funcky.Xunit.Test.csproj index 023d4241..28d4158b 100644 --- a/Funcky.Xunit.Test/Funcky.Xunit.Test.csproj +++ b/Funcky.Xunit.Test/Funcky.Xunit.Test.csproj @@ -1,4 +1,4 @@ - + net7.0 preview diff --git a/Funcky.Xunit/Funcky.Xunit.csproj b/Funcky.Xunit/Funcky.Xunit.csproj index a8fd65ef..26c97c96 100644 --- a/Funcky.Xunit/Funcky.Xunit.csproj +++ b/Funcky.Xunit/Funcky.Xunit.csproj @@ -1,4 +1,4 @@ - + netstandard2.0;net6.0 preview diff --git a/Funcky.sln b/Funcky.sln index 0bf4678c..2058fb59 100644 --- a/Funcky.sln +++ b/Funcky.sln @@ -22,7 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Config", "Build Confi GlobalUsings.props = GlobalUsings.props GlobalUsings.Test.props = GlobalUsings.Test.props NuGet.config = NuGet.config - Packages.props = Packages.props + Directory.Packages.props = Directory.Packages.props EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Funcky.Xunit", "Funcky.Xunit\Funcky.Xunit.csproj", "{F2E98B0D-CC17-4576-89DE-065FF475BE6E}" diff --git a/Funcky/Funcky.csproj b/Funcky/Funcky.csproj index 237a31a1..1d93bfd7 100644 --- a/Funcky/Funcky.csproj +++ b/Funcky/Funcky.csproj @@ -1,4 +1,4 @@ - + net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.0;netstandard2.1 preview diff --git a/NuGet.config b/NuGet.config index 6a305517..e350850f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,10 @@ - + + + + + diff --git a/Packages.props b/Packages.props deleted file mode 100644 index fa3ad5c1..00000000 --- a/Packages.props +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/global.json b/global.json index 72cd7fb1..f7978d56 100644 --- a/global.json +++ b/global.json @@ -2,8 +2,5 @@ "sdk": { "version": "7.0.100-rc.2.22477.23", "rollForward": "feature" - }, - "msbuild-sdks": { - "Microsoft.Build.CentralPackageVersions" : "2.0.79" } }