From 561619be8537ccdf8b82c195550d424720c5325c Mon Sep 17 00:00:00 2001 From: TheCakeIsNaOH Date: Tue, 10 Jan 2023 15:57:03 -0600 Subject: [PATCH 1/2] (#2896) Update from Rx-* to System.Reactive --- .../chocolatey.tests.integration.csproj | 16 +++++++++------- src/chocolatey.tests.integration/packages.config | 6 +++--- src/chocolatey/chocolatey.csproj | 16 +++++++++------- src/chocolatey/packages.config | 6 +++--- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj b/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj index b0da85f441..61ab9f96c3 100644 --- a/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj +++ b/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj @@ -124,18 +124,20 @@ - - ..\packages\Rx-Core.2.1.30214.0\lib\Net40\System.Reactive.Core.dll + + ..\packages\System.Reactive.5.0.0\lib\net472\System.Reactive.dll - - ..\packages\Rx-Interfaces.2.1.30214.0\lib\Net40\System.Reactive.Interfaces.dll - - - ..\packages\Rx-Linq.2.1.30214.0\lib\Net40\System.Reactive.Linq.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + diff --git a/src/chocolatey.tests.integration/packages.config b/src/chocolatey.tests.integration/packages.config index 3aa7493f66..59b471d0ea 100644 --- a/src/chocolatey.tests.integration/packages.config +++ b/src/chocolatey.tests.integration/packages.config @@ -12,9 +12,9 @@ - - - + + + \ No newline at end of file diff --git a/src/chocolatey/chocolatey.csproj b/src/chocolatey/chocolatey.csproj index 5afff41ebb..8bbec6bc69 100644 --- a/src/chocolatey/chocolatey.csproj +++ b/src/chocolatey/chocolatey.csproj @@ -171,19 +171,21 @@ - - ..\packages\Rx-Core.2.1.30214.0\lib\Net40\System.Reactive.Core.dll + + ..\packages\System.Reactive.5.0.0\lib\net472\System.Reactive.dll - - ..\packages\Rx-Interfaces.2.1.30214.0\lib\Net40\System.Reactive.Interfaces.dll - - - ..\packages\Rx-Linq.2.1.30214.0\lib\Net40\System.Reactive.Linq.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + diff --git a/src/chocolatey/packages.config b/src/chocolatey/packages.config index a579fafc73..0c4d337cc8 100644 --- a/src/chocolatey/packages.config +++ b/src/chocolatey/packages.config @@ -19,8 +19,8 @@ - - - + + + \ No newline at end of file From f600b539d06e147290a779c9cd6eb170d962b454 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 16 Mar 2023 14:10:52 +0000 Subject: [PATCH 2/2] (#2896) Update credits for new packages Since we are switching to the new System.Reactive package, we need to update the creditds to reflect no longer using Reactive Extensions. Also removed the second Table of Contents, as this was causing problems with updating the document, and it isn't strictly needed. --- docs/legal/CREDITS.md | 134 ++++++++++++++++++++++++++++++------------ 1 file changed, 98 insertions(+), 36 deletions(-) diff --git a/docs/legal/CREDITS.md b/docs/legal/CREDITS.md index 2f30a7cd32..f006e69e7e 100644 --- a/docs/legal/CREDITS.md +++ b/docs/legal/CREDITS.md @@ -1,6 +1,6 @@ -- [Committers & Contributors](#committers--contributors) +- [Committers \& Contributors](#committers--contributors) - [Committers](#committers) - [Chocolatey Community Team](#chocolatey-community-team) - [Contributors](#contributors) @@ -11,11 +11,13 @@ - [Checksum @ 0.2.0](#checksum--020) - [log4net @ 2.0.12](#log4net--2012) - [Microsoft.Web.Xdt @ 2.1.1](#microsoftwebxdt--211) - - [NuGet.Client @ 3.0.0-alpha-20230123-128 (modified)](#nugetclient--300alpha20230123128-modified) + - [NuGet.Client @ 3.0.0-alpha-20230123-128 (modified)](#nugetclient--300-alpha-20230123-128-modified) - [Rhino.Licensing @ 1.4.1 (modified)](#rhinolicensing--141-modified) - - [Rx (Reactive Extensions) @ 2.1.30214.0](#rx-reactive-extensions--21302140) - [Shim Generator (shimgen) @ 1.0.0](#shim-generator-shimgen--100) - [SimpleInjector @ 2.8.3](#simpleinjector--283) + - [System.Reactive @ 5.0.0](#systemreactive--500) + - [System.Runtime.CompilerServices.Unsafe @ 4.5.3](#systemruntimecompilerservicesunsafe--453) + - [System.Threading.Tasks.Extensions @ 4.5.4](#systemthreadingtasksextensions--454) @@ -70,17 +72,6 @@ We would like to credit other super sweet tools/frameworks that aid in the devel Chocolatey CLI (choco) uses a number of 3rd-party components. Their details are below. -- [7-Zip @ 21.07](#7-zip--2107) -- [AlphaFS @ 2.1.3](#alphafs--213) -- [Checksum @ 0.2.0](#checksum--020) -- [log4net @ 2.0.12](#log4net--2012) -- [Microsoft.Web.Xdt @ 2.1.1](#microsoftwebxdt--211) -- [NuGet.Client @ 3.0.0-alpha-20230123-128 (modified)](#nugetclient--300alpha20230123128-modified) -- [Rhino.Licensing @ 1.4.1 (modified)](#rhinolicensing--141-modified) -- [Rx (Reactive Extensions) @ 2.1.30214.0](#rx-reactive-extensions--21302140) -- [Shim Generator (shimgen) @ 1.0.0](#shim-generator-shimgen--100) -- [SimpleInjector @ 2.8.3](#simpleinjector--283) - ### 7-Zip @ 21.07 Chocolatey uses [7-Zip](http://www.7-zip.org/) for uncompressing archives. @@ -741,28 +732,6 @@ Chocolatey uses [Rhino.Licensing](https://github.com/ayende/rhino-licensing) [(m THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ``` -### Rx (Reactive Extensions) @ 2.1.30214.0 - -Chocolatey uses [Rx](http://reactivex.io/) for schedules and internal messaging. -[License terms](https://github.com/Reactive-Extensions/Rx.NET/blob/5003248b99f8bf4afc2d4f7570b5789cedda9155/LICENSE): - -```txt - Copyright (c) .NET Foundation and Contributors - All Rights Reserved - - Licensed under the Apache License, Version 2.0 (the "License"); you - may not use this file except in compliance with the License. You may - obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. See the License for the specific language governing permissions - and limitations under the License. -``` - ### Shim Generator (shimgen) @ 1.0.0 Chocolatey uses [shimgen](https://github.com/chocolatey/shimgen) to generate shim executables that call the original binaries. @@ -857,3 +826,96 @@ Chocolatey uses [SimpleInjector](https://simpleinjector.org/) for IoC containers CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` + +### System.Reactive @ 5.0.0 + +Chocolatey uses [System.Reactive](https://github.com/dotnet/reactive) for schedules and internal messaging. +[License terms](https://github.com/dotnet/reactive/blob/47d0f7918408bb7d9e69a19b4da4992b1173bdb1/LICENSE): + +```txt +The MIT License (MIT) + +Copyright (c) .NET Foundation and Contributors + +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +``` + +### System.Runtime.CompilerServices.Unsafe @ 4.5.3 + +This is a dependency of System.Threading.Tasks.Extensions. +[Licensed terms](https://github.com/dotnet/runtime/blob/5bdc36e1d956fc39cd768b6cf59ac4b4bf5f56a5/LICENSE.TXT): + +```txt +The MIT License (MIT) + +Copyright (c) .NET Foundation and Contributors + +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +``` + +### System.Threading.Tasks.Extensions @ 4.5.4 + +This is a dependency of System.Reactive. +[Licensed terms](https://github.com/dotnet/runtime/blob/5bdc36e1d956fc39cd768b6cf59ac4b4bf5f56a5/LICENSE.TXT): + +```txt +The MIT License (MIT) + +Copyright (c) .NET Foundation and Contributors + +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +``` \ No newline at end of file