From f9faf6339a89d2236b5dee95ddb9eee3b535285c Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Mon, 2 Nov 2020 15:28:54 -0500 Subject: [PATCH] Add Humanizer.Core This is https://github.com/Humanizr/Humanizer (different from https://github.com/Humanizer/Humanizer !) Humanizer shows up as a dependency of ASP.NET Core and roslyn-analyzers. This tries to fix that. Supposedly it also ships with the SDK. Fixes: #1767 --- eng/Version.Details.xml | 5 ++ ...x-building-in-a-source-build-context.patch | 60 +++++++++++++++++++ repos/humanizer.proj | 48 +++++++++++++++ repos/roslyn.proj | 1 + 4 files changed, 114 insertions(+) create mode 100644 patches/humanizer/0001-Fix-building-in-a-source-build-context.patch create mode 100644 repos/humanizer.proj diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8298c12fc6..ef82a069da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -130,5 +130,10 @@ https://github.com/dotnet/cssparser d6d86bcd8c162b1ae22ef00955ff748d028dd0ee + + https://github.com/Humanizr/Humanizer + b30550eed103a6970d8465fe7c5c16300b70be81 + humanizer + diff --git a/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch b/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch new file mode 100644 index 0000000000..8d31028db8 --- /dev/null +++ b/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch @@ -0,0 +1,60 @@ +From a7a9cea5471babcf1055f1552f0946dda8927c40 Mon Sep 17 00:00:00 2001 +From: Omair Majid +Date: Tue, 17 Nov 2020 13:14:19 -0500 +Subject: [PATCH] Fix building in a source-build context + +The GitVersionTask is not compatible with .NET Core. So disable it and +use an explicit PackageVersion. + +The NuGet feed points to something that returns an error for me. So just +disable it for now. + +Disable SourceLink.Create.CommandLine since upstream is dead and we dont +really need it for now. +--- + src/Humanizer/Humanizer.csproj | 5 ++--- + src/NuGet.config | 5 ++++- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/Humanizer/Humanizer.csproj b/src/Humanizer/Humanizer.csproj +index 842a373..e018285 100644 +--- a/src/Humanizer/Humanizer.csproj ++++ b/src/Humanizer/Humanizer.csproj +@@ -3,6 +3,7 @@ + netstandard1.0 + Mehdi Khalili, Oren Novotny + https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE ++ 2.2.0 + https://github.com/Humanizr/Humanizer + 2.12 + A micro-framework that turns your normal strings, type names, enum fields, date fields ETC into a human friendly format +@@ -16,7 +17,5 @@ + + + +- +- + +- +\ No newline at end of file ++ +diff --git a/src/NuGet.config b/src/NuGet.config +index be02089..2fb8ff3 100644 +--- a/src/NuGet.config ++++ b/src/NuGet.config +@@ -1,7 +1,10 @@ + + + ++ + + +- +\ No newline at end of file ++ +-- +2.26.2 + diff --git a/repos/humanizer.proj b/repos/humanizer.proj new file mode 100644 index 0000000000..78fde34bbc --- /dev/null +++ b/repos/humanizer.proj @@ -0,0 +1,48 @@ + + + + Humanizer + + + + + + $(ProjectDirectory)/src/Humanizer/bin/$(Configuration) + false + true + $(ProjectDirectory)/src/NuGet.config + + + + + + + + + + + $(ProjectDirectory)src/Humanizer/Humanizer.csproj + $(BuildCommandArgs) /p:Configuration=$(Configuration) + $(BuildCommandArgs) /v:$(LogVerbosity) + $(BuildCommandArgs) $(RedirectRepoOutputToLog) + + + + + + + + + + diff --git a/repos/roslyn.proj b/repos/roslyn.proj index 3940619a4f..bd928eb0ae 100644 --- a/repos/roslyn.proj +++ b/repos/roslyn.proj @@ -37,6 +37,7 @@ +