Skip to content

Commit 1268a0a

Browse files
adityapatwardhanadityapatwardhan
authored
Update .NET to 7.0.0-preview.2 build (PowerShell#16930)
1 parent b46ac16 commit 1268a0a

File tree

21 files changed

+71
-79
lines changed

21 files changed

+71
-79
lines changed

‎DotnetRuntimeMetadata.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"sdk": {
3-
"channel": "7.0.1xx-preview1",
3+
"channel": "7.0.1xx-preview2",
44
"quality": "signed",
55
"qualityFallback": "daily",
6-
"packageVersionPattern": "7.0.0-preview.1",
6+
"packageVersionPattern": "7.0.0-preview.2",
77
"sdkImageVersion": "7.0.100",
8-
"nextChannel": "7.0.1xx-preview1",
8+
"nextChannel": "7.0.1xx-preview2",
99
"azureFeed": "",
10-
"sdkImageOverride": "7.0.100-preview.1.22110.4"
10+
"sdkImageOverride": "7.0.100-preview.2.22153.17"
1111
},
12-
"internalfeed" : {
12+
"internalfeed": {
1313
"url": ""
1414
}
1515
}

‎assets/wix/files.wxs

+4-4
Original file line numberDiff line numberDiff line change
@@ -3177,12 +3177,12 @@
31773177
<Component Id="cmp22840874A8C84AA796496634FBEBF09C">
31783178
<File Id="fil2067B616D1FA4B30932A0240ABE06089" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Web.Services.Description.dll" />
31793179
</Component>
3180-
<Component Id="cmpAC388473B5C048E3AB478DCC0B3C61FE">
3181-
<File Id="fil2D3CF7A46E0842BABB83B0A8787FED26" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.7608.dll" />
3182-
</Component>
31833180
<Component Id="cmpE0DEAA289B2D4594A0C4791B2808C97C">
31843181
<File Id="fil530EAD567BDB402FA6F02AFAA696D721" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Cryptography.dll" />
31853182
</Component>
3183+
<Component Id="cmp05AA3332D604464298B922F34672061F">
3184+
<File Id="fil45EB1A6088AA4475B1B9B0413BC0FE02" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.15202.dll" />
3185+
</Component>
31863186
</DirectoryRef>
31873187
</Fragment>
31883188
<Fragment>
@@ -4203,9 +4203,9 @@
42034203
<ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
42044204
<ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
42054205
<ComponentRef Id="cmpB7C69B48760E47CD89D0641D4A9FEFE9" />
4206-
<ComponentRef Id="cmpAC388473B5C048E3AB478DCC0B3C61FE" />
42074206
<ComponentRef Id="cmpE5993DB9118640FD8C180A2D61C89C01" />
42084207
<ComponentRef Id="cmpE0DEAA289B2D4594A0C4791B2808C97C" />
4208+
<ComponentRef Id="cmp05AA3332D604464298B922F34672061F" />
42094209
</ComponentGroup>
42104210
</Fragment>
42114211
</Wix>

‎build.psm1

+1-1
Original file line numberDiff line numberDiff line change
@@ -2118,7 +2118,7 @@ function Start-PSBootstrap {
21182118

21192119
function Get-LatestInstalledSDK {
21202120
Start-NativeExecution -sb {
2121-
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
2121+
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
21222122
} -IgnoreExitcode 2> $null
21232123
}
21242124

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "7.0.100-preview.1"
3+
"version": "7.0.100-preview.2.22153.17"
44
}
55
}

‎nuget.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/7.0.100-preview.1.22110.4-shipping/nuget/v2" />
5+
<add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v2" />
66
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
77
</packageSources>
88
<disabledPackageSources>

‎src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

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

5353
</Project>

‎src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0-3.final" />
35-
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.1.22076.8" />
36-
<PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.1.22076.8" />
34+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0-1.final" />
35+
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.2.22152.2" />
36+
<PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.2.22152.2" />
3737
<PackageReference Include="NJsonSchema" Version="10.6.9" />
3838
</ItemGroup>
3939

‎src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

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

1414
</Project>

‎src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
1919
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
2020
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
21-
<PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.1.22076.8" />
22-
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.1.22076.8" />
23-
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.1.22076.8" />
21+
<PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.2.22152.2" />
22+
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.2.22152.2" />
23+
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.2.22152.2" />
2424
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
2525
<PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0" />
2626
<PackageReference Include="System.ServiceModel.Http" Version="4.9.0" />
@@ -30,7 +30,7 @@
3030
<PackageReference Include="System.Private.ServiceModel" Version="4.9.0" />
3131
<!-- the source could not be found for the following package(s) -->
3232
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
33-
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.1.22076.8" />
33+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.2.22152.2" />
3434
</ItemGroup>
3535

3636
</Project>

‎src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
1111
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
1212
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
13-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.1.22076.8" />
13+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.2.22152.2" />
1414
</ItemGroup>
1515

1616
<PropertyGroup>

‎src/System.Management.Automation/System.Management.Automation.csproj

+9-9
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
<!-- the Application Insights package -->
1717
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.0" />
1818
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
19-
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.1.22076.8" />
20-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.1.22076.8" />
21-
<PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.1.22076.8" />
19+
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.2.22152.2" />
20+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.2.22152.2" />
21+
<PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.2.22152.2" />
2222
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
23-
<PackageReference Include="System.Management" Version="7.0.0-preview.1.22076.8" />
24-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.1.22076.8" />
25-
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
26-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.1.22076.8" />
27-
<PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.1.22076.8" />
28-
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.1.22076.8" />
23+
<PackageReference Include="System.Management" Version="7.0.0-preview.2.22152.2" />
24+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
25+
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
26+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.2.22152.2" />
27+
<PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.2.22152.2" />
28+
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.2.22152.2" />
2929
<!-- the following package(s) are from the powershell org -->
3030
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
3131
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.3.0-preview.1" />

