diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c7d93af63..52f3a3a323 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/arcade - 731d793be2d0a66bafc96b1a79dc96b4d1f0301b + b4e499d1f6e6b3a981feabfed290d99261762382 - + https://github.com/dotnet/arcade - 731d793be2d0a66bafc96b1a79dc96b4d1f0301b + b4e499d1f6e6b3a981feabfed290d99261762382 - + https://github.com/dotnet/source-build-reference-packages - 2fa4c4f8c0b17b48d2f37839563d6862d1974736 + 4d5ba7206ed1d56612b36560334494652ed486b2 diff --git a/eng/Versions.props b/eng/Versions.props index a5695020fa..480a200ec8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,6 +18,6 @@ 2.4.2 - 15.7.179 + 17.8.3 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index ec3cd14191..3d3356e319 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -143,9 +143,10 @@ jobs: scriptType: ps scriptLocation: scriptPath scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: > + -BuildId $(BARBuildId) -PublishingInfraVersion 3 - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 20924366b8..454fd75c7a 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -307,9 +307,10 @@ stages: scriptType: ps scriptLocation: scriptPath scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: > + -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/core-templates/steps/get-federated-access-token.yml b/eng/common/core-templates/steps/get-federated-access-token.yml index c8c49cc0e8..3a4d4410c4 100644 --- a/eng/common/core-templates/steps/get-federated-access-token.yml +++ b/eng/common/core-templates/steps/get-federated-access-token.yml @@ -3,6 +3,14 @@ parameters: type: string - name: outputVariableName type: string +- name: is1ESPipeline + type: boolean +- name: stepName + type: string + default: 'getFederatedAccessToken' +- name: condition + type: string + default: '' # Resource to get a token for. Common values include: # - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps # - 'https://storage.azure.com/' for storage @@ -10,10 +18,16 @@ parameters: - name: resource type: string default: '499b84ac-1321-427f-aa17-267ca6975798' +- name: isStepOutputVariable + type: boolean + default: false steps: - task: AzureCLI@2 displayName: 'Getting federated access token for feeds' + name: ${{ parameters.stepName }} + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} inputs: azureSubscription: ${{ parameters.federatedServiceConnection }} scriptType: 'pscore' @@ -25,4 +39,4 @@ steps: exit 1 } Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" \ No newline at end of file + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 8c5ea77b58..80788c5231 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -32,7 +32,6 @@ steps: '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' '$(akams-client-id)' - '$(akams-client-secret)' '$(microsoft-symbol-server-pat)' '$(symweb-symbol-server-pat)' '$(dn-bot-all-orgs-build-rw-code-rw)' diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 4ff587ca46..90b58e32a8 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -42,6 +42,7 @@ try { --azdev-pat "$AzdoToken" ` --bar-uri "$MaestroApiEndPoint" ` --ci ` + --verbose ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/global.json b/global.json index d9de1b9ce9..2db4fc2f05 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "9.0.100-preview.5.24307.3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24360.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24368.9" } } diff --git a/patches/application-insights/0002-Update-System.Diagnostics.DiagnosticSource-to-elimin.patch b/patches/application-insights/0002-Update-System.Diagnostics.DiagnosticSource-to-elimin.patch new file mode 100644 index 0000000000..33cb1e5c34 --- /dev/null +++ b/patches/application-insights/0002-Update-System.Diagnostics.DiagnosticSource-to-elimin.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Fri, 26 Jul 2024 18:03:44 +0000 +Subject: [PATCH] Update System.Diagnostics.DiagnosticSource to eliminate + NetStandard1.* dependencies + +--- + Directory.Build.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Directory.Build.props b/Directory.Build.props +index da394914..4faf4d07 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -13,7 +13,7 @@ + + + +- 5.0.0 ++ 8.0.0 + 4.7.0 + + diff --git a/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch b/patches/humanizer/0001-Tfm-updates-and-eliminate-prebuilts.patch similarity index 69% rename from patches/humanizer/0001-Fix-building-in-a-source-build-context.patch rename to patches/humanizer/0001-Tfm-updates-and-eliminate-prebuilts.patch index fa1e793956..f4809cab8a 100644 --- a/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch +++ b/patches/humanizer/0001-Tfm-updates-and-eliminate-prebuilts.patch @@ -1,72 +1,73 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 30 Sep 2022 18:01:36 +0000 -Subject: [PATCH] Fix building in a source-build context +From: Michael Simons +Date: Fri, 26 Jul 2024 14:09:52 +0000 +Subject: [PATCH] Tfm updates and eliminate prebuilts -The GitVersionTask is not compatible with .NET Core. So disable it and -use an explicit PackageVersion. - -Disable SourceLink.Create.CommandLine since upstream is dead and we dont -really need it for now. --- - NuSpecs/Humanizer.Core.af.nuspec | 2 +- - NuSpecs/Humanizer.Core.ar.nuspec | 2 +- - NuSpecs/Humanizer.Core.az.nuspec | 2 +- - NuSpecs/Humanizer.Core.bg.nuspec | 2 +- - NuSpecs/Humanizer.Core.bn-BD.nuspec | 2 +- - NuSpecs/Humanizer.Core.cs.nuspec | 2 +- - NuSpecs/Humanizer.Core.da.nuspec | 2 +- - NuSpecs/Humanizer.Core.de.nuspec | 2 +- - NuSpecs/Humanizer.Core.el.nuspec | 2 +- - NuSpecs/Humanizer.Core.es.nuspec | 2 +- - NuSpecs/Humanizer.Core.fa.nuspec | 2 +- - NuSpecs/Humanizer.Core.fi-FI.nuspec | 2 +- - NuSpecs/Humanizer.Core.fil-PH.nuspec | 2 +- - NuSpecs/Humanizer.Core.fr-BE.nuspec | 2 +- - NuSpecs/Humanizer.Core.fr.nuspec | 2 +- - NuSpecs/Humanizer.Core.he.nuspec | 2 +- - NuSpecs/Humanizer.Core.hr.nuspec | 2 +- - NuSpecs/Humanizer.Core.hu.nuspec | 2 +- - NuSpecs/Humanizer.Core.hy.nuspec | 2 +- - NuSpecs/Humanizer.Core.id.nuspec | 2 +- - NuSpecs/Humanizer.Core.is.nuspec | 2 +- - NuSpecs/Humanizer.Core.it.nuspec | 2 +- - NuSpecs/Humanizer.Core.ja.nuspec | 2 +- - NuSpecs/Humanizer.Core.ku.nuspec | 2 +- - NuSpecs/Humanizer.Core.lv.nuspec | 2 +- - NuSpecs/Humanizer.Core.nb-NO.nuspec | 2 +- - NuSpecs/Humanizer.Core.nb.nuspec | 2 +- - NuSpecs/Humanizer.Core.nl.nuspec | 2 +- - NuSpecs/Humanizer.Core.nuspec | 6 +++--- - NuSpecs/Humanizer.Core.pl.nuspec | 2 +- - NuSpecs/Humanizer.Core.pt.nuspec | 2 +- - NuSpecs/Humanizer.Core.ro.nuspec | 2 +- - NuSpecs/Humanizer.Core.ru.nuspec | 2 +- - NuSpecs/Humanizer.Core.sk.nuspec | 2 +- - NuSpecs/Humanizer.Core.sl.nuspec | 2 +- - NuSpecs/Humanizer.Core.sr-Latn.nuspec | 2 +- - NuSpecs/Humanizer.Core.sr.nuspec | 2 +- - NuSpecs/Humanizer.Core.sv.nuspec | 2 +- - NuSpecs/Humanizer.Core.ta.nuspec.unused | 2 +- - NuSpecs/Humanizer.Core.tr.nuspec | 2 +- - NuSpecs/Humanizer.Core.uk.nuspec | 2 +- - NuSpecs/Humanizer.Core.uz-Cyrl-UZ.nuspec | 2 +- - NuSpecs/Humanizer.Core.uz-Latn-UZ.nuspec | 2 +- - NuSpecs/Humanizer.Core.vi.nuspec | 2 +- - NuSpecs/Humanizer.Core.zh-CN.nuspec | 2 +- - NuSpecs/Humanizer.Core.zh-Hans.nuspec | 2 +- - NuSpecs/Humanizer.Core.zh-Hant.nuspec | 2 +- - src/Directory.build.props | 5 ----- - src/Humanizer/Humanizer.csproj | 3 ++- - 49 files changed, 51 insertions(+), 55 deletions(-) + NuSpecs/Humanizer.Core.af.nuspec | 3 +-- + NuSpecs/Humanizer.Core.ar.nuspec | 3 +-- + NuSpecs/Humanizer.Core.az.nuspec | 3 +-- + NuSpecs/Humanizer.Core.bg.nuspec | 3 +-- + NuSpecs/Humanizer.Core.bn-BD.nuspec | 3 +-- + NuSpecs/Humanizer.Core.cs.nuspec | 3 +-- + NuSpecs/Humanizer.Core.da.nuspec | 3 +-- + NuSpecs/Humanizer.Core.de.nuspec | 3 +-- + NuSpecs/Humanizer.Core.el.nuspec | 3 +-- + NuSpecs/Humanizer.Core.es.nuspec | 3 +-- + NuSpecs/Humanizer.Core.fa.nuspec | 3 +-- + NuSpecs/Humanizer.Core.fi-FI.nuspec | 3 +-- + NuSpecs/Humanizer.Core.fil-PH.nuspec | 3 +-- + NuSpecs/Humanizer.Core.fr-BE.nuspec | 3 +-- + NuSpecs/Humanizer.Core.fr.nuspec | 3 +-- + NuSpecs/Humanizer.Core.he.nuspec | 3 +-- + NuSpecs/Humanizer.Core.hr.nuspec | 3 +-- + NuSpecs/Humanizer.Core.hu.nuspec | 3 +-- + NuSpecs/Humanizer.Core.hy.nuspec | 3 +-- + NuSpecs/Humanizer.Core.id.nuspec | 3 +-- + NuSpecs/Humanizer.Core.is.nuspec | 3 +-- + NuSpecs/Humanizer.Core.it.nuspec | 3 +-- + NuSpecs/Humanizer.Core.ja.nuspec | 3 +-- + NuSpecs/Humanizer.Core.ko-KR.nuspec | 1 - + NuSpecs/Humanizer.Core.ku.nuspec | 3 +-- + NuSpecs/Humanizer.Core.lv.nuspec | 3 +-- + NuSpecs/Humanizer.Core.ms-MY.nuspec | 1 - + NuSpecs/Humanizer.Core.mt.nuspec | 1 - + NuSpecs/Humanizer.Core.nb-NO.nuspec | 3 +-- + NuSpecs/Humanizer.Core.nb.nuspec | 3 +-- + NuSpecs/Humanizer.Core.nl.nuspec | 3 +-- + NuSpecs/Humanizer.Core.nuspec | 11 +++-------- + NuSpecs/Humanizer.Core.pl.nuspec | 3 +-- + NuSpecs/Humanizer.Core.pt.nuspec | 3 +-- + NuSpecs/Humanizer.Core.ro.nuspec | 3 +-- + NuSpecs/Humanizer.Core.ru.nuspec | 3 +-- + NuSpecs/Humanizer.Core.sk.nuspec | 3 +-- + NuSpecs/Humanizer.Core.sl.nuspec | 3 +-- + NuSpecs/Humanizer.Core.sr-Latn.nuspec | 3 +-- + NuSpecs/Humanizer.Core.sr.nuspec | 3 +-- + NuSpecs/Humanizer.Core.sv.nuspec | 3 +-- + NuSpecs/Humanizer.Core.ta.nuspec.unused | 3 +-- + NuSpecs/Humanizer.Core.th-TH.nuspec | 1 - + NuSpecs/Humanizer.Core.tr.nuspec | 3 +-- + NuSpecs/Humanizer.Core.uk.nuspec | 3 +-- + NuSpecs/Humanizer.Core.uz-Cyrl-UZ.nuspec | 3 +-- + NuSpecs/Humanizer.Core.uz-Latn-UZ.nuspec | 3 +-- + NuSpecs/Humanizer.Core.vi.nuspec | 3 +-- + NuSpecs/Humanizer.Core.zh-CN.nuspec | 3 +-- + NuSpecs/Humanizer.Core.zh-Hans.nuspec | 3 +-- + NuSpecs/Humanizer.Core.zh-Hant.nuspec | 3 +-- + src/Directory.build.props | 5 ----- + src/Humanizer/Humanizer.csproj | 2 +- + 53 files changed, 50 insertions(+), 110 deletions(-) diff --git a/NuSpecs/Humanizer.Core.af.nuspec b/NuSpecs/Humanizer.Core.af.nuspec -index a69e3a9..9fadb38 100644 +index a69e3a94..5f20c850 100644 --- a/NuSpecs/Humanizer.Core.af.nuspec +++ b/NuSpecs/Humanizer.Core.af.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -75,12 +76,14 @@ index a69e3a9..9fadb38 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.ar.nuspec b/NuSpecs/Humanizer.Core.ar.nuspec -index 3abb642..3719029 100644 +index 3abb6425..228e1b00 100644 --- a/NuSpecs/Humanizer.Core.ar.nuspec +++ b/NuSpecs/Humanizer.Core.ar.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -89,12 +92,14 @@ index 3abb642..3719029 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.az.nuspec b/NuSpecs/Humanizer.Core.az.nuspec -index d6c4a00..876ea46 100644 +index d6c4a004..6dabb04f 100644 --- a/NuSpecs/Humanizer.Core.az.nuspec +++ b/NuSpecs/Humanizer.Core.az.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -103,12 +108,14 @@ index d6c4a00..876ea46 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.bg.nuspec b/NuSpecs/Humanizer.Core.bg.nuspec -index 93924d0..8a7f2c5 100644 +index 93924d00..9fe91384 100644 --- a/NuSpecs/Humanizer.Core.bg.nuspec +++ b/NuSpecs/Humanizer.Core.bg.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -117,12 +124,14 @@ index 93924d0..8a7f2c5 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.bn-BD.nuspec b/NuSpecs/Humanizer.Core.bn-BD.nuspec -index 27585ce..f1f7e87 100644 +index 27585ce6..a1021509 100644 --- a/NuSpecs/Humanizer.Core.bn-BD.nuspec +++ b/NuSpecs/Humanizer.Core.bn-BD.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -131,12 +140,14 @@ index 27585ce..f1f7e87 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.cs.nuspec b/NuSpecs/Humanizer.Core.cs.nuspec -index 8a5fb02..5be0d87 100644 +index 8a5fb02f..4656e6ba 100644 --- a/NuSpecs/Humanizer.Core.cs.nuspec +++ b/NuSpecs/Humanizer.Core.cs.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -145,12 +156,14 @@ index 8a5fb02..5be0d87 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.da.nuspec b/NuSpecs/Humanizer.Core.da.nuspec -index 4eeaf71..2bccd73 100644 +index 4eeaf71d..447058cb 100644 --- a/NuSpecs/Humanizer.Core.da.nuspec +++ b/NuSpecs/Humanizer.Core.da.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -159,12 +172,14 @@ index 4eeaf71..2bccd73 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.de.nuspec b/NuSpecs/Humanizer.Core.de.nuspec -index 3e248df..3d02e39 100644 +index 3e248dff..7fbb42fc 100644 --- a/NuSpecs/Humanizer.Core.de.nuspec +++ b/NuSpecs/Humanizer.Core.de.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -173,12 +188,14 @@ index 3e248df..3d02e39 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.el.nuspec b/NuSpecs/Humanizer.Core.el.nuspec -index 7bb205d..19d71fc 100644 +index 7bb205df..87509bc5 100644 --- a/NuSpecs/Humanizer.Core.el.nuspec +++ b/NuSpecs/Humanizer.Core.el.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -187,12 +204,14 @@ index 7bb205d..19d71fc 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.es.nuspec b/NuSpecs/Humanizer.Core.es.nuspec -index cd050bd..bd83984 100644 +index cd050bdb..4928460f 100644 --- a/NuSpecs/Humanizer.Core.es.nuspec +++ b/NuSpecs/Humanizer.Core.es.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -201,12 +220,14 @@ index cd050bd..bd83984 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.fa.nuspec b/NuSpecs/Humanizer.Core.fa.nuspec -index 3a8cc94..71631da 100644 +index 3a8cc941..7196bf10 100644 --- a/NuSpecs/Humanizer.Core.fa.nuspec +++ b/NuSpecs/Humanizer.Core.fa.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -215,12 +236,14 @@ index 3a8cc94..71631da 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.fi-FI.nuspec b/NuSpecs/Humanizer.Core.fi-FI.nuspec -index 35796ee..4ad5baa 100644 +index 35796ee3..b183c3d8 100644 --- a/NuSpecs/Humanizer.Core.fi-FI.nuspec +++ b/NuSpecs/Humanizer.Core.fi-FI.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -229,12 +252,14 @@ index 35796ee..4ad5baa 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.fil-PH.nuspec b/NuSpecs/Humanizer.Core.fil-PH.nuspec -index 0cd678b..ac7aff9 100644 +index 0cd678b4..d23bd01f 100644 --- a/NuSpecs/Humanizer.Core.fil-PH.nuspec +++ b/NuSpecs/Humanizer.Core.fil-PH.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -243,12 +268,14 @@ index 0cd678b..ac7aff9 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.fr-BE.nuspec b/NuSpecs/Humanizer.Core.fr-BE.nuspec -index 6d2851e..efaa567 100644 +index 6d2851e3..4e891ba3 100644 --- a/NuSpecs/Humanizer.Core.fr-BE.nuspec +++ b/NuSpecs/Humanizer.Core.fr-BE.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -257,12 +284,14 @@ index 6d2851e..efaa567 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.fr.nuspec b/NuSpecs/Humanizer.Core.fr.nuspec -index 5d84bd3..ec72947 100644 +index 5d84bd3c..ade764d0 100644 --- a/NuSpecs/Humanizer.Core.fr.nuspec +++ b/NuSpecs/Humanizer.Core.fr.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -271,12 +300,14 @@ index 5d84bd3..ec72947 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.he.nuspec b/NuSpecs/Humanizer.Core.he.nuspec -index 4bd3936..be326e8 100644 +index 4bd3936f..b4792ad3 100644 --- a/NuSpecs/Humanizer.Core.he.nuspec +++ b/NuSpecs/Humanizer.Core.he.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -285,12 +316,14 @@ index 4bd3936..be326e8 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.hr.nuspec b/NuSpecs/Humanizer.Core.hr.nuspec -index 736a05a..7b3c6ff 100644 +index 736a05a3..6dc57145 100644 --- a/NuSpecs/Humanizer.Core.hr.nuspec +++ b/NuSpecs/Humanizer.Core.hr.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -299,12 +332,14 @@ index 736a05a..7b3c6ff 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.hu.nuspec b/NuSpecs/Humanizer.Core.hu.nuspec -index 3842c724..c4fc7ff 100644 +index 3842c724..68e6f484 100644 --- a/NuSpecs/Humanizer.Core.hu.nuspec +++ b/NuSpecs/Humanizer.Core.hu.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -313,12 +348,14 @@ index 3842c724..c4fc7ff 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.hy.nuspec b/NuSpecs/Humanizer.Core.hy.nuspec -index ac8827d..42fc8cb 100644 +index ac8827dc..9b7a7c66 100644 --- a/NuSpecs/Humanizer.Core.hy.nuspec +++ b/NuSpecs/Humanizer.Core.hy.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -326,12 +363,14 @@ index ac8827d..42fc8cb 100644 diff --git a/NuSpecs/Humanizer.Core.id.nuspec b/NuSpecs/Humanizer.Core.id.nuspec -index c38c48c..2d689d8 100644 +index c38c48cf..fbfebff0 100644 --- a/NuSpecs/Humanizer.Core.id.nuspec +++ b/NuSpecs/Humanizer.Core.id.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -340,12 +379,14 @@ index c38c48c..2d689d8 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.is.nuspec b/NuSpecs/Humanizer.Core.is.nuspec -index 0cedfee..46e50a5 100644 +index 0cedfee5..e54b1a25 100644 --- a/NuSpecs/Humanizer.Core.is.nuspec +++ b/NuSpecs/Humanizer.Core.is.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -354,12 +395,14 @@ index 0cedfee..46e50a5 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.it.nuspec b/NuSpecs/Humanizer.Core.it.nuspec -index a6a1cc4..44466b2 100644 +index a6a1cc4b..215f127f 100644 --- a/NuSpecs/Humanizer.Core.it.nuspec +++ b/NuSpecs/Humanizer.Core.it.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -368,12 +411,14 @@ index a6a1cc4..44466b2 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.ja.nuspec b/NuSpecs/Humanizer.Core.ja.nuspec -index 6da99ed..b7a6b2b 100644 +index 6da99ed6..3c77d2c7 100644 --- a/NuSpecs/Humanizer.Core.ja.nuspec +++ b/NuSpecs/Humanizer.Core.ja.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -381,13 +426,27 @@ index 6da99ed..b7a6b2b 100644 \ No newline at end of file +diff --git a/NuSpecs/Humanizer.Core.ko-KR.nuspec b/NuSpecs/Humanizer.Core.ko-KR.nuspec +index 864ca1f4..9f43bbb4 100644 +--- a/NuSpecs/Humanizer.Core.ko-KR.nuspec ++++ b/NuSpecs/Humanizer.Core.ko-KR.nuspec +@@ -17,7 +17,6 @@ + + + +- + + + diff --git a/NuSpecs/Humanizer.Core.ku.nuspec b/NuSpecs/Humanizer.Core.ku.nuspec -index 5c99b9f..3a7cbd0 100644 +index 5c99b9f4..af3e4cd8 100644 --- a/NuSpecs/Humanizer.Core.ku.nuspec +++ b/NuSpecs/Humanizer.Core.ku.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -396,12 +455,14 @@ index 5c99b9f..3a7cbd0 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.lv.nuspec b/NuSpecs/Humanizer.Core.lv.nuspec -index f2a5d1f..4a8f693 100644 +index f2a5d1fa..61deda01 100644 --- a/NuSpecs/Humanizer.Core.lv.nuspec +++ b/NuSpecs/Humanizer.Core.lv.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -409,13 +470,39 @@ index f2a5d1f..4a8f693 100644 \ No newline at end of file +diff --git a/NuSpecs/Humanizer.Core.ms-MY.nuspec b/NuSpecs/Humanizer.Core.ms-MY.nuspec +index 05675d75..ca26be7a 100644 +--- a/NuSpecs/Humanizer.Core.ms-MY.nuspec ++++ b/NuSpecs/Humanizer.Core.ms-MY.nuspec +@@ -17,7 +17,6 @@ + + + +- + + + +diff --git a/NuSpecs/Humanizer.Core.mt.nuspec b/NuSpecs/Humanizer.Core.mt.nuspec +index 33bf18e9..245d2d41 100644 +--- a/NuSpecs/Humanizer.Core.mt.nuspec ++++ b/NuSpecs/Humanizer.Core.mt.nuspec +@@ -18,7 +18,6 @@ + + + +- + + + diff --git a/NuSpecs/Humanizer.Core.nb-NO.nuspec b/NuSpecs/Humanizer.Core.nb-NO.nuspec -index 038c6f0..661d8ad 100644 +index 038c6f03..0e3a9b36 100644 --- a/NuSpecs/Humanizer.Core.nb-NO.nuspec +++ b/NuSpecs/Humanizer.Core.nb-NO.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -424,12 +511,14 @@ index 038c6f0..661d8ad 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.nb.nuspec b/NuSpecs/Humanizer.Core.nb.nuspec -index f0cb4ac..a99764e 100644 +index f0cb4ac9..122e3ddd 100644 --- a/NuSpecs/Humanizer.Core.nb.nuspec +++ b/NuSpecs/Humanizer.Core.nb.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -438,12 +527,14 @@ index f0cb4ac..a99764e 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.nl.nuspec b/NuSpecs/Humanizer.Core.nl.nuspec -index 8c495bc..5577e12 100644 +index 8c495bc8..798b42c4 100644 --- a/NuSpecs/Humanizer.Core.nl.nuspec +++ b/NuSpecs/Humanizer.Core.nl.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -452,20 +543,24 @@ index 8c495bc..5577e12 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.nuspec b/NuSpecs/Humanizer.Core.nuspec -index c6e3a0f..a825da0 100644 +index c6e3a0f1..daf62b97 100644 --- a/NuSpecs/Humanizer.Core.nuspec +++ b/NuSpecs/Humanizer.Core.nuspec -@@ -18,7 +18,7 @@ - - +@@ -14,20 +14,15 @@ + en + + +- +- +- - + -@@ -26,8 +26,8 @@ - +- +- - @@ -477,12 +572,14 @@ index c6e3a0f..a825da0 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.pl.nuspec b/NuSpecs/Humanizer.Core.pl.nuspec -index 75593a0..849b644 100644 +index 75593a0d..34c1c365 100644 --- a/NuSpecs/Humanizer.Core.pl.nuspec +++ b/NuSpecs/Humanizer.Core.pl.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -491,12 +588,14 @@ index 75593a0..849b644 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.pt.nuspec b/NuSpecs/Humanizer.Core.pt.nuspec -index 084ff71..4863d65 100644 +index 084ff713..b99d79bf 100644 --- a/NuSpecs/Humanizer.Core.pt.nuspec +++ b/NuSpecs/Humanizer.Core.pt.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -505,12 +604,14 @@ index 084ff71..4863d65 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.ro.nuspec b/NuSpecs/Humanizer.Core.ro.nuspec -index 4eb8746..e3c80dd 100644 +index 4eb8746c..11e9b471 100644 --- a/NuSpecs/Humanizer.Core.ro.nuspec +++ b/NuSpecs/Humanizer.Core.ro.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -519,12 +620,14 @@ index 4eb8746..e3c80dd 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.ru.nuspec b/NuSpecs/Humanizer.Core.ru.nuspec -index 9c953e7..d69e384 100644 +index 9c953e77..0c337ec8 100644 --- a/NuSpecs/Humanizer.Core.ru.nuspec +++ b/NuSpecs/Humanizer.Core.ru.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -533,12 +636,14 @@ index 9c953e7..d69e384 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.sk.nuspec b/NuSpecs/Humanizer.Core.sk.nuspec -index 10ea8c0..3e6acef 100644 +index 10ea8c0c..06f77fce 100644 --- a/NuSpecs/Humanizer.Core.sk.nuspec +++ b/NuSpecs/Humanizer.Core.sk.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -547,12 +652,14 @@ index 10ea8c0..3e6acef 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.sl.nuspec b/NuSpecs/Humanizer.Core.sl.nuspec -index 3ba1e17..f593386 100644 +index 3ba1e174..91e77402 100644 --- a/NuSpecs/Humanizer.Core.sl.nuspec +++ b/NuSpecs/Humanizer.Core.sl.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -561,12 +668,14 @@ index 3ba1e17..f593386 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.sr-Latn.nuspec b/NuSpecs/Humanizer.Core.sr-Latn.nuspec -index 8312104..8091496 100644 +index 8312104d..884aa493 100644 --- a/NuSpecs/Humanizer.Core.sr-Latn.nuspec +++ b/NuSpecs/Humanizer.Core.sr-Latn.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -575,12 +684,14 @@ index 8312104..8091496 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.sr.nuspec b/NuSpecs/Humanizer.Core.sr.nuspec -index 464a316..b06c38d 100644 +index 464a316c..6dfc894d 100644 --- a/NuSpecs/Humanizer.Core.sr.nuspec +++ b/NuSpecs/Humanizer.Core.sr.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -589,12 +700,14 @@ index 464a316..b06c38d 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.sv.nuspec b/NuSpecs/Humanizer.Core.sv.nuspec -index 13215b7..b226ff8 100644 +index 13215b74..1c63f8ac 100644 --- a/NuSpecs/Humanizer.Core.sv.nuspec +++ b/NuSpecs/Humanizer.Core.sv.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -603,25 +716,41 @@ index 13215b7..b226ff8 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.ta.nuspec.unused b/NuSpecs/Humanizer.Core.ta.nuspec.unused -index 74c9d43..dd3223c 100644 +index 74c9d434..f0065339 100644 --- a/NuSpecs/Humanizer.Core.ta.nuspec.unused +++ b/NuSpecs/Humanizer.Core.ta.nuspec.unused -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + +diff --git a/NuSpecs/Humanizer.Core.th-TH.nuspec b/NuSpecs/Humanizer.Core.th-TH.nuspec +index 42b1f963..f4c70d3b 100644 +--- a/NuSpecs/Humanizer.Core.th-TH.nuspec ++++ b/NuSpecs/Humanizer.Core.th-TH.nuspec +@@ -17,7 +17,6 @@ + + + +- + + + diff --git a/NuSpecs/Humanizer.Core.tr.nuspec b/NuSpecs/Humanizer.Core.tr.nuspec -index c06ecea..5f375e0 100644 +index c06ecea0..20b1dc40 100644 --- a/NuSpecs/Humanizer.Core.tr.nuspec +++ b/NuSpecs/Humanizer.Core.tr.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -630,12 +759,14 @@ index c06ecea..5f375e0 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.uk.nuspec b/NuSpecs/Humanizer.Core.uk.nuspec -index 489d09e..0f0c301 100644 +index 489d09eb..3602cba8 100644 --- a/NuSpecs/Humanizer.Core.uk.nuspec +++ b/NuSpecs/Humanizer.Core.uk.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -644,12 +775,14 @@ index 489d09e..0f0c301 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.uz-Cyrl-UZ.nuspec b/NuSpecs/Humanizer.Core.uz-Cyrl-UZ.nuspec -index 324e201..df3d248 100644 +index 324e201a..3d09d801 100644 --- a/NuSpecs/Humanizer.Core.uz-Cyrl-UZ.nuspec +++ b/NuSpecs/Humanizer.Core.uz-Cyrl-UZ.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -658,12 +791,14 @@ index 324e201..df3d248 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.uz-Latn-UZ.nuspec b/NuSpecs/Humanizer.Core.uz-Latn-UZ.nuspec -index 98668f0..407f726 100644 +index 98668f0f..691d0c6d 100644 --- a/NuSpecs/Humanizer.Core.uz-Latn-UZ.nuspec +++ b/NuSpecs/Humanizer.Core.uz-Latn-UZ.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -672,12 +807,14 @@ index 98668f0..407f726 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.vi.nuspec b/NuSpecs/Humanizer.Core.vi.nuspec -index 1f7288b..a981868 100644 +index 1f7288b5..9d6218c5 100644 --- a/NuSpecs/Humanizer.Core.vi.nuspec +++ b/NuSpecs/Humanizer.Core.vi.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -686,12 +823,14 @@ index 1f7288b..a981868 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.zh-CN.nuspec b/NuSpecs/Humanizer.Core.zh-CN.nuspec -index d693eb7..cefd67b 100644 +index d693eb77..a29fe464 100644 --- a/NuSpecs/Humanizer.Core.zh-CN.nuspec +++ b/NuSpecs/Humanizer.Core.zh-CN.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -700,12 +839,14 @@ index d693eb7..cefd67b 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.zh-Hans.nuspec b/NuSpecs/Humanizer.Core.zh-Hans.nuspec -index daf32b8..512231f 100644 +index daf32b8a..3d0dc105 100644 --- a/NuSpecs/Humanizer.Core.zh-Hans.nuspec +++ b/NuSpecs/Humanizer.Core.zh-Hans.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -714,12 +855,14 @@ index daf32b8..512231f 100644 \ No newline at end of file diff --git a/NuSpecs/Humanizer.Core.zh-Hant.nuspec b/NuSpecs/Humanizer.Core.zh-Hant.nuspec -index 0a219d4..b801e73 100644 +index 0a219d40..457072e0 100644 --- a/NuSpecs/Humanizer.Core.zh-Hant.nuspec +++ b/NuSpecs/Humanizer.Core.zh-Hant.nuspec -@@ -20,7 +20,7 @@ +@@ -18,9 +18,8 @@ + + - +- - + @@ -728,7 +871,7 @@ index 0a219d4..b801e73 100644 \ No newline at end of file diff --git a/src/Directory.build.props b/src/Directory.build.props -index 9312b00..e3ee1a4 100644 +index 9312b001..e3ee1a4e 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -5,11 +5,6 @@ @@ -744,15 +887,14 @@ index 9312b00..e3ee1a4 100644 true diff --git a/src/Humanizer/Humanizer.csproj b/src/Humanizer/Humanizer.csproj -index 5b2f8ad..145ac3a 100644 +index 5b2f8ad9..d8e36f6c 100644 --- a/src/Humanizer/Humanizer.csproj +++ b/src/Humanizer/Humanizer.csproj -@@ -1,6 +1,7 @@ +@@ -1,6 +1,6 @@  - netstandard1.0;netstandard2.0;net6.0 -+ 2.14.1 -+ netstandard1.0;netstandard2.0;net9.0 ++ netstandard2.0;net9.0 Mehdi Khalili, Claire Novotny https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE https://github.com/Humanizr/Humanizer diff --git a/repo-projects/newtonsoft-json.proj b/repo-projects/newtonsoft-json.proj index ed40157648..4d4fab40cd 100644 --- a/repo-projects/newtonsoft-json.proj +++ b/repo-projects/newtonsoft-json.proj @@ -4,7 +4,7 @@ - +