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

This commit is contained in:
Aditya Patwardhan
2022-03-18 09:10:53 -07:00
committed by GitHub
parent b46ac16e09
commit 1268a0a04f
21 changed files with 92 additions and 100 deletions
+5 -5
View File
@@ -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": ""
}
}
+4 -4
View File
@@ -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>
@@ -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>
+1 -1
View File
@@ -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
}
+1 -1
View File
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "7.0.100-preview.1"
"version": "7.0.100-preview.2.22153.17"
}
}
+1 -1
View File
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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" />
@@ -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>
@@ -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>
@@ -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" />
-1
View File
@@ -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'
@@ -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
@@ -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"
}
@@ -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
+1 -1
View File
@@ -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>
+2 -2
View File
@@ -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>
+1 -1
View File
@@ -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");
+44 -44
View File
@@ -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
@@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
</ItemGroup>
</Project>
@@ -9,6 +9,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
</ItemGroup>
</Project>