X Tutup
Skip to content

Update .NET to 7.0.0-preview.2 build #16930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 11 commits into from
Mar 18, 2022
Merged

Update .NET to 7.0.0-preview.2 build #16930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b083ead
Update .NET to 7.0.0-preview.2 daily build
adityapatwardhan Feb 26, 2022
2c23d53
Fix to use the appropriate SDK
adityapatwardhan Feb 27, 2022
9014f70
Update to .NET 7 Preview package versions
adityapatwardhan Mar 16, 2022
366138f
Add workaround for Ping tests on linux
adityapatwardhan Mar 17, 2022
a615ea1
Adjust expected assemblies at startup
adityapatwardhan Mar 17, 2022
60b1bb3
Revert "Disable psget tests"
adityapatwardhan Mar 17, 2022
5cdeaf5
Revert "Fix tests"
adityapatwardhan Mar 17, 2022
0af3ee2
Take startup test fix
adityapatwardhan Mar 17, 2022
82a59c7
Skip the 'TestLoadNativeInMemoryAssembly' unit test
daxian-dbw Mar 17, 2022
1239365
Update cgmanifest
daxian-dbw Mar 17, 2022
4cc6282
Make the PowerShellGet tests pending again because test gallery is down
daxian-dbw Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions DotnetRuntimeMetadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": ""
}
}
8 changes: 4 additions & 4 deletions assets/wix/files.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3177,12 +3177,12 @@
<Component Id="cmp22840874A8C84AA796496634FBEBF09C">
<File Id="fil2067B616D1FA4B30932A0240ABE06089" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Web.Services.Description.dll" />
</Component>
<Component Id="cmpAC388473B5C048E3AB478DCC0B3C61FE">
<File Id="fil2D3CF7A46E0842BABB83B0A8787FED26" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.7608.dll" />
</Component>
<Component Id="cmpE0DEAA289B2D4594A0C4791B2808C97C">
<File Id="fil530EAD567BDB402FA6F02AFAA696D721" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Cryptography.dll" />
</Component>
<Component Id="cmp05AA3332D604464298B922F34672061F">
<File Id="fil45EB1A6088AA4475B1B9B0413BC0FE02" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.15202.dll" />
</Component>
</DirectoryRef>
</Fragment>
<Fragment>
Expand Down Expand Up @@ -4203,9 +4203,9 @@
<ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
<ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
<ComponentRef Id="cmpB7C69B48760E47CD89D0641D4A9FEFE9" />
<ComponentRef Id="cmpAC388473B5C048E3AB478DCC0B3C61FE" />
<ComponentRef Id="cmpE5993DB9118640FD8C180A2D61C89C01" />
<ComponentRef Id="cmpE0DEAA289B2D4594A0C4791B2808C97C" />
<ComponentRef Id="cmp05AA3332D604464298B922F34672061F" />
</ComponentGroup>
</Fragment>
</Wix>
2 changes: 1 addition & 1 deletion build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "7.0.100-preview.1"
"version": "7.0.100-preview.2.22153.17"
}
}
2 changes: 1 addition & 1 deletion nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration>
<packageSources>
<clear />
<add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/7.0.100-preview.1.22110.4-shipping/nuget/v2" />
<add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v2" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<disabledPackageSources>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
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.1.22076.8" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.2.22152.2" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0-3.final" />
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.1.22076.8" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.1.22076.8" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0-1.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="NJsonSchema" Version="10.6.9" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
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.1.22076.8" />
<PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-preview.2.22152.2" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
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.1.22076.8" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.1.22076.8" />
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.1.22076.8" />
<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" />
<!-- 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.1.22076.8" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.2.22152.2" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
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.1.22076.8" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.2.22152.2" />
</ItemGroup>

<PropertyGroup>
Expand Down
18 changes: 9 additions & 9 deletions src/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
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.1.22076.8" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.1.22076.8" />
<PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.1.22076.8" />
<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="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="7.0.0-preview.1.22076.8" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.1.22076.8" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.1.22076.8" />
<PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.1.22076.8" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.1.22076.8" />
<PackageReference Include="System.Management" Version="7.0.0-preview.2.22152.2" />
<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" />
<!-- 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
1 change: 0 additions & 1 deletion test/powershell/Host/Startup.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 2 additions & 1 deletion test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 5 additions & 13 deletions test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {

Expand All @@ -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"
}
Expand Down
8 changes: 4 additions & 4 deletions test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/tools/TestService/TestService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

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

</Project>
4 changes: 2 additions & 2 deletions test/tools/WebListener/WebListener.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.1.22109.13" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.1.22076.8" />
<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" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/xUnit/csharp/test_NativeInterop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Loading
X Tutup