admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump to .NET 7 to version 7.0.100-rc.2.22477.20 (#18286) (#18378)

Browse Source
This commit is contained in:
Aditya Patwardhan
2022-10-25 15:16:00 -07:00
committed by GitHub
parent 476b0c5d12
commit 63281ec146
11 changed files with 29 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DotnetRuntimeMetadata.json
+4 -4
View File
@@ -1,13 +1,13 @@
{
"sdk": {
"channel": "7.0.1xx-rc1",
"channel": "7.0.1xx-rc2",
"quality": "daily",
"qualityFallback": "preview",
"packageVersionPattern": "7.0.0-rc.1",
"packageVersionPattern": "7.0.0-rc.2",
"sdkImageVersion": "7.0.100",
"nextChannel": "7.0.1xx-rc1",
"nextChannel": "7.0.1xx-rc2",
"azureFeed": "",
"sdkImageOverride": "7.0.100-rc.1.22431.12"
"sdkImageOverride": ""
},
"internalfeed": {
"url": ""
assets/wix/files.wxs
+4 -16
View File
@@ -1221,15 +1221,6 @@
<Component Id="cmpF3EB02BB62A34F509B22CC370C430A20">
<File Id="fil489339762CDF41AE97538C020401BEC6" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Net.Quic.dll" />
</Component>
<Component Id="cmp2BB1C07A912442B0BB6270D7EB3185F3">
<File Id="fil2D6E6E560F1743729D90C204D69C369C" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Asn1.dll" />
</Component>
<Component Id="cmpF5FD2E392BD94BCD957480F128A38E10">
<File Id="fil9C11C1DAFDC94C0588965EA6EAAA7592" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
</Component>
<Component Id="cmp28DEAACC47FD4B04A95521A375761643">
<File Id="filE0DD0282CF6C440C99209B0B7495422C" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
</Component>
</Directory>
<Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
<Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B">
@@ -2772,12 +2763,12 @@
<Component Id="cmp42A739F2AAC24D729DDBCAA096B8C55A">
<File Id="fil48314E2AC49B4E208C5667CEC50CA78C" KeyPath="yes" Source="$(var.ProductSourcePath)\RegisterMicrosoftUpdate.ps1" />
</Component>
<Component Id="cmp76EB2749D0464D41AD1D2BA2C51CF4C9">
<File Id="filDC81A93ACA6045E4A22C108F59D69083" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.42610.dll" />
</Component>
<Component Id="cmp6986F8B66C514347A25E03DD3096B5AE">
<File Id="fil9276D1BDBF8B4C91B90761633720A419" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationNative_cor3.dll" />
</Component>
<Component Id="cmp0AA648ADA42C4862B34099DB4C05C170">
<File Id="fil35F9A9F617154631855B83DACFC9DAD6" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.46401.dll" />
</Component>
</DirectoryRef>
</Fragment>
<Fragment>
@@ -3661,11 +3652,8 @@
<ComponentRef Id="cmp0721DF55B34849B78C98AE00D863CBFF" />
<ComponentRef Id="cmpF3EB02BB62A34F509B22CC370C430A20" />
<ComponentRef Id="cmp42A739F2AAC24D729DDBCAA096B8C55A" />
<ComponentRef Id="cmp2BB1C07A912442B0BB6270D7EB3185F3" />
<ComponentRef Id="cmp76EB2749D0464D41AD1D2BA2C51CF4C9" />
<ComponentRef Id="cmpF5FD2E392BD94BCD957480F128A38E10" />
<ComponentRef Id="cmp28DEAACC47FD4B04A95521A375761643" />
<ComponentRef Id="cmp6986F8B66C514347A25E03DD3096B5AE" />
<ComponentRef Id="cmp0AA648ADA42C4862B34099DB4C05C170" />
</ComponentGroup>
</Fragment>
</Wix>
global.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "7.0.100-rc.1.22431.12"
"version": "7.0.100-rc.2.22477.20"
}
}
src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+1 -1
View File
@@ -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-rc.1.22426.10" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-rc.2.22472.3" />
</ItemGroup>
</Project>
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+3 -3
View File
@@ -31,9 +31,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-1.final" />
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-rc.1.22426.10" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0-rc.1.22426.10" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-2.final" />
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-rc.2.22472.3" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0-rc.2.22472.3" />
<PackageReference Include="NJsonSchema" Version="10.7.2" />
</ItemGroup>
src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+1 -1
View File
@@ -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-rc.1.22426.10" />
<PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-rc.2.22472.3" />
</ItemGroup>
</Project>
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+4 -4
View File
@@ -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-rc.1.22426.10" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-rc.1.22426.10" />
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-rc.1.22426.10" />
<PackageReference Include="System.IO.Packaging" Version="7.0.0-rc.2.22472.3" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-rc.2.22472.3" />
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-rc.2.22472.3" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.10.0" />
<PackageReference Include="System.ServiceModel.Http" Version="4.10.0" />
@@ -29,7 +29,7 @@
<PackageReference Include="System.ServiceModel.Security" Version="4.10.0" />
<PackageReference Include="System.Private.ServiceModel" Version="4.10.0" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.1.22426.10" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.2.22472.3" />
</ItemGroup>
</Project>
src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+1 -1
View File
@@ -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-rc.1.22426.10" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-rc.2.22472.3" />
</ItemGroup>
<PropertyGroup>
src/System.Management.Automation/System.Management.Automation.csproj
+7 -7
View File
@@ -16,16 +16,16 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-rc.1.22426.10" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-rc.1.22426.10" />
<PackageReference Include="System.DirectoryServices" Version="7.0.0-rc.1.22426.10" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-rc.2.22472.3" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-rc.2.22472.3" />
<PackageReference Include="System.DirectoryServices" Version="7.0.0-rc.2.22472.3" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="7.0.0-rc.1.22426.10" />
<PackageReference Include="System.Management" Version="7.0.0-rc.2.22472.3" />
<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-rc.1.22426.10" />
<PackageReference Include="System.Security.Permissions" Version="7.0.0-rc.1.22426.10" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22426.10" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-rc.2.22472.3" />
<PackageReference Include="System.Security.Permissions" Version="7.0.0-rc.2.22472.3" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.2.22472.3" />
<!-- 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-rc.1" />
test/tools/TestService/TestService.csproj
+1 -1
View File
@@ -13,7 +13,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.1.22426.10" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.2.22472.3" />
</ItemGroup>
</Project>
test/tools/WebListener/WebListener.csproj
+2 -2
View File
@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-rc.1.22427.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22426.10" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-rc.2.22476.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.2.22472.3" />
</ItemGroup>
<ItemGroup>