Skip to content

Commit

Permalink
Update .NET SDK version from 7.0.100-preview.2.22153.17 to `7.0.100…
Browse files Browse the repository at this point in the history 
…-preview.4.22252.9` (#17061)
  • Loading branch information
@github-actions
github-actions[bot] committed May 12, 2022
1 parent 57965f2 commit 38909f7
Show file tree
Hide file tree
Showing 14 changed files with 43 additions and 129 deletions.
88 changes: 12 additions & 76 deletions assets/wix/files.wxs
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion global.json
View file
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "7.0.100-preview.2.22153.17"
"version": "7.0.100-preview.4.22252.9"
}
}
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file
Expand Up @@ -47,7 +47,7 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.4.22229.4" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Expand Up @@ -31,9 +31,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0-4.final" />
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-1.final" />
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="NJsonSchema" Version="10.6.10" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-preview.4.22229.4" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file
Expand Up @@ -18,9 +18,9 @@
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.4.22229.4" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0" />
<PackageReference Include="System.ServiceModel.Http" Version="4.9.0" />
Expand All @@ -30,7 +30,7 @@
<PackageReference Include="System.Private.ServiceModel" Version="4.9.0" />
<!-- 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="7.0.0-preview.2.22152.2" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.4.22229.4" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View file
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="7.0.0-preview.2.22152.2" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.4.22229.4" />
</ItemGroup>

<PropertyGroup>
Expand Down
14 changes: 7 additions & 7 deletions src/System.Management.Automation/System.Management.Automation.csproj
View file
Expand Up @@ -16,16 +16,16 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.4.22229.4" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="System.Management" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.4.22229.4" />
<!-- 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.3.0-preview.1" />
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/MshMemberInfo.cs
View file
Expand Up @@ -2691,7 +2691,7 @@ private static Type GetMethodGroupType(MethodInfo methodInfo)

return DelegateHelpers.MakeDelegate(methodTypes);
}
catch (TypeLoadException)
catch (Exception)
{
return typeof(Func<PSNonBindableType>);
}
Expand Down
28 changes: 0 additions & 28 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
View file
Expand Up @@ -1757,24 +1757,11 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {

$testCases2 = @(
@{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls13'}; Pending = $true }
# Removed this as Tls now default to Tls12
# @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls12'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls11'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
# Removed this as Tls now default to Tls12
# @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
# Removed this as Tls now default to Tls12
# @{ Test = @{IntendedProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls11, Tls12, Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
@{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls13'}; Pending = $true }
@{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
@{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
# Removed this as Tls now default to Tls12
# @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
)
}

Expand Down Expand Up @@ -3358,24 +3345,9 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {

$testCases2 = @(
@{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls13'}; Pending = $true }
# Removed this as Tls now default to Tls12
# @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls12'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls11'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
# Removed this as Tls now default to Tls12
# @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
# Removed this as Tls now default to Tls12
# @{ Test = @{IntendedProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls11, Tls12, Tls13'; ActualProtocol = 'Tls'}; Pending = $false }
@{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls13'}; Pending = $true }
@{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
@{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
# Removed this as Tls now default to Tls12
# @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
)
}

Expand Down
2 changes: 1 addition & 1 deletion test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
View file
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CSharp" version="4.5.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<Reference Include="System.Management.Automation">
<HintPath>.\Ref\System.Management.Automation.dll</HintPath>
</Reference>
Expand Down
2 changes: 1 addition & 1 deletion test/tools/TestService/TestService.csproj
View file
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.4.22229.4" />
</ItemGroup>

</Project>
10 changes: 8 additions & 2 deletions test/tools/WebListener/Program.cs
View file
Expand Up @@ -62,7 +62,10 @@ public static void Main(string[] args)
{
var certificate = new X509Certificate2(args[0], args[1]);
HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
httpsOption.SslProtocols = SslProtocols.Tls11;
// TLS 1.1 is obsolete. Using this value now defaults to TLS 1.2.
httpsOption.SslProtocols = SslProtocols.Tls12;
httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
httpsOption.CheckCertificateRevocation = false;
Expand All @@ -78,7 +81,10 @@ public static void Main(string[] args)
{
var certificate = new X509Certificate2(args[0], args[1]);
HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
httpsOption.SslProtocols = SslProtocols.Tls;
// TLS is obsolete. Using this value now defaults to TLS 1.2.
httpsOption.SslProtocols = SslProtocols.Tls12;
httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
httpsOption.CheckCertificateRevocation = false;
Expand Down
4 changes: 2 additions & 2 deletions test/tools/WebListener/WebListener.csproj
View file
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.2.22153.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.4.22251.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.4.22229.4" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 38909f7

Please sign in to comment.