Merge Third Party Notices and License updates (#7203)

* Merge Third Party Notices

* Use capital J for 'json'
This commit is contained in:
Andrew
2018-06-29 11:46:19 -07:00
committed by Travis Plunk
parent 3cc9d26bc2
commit d04fef469b
6 changed files with 768 additions and 783 deletions
+3 -3
View File
@@ -919,8 +919,8 @@
<Component Id="cmpB666825D77A8B064DA727325776EAE74" Guid="{EA8149B8-F5E5-4E65-A181-80F27B7BEA2F}">
<File Id="fil4462D6F7EC9D2E9E75BB0546B45A2375" KeyPath="yes" Source="$(env.ProductSourcePath)\api-ms-win-core-sysinfo-l1-2-3.dll" />
</Component>
<Component Id="cmp5164D4CBB99078773111F0D68087D557" Guid="{74A71ECF-64E5-4563-8E99-C12D1A71923F}">
<File Id="fil9B11D1E6A4B8B6B9D5E9C946FCE5FF73" KeyPath="yes" Source="$(env.ProductSourcePath)\license_thirdparty_proprietary.txt" />
<Component Id="cmpA75C2EC5A5EA46DE98DFE2962FEDECC0" Guid="{91AF8325-0943-44F1-83AD-F3A608ACF329}">
<File Id="fil29566AAF2D7442428E3A0D322F522F41" KeyPath="yes" Source="$(env.ProductSourcePath)\LICENSE.txt" />
</Component>
<Component Id="cmp0C712C23BAC746AABB5659096ED329EA" Guid="{0C712C23-BAC7-46AA-BB56-59096ED329EA}">
<File Id="fil0C712C23BAC746AABB5659096ED329EA" KeyPath="yes" Source="$(env.ProductSourcePath)\ThirdPartyNotices.txt" />
@@ -2215,7 +2215,7 @@
<ComponentRef Id="cmp21715E66168ACE3CEA6DE5D415CE7FDF" />
<ComponentRef Id="cmpF25DC4B00595182390A170310D95EA1D" />
<ComponentRef Id="cmpB666825D77A8B064DA727325776EAE74" />
<ComponentRef Id="cmp5164D4CBB99078773111F0D68087D557" />
<ComponentRef Id="cmpA75C2EC5A5EA46DE98DFE2962FEDECC0" />
<ComponentRef Id="cmp0C712C23BAC746AABB5659096ED329EA" />
<ComponentRef Id="cmp2BFC761F21E7234B46E57BA4DD2D9992" />
<ComponentRef Id="cmpAB383E4D8CF6F11984650BD4E72F4510" />