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

Move to .NET 5 preview.1 (#12140)

Browse Source
This commit is contained in:
Steve Lee
2020-03-19 11:27:13 -07:00
committed by GitHub
parent 5da06978b1
commit 495dea0783
28 changed files with 174 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.devcontainer/Dockerfile
+1 -1
View File
@@ -3,7 +3,7 @@
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.102
FROM mcr.microsoft.com/dotnet/core/sdk:5.0.0-preview.1.20120.5
# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
.devcontainer/devcontainer.json
+1 -1
View File
@@ -1,6 +1,6 @@
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
{
"name": ".NET Core 3.1, including pwsh (Debian 10)",
"name": ".NET Core 5.0, including pwsh (Debian 10)",
"dockerFile": "Dockerfile",
// Uncomment the next line to run commands after the container is created.
PowerShell.Common.props
+1 -1
View File
@@ -95,7 +95,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>netcoreapp5.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
assets/files.wxs
+115 -59
View File
@@ -2019,9 +2019,6 @@
<Component Id="cmpBD566B3E609A4CF58FBDBC7F4810D738" Guid="{aca4a533-71cb-41e4-a9e5-41ac15128ea8}">
<File Id="filCF51CCC233184DD18CE302B241152511" KeyPath="yes" Source="$(env.ProductSourcePath)\cs\System.Printing.resources.dll" />
</Component>
<Component Id="cmp7D6CFB0CBC3541009CCEC1E814F0C9B7" Guid="{e8bd3258-a6dd-4f0d-86ae-2f30196f1768}">
<File Id="fil4AF60E53F9F74F909C2D59AD4CA4F547" KeyPath="yes" Source="$(env.ProductSourcePath)\cs\System.Windows.Forms.Design.Editors.resources.dll" />
</Component>
<Component Id="cmp7B112D436F7A426CB85E9C0DFC3C84BB" Guid="{5d81602f-ad96-4d19-9086-6ac0b4e3c83e}">
<File Id="fil2CED30DFA1E64755AAE303486A54B65D" KeyPath="yes" Source="$(env.ProductSourcePath)\cs\PresentationUI.resources.dll" />
</Component>
@@ -2037,6 +2034,12 @@
<Component Id="cmpF429A622BF26430592ECE6BFD1EBE61A" Guid="{a0a27703-7f9a-47d7-ad21-32cbeb5d8b7b}">
<File Id="filAA4340033EBD4532875FF4D3DF2FFB92" KeyPath="yes" Source="$(env.ProductSourcePath)\cs\UIAutomationClientSideProviders.resources.dll" />
</Component>
<Component Id="cmp38D8A48C68FB4CB399A0A7677FA428E4" Guid="{1e0cfaee-d1e2-4bea-89b0-4ba54fc277fa}">
<File Id="fil471D3319BAA941DC858853CF3D27B6EE" KeyPath="yes" Source="$(env.ProductSourcePath)\cs\System.Windows.Forms.Primitives.resources.dll" />
</Component>
<Component Id="cmp57D197B18F1F4A6AAB704B28CF61B535" Guid="{35a1e070-598e-4a40-9aa3-b21dd4f6c59e}">
<File Id="fil71B3802CB88348AC888B9902212CADA2" KeyPath="yes" Source="$(env.ProductSourcePath)\cs\Microsoft.VisualBasic.Forms.resources.dll" />
</Component>
</Directory>
<Directory Id="dirEA0127D6607E68B508B9DB9CE315A2CE" Name="de">
<Component Id="cmpF2941A91B17EEA22CD6DAB34693D9AC0" Guid="{BE73377F-7647-468E-B130-76A36977B4F9}">
@@ -2081,9 +2084,6 @@
<Component Id="cmp63DE4A246C29457C8BD32B4C288CC0D0" Guid="{f481e6f4-2b6f-421e-9292-2dc0282e6c16}">
<File Id="fil0E2A68D54FDA4D5AB5B40D9188517766" KeyPath="yes" Source="$(env.ProductSourcePath)\de\System.Printing.resources.dll" />
</Component>
<Component Id="cmpA5F71B7187C04A7B9B979DD6EC731439" Guid="{7980dfb2-4cff-4de8-a130-e66f985d3902}">
<File Id="fil7464F67573E1421183877AECC907FF59" KeyPath="yes" Source="$(env.ProductSourcePath)\de\System.Windows.Forms.Design.Editors.resources.dll" />
</Component>
<Component Id="cmp314AE8812E0E4183BC9E211D1EB5151F" Guid="{1ce69a9b-ccb3-466a-bde6-6d13a364ccee}">
<File Id="fil9BAF851D0824459F81592413EF3FD591" KeyPath="yes" Source="$(env.ProductSourcePath)\de\System.Windows.Controls.Ribbon.resources.dll" />
</Component>
@@ -2096,6 +2096,12 @@
<Component Id="cmp775BF8C154D047B5AE4779F4AD2727BE" Guid="{f0a47bd2-72c8-42f4-b620-cf95108ddc5a}">
<File Id="fil23AC7B50D781445EA590C5DCC94D5CCA" KeyPath="yes" Source="$(env.ProductSourcePath)\de\ReachFramework.resources.dll" />
</Component>
<Component Id="cmp9C5650D758FC401F8C785A0F979A9505" Guid="{1749f3d9-f028-4a72-a81d-3b8c557869d4}">
<File Id="fil3E305757451F4E52845ABC2FE7F6AA2E" KeyPath="yes" Source="$(env.ProductSourcePath)\de\Microsoft.VisualBasic.Forms.resources.dll" />
</Component>
<Component Id="cmpB40EE0CC916B4928987F62F5909AE709" Guid="{965209da-110f-4f5b-920b-1b5547339ca9}">
<File Id="filA21E2DDEAEAE4E0D94346C5671D9D29F" KeyPath="yes" Source="$(env.ProductSourcePath)\de\System.Windows.Forms.Primitives.resources.dll" />
</Component>
</Directory>
<Directory Id="dir5B65D7353FBDCD17AB60A674B3FDF93B" Name="es">
<Component Id="cmpBEB5F3CF75675537751F0D0B32125BF1" Guid="{0488C929-AB3A-4033-912A-7C17EC9410C3}">
@@ -2104,9 +2110,6 @@
<Component Id="cmpFB3B0ED1FFF7496CAF70B2F12EBC5CAE" Guid="{494BD2E2-2E8A-48FE-A9EA-03AA2312B54D}">
<File Id="filE823DFCBDDC210A2E54DD02B718A238E" KeyPath="yes" Source="$(env.ProductSourcePath)\es\Microsoft.CodeAnalysis.resources.dll" />
</Component>
<Component Id="cmp8D4128969CF54E1880EF17FDFA848837" Guid="{c461beb0-8f1b-43f8-ab4a-035cc16a20ac}">
<File Id="fil2A06E4C87AFB4C7A8D906835CC0D6FA6" KeyPath="yes" Source="$(env.ProductSourcePath)\es\System.Windows.Forms.Design.Editors.resources.dll" />
</Component>
<Component Id="cmp78CCCF5167C845FD817F6D641D4539A1" Guid="{d71e21a7-f14f-4020-b769-7e77ce9236f4}">
<File Id="filFFB162AD603C42BF9744AAB241265BA4" KeyPath="yes" Source="$(env.ProductSourcePath)\es\System.Printing.resources.dll" />
</Component>
@@ -2155,6 +2158,12 @@
<Component Id="cmpC6C53A5B540B4A3C9624A0D14D5A9790" Guid="{efe2dd2e-f385-426a-a13b-8029b475c25b}">
<File Id="filD7C99F368BE74A6EBA3C9FFCE01BBA22" KeyPath="yes" Source="$(env.ProductSourcePath)\es\UIAutomationClient.resources.dll" />
</Component>
<Component Id="cmp2868115863264407B40346B27ABE3E4D" Guid="{3c9c59b4-c242-41bd-ba9b-a672c24e26f6}">
<File Id="fil96E3FCAB7E034BC785D15D4B400605BE" KeyPath="yes" Source="$(env.ProductSourcePath)\es\Microsoft.VisualBasic.Forms.resources.dll" />
</Component>
<Component Id="cmpB944176DE7924A268269903DC0B5D510" Guid="{483f8550-a06a-4735-bdde-628eb3ed2b22}">
<File Id="filBA47C41DFB3849228624C99949FB61FC" KeyPath="yes" Source="$(env.ProductSourcePath)\es\System.Windows.Forms.Primitives.resources.dll" />
</Component>
</Directory>
<Directory Id="dir23063512FA8C884E1B4F08FDF0A44516" Name="fr">
<Component Id="cmp1DEB513A065956086898BCDACC5887B6" Guid="{95058EF3-8C81-4F2B-A465-C2A60142411E}">
@@ -2205,15 +2214,18 @@
<Component Id="cmp2432BC382728406FA98A6EAC2A038F11" Guid="{bb3f879d-a0c5-414f-b650-b6d694efc0fc}">
<File Id="filA944C0098D33494E88134607839CBF25" KeyPath="yes" Source="$(env.ProductSourcePath)\fr\System.Windows.Forms.resources.dll" />
</Component>
<Component Id="cmpACD54B8F73574540BC302D9B171D21F3" Guid="{a5a1b07a-594f-4ec7-b852-c0be15f8cb5d}">
<File Id="fil9BCC923EF616416EA2709693ADA675A4" KeyPath="yes" Source="$(env.ProductSourcePath)\fr\System.Windows.Forms.Design.Editors.resources.dll" />
</Component>
<Component Id="cmp96C4EA9D377044E3B5002E37D322B840" Guid="{9d25d2ff-8302-4c07-9449-bcc71fc2157a}">
<File Id="fil9DFE71D7BB8546CDA5099CB1302C0316" KeyPath="yes" Source="$(env.ProductSourcePath)\fr\UIAutomationClient.resources.dll" />
</Component>
<Component Id="cmpCC41F040CB1B4D0487DD193036A9DD1A" Guid="{ba6f48fe-491f-4fc7-8a09-ced02509a44a}">
<File Id="fil585A4D2483DA4D1A957F3FE782B5AA94" KeyPath="yes" Source="$(env.ProductSourcePath)\fr\System.Windows.Controls.Ribbon.resources.dll" />
</Component>
<Component Id="cmp5359C8369744482FBB5D56CDF3FA0DB0" Guid="{21ef3f05-eff3-49ea-b6b1-b4e0920df595}">
<File Id="fil611BE1F701F342309F78C3450897211A" KeyPath="yes" Source="$(env.ProductSourcePath)\fr\Microsoft.VisualBasic.Forms.resources.dll" />
</Component>
<Component Id="cmp7B5948A1A366409F99B871F0E772B945" Guid="{4fc6f354-12cd-4b72-881a-4771070c4f2b}">
<File Id="filCCA6A5EE7ED9459C93A8C05B0A93880F" KeyPath="yes" Source="$(env.ProductSourcePath)\fr\System.Windows.Forms.Primitives.resources.dll" />
</Component>
</Directory>
<Directory Id="dir42B03840AE19D1498CC524F2B6C0389D" Name="it">
<Component Id="cmp3EC91B8BF4282E77113321E5D1ED27B2" Guid="{DFCDE87B-D5FF-40B8-B520-BF719148F434}">
@@ -2231,9 +2243,6 @@
<Component Id="cmpE21D33B37D174B1C839677DD631FF425" Guid="{172a4dfd-c7b7-4ffa-9f4c-eb14725f84f2}">
<File Id="filB05CF8D0575F4374B648FC8E0D76319F" KeyPath="yes" Source="$(env.ProductSourcePath)\it\ReachFramework.resources.dll" />
</Component>
<Component Id="cmp32A5238804144C71A117F431BDA86225" Guid="{2a4b2119-741f-4491-8876-7f3583e0ace5}">
<File Id="fil9EDE4C049EAE4866B050C85AF5CC3486" KeyPath="yes" Source="$(env.ProductSourcePath)\it\System.Windows.Forms.Design.Editors.resources.dll" />
</Component>
<Component Id="cmp4845622039D44CB09C42A4EAD5997AE6" Guid="{35743fa0-1eed-45a6-9527-1a1cbb0d7995}">
<File Id="filD0C458C44AD84ADBA0F098AA7CA91091" KeyPath="yes" Source="$(env.ProductSourcePath)\it\UIAutomationProvider.resources.dll" />
</Component>
@@ -2273,6 +2282,12 @@
<Component Id="cmpEB0B8586AAC24EACA2867506D39669C5" Guid="{07b375e3-d4de-479f-a63e-10ebf3900c03}">
<File Id="filA7C9B844150543CEBAD12476244BB7A7" KeyPath="yes" Source="$(env.ProductSourcePath)\it\PresentationFramework.resources.dll" />
</Component>
<Component Id="cmp11087C190382415AB1DC1DFBD78DF348" Guid="{6aaac528-2bd4-4d6f-b0c8-0a0ac7233282}">
<File Id="fil8A3F292DDC9145BDAB8BA3930F89D91C" KeyPath="yes" Source="$(env.ProductSourcePath)\it\System.Windows.Forms.Primitives.resources.dll" />
</Component>
<Component Id="cmp28349C4ACD6D42D3967853E0A1D7DC4E" Guid="{5ea96389-757f-4be0-98ff-9bd1b4f0fee1}">
<File Id="filDF0828378FCA4CAC8F7DA90DC4F802CC" KeyPath="yes" Source="$(env.ProductSourcePath)\it\Microsoft.VisualBasic.Forms.resources.dll" />
</Component>
</Directory>
<Directory Id="dir086D21BE309BE4C7081FC60E3524890F" Name="ja">
<Component Id="cmp867E4E51FE7BC09AAD5D59FD76716FBC" Guid="{1A35A14A-1698-4C8D-AA92-239C1C4DA5F5}">
@@ -2314,9 +2329,6 @@
<Component Id="cmp2808FB4A38C7470FAD14A0B1FE7D8614" Guid="{61c19c1c-5edf-4a66-b123-0f9e482009fd}">
<File Id="filAB4D5AEB904B409C8E48B2CA5AF67029" KeyPath="yes" Source="$(env.ProductSourcePath)\ja\System.Windows.Input.Manipulations.resources.dll" />
</Component>
<Component Id="cmpCB7AC9BDE4024EF08DDF9C2F7EB70F52" Guid="{7c7d7338-865e-41c7-94df-93bdf48d74f7}">
<File Id="filEC00D8C19E87495999045C741793809A" KeyPath="yes" Source="$(env.ProductSourcePath)\ja\System.Windows.Forms.Design.Editors.resources.dll" />
</Component>
<Component Id="cmp6EB4F2886A6D44ED86EF8BA6EC0C76A0" Guid="{cc8c4413-6de4-42e7-8ea5-b4c442c4030e}">
<File Id="fil29AACBEC10624DE9A97D2C786DEC61D2" KeyPath="yes" Source="$(env.ProductSourcePath)\ja\WindowsBase.resources.dll" />
</Component>
@@ -2332,6 +2344,12 @@
<Component Id="cmp58AA8F924CF74562A2D8A789B5EE8B97" Guid="{476dd468-af18-4683-8d50-5705cc00b106}">
<File Id="fil52EC995D889B4FBE915C01DC2A471ACD" KeyPath="yes" Source="$(env.ProductSourcePath)\ja\System.Windows.Forms.Design.resources.dll" />
</Component>
<Component Id="cmp1F2C85D1488B417F9F8FD96EA4A4D8B4" Guid="{e7096003-5722-4728-a6d1-d282cd279a15}">
<File Id="fil5D77B1DBC7AA4E38BBBE39B05DDEFC83" KeyPath="yes" Source="$(env.ProductSourcePath)\ja\Microsoft.VisualBasic.Forms.resources.dll" />
</Component>
<Component Id="cmp26335B5D1FE94E87A6B6EBD56A22C2B9" Guid="{090e5786-9579-4416-bbfa-4122add62e71}">
<File Id="filD585A7E89ACF4E4CB9DB8EAD4ACB7092" KeyPath="yes" Source="$(env.ProductSourcePath)\ja\System.Windows.Forms.Primitives.resources.dll" />
</Component>
</Directory>
<Directory Id="dir43D6CAD5F3ED1060009918D06D84FB18" Name="ko">
<Component Id="cmpAA026CCA623F0E8FB5BAE9F201C5B89D" Guid="{ABEAEF0D-B77C-4161-866F-3C711C97B5C4}">
@@ -2367,9 +2385,6 @@
<Component Id="cmpDFB169026CE14CE78D686C69F2B2F6AB" Guid="{840e47b3-a875-4213-91f3-58b18db6376f}">
<File Id="fil1966A617CD6641DB8334B9563346CF14" KeyPath="yes" Source="$(env.ProductSourcePath)\ko\WindowsBase.resources.dll" />
</Component>
<Component Id="cmp748B6A557C474380A08B0EB80EC39867" Guid="{31b5e991-0b99-4ee0-8b74-6aa876b2433e}">
<File Id="fil7D6893F5FFC74533B82153CC1C506FBB" KeyPath="yes" Source="$(env.ProductSourcePath)\ko\System.Windows.Forms.Design.Editors.resources.dll" />
</Component>
<Component Id="cmp3986112FD28649AAB697E73E48295FA5" Guid="{3d3945e4-36e7-42bd-ab1a-3b2c6f5bc6db}">
<File Id="filC3D3EE0C477C4251B006CBAA1284D4B9" KeyPath="yes" Source="$(env.ProductSourcePath)\ko\PresentationFramework.resources.dll" />
</Component>
@@ -2391,6 +2406,12 @@
<Component Id="cmpA3B2086013B5455D9D98B260493EC0B2" Guid="{0edb308d-5c38-4aee-afb2-05eda7151ff3}">
<File Id="fil9C0242A8164442C7AA07334144570B81" KeyPath="yes" Source="$(env.ProductSourcePath)\ko\UIAutomationProvider.resources.dll" />
</Component>
<Component Id="cmp0DA1B3EF85234C7BBA6DE35BBD1B45D2" Guid="{12f17515-7b15-4575-8c00-fe745c9be62f}">
<File Id="fil16AE972D64574C00841BBF9D7156A73B" KeyPath="yes" Source="$(env.ProductSourcePath)\ko\Microsoft.VisualBasic.Forms.resources.dll" />
</Component>
<Component Id="cmpF4093A1E8AB94B43AB0F852EB647CE7F" Guid="{db7df9e8-46a8-49b5-99ed-b4ded13ab836}">
<File Id="filCE28F42A54C24F5DA508904E60E23BBD" KeyPath="yes" Source="$(env.ProductSourcePath)\ko\System.Windows.Forms.Primitives.resources.dll" />
</Component>
</Directory>
<Directory Id="dirE8201C74A7184D11233BAD63C6DB37BD" Name="pl">
<Component Id="cmpA656A18FE14D3C8EB02C31AE474054E3" Guid="{24699144-EC00-45E9-B2E5-D6E6478093B6}">
@@ -2444,12 +2465,15 @@
<Component Id="cmpC2EF4DEECCAB41CDBEF1F7898B11D2C1" Guid="{f824cd00-d445-40a3-90e5-bb0cc281298b}">
<File Id="fil18789833D491457D80A09068794524B9" KeyPath="yes" Source="$(env.ProductSourcePath)\pl\System.Windows.Forms.Design.resources.dll" />
</Component>
<Component Id="cmp387B92B7BF324B4F95461BCB292CB11C" Guid="{a05320a0-66f4-49a6-b2bd-bdedc5d8c370}">
<File Id="fil828EFADE108F4421A513DDAFBBE78D5A" KeyPath="yes" Source="$(env.ProductSourcePath)\pl\System.Windows.Forms.Design.Editors.resources.dll" />
</Component>
<Component Id="cmp74681822D78E49DB9E42A990DFDFB3A9" Guid="{9ee6f820-ae6d-476a-9cd5-875e099bbbb9}">
<File Id="fil2CCD2A9DF61947289A4F0C567DDE7C66" KeyPath="yes" Source="$(env.ProductSourcePath)\pl\PresentationUI.resources.dll" />
</Component>
<Component Id="cmpC3357D2F892347769141A20222683855" Guid="{9eaae780-912d-476c-b05f-d6404b1972b6}">
<File Id="filA32D91A3FA5C47708122CAE55B69BC79" KeyPath="yes" Source="$(env.ProductSourcePath)\pl\Microsoft.VisualBasic.Forms.resources.dll" />
</Component>
<Component Id="cmp705598FEC8EA43D7A9B239787BA5DB09" Guid="{7509921e-9f88-4d28-a66f-621ae9b15f59}">
<File Id="filD8ECB20D015F4477ABD58505B48D02D1" KeyPath="yes" Source="$(env.ProductSourcePath)\pl\System.Windows.Forms.Primitives.resources.dll" />
</Component>
</Directory>
<Directory Id="dir47ED939BFA870848E0764E862CD6B4D7" Name="pt-BR">
<Component Id="cmp3D20E940BDBF41630242C63011A80CE5" Guid="{290F488F-ACFF-4715-9BE7-CC89EA1274F4}">
@@ -2464,9 +2488,6 @@
<Component Id="cmp25C8E163A5CF4460A30E08E77377C186" Guid="{18c9de17-35cf-4417-bb2a-b55ad8bb9491}">
<File Id="fil7B99860821534BA8A7B91A62B650EDBF" KeyPath="yes" Source="$(env.ProductSourcePath)\pt-BR\UIAutomationClient.resources.dll" />
</Component>
<Component Id="cmp517EBA1503904621AA44603058D097A9" Guid="{e84ac408-6c05-443d-9503-a8df7399bff0}">
<File Id="fil00AC21E90DE64A778E5DBDE3C296E715" KeyPath="yes" Source="$(env.ProductSourcePath)\pt-BR\System.Windows.Forms.Design.Editors.resources.dll" />
</Component>
<Component Id="cmp0892A230934B409C978C37CC1F723F72" Guid="{b8feafeb-21ee-4521-bf38-ac2889152697}">
<File Id="fil53E9CBED5699468C857FACDF597D6FDC" KeyPath="yes" Source="$(env.ProductSourcePath)\pt-BR\WindowsFormsIntegration.resources.dll" />
</Component>
@@ -2509,6 +2530,12 @@
<Component Id="cmp6A48FC0DE86C41C297EC418A0E49CA2C" Guid="{fb4380ec-e526-4f84-8c9d-f129b22b1714}">
<File Id="fil6A34E5CD258B46FB9C72FCCCAC04FAD8" KeyPath="yes" Source="$(env.ProductSourcePath)\pt-BR\System.Xaml.resources.dll" />
</Component>
<Component Id="cmp213F9BA38ED149468C656788A7ED847D" Guid="{780fe27b-f997-4aa0-a143-bdc2fe467c1d}">
<File Id="filA2E878605EC84DE480F48C8EB37DF399" KeyPath="yes" Source="$(env.ProductSourcePath)\pt-BR\Microsoft.VisualBasic.Forms.resources.dll" />
</Component>
<Component Id="cmpFAA0CCBA17FE4E8FAE5FE4B5F679DF52" Guid="{5ceb4ed7-9e41-4065-98be-a4401efc6cb6}">
<File Id="fil6A42B845F64A4B2490AFFA079E0FB086" KeyPath="yes" Source="$(env.ProductSourcePath)\pt-BR\System.Windows.Forms.Primitives.resources.dll" />
</Component>
</Directory>
<Directory Id="dir37B8DFAE26D5F8E9948851F7D19F9E20" Name="ru">
<Component Id="cmpFDCD51BD80926ABECCE27D0D66A47C8F" Guid="{40939DF1-4A99-49B2-98F2-A497EE9262EB}">
@@ -2529,9 +2556,6 @@
<Component Id="cmp53B914C6F5CE4FFE8CFCFB9F2408BA9E" Guid="{131e23e8-f453-44c4-a263-fb12472a9004}">
<File Id="filAA49858E7660451997035FCCEF910F1F" KeyPath="yes" Source="$(env.ProductSourcePath)\ru\WindowsFormsIntegration.resources.dll" />
</Component>
<Component Id="cmp16F0DBFB76114DA497A51D9A919EC009" Guid="{97ce4b0c-2ba7-4e17-a36c-f83c64b8ca89}">
<File Id="fil5A0D54F33E3E42CFBE886EE510476BA2" KeyPath="yes" Source="$(env.ProductSourcePath)\ru\System.Windows.Forms.Design.Editors.resources.dll" />
</Component>
<Component Id="cmp222A8A32083347E68BA8B2258B6E3C82" Guid="{c19fe69b-8963-4312-83c3-2551338dc59a}">
<File Id="fil1C2BB8669F50418D8D17952531B8FC81" KeyPath="yes" Source="$(env.ProductSourcePath)\ru\System.Xaml.resources.dll" />
</Component>
@@ -2568,6 +2592,12 @@
<Component Id="cmp38EEEBD629164D8FA34DBE11D92B5712" Guid="{0ae1a93f-59d9-465c-a3a2-7e58eb0988d6}">
<File Id="filB86A9EBC57E24EAB81491383FECACC9D" KeyPath="yes" Source="$(env.ProductSourcePath)\ru\UIAutomationClientSideProviders.resources.dll" />
</Component>
<Component Id="cmp4CCDE73A2A9E4D7B90065639D9433178" Guid="{b21d8d39-f4a5-4d42-bb95-c6f74f5fde2d}">
<File Id="fil8BB0777493324586A165234D6263F483" KeyPath="yes" Source="$(env.ProductSourcePath)\ru\Microsoft.VisualBasic.Forms.resources.dll" />
</Component>
<Component Id="cmpA6FA5B27C61E482D8BBC5F1806D3B223" Guid="{3cb50f74-4cf6-474e-b271-a3d0cbed0f1f}">
<File Id="filD4732A3ABFD342B890F75CCB5DE1CAE8" KeyPath="yes" Source="$(env.ProductSourcePath)\ru\System.Windows.Forms.Primitives.resources.dll" />
</Component>
</Directory>
<Directory Id="dirA7E9CC01273A7FED89FC8D3A368E00CC" Name="tr">
<Component Id="cmp286FCD0B19BF06446A7274672A2491CA" Guid="{72478D31-A36A-48CC-8BF3-6164D687A368}">
@@ -2591,9 +2621,6 @@
<Component Id="cmp2F888F24537C4A59B8DE0D9600ED5F86" Guid="{092557ee-6d65-4d5a-8433-fd8dff2d408e}">
<File Id="fil18B820710838483B809CFD53F651AAF1" KeyPath="yes" Source="$(env.ProductSourcePath)\tr\System.Windows.Input.Manipulations.resources.dll" />
</Component>
<Component Id="cmp04E47666C6FA4BFD86F37133B21D88D9" Guid="{4cbad024-b689-4776-a3b8-a334632c5b4e}">
<File Id="fil694085223B6743079F9862BED7BD596B" KeyPath="yes" Source="$(env.ProductSourcePath)\tr\System.Windows.Forms.Design.Editors.resources.dll" />
</Component>
<Component Id="cmp3F0494AB0EA8424C8C45C8421364B695" Guid="{7c3a67cd-009f-4181-b32d-44c4fbcdfd10}">
<File Id="fil195144FDB0F44371B4CBAAFC58FB6B7D" KeyPath="yes" Source="$(env.ProductSourcePath)\tr\System.Windows.Forms.Design.resources.dll" />
</Component>
@@ -2627,6 +2654,12 @@
<Component Id="cmp363CFDFE64D94C5693BAB14FCD5FE78C" Guid="{6083def7-bc5b-46c2-98b9-5a4b040cb481}">
<File Id="filAC8859D674A6466E95EFBD086FE04670" KeyPath="yes" Source="$(env.ProductSourcePath)\tr\PresentationFramework.resources.dll" />
</Component>
<Component Id="cmpA34D56794B9144A2BE67E7CDABCF5B4E" Guid="{ceb68bc2-347d-490a-8c09-4e9c5c4c22f5}">
<File Id="filD97E04BF3E874B7092250BC1C1C4C574" KeyPath="yes" Source="$(env.ProductSourcePath)\tr\System.Windows.Forms.Primitives.resources.dll" />
</Component>
<Component Id="cmp10773057C33543FA93222022DEC0847D" Guid="{60320198-666b-403a-8146-fe0939f7aaba}">
<File Id="filD2D3E621E5C54C5EBF044078C9073C2B" KeyPath="yes" Source="$(env.ProductSourcePath)\tr\Microsoft.VisualBasic.Forms.resources.dll" />
</Component>
</Directory>
<Directory Id="dir47E993970F74AA9F393D23500827D12C" Name="zh-Hans">
<Component Id="cmp34C4A21743AC68583599BF2B139F39F2" Guid="{36C49B4C-1884-4134-A583-0ECC77BD2A8A}">
@@ -2674,9 +2707,6 @@
<Component Id="cmp19DB395024234D64B015F638FCDA8C5A" Guid="{fb59c71d-0528-41f7-a5c0-a36dc26f1856}">
<File Id="filC4066D0930BB44DA90D9746B3A754C70" KeyPath="yes" Source="$(env.ProductSourcePath)\zh-Hans\System.Xaml.resources.dll" />
</Component>
<Component Id="cmpBB165E166A6C4A9787203A73BEB2D000" Guid="{061aada9-9091-4d06-994f-2a71b125c1ec}">
<File Id="fil9608632AD6E541B8B171FB23559C9726" KeyPath="yes" Source="$(env.ProductSourcePath)\zh-Hans\System.Windows.Forms.Design.Editors.resources.dll" />
</Component>
<Component Id="cmp54EE3E452F8341E69DE045A2DB941DEE" Guid="{41c988ff-d770-4490-9079-b732c074d320}">
<File Id="fil34A074B1CB3F43BE8D59684A10629730" KeyPath="yes" Source="$(env.ProductSourcePath)\zh-Hans\UIAutomationClient.resources.dll" />
</Component>
@@ -2686,6 +2716,12 @@
<Component Id="cmp119D48233B3B479FBD8222BA060D65EB" Guid="{30dbda12-b642-4799-a110-3ced6e35fd15}">
<File Id="fil27FFF1152C894EC28873C4D4209E9736" KeyPath="yes" Source="$(env.ProductSourcePath)\zh-Hans\UIAutomationProvider.resources.dll" />
</Component>
<Component Id="cmpEC0DB2C3A9C14F4E9FC6883357345CB5" Guid="{d35d10da-14ed-4712-96b0-d92f772ecef2}">
<File Id="filF0E3BC887EA741E9B90122B8701D6769" KeyPath="yes" Source="$(env.ProductSourcePath)\zh-Hans\System.Windows.Forms.Primitives.resources.dll" />
</Component>
<Component Id="cmp33364765C98D4BE09BD26DC1E6B95B86" Guid="{bbae970f-25ca-41d1-a143-82ce2137d8a7}">
<File Id="filB57C4C58936D4A7587CEA358B1AF57C2" KeyPath="yes" Source="$(env.ProductSourcePath)\zh-Hans\Microsoft.VisualBasic.Forms.resources.dll" />
</Component>
</Directory>
<Directory Id="dirB1FFB91EED6FD71EA866548CEA3A5298" Name="zh-Hant">
<Component Id="cmpBC28FE8B65954B00AECA9C534639596D" Guid="{247D5128-9957-44BD-8B31-58265EE0C90B}">
@@ -2715,9 +2751,6 @@
<Component Id="cmpAC2613BBBA934B3C9D8C6DB1B27AA153" Guid="{28520c13-95ae-4622-897f-f6b8e92c0ead}">
<File Id="fil0982E42C020D4C548E9F205FF883BD74" KeyPath="yes" Source="$(env.ProductSourcePath)\zh-Hant\UIAutomationClient.resources.dll" />
</Component>
<Component Id="cmp49C115344FB34DF69CB6DC600E8AF6FF" Guid="{04e4d8f5-436b-4ea5-87ed-b3d0bc8c1700}">
<File Id="filB2862B1ADD9146F69357650B62522A6A" KeyPath="yes" Source="$(env.ProductSourcePath)\zh-Hant\System.Windows.Forms.Design.Editors.resources.dll" />
</Component>
<Component Id="cmpB0757B4B80DB48F2BD94AB74A9CE3487" Guid="{9274c0a3-88a6-4eb8-ad3b-d68eb9cd90ff}">
<File Id="fil7AD133AC602C432382EC06A15E1C8AE3" KeyPath="yes" Source="$(env.ProductSourcePath)\zh-Hant\ReachFramework.resources.dll" />
</Component>
@@ -2745,6 +2778,12 @@
<Component Id="cmp7E10BA8A64E1482BAD717A0A3DC0746E" Guid="{9f41ee76-eec2-4e6b-8464-09dda5439871}">
<File Id="filFCB0DDA7C4D44FB8B90A6C9A289CAEAB" KeyPath="yes" Source="$(env.ProductSourcePath)\zh-Hant\System.Windows.Forms.resources.dll" />
</Component>
<Component Id="cmpD8CDC1F864664A33B6221A40F2BE8406" Guid="{a74481a9-548d-4c8b-bd6e-8c9e1ef75ff8}">
<File Id="fil7F22DE0DD33D49449CA061A6F1456C91" KeyPath="yes" Source="$(env.ProductSourcePath)\zh-Hant\System.Windows.Forms.Primitives.resources.dll" />
</Component>
<Component Id="cmpB9B22A80E70F414B8778B852E29D6492" Guid="{df67e47e-2854-4243-8350-e53945a25b19}">
<File Id="fil46C0F341CAB64BD390BEA73E1FE0F552" KeyPath="yes" Source="$(env.ProductSourcePath)\zh-Hant\Microsoft.VisualBasic.Forms.resources.dll" />
</Component>
</Directory>
<Directory Name="Schemas" Id="dir1DB5B24CC3494785974A51F28F128069">
<Directory Name="PSMaml" Id="dirAC38B2C7629B42DC836E01F976A10EC9">
@@ -2951,9 +2990,6 @@
<Component Id="cmp011004AE1CF04BEBBAD8B831F844C045" Guid="{6b8d5180-b410-4b99-81bc-09a608eafbca}">
<File Id="filE938890D95C3422687388791780FC0FB" KeyPath="yes" Source="$(env.ProductSourcePath)\wpfgfx_cor3.dll" />
</Component>
<Component Id="cmpBC496597B2E948E891B76934844120F0" Guid="{f9c59ccf-4a12-4c2e-a106-83ea2c5393ed}">
<File Id="fil32CD6207FB7B444BA8F389C95949BB68" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Windows.Forms.Design.Editors.dll" />
</Component>
<Component Id="cmpA1BA99196E3645448F2061091FD85C4A" Guid="{d1caed94-ee11-4d8d-b770-7eb6e923c00b}">
<File Id="fil00E8D1182FCD4D8ABF9C8E36D328A0C8" KeyPath="yes" Source="$(env.ProductSourcePath)\ReachFramework.dll" />
</Component>
@@ -3071,8 +3107,14 @@
<Component Id="cmp2E32A6E773F543F0A150B972F8D3E23A" Guid="{a43d0117-1193-4316-a0f6-fef892870f38}">
<File Id="fil66411B8941CA492E93BF262EA72C6BE6" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.PowerShell.GraphicalHost.xml" />
</Component>
<Component Id="cmp4FF68ECC102A4EC79019A7B087B5DE8D" Guid="{44683a04-9f1c-4323-8223-8d2ee880e8ac}">
<File Id="fil5C3BB8A26E31487E931ABDD7FB37651A" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.20.6602.dll" />
<Component Id="cmp0535678883A44B4D81A04C8BA7B2068C" Guid="{9253aa88-ab71-4f6c-98c1-b305af57c18f}">
<File Id="fil3D9B499EC41D4B4D9C7139B86D8CC398" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.12005.dll" />
</Component>
<Component Id="cmp874F51885AE34AD9AA37DC46A44B3194" Guid="{77932153-0935-4689-8b48-6d2e21ae4824}">
<File Id="fil16005153CF144E458123E5989CCB3A0E" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Windows.Forms.Primitives.dll" />
</Component>
<Component Id="cmp798A4EE6784541FE9B13582E52C5A818" Guid="{ec646ea5-c60e-41d5-9fd0-36fb14b1fc28}">
<File Id="fil8A6290BE106E416CB35FB2BEA982C3B8" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.VisualBasic.Forms.dll" />
</Component>
</DirectoryRef>
</Fragment>
@@ -3722,7 +3764,6 @@
<ComponentRef Id="cmp3B69477C65444471BFEA22BB68C3E7BF" />
<ComponentRef Id="cmp1F81BFEC090444E7970ABB24AEEA3025" />
<ComponentRef Id="cmpBD566B3E609A4CF58FBDBC7F4810D738" />
<ComponentRef Id="cmp7D6CFB0CBC3541009CCEC1E814F0C9B7" />
<ComponentRef Id="cmp7B112D436F7A426CB85E9C0DFC3C84BB" />
<ComponentRef Id="cmpEC979AEEB8104AC38CC49A276A8E2BBA" />
<ComponentRef Id="cmp8A9BD4D7BCD84712BFE690F6873BF7EB" />
@@ -3742,14 +3783,12 @@
<ComponentRef Id="cmpB5589E1EF9AF4ECCAE59F3330072CECD" />
<ComponentRef Id="cmpAFE9F438F120421D8CB6D25DE926A915" />
<ComponentRef Id="cmp63DE4A246C29457C8BD32B4C288CC0D0" />
<ComponentRef Id="cmpA5F71B7187C04A7B9B979DD6EC731439" />
<ComponentRef Id="cmp314AE8812E0E4183BC9E211D1EB5151F" />
<ComponentRef Id="cmpE4DC02E957BC4B098FC855C9F5A72A9A" />
<ComponentRef Id="cmp79FFF94E23E14C96AB959B15243E5317" />
<ComponentRef Id="cmp775BF8C154D047B5AE4779F4AD2727BE" />
<ComponentRef Id="cmpBEB5F3CF75675537751F0D0B32125BF1" />
<ComponentRef Id="cmpFB3B0ED1FFF7496CAF70B2F12EBC5CAE" />
<ComponentRef Id="cmp8D4128969CF54E1880EF17FDFA848837" />
<ComponentRef Id="cmp78CCCF5167C845FD817F6D641D4539A1" />
<ComponentRef Id="cmp726DCF2BD14F471AAE8C088A527A1B21" />
<ComponentRef Id="cmp3C199F9401234C618CA9E342954801FA" />
@@ -3782,7 +3821,6 @@
<ComponentRef Id="cmp357B1BB2DA1242478313F8BA1011617B" />
<ComponentRef Id="cmpBBD6269085BF40E2A83C3462DBD71230" />
<ComponentRef Id="cmp2432BC382728406FA98A6EAC2A038F11" />
<ComponentRef Id="cmpACD54B8F73574540BC302D9B171D21F3" />
<ComponentRef Id="cmp96C4EA9D377044E3B5002E37D322B840" />
<ComponentRef Id="cmpCC41F040CB1B4D0487DD193036A9DD1A" />
<ComponentRef Id="cmp3EC91B8BF4282E77113321E5D1ED27B2" />
@@ -3790,7 +3828,6 @@
<ComponentRef Id="cmpAF881D0D194F4D6984F92E8386E67445" />
<ComponentRef Id="cmp563F908E483C4F27A77016BDAD2EDB3D" />
<ComponentRef Id="cmpE21D33B37D174B1C839677DD631FF425" />
<ComponentRef Id="cmp32A5238804144C71A117F431BDA86225" />
<ComponentRef Id="cmp4845622039D44CB09C42A4EAD5997AE6" />
<ComponentRef Id="cmp0F27C4A051AD48F69B9697CD53EBC180" />
<ComponentRef Id="cmp5976983B67E94E95BFA840B7673FA1AC" />
@@ -3817,7 +3854,6 @@
<ComponentRef Id="cmp78644E05B1844431B7B7D0DDCE98EE1B" />
<ComponentRef Id="cmp09AE0992771647D5A12A95BF64C14842" />
<ComponentRef Id="cmp2808FB4A38C7470FAD14A0B1FE7D8614" />
<ComponentRef Id="cmpCB7AC9BDE4024EF08DDF9C2F7EB70F52" />
<ComponentRef Id="cmp6EB4F2886A6D44ED86EF8BA6EC0C76A0" />
<ComponentRef Id="cmp0989D491D80945AEBE2D0B14EF2C53D7" />
<ComponentRef Id="cmp3B0221BF9E5B40A6A25133725C97C0BE" />
@@ -3834,7 +3870,6 @@
<ComponentRef Id="cmpB8FA7AEE0A824184B543ED2231870C79" />
<ComponentRef Id="cmp006DBAC58EB04099A3B6DD1A69981814" />
<ComponentRef Id="cmpDFB169026CE14CE78D686C69F2B2F6AB" />
<ComponentRef Id="cmp748B6A557C474380A08B0EB80EC39867" />
<ComponentRef Id="cmp3986112FD28649AAB697E73E48295FA5" />
<ComponentRef Id="cmp1B309D09A58349A09BC60B35FCD982FF" />
<ComponentRef Id="cmp10D63BDD63C74483BB3F7AE952A15F90" />
@@ -3859,13 +3894,11 @@
<ComponentRef Id="cmpE57BDA25049143CEB30225B89C33DF7E" />
<ComponentRef Id="cmpBA83057401A44CF2A357203F266DAD18" />
<ComponentRef Id="cmpC2EF4DEECCAB41CDBEF1F7898B11D2C1" />
<ComponentRef Id="cmp387B92B7BF324B4F95461BCB292CB11C" />
<ComponentRef Id="cmp74681822D78E49DB9E42A990DFDFB3A9" />
<ComponentRef Id="cmp3D20E940BDBF41630242C63011A80CE5" />
<ComponentRef Id="cmp7C2E3035EE02569D9F11970586140F28" />
<ComponentRef Id="cmp1E40E7911F29449487A42C55FFF9679B" />
<ComponentRef Id="cmp25C8E163A5CF4460A30E08E77377C186" />
<ComponentRef Id="cmp517EBA1503904621AA44603058D097A9" />
<ComponentRef Id="cmp0892A230934B409C978C37CC1F723F72" />
<ComponentRef Id="cmp03BBEB6A73524059AE3127C2459B0E8C" />
<ComponentRef Id="cmp64227EAAFB4341F28C1C336EF2115CF0" />
@@ -3886,7 +3919,6 @@
<ComponentRef Id="cmpF615667140B44D6BB380D215D17FF982" />
<ComponentRef Id="cmpACAC7E20898E4F51999C09E9980FAB46" />
<ComponentRef Id="cmp53B914C6F5CE4FFE8CFCFB9F2408BA9E" />
<ComponentRef Id="cmp16F0DBFB76114DA497A51D9A919EC009" />
<ComponentRef Id="cmp222A8A32083347E68BA8B2258B6E3C82" />
<ComponentRef Id="cmp6E116504475844D7810236B408748E80" />
<ComponentRef Id="cmp48D158C7B6A54EE7A5983261703DFE01" />
@@ -3906,7 +3938,6 @@
<ComponentRef Id="cmpEDD4BBB46F0F405F9D03F23AD540F006" />
<ComponentRef Id="cmp5CB558FECF2F40699DC54E212C849E5E" />
<ComponentRef Id="cmp2F888F24537C4A59B8DE0D9600ED5F86" />
<ComponentRef Id="cmp04E47666C6FA4BFD86F37133B21D88D9" />
<ComponentRef Id="cmp3F0494AB0EA8424C8C45C8421364B695" />
<ComponentRef Id="cmp982D240D3FB34B909262D8C6D345C0B4" />
<ComponentRef Id="cmp92D157C1F70440D8B756ECA2D5DAA438" />
@@ -3933,7 +3964,6 @@
<ComponentRef Id="cmpF9F3FA55774C412A83157FA1E64D44E2" />
<ComponentRef Id="cmp3418E005ECC646A8AD5C0467397185E8" />
<ComponentRef Id="cmp19DB395024234D64B015F638FCDA8C5A" />
<ComponentRef Id="cmpBB165E166A6C4A9787203A73BEB2D000" />
<ComponentRef Id="cmp54EE3E452F8341E69DE045A2DB941DEE" />
<ComponentRef Id="cmp99F588E14200498095845D1AB84D70D8" />
<ComponentRef Id="cmp119D48233B3B479FBD8222BA060D65EB" />
@@ -3946,7 +3976,6 @@
<ComponentRef Id="cmp49BBAD244F0046C7ACB8CE4356300EE1" />
<ComponentRef Id="cmp1E21C2E7CAF54358AE80B36CE715AAD3" />
<ComponentRef Id="cmpAC2613BBBA934B3C9D8C6DB1B27AA153" />
<ComponentRef Id="cmp49C115344FB34DF69CB6DC600E8AF6FF" />
<ComponentRef Id="cmpB0757B4B80DB48F2BD94AB74A9CE3487" />
<ComponentRef Id="cmp905E602506DA4B39ADA617E8AE43E12B" />
<ComponentRef Id="cmpCF69FB22CA5B47A7BBC959539C7EC653" />
@@ -4023,7 +4052,6 @@
<ComponentRef Id="cmpF543DDEF59CB4ACB85CBC9A106BD853D" />
<ComponentRef Id="cmp3002312C17174D51B6DAFF6EFE5854E3" />
<ComponentRef Id="cmp011004AE1CF04BEBBAD8B831F844C045" />
<ComponentRef Id="cmpBC496597B2E948E891B76934844120F0" />
<ComponentRef Id="cmpA1BA99196E3645448F2061091FD85C4A" />
<ComponentRef Id="cmpF98969464485476CB2FC4A4A20F1AC9E" />
<ComponentRef Id="cmp5B5FA4F5288D4C7B97F0D41B0EBAF12A" />
@@ -4063,7 +4091,35 @@
<ComponentRef Id="cmp73A4CC8E2C9E4594A3D8258C9E00D7E6" />
<ComponentRef Id="cmpAC984FA3A67247BC996F60290C87D0A1" />
<ComponentRef Id="cmp2E32A6E773F543F0A150B972F8D3E23A" />
<ComponentRef Id="cmp4FF68ECC102A4EC79019A7B087B5DE8D" />
<ComponentRef Id="cmpC3357D2F892347769141A20222683855" />
<ComponentRef Id="cmp9C5650D758FC401F8C785A0F979A9505" />
<ComponentRef Id="cmp2868115863264407B40346B27ABE3E4D" />
<ComponentRef Id="cmp11087C190382415AB1DC1DFBD78DF348" />
<ComponentRef Id="cmp28349C4ACD6D42D3967853E0A1D7DC4E" />
<ComponentRef Id="cmpB944176DE7924A268269903DC0B5D510" />
<ComponentRef Id="cmp213F9BA38ED149468C656788A7ED847D" />
<ComponentRef Id="cmp0DA1B3EF85234C7BBA6DE35BBD1B45D2" />
<ComponentRef Id="cmpA34D56794B9144A2BE67E7CDABCF5B4E" />
<ComponentRef Id="cmpF4093A1E8AB94B43AB0F852EB647CE7F" />
<ComponentRef Id="cmp0535678883A44B4D81A04C8BA7B2068C" />
<ComponentRef Id="cmp4CCDE73A2A9E4D7B90065639D9433178" />
<ComponentRef Id="cmp874F51885AE34AD9AA37DC46A44B3194" />
<ComponentRef Id="cmp5359C8369744482FBB5D56CDF3FA0DB0" />
<ComponentRef Id="cmp798A4EE6784541FE9B13582E52C5A818" />
<ComponentRef Id="cmp1F2C85D1488B417F9F8FD96EA4A4D8B4" />
<ComponentRef Id="cmpFAA0CCBA17FE4E8FAE5FE4B5F679DF52" />
<ComponentRef Id="cmp705598FEC8EA43D7A9B239787BA5DB09" />
<ComponentRef Id="cmpB40EE0CC916B4928987F62F5909AE709" />
<ComponentRef Id="cmp7B5948A1A366409F99B871F0E772B945" />
<ComponentRef Id="cmpD8CDC1F864664A33B6221A40F2BE8406" />
<ComponentRef Id="cmp10773057C33543FA93222022DEC0847D" />
<ComponentRef Id="cmpEC0DB2C3A9C14F4E9FC6883357345CB5" />
<ComponentRef Id="cmp33364765C98D4BE09BD26DC1E6B95B86" />
<ComponentRef Id="cmpB9B22A80E70F414B8778B852E29D6492" />
<ComponentRef Id="cmpA6FA5B27C61E482D8BBC5F1806D3B223" />
<ComponentRef Id="cmp38D8A48C68FB4CB399A0A7677FA428E4" />
<ComponentRef Id="cmp26335B5D1FE94E87A6B6EBD56A22C2B9" />
<ComponentRef Id="cmp57D197B18F1F4A6AAB704B28CF61B535" />
</ComponentGroup>
</Fragment>
</Wix>
build.psm1
+3 -3
View File
@@ -712,8 +712,8 @@ function New-PSOptions {
[ValidateSet("Debug", "Release", "CodeCoverage", '')]
[string]$Configuration,
[ValidateSet("netcoreapp3.1")]
[string]$Framework = "netcoreapp3.1",
[ValidateSet("netcoreapp5.0")]
[string]$Framework = "netcoreapp5.0",
# These are duplicated from Start-PSBuild
# We do not use ValidateScript since we want tab completion
@@ -2410,7 +2410,7 @@ function Copy-PSGalleryModules
Restore-PSPackage -ProjectDirs (Split-Path $CsProjPath) -Force:$Force.IsPresent
$cache = dotnet nuget locals global-packages -l
if ($cache -match "info : global-packages: (.*)") {
if ($cache -match "global-packages: (.*)") {
$nugetCache = $Matches[1]
}
else {
global.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.1.102"
"version": "5.0.100-preview.1.20155.7"
}
}
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="4.7.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.1.20120.5" />
</ItemGroup>
</Project>
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+2 -2
View File
@@ -32,8 +32,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.5.0" />
<PackageReference Include="System.Threading.AccessControl" Version="4.7.0" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.1.20120.5" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.1.20120.5" />
<PackageReference Include="NJsonSchema" Version="10.1.8" />
</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="4.7.0" />
<PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0-preview.1.20120.5" />
</ItemGroup>
</Project>
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+3 -3
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.1" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="4.7.0" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.0" />
<PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.1.20120.5" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.1.20120.5" />
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.1.20120.5" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0" />
<PackageReference Include="System.ServiceModel.Http" Version="4.7.0" />
src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+1 -1
View File
@@ -9,7 +9,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="4.7.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.1.20120.5" />
</ItemGroup>
<PropertyGroup>
src/ResGen/ResGen.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<Description>Generates C# typed bindings for .resx files</Description>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>netcoreapp5.0</TargetFramework>
<AssemblyName>resgen</AssemblyName>
<OutputType>Exe</OutputType>
<TieredCompilation>true</TieredCompilation>
src/System.Management.Automation/System.Management.Automation.csproj
+10 -10
View File
@@ -16,16 +16,16 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.13.1" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.7.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
<PackageReference Include="System.DirectoryServices" Version="4.7.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
<PackageReference Include="System.Management" Version="4.7.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
<PackageReference Include="System.Security.AccessControl" Version="4.7.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.7.0" />
<PackageReference Include="System.Security.Permissions" Version="4.7.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.1.20120.5" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.1.20120.5" />
<PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.1.20120.5" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.1.20120.5" />
<PackageReference Include="System.Management" Version="5.0.0-preview.1.20120.5" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.1.20120.5" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.1.20120.5" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.1.20120.5" />
<PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.1.20120.5" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.1.20120.5" />
<!-- 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.0.0" />
src/System.Management.Automation/security/nativeMethods.cs
+3 -24
View File
@@ -808,7 +808,7 @@ namespace System.Management.Automation.Security
internal uint cbStruct;
/// GUID->_GUID
internal GUID gSubject;
internal Guid gSubject;
/// LPCWSTR->WCHAR*
[MarshalAsAttribute(UnmanagedType.LPWStr)]
@@ -827,23 +827,6 @@ namespace System.Management.Automation.Security
internal System.IntPtr pbMemSignedMsg;
}
[StructLayoutAttribute(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
internal struct GUID
{
/// unsigned int
internal uint Data1;
/// unsigned short
internal ushort Data2;
/// unsigned short
internal ushort Data3;
/// unsigned char[8]
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
internal byte[] Data4;
}
[ArchitectureSensitive]
internal static WINTRUST_FILE_INFO InitWintrustFileInfoStruct(string fileName)
{
@@ -864,11 +847,7 @@ namespace System.Management.Automation.Security
byte[] contentBytes = System.Text.Encoding.Unicode.GetBytes(content);
// The GUID of the PowerShell SIP
bi.gSubject.Data1 = 0x603bcc1f;
bi.gSubject.Data2 = 0x4b59;
bi.gSubject.Data3 = 0x4e08;
bi.gSubject.Data4 = new byte[] { 0xb7, 0x24, 0xd2, 0xc6, 0x29, 0x7e, 0xf3, 0x51 };
bi.gSubject = new Guid(0x603bcc1f, 0x4b59, 0x4e08, new byte[] { 0xb7, 0x24, 0xd2, 0xc6, 0x29, 0x7e, 0xf3, 0x51 });
bi.cbStruct = (DWORD)Marshal.SizeOf(bi);
bi.pcwszDisplayName = fileName;
bi.cbMemObject = (uint)contentBytes.Length;
@@ -1988,7 +1967,7 @@ namespace System.Management.Automation.Security
internal string pwszReferenceTag;
[MarshalAs(UnmanagedType.LPWStr)]
internal string pwszFileName;
internal GUID gSubjectType;
internal Guid gSubjectType;
internal DWORD fdwMemberFlags;
internal IntPtr pIndirectData;
internal DWORD dwCertVersion;
src/TypeCatalogGen/TypeCatalogGen.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<Description>Generates CorePsTypeCatalog.cs given powershell.inc</Description>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>netcoreapp5.0</TargetFramework>
<AssemblyName>TypeCatalogGen</AssemblyName>
<OutputType>Exe</OutputType>
<TieredCompilation>true</TieredCompilation>
test/Test.Common.props
+1 -1
View File
@@ -4,7 +4,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>netcoreapp5.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
test/powershell/Host/ConsoleHost.Tests.ps1
+7
View File
@@ -1009,3 +1009,10 @@ Describe 'Pwsh startup and PATH' -Tag CI {
$path | Should -BeExactly ($PSHOME + [System.IO.Path]::PathSeparator)
}
}
Describe 'Console host name' -Tag CI {
It 'Name is pwsh' -Pending {
# waiting on https://github.com/dotnet/runtime/issues/33673
(Get-Process -id $PID).Name | Should -BeExactly 'pwsh'
}
}
test/powershell/Host/Startup.Tests.ps1
-6
View File
@@ -13,7 +13,6 @@ Describe "Validate start of console host" -Tag CI {
'netstandard.dll'
'Newtonsoft.Json.dll'
'pwsh.dll'
'System.Buffers.dll'
'System.Collections.Concurrent.dll'
'System.Collections.dll'
'System.Collections.NonGeneric.dll'
@@ -23,7 +22,6 @@ Describe "Validate start of console host" -Tag CI {
'System.ComponentModel.TypeConverter.dll'
'System.Console.dll'
'System.Data.Common.dll'
'System.Diagnostics.Debug.dll'
'System.Diagnostics.FileVersionInfo.dll'
'System.Diagnostics.Process.dll'
'System.Diagnostics.TraceSource.dll'
@@ -46,9 +44,7 @@ Describe "Validate start of console host" -Tag CI {
'System.Reflection.Emit.ILGeneration.dll'
'System.Reflection.Emit.Lightweight.dll'
'System.Reflection.Primitives.dll'
'System.Resources.ResourceManager.dll'
'System.Runtime.dll'
'System.Runtime.Extensions.dll'
'System.Runtime.InteropServices.dll'
'System.Runtime.InteropServices.RuntimeInformation.dll'
'System.Runtime.Loader.dll'
@@ -62,7 +58,6 @@ Describe "Validate start of console host" -Tag CI {
'System.Text.Encoding.Extensions.dll'
'System.Text.RegularExpressions.dll'
'System.Threading.dll'
'System.Threading.Tasks.dll'
'System.Threading.Tasks.Parallel.dll'
'System.Threading.Thread.dll'
'System.Threading.ThreadPool.dll'
@@ -76,7 +71,6 @@ Describe "Validate start of console host" -Tag CI {
'System.Management.dll'
'System.Security.Claims.dll'
'System.Security.Cryptography.Primitives.dll'
'System.Security.Principal.dll'
'System.Threading.Overlapped.dll'
)
}
test/powershell/Language/Operators/NullConditional.Tests.ps1
+2 -3
View File
@@ -296,7 +296,6 @@ Describe 'NullConditionalMemberAccess' -Tag 'CI' {
${array}?.length | Should -Be 3
${hash}?.a | Should -Be 1
(Get-Process -Id $PID)?.Name | Should -BeLike "pwsh*"
(Get-Item $TestDrive)?.EnumerateFiles()?.Name | Should -BeExactly 'testfile.txt'
[int32]::MaxValue?.ToString() | Should -BeExactly '2147483647'
@@ -360,8 +359,8 @@ Describe 'NullConditionalMemberAccess' -Tag 'CI' {
It 'Use ?. on a dynamic property name' {
$testContent = @'
$propName = 'Name'
(Get-Process -Id $PID)?.$propName | Should -BeLike 'pwsh*'
$propName = 'SI'
(Get-Process -Id $PID)?.$propName | Should -Be (Get-Process -id $PID).SessionId
${doesNotExist}?.$propName() | Should -BeNullOrEmpty
'@
test/powershell/Language/Operators/TernaryOperator.Tests.ps1
+2 -2
View File
@@ -22,7 +22,7 @@ Describe "Using of ternary operator" -Tags CI {
@{ Script = { @{name = 'name'}.Contains('name') ? 'Core' : 'Desktop' }; ExpectedValue = 'Core' }
@{ Script = { (Test-Path Env:\NonExist) ? 'true' : 'false' }; ExpectedValue = 'false' }
@{ Script = { (Test-Path Env:\PSModulePath) ? 'true' : 'false' }; ExpectedValue = 'true' }
@{ Script = { $($p = Get-Process -Id $PID; $p.Name -eq 'pwsh') ? 'Core' : 'Desktop' }; ExpectedValue = 'Core' }
@{ Script = { $($p = Get-Process -Id $PID; $p.Id -eq $PID) ? 'Core' : 'Desktop' }; ExpectedValue = 'Core' }
@{ Script = { ($a = 1) ? 2 : 3 }; ExpectedValue = 2 }
@{ Script = { $($a = 1) ? 2 : 3 }; ExpectedValue = 3 }
@{ Script = { (Write-Warning -Message warning -WarningAction SilentlyContinue) ? 1 : 2 }; ExpectedValue = 2 }
@@ -31,7 +31,7 @@ Describe "Using of ternary operator" -Tags CI {
## Condition: unary and binary expression expressions
@{ Script = { -not $IsCoreCLR ? 'Desktop' : 'Core' }; ExpectedValue = 'Core' }
@{ Script = { $PSEdition -eq 'Core' ? 'Core' : 'Desktop' }; ExpectedValue = 'Core' }
@{ Script = { $IsCoreCLR -and (Get-Process -Id $PID).Name -eq 'pwsh' ? 'Core' : 'Desktop' }; ExpectedValue = 'Core' }
@{ Script = { $IsCoreCLR -and (Get-Process -Id $PID).Id -eq $PID ? 'Core' : 'Desktop' }; ExpectedValue = 'Core' }
@{ Script = { $IsCoreCLR -and 'pwsh' -match 'p.*h' ? 'Core' : 'Desktop' }; ExpectedValue = 'Core' }
@{ Script = { 1,2,3 -contains 2 ? 'Core' : 'Desktop' }; ExpectedValue = 'Core' }
test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
-30
View File
@@ -1901,36 +1901,6 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
}
Context "Denial of service" -Tag 'DOS' {
It "Image Parsing" {
$dosUri = Get-WebListenerUrl -Test 'Dos' -query @{
dosType='img'
dosLength='5000'
}
$script:content = ''
[TimeSpan] $timeSpan = Measure-Command {
$response = Invoke-WebRequest -Uri $dosUri
$script:content = $response.content
$response.Images | out-null
}
$script:content | Should -Not -BeNullOrEmpty
# pathological regex
$regex = [RegEx]::new('<img\s+[^>]*>')
[TimeSpan] $pathologicalTimeSpan = Measure-Command {
$regex.Match($content)
}
$pathologicalRatio = $pathologicalTimeSpan.TotalMilliseconds/$timeSpan.TotalMilliseconds
Write-Verbose "Pathological ratio: $pathologicalRatio" -Verbose
# dosLength 4,000 on my 3.5 GHz 6-Core Intel Xeon E5 macpro produced a ratio of 12
# dosLength 5,000 on my 3.5 GHz 6-Core Intel Xeon E5 macpro produced a ratio of 21
# dosLength 10,000 on my 3.5 GHz 6-Core Intel Xeon E5 macpro produced a ratio of 75
# in some cases we will be running in a Docker container with modest resources
$pathologicalRatio | Should -BeGreaterThan 5
}
It "Charset Parsing" {
$dosUri = Get-WebListenerUrl -Test 'Dos' -query @{
dosType='charset'
test/tools/OpenCover/OpenCover.psm1
+1 -1
View File
@@ -624,7 +624,7 @@ function Invoke-OpenCover
[parameter()]$OutputLog = "$HOME/Documents/OpenCover.xml",
[parameter()]$TestPath = "${script:psRepoPath}/test/powershell",
[parameter()]$OpenCoverPath = "$HOME/OpenCover",
[parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/netcoreapp3.1/win7-x64/publish",
[parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/netcoreapp5.0/win7-x64/publish",
[parameter()]$PesterLogElevated = "$HOME/Documents/TestResultsElevated.xml",
[parameter()]$PesterLogUnelevated = "$HOME/Documents/TestResultsUnelevated.xml",
[parameter()]$PesterLogFormat = "NUnitXml",
test/tools/WebListener/WebListener.csproj
+1 -1
View File
@@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.1.20120.5" />
</ItemGroup>
<ItemGroup>
tools/packaging/packaging.psm1
+8 -8
View File
@@ -131,14 +131,14 @@ function Start-PSPackage {
-not $Script:Options -or ## Start-PSBuild hasn't been executed yet
-not $PSModuleRestoreCorrect -or ## Last build didn't specify '-PSModuleRestore' correctly
$Script:Options.Configuration -ne $Configuration -or ## Last build was with configuration other than 'Release'
$Script:Options.Framework -ne "netcoreapp3.1" ## Last build wasn't for CoreCLR
$Script:Options.Framework -ne "netcoreapp5.0" ## Last build wasn't for CoreCLR
} else {
-not $Script:Options -or ## Start-PSBuild hasn't been executed yet
-not $crossGenCorrect -or ## Last build didn't specify '-CrossGen' correctly
-not $PSModuleRestoreCorrect -or ## Last build didn't specify '-PSModuleRestore' correctly
$Script:Options.Runtime -ne $Runtime -or ## Last build wasn't for the required RID
$Script:Options.Configuration -ne $Configuration -or ## Last build was with configuration other than 'Release'
$Script:Options.Framework -ne "netcoreapp3.1" ## Last build wasn't for CoreCLR
$Script:Options.Framework -ne "netcoreapp5.0" ## Last build wasn't for CoreCLR
}
# Make sure the most recent build satisfies the package requirement
@@ -1626,7 +1626,7 @@ function CreateNugetPlatformFolder
[string] $PlatformBinPath
)
$destPath = New-Item -ItemType Directory -Path (Join-Path $PackageRuntimesFolder "$Platform/lib/netcoreapp3.1")
$destPath = New-Item -ItemType Directory -Path (Join-Path $PackageRuntimesFolder "$Platform/lib/netcoreapp5.0")
$fullPath = Join-Path $PlatformBinPath $file
if (-not(Test-Path $fullPath)) {
@@ -1726,7 +1726,7 @@ function New-ILNugetPackage
$packageRuntimesFolder = New-Item (Join-Path $filePackageFolder.FullName 'runtimes') -ItemType Directory
#region ref
$refFolder = New-Item (Join-Path $filePackageFolder.FullName 'ref/netcoreapp3.1') -ItemType Directory -Force
$refFolder = New-Item (Join-Path $filePackageFolder.FullName 'ref/netcoreapp5.0') -ItemType Directory -Force
CopyReferenceAssemblies -assemblyName $fileBaseName -refBinPath $refBinPath -refNugetPath $refFolder -assemblyFileList $fileList
#endregion ref
@@ -1770,8 +1770,8 @@ function New-ILNugetPackage
"Microsoft.PowerShell.Utility"
)
$winModuleFolder = New-Item (Join-Path $contentFolder "runtimes\win\lib\netcoreapp3.1\Modules") -ItemType Directory -Force
$unixModuleFolder = New-Item (Join-Path $contentFolder "runtimes\unix\lib\netcoreapp3.1\Modules") -ItemType Directory -Force
$winModuleFolder = New-Item (Join-Path $contentFolder "runtimes\win\lib\netcoreapp5.0\Modules") -ItemType Directory -Force
$unixModuleFolder = New-Item (Join-Path $contentFolder "runtimes\unix\lib\netcoreapp5.0\Modules") -ItemType Directory -Force
foreach ($module in $winBuiltInModules) {
$source = Join-Path $WinFxdBinPath "Modules\$module"
@@ -2140,7 +2140,7 @@ function New-ReferenceAssembly
Write-Log "Running: dotnet $arguments"
Start-NativeExecution -sb {dotnet $arguments}
$refBinPath = Join-Path $projectFolder "bin/Release/netcoreapp3.1/$assemblyName.dll"
$refBinPath = Join-Path $projectFolder "bin/Release/netcoreapp5.0/$assemblyName.dll"
if ($null -eq $refBinPath) {
throw "Reference assembly was not built."
}
@@ -3578,7 +3578,7 @@ function New-GlobalToolNupkg
}
$packageInfo | ForEach-Object {
$ridFolder = New-Item -Path (Join-Path $_.RootFolder "tools/netcoreapp3.1/any") -ItemType Directory
$ridFolder = New-Item -Path (Join-Path $_.RootFolder "tools/netcoreapp5.0/any") -ItemType Directory
$packageType = $_.Type
tools/packaging/projects/nuget/package.csproj
+1 -1
View File
@@ -11,6 +11,6 @@
<NuspecProperties>runtime=$(RID);version=$(SemVer);PackageName=$(PackageName)</NuspecProperties>
<NuspecBasePath>$(StagingPath)</NuspecBasePath>
<IsTool>True</IsTool>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>netcoreapp5.0</TargetFramework>
</PropertyGroup>
</Project>
tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+2 -2
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>netcoreapp5.0</TargetFramework>
<Version>$(RefAsmVersion)</Version>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
@@ -14,6 +14,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.Security.AccessControl" Version="4.7.0" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.1.20120.5" />
</ItemGroup>
</Project>
tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
+1 -1
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>netcoreapp5.0</TargetFramework>
<Version>$(RefAsmVersion)</Version>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+3 -3
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>netcoreapp5.0</TargetFramework>
<Version>$(RefAsmVersion)</Version>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="4.7.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.7.0" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.1.20120.5" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.1.20120.5" />
</ItemGroup>
</Project>