Skip to content

Commit 028eeb0

Browse files
adityapatwardhanadityapatwardhan
authored
Bump to .NET 7 to version 7.0.100-rc.2.22477.20 (PowerShell#18286)
1 parent 813d388 commit 028eeb0

File tree

11 files changed

+29
-41
lines changed

11 files changed

+29
-41
lines changed

‎DotnetRuntimeMetadata.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"sdk": {
3-
"channel": "7.0.1xx-rc1",
3+
"channel": "7.0.1xx-rc2",
44
"quality": "daily",
55
"qualityFallback": "preview",
6-
"packageVersionPattern": "7.0.0-rc.1",
6+
"packageVersionPattern": "7.0.0-rc.2",
77
"sdkImageVersion": "7.0.100",
8-
"nextChannel": "7.0.1xx-rc1",
8+
"nextChannel": "7.0.1xx-rc2",
99
"azureFeed": "",
10-
"sdkImageOverride": "7.0.100-rc.1.22431.12"
10+
"sdkImageOverride": ""
1111
},
1212
"internalfeed": {
1313
"url": ""

‎assets/wix/files.wxs

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,15 +1221,6 @@
12211221
<Component Id="cmpF3EB02BB62A34F509B22CC370C430A20">
12221222
<File Id="fil489339762CDF41AE97538C020401BEC6" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Net.Quic.dll" />
12231223
</Component>
1224-
<Component Id="cmp2BB1C07A912442B0BB6270D7EB3185F3">
1225-
<File Id="fil2D6E6E560F1743729D90C204D69C369C" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Asn1.dll" />
1226-
</Component>
1227-
<Component Id="cmpF5FD2E392BD94BCD957480F128A38E10">
1228-
<File Id="fil9C11C1DAFDC94C0588965EA6EAAA7592" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
1229-
</Component>
1230-
<Component Id="cmp28DEAACC47FD4B04A95521A375761643">
1231-
<File Id="filE0DD0282CF6C440C99209B0B7495422C" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
1232-
</Component>
12331224
</Directory>
12341225
<Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
12351226
<Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B">
@@ -2772,12 +2763,12 @@
27722763
<Component Id="cmp42A739F2AAC24D729DDBCAA096B8C55A">
27732764
<File Id="fil48314E2AC49B4E208C5667CEC50CA78C" KeyPath="yes" Source="$(var.ProductSourcePath)\RegisterMicrosoftUpdate.ps1" />
27742765
</Component>
2775-
<Component Id="cmp76EB2749D0464D41AD1D2BA2C51CF4C9">
2776-
<File Id="filDC81A93ACA6045E4A22C108F59D69083" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.42610.dll" />
2777-
</Component>
27782766
<Component Id="cmp6986F8B66C514347A25E03DD3096B5AE">
27792767
<File Id="fil9276D1BDBF8B4C91B90761633720A419" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationNative_cor3.dll" />
27802768
</Component>
2769+
<Component Id="cmp0AA648ADA42C4862B34099DB4C05C170">
2770+
<File Id="fil35F9A9F617154631855B83DACFC9DAD6" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.46401.dll" />
2771+
</Component>
27812772
</DirectoryRef>
27822773
</Fragment>
27832774
<Fragment>
@@ -3661,11 +3652,8 @@
36613652
<ComponentRef Id="cmp0721DF55B34849B78C98AE00D863CBFF" />
36623653
<ComponentRef Id="cmpF3EB02BB62A34F509B22CC370C430A20" />
36633654
<ComponentRef Id="cmp42A739F2AAC24D729DDBCAA096B8C55A" />
3664-
<ComponentRef Id="cmp2BB1C07A912442B0BB6270D7EB3185F3" />
3665-
<ComponentRef Id="cmp76EB2749D0464D41AD1D2BA2C51CF4C9" />
3666-
<ComponentRef Id="cmpF5FD2E392BD94BCD957480F128A38E10" />
3667-
<ComponentRef Id="cmp28DEAACC47FD4B04A95521A375761643" />
36683655
<ComponentRef Id="cmp6986F8B66C514347A25E03DD3096B5AE" />
3656+
<ComponentRef Id="cmp0AA648ADA42C4862B34099DB4C05C170" />
36693657
</ComponentGroup>
36703658
</Fragment>
36713659
</Wix>

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "7.0.100-rc.1.22431.12"
3+
"version": "7.0.100-rc.2.22477.20"
44
}
55
}

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

