From 1268a0a04f797aa631f92ada5271f594379155af Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Fri, 18 Mar 2022 09:10:53 -0700 Subject: [PATCH] Update .NET to 7.0.0-preview.2 build (#16930) --- DotnetRuntimeMetadata.json | 10 +-- assets/wix/files.wxs | 8 +- build.psm1 | 2 +- global.json | 2 +- nuget.config | 2 +- ...soft.PowerShell.Commands.Management.csproj | 2 +- ...crosoft.PowerShell.Commands.Utility.csproj | 6 +- ...crosoft.PowerShell.CoreCLR.Eventing.csproj | 2 +- .../Microsoft.PowerShell.SDK.csproj | 8 +- .../Microsoft.WSMan.Management.csproj | 2 +- .../System.Management.Automation.csproj | 18 ++-- test/powershell/Host/Startup.Tests.ps1 | 1 - .../Test-Connection.Tests.ps1 | 3 +- .../PackageManagement.Tests.ps1 | 18 ++-- .../PowerShellGet/PowerShellGet.Tests.ps1 | 8 +- test/tools/TestService/TestService.csproj | 2 +- test/tools/WebListener/WebListener.csproj | 4 +- test/xUnit/csharp/test_NativeInterop.cs | 2 +- tools/cgmanifest.json | 88 +++++++++---------- ...crosoft.PowerShell.Commands.Utility.csproj | 2 +- .../System.Management.Automation.csproj | 2 +- 21 files changed, 92 insertions(+), 100 deletions(-) diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json index 92f5825c97..fcb9f330e2 100644 --- a/DotnetRuntimeMetadata.json +++ b/DotnetRuntimeMetadata.json @@ -1,15 +1,15 @@ { "sdk": { - "channel": "7.0.1xx-preview1", + "channel": "7.0.1xx-preview2", "quality": "signed", "qualityFallback": "daily", - "packageVersionPattern": "7.0.0-preview.1", + "packageVersionPattern": "7.0.0-preview.2", "sdkImageVersion": "7.0.100", - "nextChannel": "7.0.1xx-preview1", + "nextChannel": "7.0.1xx-preview2", "azureFeed": "", - "sdkImageOverride": "7.0.100-preview.1.22110.4" + "sdkImageOverride": "7.0.100-preview.2.22153.17" }, - "internalfeed" : { + "internalfeed": { "url": "" } } diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs index a9f2465288..65fe6f17e6 100644 --- a/assets/wix/files.wxs +++ b/assets/wix/files.wxs @@ -3177,12 +3177,12 @@ - - - + + + @@ -4203,9 +4203,9 @@ - + diff --git a/build.psm1 b/build.psm1 index 24c5500eb9..5d56fe5c92 100644 --- a/build.psm1 +++ b/build.psm1 @@ -2118,7 +2118,7 @@ function Start-PSBootstrap { function Get-LatestInstalledSDK { Start-NativeExecution -sb { - dotnet --list-sdks | Select-String -Pattern '\d*.\d*.\d*(-\w*\.\d*)?' | ForEach-Object { [System.Management.Automation.SemanticVersion]::new($_.matches.value) } | Sort-Object -Descending | Select-Object -First 1 + dotnet --list-sdks | Select-String -Pattern '\d*.\d*.\d*(-\w*\.\d*.\d*.\d*)?' | ForEach-Object { [System.Management.Automation.SemanticVersion]::new($_.matches.value) } | Sort-Object -Descending | Select-Object -First 1 } -IgnoreExitcode 2> $null } diff --git a/global.json b/global.json index 9b02b7b47f..463c146c54 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-preview.1" + "version": "7.0.100-preview.2.22153.17" } } diff --git a/nuget.config b/nuget.config index aca42b6249..314766a64f 100644 --- a/nuget.config +++ b/nuget.config @@ -2,7 +2,7 @@ - + diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj index 2d5c09d969..50cb39f320 100644 --- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj +++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj index c91fa2e60f..f6059f756e 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -31,9 +31,9 @@ - - - + + + diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj index 5b615fd1ae..3afc569156 100644 --- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj index 3a36a1b19d..a7f86581f9 100644 --- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj +++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj @@ -18,9 +18,9 @@ - - - + + + @@ -30,7 +30,7 @@ - + diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj index a18bc1305f..a0d5f1f3c3 100644 --- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj +++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj index f6f6ab1adb..b53b6c3eee 100644 --- a/src/System.Management.Automation/System.Management.Automation.csproj +++ b/src/System.Management.Automation/System.Management.Automation.csproj @@ -16,16 +16,16 @@ - - - + + + - - - - - - + + + + + + diff --git a/test/powershell/Host/Startup.Tests.ps1 b/test/powershell/Host/Startup.Tests.ps1 index 54d8d9a522..d0d8662cc9 100644 --- a/test/powershell/Host/Startup.Tests.ps1 +++ b/test/powershell/Host/Startup.Tests.ps1 @@ -50,7 +50,6 @@ Describe "Validate start of console host" -Tag CI { 'System.Runtime.Serialization.Primitives.dll' 'System.Security.AccessControl.dll' 'System.Security.Cryptography.dll' - 'System.Security.Cryptography.X509Certificates.dll' 'System.Security.Principal.Windows.dll' 'System.Text.Encoding.Extensions.dll' 'System.Text.RegularExpressions.dll' diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1 index c41b60c3ec..dbe91e8657 100644 --- a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1 +++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1 @@ -32,7 +32,8 @@ function GetExternalHostAddress([string]$HostName) } } -Describe "Test-Connection" -tags "CI" { +# Adding RequireSudoOnUnix due to issue: https://github.com/dotnet/runtime/issues/66746 +Describe "Test-Connection" -tags "CI", "RequireSudoOnUnix" { BeforeAll { $hostName = [System.Net.Dns]::GetHostName() $gatewayAddress = GetGatewayAddress diff --git a/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1 b/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1 index 5070cf9e8b..0520860c8d 100644 --- a/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1 +++ b/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1 @@ -19,24 +19,15 @@ $InternalSource = 'OneGetTestSource' Describe "PackageManagement Acceptance Test" -Tags "Feature" { BeforeAll{ + Register-PackageSource -Name Nugettest -provider NuGet -Location https://www.nuget.org/api/v2 -Force - # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013 - # These should be re-enabled when the issue is fixed - $originalDefaultParameterValues = $PSDefaultParameterValues.Clone() - $PSDefaultParameterValues["it:pending"] = $true - - # The cmdlets in the if block fail due the to above issue, hence putting them in a if ($false) - if ($false) { - Register-PackageSource -Name Nugettest -provider NuGet -Location https://www.nuget.org/api/v2 -Force - Register-PackageSource -Name $InternalSource -Location $InternalGallery -ProviderName 'PowerShellGet' -Trusted -ErrorAction SilentlyContinue - } - + ## Comment out this line because 'poshtestgallery.com' is down, tracked by https://github.com/PowerShell/PowerShell/issues/17019 + ## Register-PackageSource -Name $InternalSource -Location $InternalGallery -ProviderName 'PowerShellGet' -Trusted -ErrorAction SilentlyContinue $SavedProgressPreference = $ProgressPreference $ProgressPreference = "SilentlyContinue" } AfterAll { $ProgressPreference = $SavedProgressPreference - $global:PSDefaultParameterValues = $originalDefaultParameterValues } It "get-packageprovider" { @@ -52,7 +43,8 @@ Describe "PackageManagement Acceptance Test" -Tags "Feature" { $fpp | Should -Contain "PowerShellGet" } - It "install-packageprovider, Expect succeed" { + ## Make this test pending because 'poshtestgallery.com' is down, tracked by https://github.com/PowerShell/PowerShell/issues/17019 + It "install-packageprovider, Expect succeed" -Pending { $ipp = (Install-PackageProvider -Name gistprovider -Force -Source $InternalSource -Scope CurrentUser).name $ipp | Should -Contain "gistprovider" } diff --git a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1 b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1 index dcecd602d4..d3cc46f2e9 100644 --- a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1 +++ b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1 @@ -111,7 +111,7 @@ function Remove-InstalledModules Describe "PowerShellGet - Module tests" -tags "Feature" { BeforeAll { - # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013 + # Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019 # These should be re-enabled when the issue is fixed $originalDefaultParameterValues = $PSDefaultParameterValues.Clone() $PSDefaultParameterValues["it:pending"] = $true @@ -155,7 +155,7 @@ Describe "PowerShellGet - Module tests" -tags "Feature" { Describe "PowerShellGet - Module tests (Admin)" -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { BeforeAll { - # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013 + # Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019 # These should be re-enabled when the issue is fixed $originalDefaultParameterValues = $PSDefaultParameterValues.Clone() $PSDefaultParameterValues["it:pending"] = $true @@ -198,7 +198,7 @@ function Remove-InstalledScripts Describe "PowerShellGet - Script tests" -tags "Feature" { BeforeAll { - # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013 + # Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019 # These should be re-enabled when the issue is fixed $originalDefaultParameterValues = $PSDefaultParameterValues.Clone() $PSDefaultParameterValues["it:pending"] = $true @@ -238,7 +238,7 @@ Describe "PowerShellGet - Script tests" -tags "Feature" { Describe "PowerShellGet - Script tests (Admin)" -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { BeforeAll { - # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013 + # Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019 # These should be re-enabled when the issue is fixed $originalDefaultParameterValues = $PSDefaultParameterValues.Clone() $PSDefaultParameterValues["it:pending"] = $true diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj index c49ec96994..50338b19df 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 c425f0002c..878d254778 100644 --- a/test/tools/WebListener/WebListener.csproj +++ b/test/tools/WebListener/WebListener.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/test/xUnit/csharp/test_NativeInterop.cs b/test/xUnit/csharp/test_NativeInterop.cs index 685e8a23ce..b0c1c531e7 100644 --- a/test/xUnit/csharp/test_NativeInterop.cs +++ b/test/xUnit/csharp/test_NativeInterop.cs @@ -17,7 +17,7 @@ namespace PSTests.Sequential { public static class NativeInterop { - [Fact] + [Fact(Skip = "Have to skip this test due to https://github.com/dotnet/runtime/issues/66785")] public static void TestLoadNativeInMemoryAssembly() { string tempDir = Path.Combine(Path.GetTempPath(), "TestLoadNativeInMemoryAssembly"); diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json index 6a4ca73ef6..11b27afff6 100644 --- a/tools/cgmanifest.json +++ b/tools/cgmanifest.json @@ -65,7 +65,7 @@ "Type": "nuget", "Nuget": { "Name": "Microsoft.CodeAnalysis.Common", - "Version": "4.0.1" + "Version": "4.1.0" } }, "DevelopmentDependency": false @@ -75,7 +75,7 @@ "Type": "nuget", "Nuget": { "Name": "Microsoft.CodeAnalysis.CSharp", - "Version": "4.0.1" + "Version": "4.1.0" } }, "DevelopmentDependency": false @@ -500,16 +500,6 @@ }, "DevelopmentDependency": false }, - { - "Component": { - "Type": "nuget", - "Nuget": { - "Name": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "Version": "4.3.0" - } - }, - "DevelopmentDependency": false - }, { "Component": { "Type": "nuget", @@ -530,6 +520,16 @@ }, "DevelopmentDependency": false }, + { + "Component": { + "Type": "nuget", + "Nuget": { + "Name": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "Version": "4.3.0" + } + }, + "DevelopmentDependency": false + }, { "Component": { "Type": "nuget", @@ -600,6 +600,36 @@ }, "DevelopmentDependency": false }, + { + "Component": { + "Type": "nuget", + "Nuget": { + "Name": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni", + "Version": "4.4.0" + } + }, + "DevelopmentDependency": false + }, + { + "Component": { + "Type": "nuget", + "Nuget": { + "Name": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni", + "Version": "4.4.0" + } + }, + "DevelopmentDependency": false + }, + { + "Component": { + "Type": "nuget", + "Nuget": { + "Name": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni", + "Version": "4.4.0" + } + }, + "DevelopmentDependency": false + }, { "Component": { "Type": "nuget", @@ -620,16 +650,6 @@ }, "DevelopmentDependency": false }, - { - "Component": { - "Type": "nuget", - "Nuget": { - "Name": "runtime.win7.System.Private.Uri", - "Version": "4.3.0" - } - }, - "DevelopmentDependency": false - }, { "Component": { "Type": "nuget", @@ -654,28 +674,8 @@ "Component": { "Type": "nuget", "Nuget": { - "Name": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni", - "Version": "4.4.0" - } - }, - "DevelopmentDependency": false - }, - { - "Component": { - "Type": "nuget", - "Nuget": { - "Name": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni", - "Version": "4.4.0" - } - }, - "DevelopmentDependency": false - }, - { - "Component": { - "Type": "nuget", - "Nuget": { - "Name": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni", - "Version": "4.4.0" + "Name": "runtime.win7.System.Private.Uri", + "Version": "4.3.0" } }, "DevelopmentDependency": false diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj index e8efd4c4ae..4dfc566682 100644 --- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -14,7 +14,7 @@ - + diff --git a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj index 5793e09c88..862cf1ddff 100644 --- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj +++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj @@ -9,6 +9,6 @@ - +