From 116d193ed28dcc6914653c799846bbf379cea0fb Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Wed, 25 Oct 2023 18:04:18 +0000 Subject: [PATCH] Merged PR 28148: Update .NET 7 and manifests Update .NET 7 and packages Update CGManifest Update TPN --- ThirdPartyNotices.txt | 56 ++++++++++--------- global.json | 2 +- .../Microsoft.PowerShell.SDK.csproj | 16 +++--- test/tools/TestService/TestService.csproj | 2 +- test/tools/WebListener/WebListener.csproj | 2 +- tools/cgmanifest.json | 16 +++--- 6 files changed, 50 insertions(+), 44 deletions(-) diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index c1820ad3f2..5d8620194f 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -38,6 +38,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND Microsoft.ApplicationInsights 2.21.0 - MIT +(c) Microsoft Corporation MIT License @@ -229,7 +230,7 @@ SOFTWARE. --------------------------------------------------------- -Microsoft.Extensions.ObjectPool 7.0.11 - MIT +Microsoft.Extensions.ObjectPool 7.0.13 - MIT (c) Microsoft Corporation @@ -359,41 +360,44 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI Microsoft.Win32.Registry 5.0.0 - MIT -(c) Microsoft Corporation. +(c) Microsoft Corporation Copyright (c) Andrew Arnott Copyright 2018 Daniel Lemire -Copyright 2012 the V8 project -Copyright (c) .NET Foundation. +Copyright (c) .NET Foundation Copyright (c) 2011, Google Inc. +Copyright (c) 2020 Dan Shechter +(c) 1997-2005 Sean Eron Anderson Copyright (c) 1998 Microsoft. To -(c) 1997-2005 Sean Eron Anderson. Copyright (c) 2017 Yoshifumi Kawai Copyright (c) Microsoft Corporation Copyright (c) 2007 James Newton-King Copyright (c) 2012-2014, Yann Collet +Copyright (c) 1991-2020 Unicode, Inc. Copyright (c) 2013-2017, Alfred Klomp +Copyright 2012 the V8 project authors +Copyright (c) 2011-2020 Microsoft Corp Copyright (c) 2015-2017, Wojciech Mula Copyright (c) 2005-2007, Nick Galbreath +Copyright (c) 2015 The Chromium Authors Copyright (c) 2018 Alexander Chermyanin +Copyright (c) The Internet Society 1997 Portions (c) International Organization -Copyright (c) 2015 The Chromium Authors. -Copyright (c) The Internet Society 1997. Copyright (c) 2004-2006 Intel Corporation Copyright (c) 2013-2017, Milosz Krajewski Copyright (c) 2016-2017, Matthieu Darbois +Copyright (c) The Internet Society (2003) Copyright (c) .NET Foundation Contributors -Copyright (c) The Internet Society (2003). Copyright (c) .NET Foundation and Contributors Copyright (c) 2011 Novell, Inc (http://www.novell.com) Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com) -Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors. +Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc. -Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip. -Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS -Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California. -Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. +Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers +Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip +Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California +Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To The MIT License (MIT) @@ -2912,20 +2916,22 @@ SOFTWARE. System.Numerics.Vectors 4.5.0 - MIT -(c) Microsoft Corporation. +(c) 2023 GitHub, Inc. +(c) Microsoft Corporation +Copyright (c) .NET Foundation Copyright (c) 2011, Google Inc. -(c) 1997-2005 Sean Eron Anderson. +(c) 1997-2005 Sean Eron Anderson Copyright (c) 1991-2017 Unicode, Inc. +Copyright (c) 2015 The Chromium Authors Portions (c) International Organization -Copyright (c) 2015 The Chromium Authors. Copyright (c) 2004-2006 Intel Corporation Copyright (c) .NET Foundation Contributors Copyright (c) .NET Foundation and Contributors Copyright (c) 2011 Novell, Inc (http://www.novell.com) Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com) -Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors. -Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS +Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors +Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers The MIT License (MIT) @@ -2956,7 +2962,7 @@ SOFTWARE. --------------------------------------------------------- -System.Private.ServiceModel 4.10.2 - MIT +System.Private.ServiceModel 4.10.3 - MIT (c) Microsoft Corporation @@ -3809,7 +3815,7 @@ SOFTWARE. --------------------------------------------------------- -System.ServiceModel.Duplex 4.10.2 - MIT +System.ServiceModel.Duplex 4.10.3 - MIT (c) Microsoft Corporation @@ -3845,7 +3851,7 @@ SOFTWARE. --------------------------------------------------------- -System.ServiceModel.Http 4.10.2 - MIT +System.ServiceModel.Http 4.10.3 - MIT (c) Microsoft Corporation @@ -3881,7 +3887,7 @@ SOFTWARE. --------------------------------------------------------- -System.ServiceModel.NetTcp 4.10.2 - MIT +System.ServiceModel.NetTcp 4.10.3 - MIT (c) Microsoft Corporation @@ -3917,7 +3923,7 @@ SOFTWARE. --------------------------------------------------------- -System.ServiceModel.Primitives 4.10.2 - MIT +System.ServiceModel.Primitives 4.10.3 - MIT (c) Microsoft Corporation @@ -3953,7 +3959,7 @@ SOFTWARE. --------------------------------------------------------- -System.ServiceModel.Security 4.10.2 - MIT +System.ServiceModel.Security 4.10.3 - MIT (c) Microsoft Corporation @@ -4523,7 +4529,7 @@ SOFTWARE. --------------------------------------------------------- -System.Web.Services.Description 4.10.2 - MIT +System.Web.Services.Description 4.10.3 - MIT (c) Microsoft Corporation diff --git a/global.json b/global.json index 35639016a8..d3526757ae 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.401" + "version": "7.0.403" } } diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj index 1f0fe694d2..70d70e4d45 100644 --- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj +++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj @@ -17,11 +17,11 @@ - + - + @@ -29,12 +29,12 @@ - - - - - - + + + + + + diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj index b9271b48a9..f2d9c704ec 100644 --- a/test/tools/TestService/TestService.csproj +++ b/test/tools/TestService/TestService.csproj @@ -13,7 +13,7 @@ - + diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj index 8d4e830ba9..45aef38903 100644 --- a/test/tools/WebListener/WebListener.csproj +++ b/test/tools/WebListener/WebListener.csproj @@ -7,7 +7,7 @@ - + diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json index 6d168df07d..f081f42fc3 100644 --- a/tools/cgmanifest.json +++ b/tools/cgmanifest.json @@ -106,7 +106,7 @@ "Type": "nuget", "Nuget": { "Name": "Microsoft.Extensions.ObjectPool", - "Version": "7.0.11" + "Version": "7.0.13" } }, "DevelopmentDependency": false @@ -586,7 +586,7 @@ "Type": "nuget", "Nuget": { "Name": "System.Private.ServiceModel", - "Version": "4.10.2" + "Version": "4.10.3" } }, "DevelopmentDependency": false @@ -706,7 +706,7 @@ "Type": "nuget", "Nuget": { "Name": "System.ServiceModel.Duplex", - "Version": "4.10.2" + "Version": "4.10.3" } }, "DevelopmentDependency": false @@ -716,7 +716,7 @@ "Type": "nuget", "Nuget": { "Name": "System.ServiceModel.Http", - "Version": "4.10.2" + "Version": "4.10.3" } }, "DevelopmentDependency": false @@ -726,7 +726,7 @@ "Type": "nuget", "Nuget": { "Name": "System.ServiceModel.NetTcp", - "Version": "4.10.2" + "Version": "4.10.3" } }, "DevelopmentDependency": false @@ -736,7 +736,7 @@ "Type": "nuget", "Nuget": { "Name": "System.ServiceModel.Primitives", - "Version": "4.10.2" + "Version": "4.10.3" } }, "DevelopmentDependency": false @@ -746,7 +746,7 @@ "Type": "nuget", "Nuget": { "Name": "System.ServiceModel.Security", - "Version": "4.10.2" + "Version": "4.10.3" } }, "DevelopmentDependency": false @@ -826,7 +826,7 @@ "Type": "nuget", "Nuget": { "Name": "System.Web.Services.Description", - "Version": "4.10.2" + "Version": "4.10.3" } }, "DevelopmentDependency": false