Skip to content

Commit

Permalink
Bump to .NET 9 preview 3 (#21782)
Browse files Browse the repository at this point in the history
  • Loading branch information
daxian-dbw committed May 9, 2024
1 parent 11a7448 commit d564d0f
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 25 deletions.
2 changes: 1 addition & 1 deletion global.json
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "9.0.100-preview.1.24101.2"
"version": "9.0.100-preview.3.24204.13"
}
}
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0-preview.3.24172.9" />
</ItemGroup>

<PropertyGroup>
Expand Down
Expand Up @@ -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-preview.1.24080.9" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-preview.3.24172.9" />
</ItemGroup>

</Project>
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<PackageReference Include="Markdig.Signed" Version="0.34.0" />
<PackageReference Include="Markdig.Signed" Version="0.37.0" />
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.1" />
</ItemGroup>

Expand All @@ -32,10 +32,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.0-3.final" />
<PackageReference Include="System.Threading.AccessControl" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0-preview.1.24081.2" />
<PackageReference Include="JsonSchema.Net" Version="6.0.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
<PackageReference Include="System.Threading.AccessControl" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="JsonSchema.Net" Version="7.0.1" />
</ItemGroup>

</Project>
Expand Up @@ -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-preview.1.24080.9" />
<PackageReference Include="System.Diagnostics.EventLog" Version="9.0.0-preview.3.24172.9" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
Expand Up @@ -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.3" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.4" />
<!-- 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-preview.1.24080.9" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.IO.Packaging" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.0-preview.3.24172.9" />
<!--
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.
Expand All @@ -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-preview.1.24081.3" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0-preview.3.24175.3" />
</ItemGroup>

</Project>
Expand Up @@ -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-preview.1.24080.9" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-preview.3.24172.9" />
</ItemGroup>

<PropertyGroup>
Expand Down
Expand Up @@ -34,16 +34,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-preview.1.24080.9" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.DirectoryServices" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.DirectoryServices" Version="9.0.0-preview.3.24172.9" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Security.Permissions" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Management" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Security.Permissions" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0-preview.3.24172.9" />
<!-- 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" />
Expand Down
1 change: 1 addition & 0 deletions test/powershell/Host/Startup.Tests.ps1
Expand Up @@ -33,6 +33,7 @@ Describe "Validate start of console host" -Tag CI {
'System.Net.Mail.dll'
'System.Net.NetworkInformation.dll'
'System.Net.Primitives.dll'
'System.Numerics.Vectors.dll'
'System.ObjectModel.dll'
'System.Private.CoreLib.dll'
'System.Private.Uri.dll'
Expand Down
2 changes: 1 addition & 1 deletion test/powershell/Language/Parser/MethodInvocation.Tests.ps1
Expand Up @@ -238,7 +238,7 @@ Describe 'Generic Method invocation' -Tags 'CI' {
}
)

$result.GetType().Name | Should -BeExactly 'SelectListIterator`2'
$result.GetType().Name | Should -BeExactly 'ListSelectIterator`2'
$typeArgs = $result.GetType().GenericTypeArguments
$typeArgs[0] | Should -Be ([int])
$typeArgs[1] | Should -Be ([float])
Expand Down
4 changes: 4 additions & 0 deletions tools/packaging/boms/windows.json
Expand Up @@ -19,6 +19,10 @@
"Pattern": "clrgc.dll",
"FileType": "NonProduct"
},
{
"Pattern": "clrgcexp.dll",
"FileType": "NonProduct"
},
{
"Pattern": "clrjit.dll",
"FileType": "NonProduct"
Expand Down

0 comments on commit d564d0f

Please sign in to comment.