‎test/powershell/Host/Startup.Tests.ps1

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ Describe "Validate start of console host" -Tag CI {
5050
'System.Runtime.Serialization.Primitives.dll'
5151
'System.Security.AccessControl.dll'
5252
'System.Security.Cryptography.dll'
53-
'System.Security.Cryptography.X509Certificates.dll'
5453
'System.Security.Principal.Windows.dll'
5554
'System.Text.Encoding.Extensions.dll'
5655
'System.Text.RegularExpressions.dll'

‎test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ function GetExternalHostAddress([string]$HostName)
3232
}
3333
}
3434

35-
Describe "Test-Connection" -tags "CI" {
35+
# Adding RequireSudoOnUnix due to issue: https://github.com/dotnet/runtime/issues/66746
36+
Describe "Test-Connection" -tags "CI", "RequireSudoOnUnix" {
3637
BeforeAll {
3738
$hostName = [System.Net.Dns]::GetHostName()
3839
$gatewayAddress = GetGatewayAddress

‎test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1

+5-13
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,15 @@ $InternalSource = 'OneGetTestSource'
1919
Describe "PackageManagement Acceptance Test" -Tags "Feature" {
2020

2121
BeforeAll{
22+
Register-PackageSource -Name Nugettest -provider NuGet -Location https://www.nuget.org/api/v2 -Force
2223

23-
# Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
24-
# These should be re-enabled when the issue is fixed
25-
$originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
26-
$PSDefaultParameterValues["it:pending"] = $true
27-
28-
# The cmdlets in the if block fail due the to above issue, hence putting them in a if ($false)
29-
if ($false) {
30-
Register-PackageSource -Name Nugettest -provider NuGet -Location https://www.nuget.org/api/v2 -Force
31-
Register-PackageSource -Name $InternalSource -Location $InternalGallery -ProviderName 'PowerShellGet' -Trusted -ErrorAction SilentlyContinue
32-
}
33-
24+
## Comment out this line because 'poshtestgallery.com' is down, tracked by https://github.com/PowerShell/PowerShell/issues/17019
25+
## Register-PackageSource -Name $InternalSource -Location $InternalGallery -ProviderName 'PowerShellGet' -Trusted -ErrorAction SilentlyContinue
3426
$SavedProgressPreference = $ProgressPreference
3527
$ProgressPreference = "SilentlyContinue"
3628
}
3729
AfterAll {
3830
$ProgressPreference = $SavedProgressPreference
39-
$global:PSDefaultParameterValues = $originalDefaultParameterValues
4031
}
4132
It "get-packageprovider" {
4233

@@ -52,7 +43,8 @@ Describe "PackageManagement Acceptance Test" -Tags "Feature" {
5243
$fpp | Should -Contain "PowerShellGet"
5344
}
5445

55-
It "install-packageprovider, Expect succeed" {
46+
## Make this test pending because 'poshtestgallery.com' is down, tracked by https://github.com/PowerShell/PowerShell/issues/17019
47+
It "install-packageprovider, Expect succeed" -Pending {
5648
$ipp = (Install-PackageProvider -Name gistprovider -Force -Source $InternalSource -Scope CurrentUser).name
5749
$ipp | Should -Contain "gistprovider"
5850
}

‎test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1

+4-4
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ function Remove-InstalledModules
111111
Describe "PowerShellGet - Module tests" -tags "Feature" {
112112

113113
BeforeAll {
114-
# Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
114+
# Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019
115115
# These should be re-enabled when the issue is fixed
116116
$originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
117117
$PSDefaultParameterValues["it:pending"] = $true
@@ -155,7 +155,7 @@ Describe "PowerShellGet - Module tests" -tags "Feature" {
155155
Describe "PowerShellGet - Module tests (Admin)" -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') {
156156

157157
BeforeAll {
158-
# Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
158+
# Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019
159159
# These should be re-enabled when the issue is fixed
160160
$originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
161161
$PSDefaultParameterValues["it:pending"] = $true
@@ -198,7 +198,7 @@ function Remove-InstalledScripts
198198
Describe "PowerShellGet - Script tests" -tags "Feature" {
199199

200200
BeforeAll {
201-
# Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
201+
# Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019
202202
# These should be re-enabled when the issue is fixed
203203
$originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
204204
$PSDefaultParameterValues["it:pending"] = $true
@@ -238,7 +238,7 @@ Describe "PowerShellGet - Script tests" -tags "Feature" {
238238
Describe "PowerShellGet - Script tests (Admin)" -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') {
239239

240240
BeforeAll {
241-
# Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
241+
# Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019
242242
# These should be re-enabled when the issue is fixed
243243
$originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
244244
$PSDefaultParameterValues["it:pending"] = $true

‎test/tools/TestService/TestService.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.1.22076.8" />
16+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.2.22152.2" />
1717
</ItemGroup>
1818

1919
</Project>

‎test/tools/WebListener/WebListener.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.1.22109.13" />
11-
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.1.22076.8" />
10+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.2.22153.2" />
11+
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.2.22152.2" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎test/xUnit/csharp/test_NativeInterop.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace PSTests.Sequential
1717
{
1818
public static class NativeInterop
1919
{
20-
[Fact]
20+
[Fact(Skip = "Have to skip this test due to https://github.com/dotnet/runtime/issues/66785")]
2121
public static void TestLoadNativeInMemoryAssembly()
2222
{
2323
string tempDir = Path.Combine(Path.GetTempPath(), "TestLoadNativeInMemoryAssembly");

0 commit comments

Comments
 (0)