mirror of
https://github.com/PowerShell/PowerShell
synced 2026-06-08 12:12:50 +00:00
Backport compliance changes (#19719)
This commit is contained in:
@@ -172,6 +172,7 @@
|
||||
<!-- Define all OS, release configuration properties -->
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>portable</DebugType>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Define windows, release configuration properties -->
|
||||
|
||||
+46
-50
@@ -2958,9 +2958,6 @@
|
||||
<Component Id="cmpF2634E50875D4698921081E3C6B1D5DC">
|
||||
<File Id="fil5A54754B01054DB590032470CE5F1EBD" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationCore.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpBFAC308E2D8645278D61C126C0FC2C61">
|
||||
<File Id="fil2954DD50127543F991A9F0A539E80FA4" KeyPath="yes" Source="$(var.ProductSourcePath)\PenImc_cor3.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp8F0E2CF1B76B4D5185CB6A8DB9236F93">
|
||||
<File Id="fil91831C8BEFBB49AE8A4FDE50300CA3E8" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationFramework-SystemXml.dll" />
|
||||
</Component>
|
||||
@@ -3045,9 +3042,6 @@
|
||||
<Component Id="cmp930F2D2320B94F6397ECD91862AF7A90">
|
||||
<File Id="fil0B2E8182CDEC485F8364AB82F5EA2D35" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationFramework.Luna.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp5C8827EF42BE4C098EF08EBD4011DA47">
|
||||
<File Id="fil15D3E880E8AD4F9A970422D79FADDBAF" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationNative_cor3.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp6C0567CC32E4457A8F2D03C6E7F5897E">
|
||||
<File Id="filB46C0C9BDA404C51ACB0F93E5ADACDE5" KeyPath="yes" Source="$(var.ProductSourcePath)\WindowsFormsIntegration.dll" />
|
||||
</Component>
|
||||
@@ -3111,9 +3105,6 @@
|
||||
<Component Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E">
|
||||
<File Id="fil6EF5C2AED8674A32B0F3CCEE9CBEED71" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Formats.Asn1.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D">
|
||||
<File Id="fil8FEEEB3B27DF40148EB85CE6AE1A420B" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.DiaSymReader.Native.$(var.FileArchitecture).dll" />
|
||||
</Component>
|
||||
<Component Id="cmp1EBDE676D79B4B0DB859B3F601D78513">
|
||||
<File Id="fil589A10D0D26C4D7F8479F40D11824D63" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-console-l1-2-0.dll" />
|
||||
</Component>
|
||||
@@ -3157,6 +3148,12 @@
|
||||
<Component Id="cmp67BD9092B046498294EB7689F85B33E8">
|
||||
<File Id="fil12B01FBAC62A402883168CE835231417" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.1623.17311.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp6986F8B66C514347A25E03DD3096B5AE">
|
||||
<File Id="fil9276D1BDBF8B4C91B90761633720A419" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationNative_cor3.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp96588875574749E295496861FFC1DB58">
|
||||
<File Id="filF931B05A25224A188D08E09A9FDC3A58" KeyPath="yes" Source="$(var.ProductSourcePath)\PenImc_cor3.dll" />
|
||||
</Component>
|
||||
</DirectoryRef>
|
||||
</Fragment>
|
||||
<Fragment>
|
||||
@@ -3695,6 +3692,17 @@
|
||||
<ComponentRef Id="cmp859A3876902946E7B5B4965F90664C5D" />
|
||||
<ComponentRef Id="cmp25A144CC34E545378735B06794A02F90" />
|
||||
<ComponentRef Id="cmp19ADFEFDD03047828CF493B5B5CE7B6E" />
|
||||
<ComponentRef Id="cmp72C41225E0B4457C8CB5F4C5FE6E3187" />
|
||||
<ComponentRef Id="cmpEE26930D65E346FDAE1B3E07F5DBEF77" />
|
||||
<ComponentRef Id="cmp834F3E0C83664E92B0D115A39A8FAACB" />
|
||||
<ComponentRef Id="cmp68158D010ECB439582D041355BFACCBB" />
|
||||
<ComponentRef Id="cmp690F24F04C044127A61754363A4D63E3" />
|
||||
<ComponentRef Id="cmpFAD6557C4AEC48B89DDC4E6485C020C4" />
|
||||
<ComponentRef Id="cmpB5458B36303A472B80582AF1C2E7FB94" />
|
||||
<ComponentRef Id="cmp0EBD333D501A45089F58504074E229E7" />
|
||||
<ComponentRef Id="cmpD11E9CA5069045578BA5D89C86F7FDEF" />
|
||||
<ComponentRef Id="cmp708913639F7A46E784CC0FA862A1A2CE" />
|
||||
<ComponentRef Id="cmpA75DEF5617C54DA1937CB37D5824BF79" />
|
||||
<ComponentRef Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B" />
|
||||
<ComponentRef Id="cmpA620CA71E6FF4F50B6D7BB0761D17036" />
|
||||
<ComponentRef Id="cmp2DF9FE0BD560EB7DC8489A259330C2C6" />
|
||||
@@ -3784,6 +3792,8 @@
|
||||
<ComponentRef Id="cmpF429A622BF26430592ECE6BFD1EBE61A" />
|
||||
<ComponentRef Id="cmp38D8A48C68FB4CB399A0A7677FA428E4" />
|
||||
<ComponentRef Id="cmp57D197B18F1F4A6AAB704B28CF61B535" />
|
||||
<ComponentRef Id="cmp690BAC3241424F59B5D30DE0E846D03E" />
|
||||
<ComponentRef Id="cmp5B67AE2852E04C26970FD2016CA76E07" />
|
||||
<ComponentRef Id="cmpF2941A91B17EEA22CD6DAB34693D9AC0" />
|
||||
<ComponentRef Id="cmp0E8354647101C56EF81E9BDB164B586E" />
|
||||
<ComponentRef Id="cmpDCAA22865EF8486AB7526E046A51DBF6" />
|
||||
@@ -3803,6 +3813,8 @@
|
||||
<ComponentRef Id="cmp775BF8C154D047B5AE4779F4AD2727BE" />
|
||||
<ComponentRef Id="cmp9C5650D758FC401F8C785A0F979A9505" />
|
||||
<ComponentRef Id="cmpB40EE0CC916B4928987F62F5909AE709" />
|
||||
<ComponentRef Id="cmpB43ED7BA30C844E2B5C38F7B747EEFDC" />
|
||||
<ComponentRef Id="cmp777DF202EF2542F2ACFCCF0481E8D6EE" />
|
||||
<ComponentRef Id="cmpBEB5F3CF75675537751F0D0B32125BF1" />
|
||||
<ComponentRef Id="cmpFB3B0ED1FFF7496CAF70B2F12EBC5CAE" />
|
||||
<ComponentRef Id="cmp726DCF2BD14F471AAE8C088A527A1B21" />
|
||||
@@ -3822,6 +3834,8 @@
|
||||
<ComponentRef Id="cmpC6C53A5B540B4A3C9624A0D14D5A9790" />
|
||||
<ComponentRef Id="cmp2868115863264407B40346B27ABE3E4D" />
|
||||
<ComponentRef Id="cmpB944176DE7924A268269903DC0B5D510" />
|
||||
<ComponentRef Id="cmpCC4A42AA70EE4418926986F5A4B8D3FA" />
|
||||
<ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
|
||||
<ComponentRef Id="cmp1DEB513A065956086898BCDACC5887B6" />
|
||||
<ComponentRef Id="cmpBAF5257E7B0B1D023F465B43792BC250" />
|
||||
<ComponentRef Id="cmp5C9DD1C2D13D443FBC9C74883439DD56" />
|
||||
@@ -3841,6 +3855,8 @@
|
||||
<ComponentRef Id="cmpCC41F040CB1B4D0487DD193036A9DD1A" />
|
||||
<ComponentRef Id="cmp5359C8369744482FBB5D56CDF3FA0DB0" />
|
||||
<ComponentRef Id="cmp7B5948A1A366409F99B871F0E772B945" />
|
||||
<ComponentRef Id="cmpE7BE9D8F63E04798870E57BA1EABB9A5" />
|
||||
<ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
|
||||
<ComponentRef Id="cmp3EC91B8BF4282E77113321E5D1ED27B2" />
|
||||
<ComponentRef Id="cmp6E798DAF34F45B4588AEA3E3F33A3FAE" />
|
||||
<ComponentRef Id="cmpAF881D0D194F4D6984F92E8386E67445" />
|
||||
@@ -3860,6 +3876,8 @@
|
||||
<ComponentRef Id="cmpEB0B8586AAC24EACA2867506D39669C5" />
|
||||
<ComponentRef Id="cmp11087C190382415AB1DC1DFBD78DF348" />
|
||||
<ComponentRef Id="cmp28349C4ACD6D42D3967853E0A1D7DC4E" />
|
||||
<ComponentRef Id="cmp166B17F72C954B0087DF991E560B399A" />
|
||||
<ComponentRef Id="cmp0173AE0CBFA44C269D93361F6C98F99B" />
|
||||
<ComponentRef Id="cmp867E4E51FE7BC09AAD5D59FD76716FBC" />
|
||||
<ComponentRef Id="cmpD7A394A1A96413EC3644F59D3099C0F5" />
|
||||
<ComponentRef Id="cmpA0A01F4E746F4F3C90E0AE3895336E24" />
|
||||
@@ -3879,6 +3897,8 @@
|
||||
<ComponentRef Id="cmp58AA8F924CF74562A2D8A789B5EE8B97" />
|
||||
<ComponentRef Id="cmp1F2C85D1488B417F9F8FD96EA4A4D8B4" />
|
||||
<ComponentRef Id="cmp26335B5D1FE94E87A6B6EBD56A22C2B9" />
|
||||
<ComponentRef Id="cmp529A2B5343FD466884FAF627E37C648D" />
|
||||
<ComponentRef Id="cmp5492F78ACB1A4391BBED371FDFC06B9E" />
|
||||
<ComponentRef Id="cmpAA026CCA623F0E8FB5BAE9F201C5B89D" />
|
||||
<ComponentRef Id="cmp341C4F1E70E4484001218F1B20F62FCF" />
|
||||
<ComponentRef Id="cmp52513C1A98FF4241AC3588CCB18C5A1F" />
|
||||
@@ -3898,6 +3918,8 @@
|
||||
<ComponentRef Id="cmpA3B2086013B5455D9D98B260493EC0B2" />
|
||||
<ComponentRef Id="cmp0DA1B3EF85234C7BBA6DE35BBD1B45D2" />
|
||||
<ComponentRef Id="cmpF4093A1E8AB94B43AB0F852EB647CE7F" />
|
||||
<ComponentRef Id="cmp4EE1633EE4864CE5B9015BF76BD31D14" />
|
||||
<ComponentRef Id="cmp3B07F4E4B6034F3284288C18F4638CA7" />
|
||||
<ComponentRef Id="cmpA656A18FE14D3C8EB02C31AE474054E3" />
|
||||
<ComponentRef Id="cmp070651CCF2761B3EF1985884AEB8AC64" />
|
||||
<ComponentRef Id="cmpFA35A2719CE343E1B41665922CC26AF4" />
|
||||
@@ -3917,6 +3939,8 @@
|
||||
<ComponentRef Id="cmp74681822D78E49DB9E42A990DFDFB3A9" />
|
||||
<ComponentRef Id="cmpC3357D2F892347769141A20222683855" />
|
||||
<ComponentRef Id="cmp705598FEC8EA43D7A9B239787BA5DB09" />
|
||||
<ComponentRef Id="cmpC8C68DB0DEE44CF49D98532D2C26395E" />
|
||||
<ComponentRef Id="cmpA8A66545C44F428BB552B55EEE353BB0" />
|
||||
<ComponentRef Id="cmp3D20E940BDBF41630242C63011A80CE5" />
|
||||
<ComponentRef Id="cmp7C2E3035EE02569D9F11970586140F28" />
|
||||
<ComponentRef Id="cmp1E40E7911F29449487A42C55FFF9679B" />
|
||||
@@ -3936,6 +3960,8 @@
|
||||
<ComponentRef Id="cmp6A48FC0DE86C41C297EC418A0E49CA2C" />
|
||||
<ComponentRef Id="cmp213F9BA38ED149468C656788A7ED847D" />
|
||||
<ComponentRef Id="cmpFAA0CCBA17FE4E8FAE5FE4B5F679DF52" />
|
||||
<ComponentRef Id="cmpF3C18F07C6A148638CBC858EB02E3A6D" />
|
||||
<ComponentRef Id="cmp0C4751F9D5C14419A45F234152D21DA9" />
|
||||
<ComponentRef Id="cmpFDCD51BD80926ABECCE27D0D66A47C8F" />
|
||||
<ComponentRef Id="cmp85FE3DB247B4FB3E04D8E4CED6D66853" />
|
||||
<ComponentRef Id="cmp50F3BA81002D443DBD8AA4A4A494A37D" />
|
||||
@@ -3955,6 +3981,8 @@
|
||||
<ComponentRef Id="cmp38EEEBD629164D8FA34DBE11D92B5712" />
|
||||
<ComponentRef Id="cmp4CCDE73A2A9E4D7B90065639D9433178" />
|
||||
<ComponentRef Id="cmpA6FA5B27C61E482D8BBC5F1806D3B223" />
|
||||
<ComponentRef Id="cmpBD958F4B8F9146499DE2CA6321C65F96" />
|
||||
<ComponentRef Id="cmp6ADB50DF9F2D4BCA9E682AA6D1C7C03B" />
|
||||
<ComponentRef Id="cmp286FCD0B19BF06446A7274672A2491CA" />
|
||||
<ComponentRef Id="cmp137236E8DF48EE210ABFCB127CC1E46C" />
|
||||
<ComponentRef Id="cmpBA1EE6DA3429452BA3A1F3428C9CC942" />
|
||||
@@ -3974,6 +4002,8 @@
|
||||
<ComponentRef Id="cmp363CFDFE64D94C5693BAB14FCD5FE78C" />
|
||||
<ComponentRef Id="cmpA34D56794B9144A2BE67E7CDABCF5B4E" />
|
||||
<ComponentRef Id="cmp10773057C33543FA93222022DEC0847D" />
|
||||
<ComponentRef Id="cmp2B8239B905B146A69CD5D55A353AC131" />
|
||||
<ComponentRef Id="cmp9FCFAEB797D9475C873E21B4B5A89E28" />
|
||||
<ComponentRef Id="cmp34C4A21743AC68583599BF2B139F39F2" />
|
||||
<ComponentRef Id="cmp2AB68868B57E7E15FCD69157375E39D1" />
|
||||
<ComponentRef Id="cmpBCFD31F785CB4246B79A3208D566B2F2" />
|
||||
@@ -3993,6 +4023,8 @@
|
||||
<ComponentRef Id="cmp119D48233B3B479FBD8222BA060D65EB" />
|
||||
<ComponentRef Id="cmpEC0DB2C3A9C14F4E9FC6883357345CB5" />
|
||||
<ComponentRef Id="cmp33364765C98D4BE09BD26DC1E6B95B86" />
|
||||
<ComponentRef Id="cmp582595AE8291444E837793472E0A259C" />
|
||||
<ComponentRef Id="cmpF24D3B9F29F84B4D9C47577B7926FC2E" />
|
||||
<ComponentRef Id="cmpBC28FE8B65954B00AECA9C534639596D" />
|
||||
<ComponentRef Id="cmp16789176DD8EDBC99C26E1230DB2BDDF" />
|
||||
<ComponentRef Id="cmpBC7156375AC544C890A2F93727161B79" />
|
||||
@@ -4012,6 +4044,8 @@
|
||||
<ComponentRef Id="cmp7E10BA8A64E1482BAD717A0A3DC0746E" />
|
||||
<ComponentRef Id="cmpD8CDC1F864664A33B6221A40F2BE8406" />
|
||||
<ComponentRef Id="cmpB9B22A80E70F414B8778B852E29D6492" />
|
||||
<ComponentRef Id="cmp91C27D1766E84B8BB0F0C70888F03C2E" />
|
||||
<ComponentRef Id="cmpD55F08F6CF51498E9E8551067BA57040" />
|
||||
<ComponentRef Id="cmp8A3254D57ABF4F828B08648187233EE4" />
|
||||
<ComponentRef Id="cmpC29B22A77B6341C88E4D6CD2876F3BCF" />
|
||||
<ComponentRef Id="cmpCBC6AAA9CB644B3C8FFE80E2339C8C62" />
|
||||
@@ -4072,7 +4106,6 @@
|
||||
<ComponentRef Id="cmp30126C60BD784974B74EA45AE9B04032" />
|
||||
<ComponentRef Id="cmp9EC1507780D247E095EA92A7715B4BAC" />
|
||||
<ComponentRef Id="cmpF2634E50875D4698921081E3C6B1D5DC" />
|
||||
<ComponentRef Id="cmpBFAC308E2D8645278D61C126C0FC2C61" />
|
||||
<ComponentRef Id="cmp8F0E2CF1B76B4D5185CB6A8DB9236F93" />
|
||||
<ComponentRef Id="cmp14EA1CB2EC4E4B1DB7F7968B5B3D8E16" />
|
||||
<ComponentRef Id="cmpF543DDEF59CB4ACB85CBC9A106BD853D" />
|
||||
@@ -4101,7 +4134,6 @@
|
||||
<ComponentRef Id="cmpDEE7C0BADEA14B9A9AFFD4C9BF4E7702" />
|
||||
<ComponentRef Id="cmp10ABC7FB464B42FCA1EDEC7015AFEDCF" />
|
||||
<ComponentRef Id="cmp930F2D2320B94F6397ECD91862AF7A90" />
|
||||
<ComponentRef Id="cmp5C8827EF42BE4C098EF08EBD4011DA47" />
|
||||
<ComponentRef Id="cmp6C0567CC32E4457A8F2D03C6E7F5897E" />
|
||||
<ComponentRef Id="cmp18A181D71C894FBE96F4A3563213DC57" />
|
||||
<ComponentRef Id="cmp1C666476BE6044B4B8C74450F1F32E67" />
|
||||
@@ -4122,58 +4154,22 @@
|
||||
<ComponentRef Id="cmpBB705B2570064C99A71B6FA65CDF9DC8" />
|
||||
<ComponentRef Id="cmpE9599A00802144DF98F5792E029C8875" />
|
||||
<ComponentRef Id="cmp0989343D60B74AF082291F612F0E6FA6" />
|
||||
<ComponentRef Id="cmp72C41225E0B4457C8CB5F4C5FE6E3187" />
|
||||
<ComponentRef Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" />
|
||||
<ComponentRef Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D" />
|
||||
<ComponentRef Id="cmp1EBDE676D79B4B0DB859B3F601D78513" />
|
||||
<ComponentRef Id="cmpB92B70CEFC2F438386F97264FB436CDD" />
|
||||
<ComponentRef Id="cmpEE26930D65E346FDAE1B3E07F5DBEF77" />
|
||||
<ComponentRef Id="cmp8635213A03B04AAE8E1BFB7EA85E0DB2" />
|
||||
<ComponentRef Id="cmp834F3E0C83664E92B0D115A39A8FAACB" />
|
||||
<ComponentRef Id="cmp2BB002B115C247FFB3353C80CAAC10B3" />
|
||||
<ComponentRef Id="cmp68158D010ECB439582D041355BFACCBB" />
|
||||
<ComponentRef Id="cmp3547A55EA9D04784B4CF2FC717447E16" />
|
||||
<ComponentRef Id="cmp690F24F04C044127A61754363A4D63E3" />
|
||||
<ComponentRef Id="cmpFAD6557C4AEC48B89DDC4E6485C020C4" />
|
||||
<ComponentRef Id="cmpB5458B36303A472B80582AF1C2E7FB94" />
|
||||
<ComponentRef Id="cmp0EBD333D501A45089F58504074E229E7" />
|
||||
<ComponentRef Id="cmpD11E9CA5069045578BA5D89C86F7FDEF" />
|
||||
<ComponentRef Id="cmp708913639F7A46E784CC0FA862A1A2CE" />
|
||||
<ComponentRef Id="cmpA75DEF5617C54DA1937CB37D5824BF79" />
|
||||
<ComponentRef Id="cmp957498053E01454DA1E21E6D7317DCD6" />
|
||||
<ComponentRef Id="cmp408A3AF905EB47ADA35FBC5A6B1465A0" />
|
||||
<ComponentRef Id="cmpB2EF287C99374D839EDF65DF6D2610F0" />
|
||||
<ComponentRef Id="cmpA6276F9EAB41411AAAEC496E67A3DBAE" />
|
||||
<ComponentRef Id="cmp91C27D1766E84B8BB0F0C70888F03C2E" />
|
||||
<ComponentRef Id="cmpCC4A42AA70EE4418926986F5A4B8D3FA" />
|
||||
<ComponentRef Id="cmp690BAC3241424F59B5D30DE0E846D03E" />
|
||||
<ComponentRef Id="cmp3CF3F69A352F4438B8F2F73EBBD12996" />
|
||||
<ComponentRef Id="cmp09155DA101E1424B98832A789E93E835" />
|
||||
<ComponentRef Id="cmpC8C68DB0DEE44CF49D98532D2C26395E" />
|
||||
<ComponentRef Id="cmpB43ED7BA30C844E2B5C38F7B747EEFDC" />
|
||||
<ComponentRef Id="cmpF3C18F07C6A148638CBC858EB02E3A6D" />
|
||||
<ComponentRef Id="cmp582595AE8291444E837793472E0A259C" />
|
||||
<ComponentRef Id="cmp2B8239B905B146A69CD5D55A353AC131" />
|
||||
<ComponentRef Id="cmpBD958F4B8F9146499DE2CA6321C65F96" />
|
||||
<ComponentRef Id="cmp166B17F72C954B0087DF991E560B399A" />
|
||||
<ComponentRef Id="cmp529A2B5343FD466884FAF627E37C648D" />
|
||||
<ComponentRef Id="cmp4EE1633EE4864CE5B9015BF76BD31D14" />
|
||||
<ComponentRef Id="cmpE7BE9D8F63E04798870E57BA1EABB9A5" />
|
||||
<ComponentRef Id="cmp5B67AE2852E04C26970FD2016CA76E07" />
|
||||
<ComponentRef Id="cmp6ADB50DF9F2D4BCA9E682AA6D1C7C03B" />
|
||||
<ComponentRef Id="cmpA8A66545C44F428BB552B55EEE353BB0" />
|
||||
<ComponentRef Id="cmp5492F78ACB1A4391BBED371FDFC06B9E" />
|
||||
<ComponentRef Id="cmp22840874A8C84AA796496634FBEBF09C" />
|
||||
<ComponentRef Id="cmp0173AE0CBFA44C269D93361F6C98F99B" />
|
||||
<ComponentRef Id="cmpD55F08F6CF51498E9E8551067BA57040" />
|
||||
<ComponentRef Id="cmp777DF202EF2542F2ACFCCF0481E8D6EE" />
|
||||
<ComponentRef Id="cmpF24D3B9F29F84B4D9C47577B7926FC2E" />
|
||||
<ComponentRef Id="cmp3B07F4E4B6034F3284288C18F4638CA7" />
|
||||
<ComponentRef Id="cmp9FCFAEB797D9475C873E21B4B5A89E28" />
|
||||
<ComponentRef Id="cmp0C4751F9D5C14419A45F234152D21DA9" />
|
||||
<ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
|
||||
<ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
|
||||
<ComponentRef Id="cmpB2EF287C99374D839EDF65DF6D2610F0" />
|
||||
<ComponentRef Id="cmp67BD9092B046498294EB7689F85B33E8" />
|
||||
<ComponentRef Id="cmp6986F8B66C514347A25E03DD3096B5AE" />
|
||||
<ComponentRef Id="cmp96588875574749E295496861FFC1DB58" />
|
||||
</ComponentGroup>
|
||||
</Fragment>
|
||||
</Wix>
|
||||
|
||||
+68
@@ -673,6 +673,8 @@ Fix steps:
|
||||
Restore-PSPester -Destination (Join-Path $publishPath "Modules")
|
||||
}
|
||||
|
||||
Clear-NativeDependencies -PublishFolder $publishPath
|
||||
|
||||
if ($PSOptionsPath) {
|
||||
$resolvedPSOptionsPath = $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($PSOptionsPath)
|
||||
$parent = Split-Path -Path $resolvedPSOptionsPath
|
||||
@@ -3307,3 +3309,69 @@ function Find-AzCopy {
|
||||
$azCopy = Get-Command -Name azCopy -ErrorAction Stop | Select-Object -First 1
|
||||
return $azCopy.Path
|
||||
}
|
||||
|
||||
function Clear-NativeDependencies
|
||||
{
|
||||
param(
|
||||
[Parameter(Mandatory=$true)] [string] $PublishFolder
|
||||
)
|
||||
|
||||
$diasymFileNamePattern = 'microsoft.diasymreader.native.{0}.dll'
|
||||
|
||||
switch -regex ($($script:Options.Runtime)) {
|
||||
'.*-x64' {
|
||||
$diasymFileName = $diasymFileNamePattern -f 'amd64'
|
||||
}
|
||||
'.*-x86' {
|
||||
$diasymFileName = $diasymFileNamePattern -f 'x86'
|
||||
}
|
||||
'.*-arm' {
|
||||
$diasymFileName = $diasymFileNamePattern -f 'arm'
|
||||
}
|
||||
'.*-arm64' {
|
||||
$diasymFileName = $diasymFileNamePattern -f 'arm64'
|
||||
}
|
||||
'fxdependent.*' {
|
||||
Write-Verbose -Message "$($script:Options.Runtime) is a fxdependent runtime, no cleanup needed in pwsh.deps.json" -Verbose
|
||||
return
|
||||
}
|
||||
Default {
|
||||
throw "Unknown runtime $($script:Options.Runtime)"
|
||||
}
|
||||
}
|
||||
|
||||
$filesToDeleteCore = @($diasymFileName)
|
||||
|
||||
## Currently we do not need to remove any files from WinDesktop runtime.
|
||||
$filesToDeleteWinDesktop = @()
|
||||
|
||||
$deps = Get-Content "$PublishFolder/pwsh.deps.json" -Raw | ConvertFrom-Json -Depth 20
|
||||
$targetRuntime = ".NETCoreApp,Version=v6.0/$($script:Options.Runtime)"
|
||||
|
||||
$runtimePackNetCore = $deps.targets.${targetRuntime}.PSObject.Properties.Name -like 'runtimepack.Microsoft.NETCore.App.Runtime*'
|
||||
$runtimePackWinDesktop = $deps.targets.${targetRuntime}.PSObject.Properties.Name -like 'runtimepack.Microsoft.WindowsDesktop.App.Runtime*'
|
||||
|
||||
if ($runtimePackNetCore)
|
||||
{
|
||||
$filesToDeleteCore | ForEach-Object {
|
||||
Write-Verbose "Removing $_ from pwsh.deps.json" -Verbose
|
||||
$deps.targets.${targetRuntime}.${runtimePackNetCore}.native.PSObject.Properties.Remove($_)
|
||||
if (Test-Path $PublishFolder/$_) {
|
||||
Remove-Item -Path $PublishFolder/$_ -Force -Verbose
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($runtimePackWinDesktop)
|
||||
{
|
||||
$filesToDeleteWinDesktop | ForEach-Object {
|
||||
Write-Verbose "Removing $_ from pwsh.deps.json" -Verbose
|
||||
$deps.targets.${targetRuntime}.${runtimePackWinDesktop}.native.PSObject.Properties.Remove($_)
|
||||
if (Test-Path $PublishFolder/$_) {
|
||||
Remove-Item -Path $PublishFolder/$_ -Force -Verbose
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$deps | ConvertTo-Json -Depth 20 | Set-Content "$PublishFolder/pwsh.deps.json" -Force
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user