[master] Update branch for release (#24534)

* Update package references

* Update cgmanifest

* Update IsolatedModule.Tests.ps1

---------

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
This commit is contained in:
PowerShell Team Bot 2024-10-31 15:15:28 -07:00 committed by GitHub
parent 4b40e5f60e
commit 7db6a70b56
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 85 additions and 111 deletions

View File

@ -8,7 +8,7 @@
<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0-rc.2.24473.5" />
</ItemGroup>
<PropertyGroup>

View File

@ -47,7 +47,7 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-rc.2.24473.5" />
</ItemGroup>
</Project>

View File

@ -8,7 +8,7 @@
<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<PackageReference Include="Markdig.Signed" Version="0.37.0" />
<PackageReference Include="Markdig.Signed" Version="0.38.0" />
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.1" />
</ItemGroup>
@ -32,10 +32,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
<PackageReference Include="System.Threading.AccessControl" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0-rc.1.24451.1" />
<PackageReference Include="JsonSchema.Net" Version="7.0.4" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
<PackageReference Include="System.Threading.AccessControl" Version="9.0.0-rc.2.24473.5" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0-rc.2.24474.1" />
<PackageReference Include="JsonSchema.Net" Version="7.2.3" />
</ItemGroup>
</Project>

View File

@ -8,7 +8,7 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Diagnostics.EventLog" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Diagnostics.EventLog" Version="9.0.0-rc.2.24473.5" />
</ItemGroup>
</Project>

View File

@ -17,13 +17,13 @@
<ItemGroup>
<!-- This section is to force the version of non-direct dependencies -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.8" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.10" />
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.IO.Packaging" Version="9.0.0-rc.2.24473.5" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="9.0.0-rc.2.24473.5" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.0-rc.2.24473.5" />
<!--
the following package(s) are from https://github.com/dotnet/wcf
they are pinned to the version 4.10.x due to a breaking change in newer versions.
@ -36,7 +36,7 @@
<PackageReference Include="System.ServiceModel.Security" Version="4.10.3" />
<PackageReference Include="System.Private.ServiceModel" Version="4.10.3" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0-rc.1.24452.1" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0-rc.2.24474.4" />
</ItemGroup>
</Project>

View File

@ -10,7 +10,7 @@
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-rc.2.24473.5" />
</ItemGroup>
<PropertyGroup>

View File

@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24165.2" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" />
</ItemGroup>
</Project>

View File

@ -19,9 +19,7 @@
<CompilerVisibleProperty Include="PowerShellVersion" />
<CompilerVisibleProperty Include="ReleaseTag" />
<ProjectReference Include="SourceGenerators\PSVersionInfoGenerator\PSVersionInfoGenerator.csproj"
OutputItemType="Analyzer"
ReferenceOutputAssembly="false" />
<ProjectReference Include="SourceGenerators\PSVersionInfoGenerator\PSVersionInfoGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>
<ItemGroup Condition=" '$(IsWindows)' == 'true' ">
@ -34,16 +32,16 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.DirectoryServices" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="9.0.0-rc.2.24473.5" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0-rc.2.24473.5" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.0-rc.2.24473.5" />
<PackageReference Include="System.DirectoryServices" Version="9.0.0-rc.2.24473.5" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Management" Version="9.0.0-rc.2.24473.5" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Security.Permissions" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.0-rc.2.24473.5" />
<PackageReference Include="System.Security.Permissions" Version="9.0.0-rc.2.24473.5" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0-rc.2.24473.5" />
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.4.0" />

View File

@ -6,8 +6,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.9" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.9" />
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.14.0" />
</ItemGroup>
<ItemGroup>

View File

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="5.0.0-preview.5.20278.1" />
</ItemGroup>

View File

@ -9,7 +9,7 @@
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.9" />
<PackageReference Include="Perfolizer" Version="0.3.5" />
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
<PackageReference Include="Perfolizer" Version="0.4.0" />
</ItemGroup>
</Project>

View File

@ -3,6 +3,9 @@
Describe "Isolated module scenario - load the whole module in custom ALC" -Tag 'CI' {
It "Loading 'IsolatedModule' should work as expected" {
Set-ItResult -Pending -Because "The test is failing as we cannot depend on Newtonsoft.Json v10.0.0 as it has security vulnerabilities."
## The 'IsolatedModule' module can be found at '<repo-root>\test\tools\Modules'.
## The module assemblies are created and deployed by '<repo-root>\test\tools\TestAlc'.
## The module defines its own custom ALC and has its module structure organized in a special way that allows the module to be loaded in that custom ALC.

View File

@ -15,6 +15,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Management.Automation" Version="7.4.0-preview.6" />
<PackageReference Include="System.Management.Automation" Version="7.5.0-preview.5" />
</ItemGroup>
</Project>

View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\Test.Common.props"/>
<Import Project="..\..\..\Test.Common.props" />
<PropertyGroup>
<!-- Disable PDB generation -->
@ -15,7 +15,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0" PrivateAssets="All" />
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" PrivateAssets="All" />
</ItemGroup>
</Project>

View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\Test.Common.props"/>
<Import Project="..\..\..\Test.Common.props" />
<PropertyGroup>
<!-- Disable PDB generation -->
@ -16,8 +16,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
</Project>

View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\Test.Common.props"/>
<Import Project="..\..\..\Test.Common.props" />
<PropertyGroup>
<!-- Disable PDB generation -->
@ -15,7 +15,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0" PrivateAssets="All" />
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" PrivateAssets="All" />
</ItemGroup>
</Project>

View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\Test.Common.props"/>
<Import Project="..\..\Test.Common.props" />
<PropertyGroup>
<Description>Very tiny windows service to do service testing</Description>
@ -15,8 +15,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0-rc.1.24452.1" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0-rc.2.24474.4" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.0-rc.2.24473.5" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
</ItemGroup>

View File

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.0-rc.1.24452.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.0-rc.2.24474.3" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0-rc.2.24473.5" />
</ItemGroup>
</Project>

View File

@ -23,11 +23,14 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageReference Include="XunitXml.TestLogger" Version="3.1.20" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="XunitXml.TestLogger" Version="4.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
</ItemGroup>
<ItemGroup>

View File

@ -1,4 +1,5 @@
{
"$schema": "https://json.schemastore.org/component-detection-manifest.json",
"Registrations": [
{
"Component": {
@ -55,7 +56,7 @@
"Type": "nuget",
"Nuget": {
"Name": "JsonSchema.Net",
"Version": "7.0.1"
"Version": "7.2.3"
}
},
"DevelopmentDependency": false
@ -65,7 +66,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Markdig.Signed",
"Version": "0.37.0"
"Version": "0.38.0"
}
},
"DevelopmentDependency": false
@ -105,7 +106,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.CodeAnalysis.Common",
"Version": "4.9.2"
"Version": "4.11.0"
}
},
"DevelopmentDependency": false
@ -115,7 +116,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.CodeAnalysis.CSharp",
"Version": "4.9.2"
"Version": "4.11.0"
}
},
"DevelopmentDependency": false
@ -125,7 +126,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Extensions.ObjectPool",
"Version": "8.0.4"
"Version": "8.0.10"
}
},
"DevelopmentDependency": false
@ -205,7 +206,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Win32.Registry",
"Version": "4.7.0"
"Version": "5.0.0"
}
},
"DevelopmentDependency": false
@ -225,7 +226,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Windows.Compatibility",
"Version": "8.0.8"
"Version": "8.0.10"
}
},
"DevelopmentDependency": false
@ -245,7 +246,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.android-arm.runtime.native.System.IO.Ports",
"Version": "9.0.0-preview.3.24172.9"
"Version": "9.0.0-rc.2.24473.5"
}
},
"DevelopmentDependency": false
@ -255,7 +256,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.android-arm64.runtime.native.System.IO.Ports",
"Version": "9.0.0-preview.3.24172.9"
"Version": "9.0.0-rc.2.24473.5"
}
},
"DevelopmentDependency": false
@ -265,7 +266,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.android-x64.runtime.native.System.IO.Ports",
"Version": "9.0.0-preview.3.24172.9"
"Version": "9.0.0-rc.2.24473.5"
}
},
"DevelopmentDependency": false
@ -275,7 +276,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.android-x86.runtime.native.System.IO.Ports",
"Version": "9.0.0-preview.3.24172.9"
"Version": "9.0.0-rc.2.24473.5"
}
},
"DevelopmentDependency": false
@ -305,7 +306,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-bionic-arm64.runtime.native.System.IO.Ports",
"Version": "9.0.0-preview.3.24172.9"
"Version": "9.0.0-rc.2.24473.5"
}
},
"DevelopmentDependency": false
@ -315,7 +316,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-bionic-x64.runtime.native.System.IO.Ports",
"Version": "9.0.0-preview.3.24172.9"
"Version": "9.0.0-rc.2.24473.5"
}
},
"DevelopmentDependency": false
@ -325,7 +326,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-musl-arm.runtime.native.System.IO.Ports",
"Version": "9.0.0-preview.3.24172.9"
"Version": "9.0.0-rc.2.24473.5"
}
},
"DevelopmentDependency": false
@ -335,7 +336,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-musl-arm64.runtime.native.System.IO.Ports",
"Version": "9.0.0-preview.3.24172.9"
"Version": "9.0.0-rc.2.24473.5"
}
},
"DevelopmentDependency": false
@ -345,7 +346,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-musl-x64.runtime.native.System.IO.Ports",
"Version": "9.0.0-preview.3.24172.9"
"Version": "9.0.0-rc.2.24473.5"
}
},
"DevelopmentDependency": false
@ -365,7 +366,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.maccatalyst-arm64.runtime.native.System.IO.Ports",
"Version": "9.0.0-preview.3.24172.9"
"Version": "9.0.0-rc.2.24473.5"
}
},
"DevelopmentDependency": false
@ -375,7 +376,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.maccatalyst-x64.runtime.native.System.IO.Ports",
"Version": "9.0.0-preview.3.24172.9"
"Version": "9.0.0-rc.2.24473.5"
}
},
"DevelopmentDependency": false
@ -515,7 +516,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Configuration.ConfigurationManager",
"Version": "8.0.0"
"Version": "8.0.1"
}
},
"DevelopmentDependency": false
@ -525,7 +526,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Data.Odbc",
"Version": "8.0.0"
"Version": "8.0.1"
}
},
"DevelopmentDependency": false
@ -535,7 +536,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Data.OleDb",
"Version": "8.0.0"
"Version": "8.0.1"
}
},
"DevelopmentDependency": false
@ -565,7 +566,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Diagnostics.EventLog",
"Version": "8.0.0"
"Version": "8.0.1"
}
},
"DevelopmentDependency": false
@ -575,17 +576,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Diagnostics.PerformanceCounter",
"Version": "8.0.0"
}
},
"DevelopmentDependency": false
},
{
"Component": {
"Type": "nuget",
"Nuget": {
"Name": "System.Diagnostics.PerformanceCounter",
"Version": "8.0.0"
"Version": "8.0.1"
}
},
"DevelopmentDependency": false
@ -595,7 +586,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.DirectoryServices.AccountManagement",
"Version": "8.0.0"
"Version": "8.0.1"
}
},
"DevelopmentDependency": false
@ -625,17 +616,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Drawing.Common",
"Version": "8.0.8"
}
},
"DevelopmentDependency": false
},
{
"Component": {
"Type": "nuget",
"Nuget": {
"Name": "System.Formats.Asn1",
"Version": "8.0.1"
"Version": "8.0.10"
}
},
"DevelopmentDependency": false
@ -645,7 +626,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.IO.Packaging",
"Version": "8.0.0"
"Version": "8.0.1"
}
},
"DevelopmentDependency": false
@ -735,17 +716,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Runtime.Caching",
"Version": "8.0.0"
}
},
"DevelopmentDependency": false
},
{
"Component": {
"Type": "nuget",
"Nuget": {
"Name": "System.Runtime.CompilerServices.Unsafe",
"Version": "6.0.0"
"Version": "8.0.1"
}
},
"DevelopmentDependency": false
@ -765,7 +736,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Security.Cryptography.Pkcs",
"Version": "8.0.0"
"Version": "8.0.1"
}
},
"DevelopmentDependency": false
@ -785,7 +756,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Security.Cryptography.Xml",
"Version": "8.0.1"
"Version": "8.0.2"
}
},
"DevelopmentDependency": false
@ -875,7 +846,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.ServiceProcess.ServiceController",
"Version": "8.0.0"
"Version": "8.0.1"
}
},
"DevelopmentDependency": false
@ -940,6 +911,5 @@
},
"DevelopmentDependency": false
}
],
"$schema": "https://json.schemastore.org/component-detection-manifest.json"
]
}