Update .NET to version 6.0.100-preview.2.21155.3
(#15007)
This commit is contained in:
parent
05f7624c8c
commit
5c4a80e2e2
|
@ -3063,8 +3063,11 @@
|
|||
<Component Id="cmp2BB002B115C247FFB3353C80CAAC10B3">
|
||||
<File Id="filF1771BA6F8A140FFB77E7558D035A0F2" KeyPath="yes" Source="$(var.ProductSourcePath)\System.IO.Compression.Native.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpD9AA61B3F5F44A7B99E535A712E8310D">
|
||||
<File Id="fil16547FB6A5EC4C6791FFFF5D561F2D31" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.10212.dll" />
|
||||
<Component Id="cmp3547A55EA9D04784B4CF2FC717447E16">
|
||||
<File Id="fil463DDA419769417A8D5A34C433E194F2" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Speech.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp5FDF8631A090425A90B27344B4C2A62A">
|
||||
<File Id="fil97828F3C973A46BDB0EF08D17F630D73" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.15406.dll" />
|
||||
</Component>
|
||||
</DirectoryRef>
|
||||
</Fragment>
|
||||
|
@ -4053,7 +4056,8 @@
|
|||
<ComponentRef Id="cmp834F3E0C83664E92B0D115A39A8FAACB" />
|
||||
<ComponentRef Id="cmp2BB002B115C247FFB3353C80CAAC10B3" />
|
||||
<ComponentRef Id="cmp68158D010ECB439582D041355BFACCBB" />
|
||||
<ComponentRef Id="cmpD9AA61B3F5F44A7B99E535A712E8310D" />
|
||||
<ComponentRef Id="cmp3547A55EA9D04784B4CF2FC717447E16" />
|
||||
<ComponentRef Id="cmp5FDF8631A090425A90B27344B4C2A62A" />
|
||||
</ComponentGroup>
|
||||
</Fragment>
|
||||
</Wix>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "6.0.100-preview.1.21103.13"
|
||||
"version": "6.0.100-preview.2.21155.3"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
|
||||
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.2.21154.6" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -31,9 +31,9 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
|
||||
<PackageReference Include="System.Threading.AccessControl" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0-1.final" />
|
||||
<PackageReference Include="System.Threading.AccessControl" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="NJsonSchema" Version="10.3.10" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
|
||||
<PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-preview.2.21154.6" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -18,9 +18,9 @@
|
|||
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
|
||||
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
|
||||
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
|
||||
<PackageReference Include="System.IO.Packaging" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.IO.Packaging" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-preview.2.21154.6" />
|
||||
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
|
||||
<PackageReference Include="System.ServiceModel.Duplex" Version="4.8.1" />
|
||||
<PackageReference Include="System.ServiceModel.Http" Version="4.8.1" />
|
||||
|
@ -30,7 +30,7 @@
|
|||
<PackageReference Include="System.Private.ServiceModel" Version="4.8.1" />
|
||||
<!-- the source could not be found for the following package(s) -->
|
||||
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
|
||||
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
|
||||
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-preview.2.21154.6" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -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="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-preview.2.21154.6" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
@ -16,16 +16,16 @@
|
|||
<!-- the Application Insights package -->
|
||||
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.17.0" />
|
||||
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
|
||||
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.DirectoryServices" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.Management" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.1" />
|
||||
<PackageReference Include="System.Security.Permissions" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="System.DirectoryServices" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="System.Management" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="System.Security.Permissions" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.2.21154.6" />
|
||||
<!-- the following package(s) are from the powershell org -->
|
||||
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
|
||||
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.1.0" />
|
||||
|
|
|
@ -5316,7 +5316,7 @@ namespace System.Management.Automation
|
|||
private RemoteRunspacePoolInternal GetRemoteRunspacePoolInternal()
|
||||
{
|
||||
RunspacePool runspacePool = _rsConnection as RunspacePool;
|
||||
return (runspacePool != null) ? (runspacePool.RemoteRunspacePoolInternal) : null;
|
||||
return runspacePool?.RemoteRunspacePoolInternal;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
|
||||
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-preview.2.21154.6" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.2" />
|
||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.2.21154.6" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0-preview.2" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
|
||||
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.Security.Principal.Windows" Version="6.0.0-preview.1.21102.12" />
|
||||
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.2.21154.6" />
|
||||
<PackageReference Include="System.Security.Principal.Windows" Version="6.0.0-preview.2.21154.6" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
Loading…
Reference in a new issue