Lines changed: 1 addition & 1 deletion
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-rc.1.22426.10" />
50+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-rc.2.22472.3" />
5151
</ItemGroup>
5252

5353
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232

3333
<ItemGroup>
3434
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-2.final" />
35-
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-rc.1.22426.10" />
36-
<PackageReference Include="System.Drawing.Common" Version="7.0.0-rc.1.22426.10" />
35+
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-rc.2.22472.3" />
36+
<PackageReference Include="System.Drawing.Common" Version="7.0.0-rc.2.22472.3" />
3737
<PackageReference Include="NJsonSchema" Version="10.7.2" />
3838
</ItemGroup>
3939

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

Lines changed: 1 addition & 1 deletion
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-rc.1.22426.10" />
11+
<PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-rc.2.22472.3" />
1212
</ItemGroup>
1313

1414
</Project>

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

Lines changed: 4 additions & 4 deletions
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-rc.1.22426.10" />
22-
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-rc.1.22426.10" />
23-
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-rc.1.22426.10" />
21+
<PackageReference Include="System.IO.Packaging" Version="7.0.0-rc.2.22472.3" />
22+
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-rc.2.22472.3" />
23+
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-rc.2.22472.3" />
2424
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
2525
<PackageReference Include="System.ServiceModel.Duplex" Version="4.10.0" />
2626
<PackageReference Include="System.ServiceModel.Http" Version="4.10.0" />
@@ -29,7 +29,7 @@
2929
<PackageReference Include="System.ServiceModel.Security" Version="4.10.0" />
3030
<PackageReference Include="System.Private.ServiceModel" Version="4.10.0" />
3131
<!-- the source could not be found for the following package(s) -->
32-
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.1.22426.10" />
32+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.2.22472.3" />
3333
</ItemGroup>
3434

3535
</Project>

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

Lines changed: 1 addition & 1 deletion
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-rc.1.22426.10" />
13+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-rc.2.22472.3" />
1414
</ItemGroup>
1515

1616
<PropertyGroup>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
1+
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
22
<Import Project="..\..\PowerShell.Common.props" />
33
<PropertyGroup>
44
<Description>PowerShell's System.Management.Automation project</Description>
@@ -34,16 +34,16 @@
3434
<!-- the Application Insights package -->
3535
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
3636
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
37-
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-rc.1.22426.10" />
38-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-rc.1.22426.10" />
39-
<PackageReference Include="System.DirectoryServices" Version="7.0.0-rc.1.22426.10" />
37+
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-rc.2.22472.3" />
38+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-rc.2.22472.3" />
39+
<PackageReference Include="System.DirectoryServices" Version="7.0.0-rc.2.22472.3" />
4040
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
41-
<PackageReference Include="System.Management" Version="7.0.0-rc.1.22426.10" />
41+
<PackageReference Include="System.Management" Version="7.0.0-rc.2.22472.3" />
4242
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
4343
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
44-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-rc.1.22426.10" />
45-
<PackageReference Include="System.Security.Permissions" Version="7.0.0-rc.1.22426.10" />
46-
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22426.10" />
44+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-rc.2.22472.3" />
45+
<PackageReference Include="System.Security.Permissions" Version="7.0.0-rc.2.22472.3" />
46+
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.2.22472.3" />
4747
<!-- the following package(s) are from the powershell org -->
4848
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
4949
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.3.0-rc.1" />

‎test/tools/TestService/TestService.csproj

Lines changed: 1 addition & 1 deletion
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-rc.1.22426.10" />
16+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.2.22472.3" />
1717
</ItemGroup>
1818

1919
</Project>

0 commit comments

Comments
 (0)