Skip to content

Commit a0f425b

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/6.0' changes
2 parents c23f556 + 002b73c commit a0f425b

File tree

28 files changed

+203
-59
lines changed

28 files changed

+203
-59
lines changed

‎src/Components/Web.JS/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"webpack-cli": "^4.8.0"
4242
},
4343
"resolutions": {
44-
"**/set-value": "^3.0.2",
45-
"url-parse": ">=1.5.0"
44+
"**/set-value": "^4.0.1",
45+
"url-parse": ">=1.5.6",
46+
"node-fetch": ">=2.6.7"
4647
}
4748
}

‎src/Components/Web.JS/yarn.lock

Lines changed: 52 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2289,6 +2289,11 @@ cssstyle@^2.3.0:
22892289
dependencies:
22902290
cssom "~0.3.6"
22912291

2292+
data-uri-to-buffer@^4.0.0:
2293+
version "4.0.0"
2294+
resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b"
2295+
integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==
2296+
22922297
data-urls@^2.0.0:
22932298
version "2.0.0"
22942299
resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -2668,6 +2673,14 @@ fb-watchman@^2.0.0:
26682673
dependencies:
26692674
bser "2.1.1"
26702675

2676+
fetch-blob@^3.1.2, fetch-blob@^3.1.4:
2677+
version "3.1.4"
2678+
resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.1.4.tgz#e8c6567f80ad7fc22fd302e7dcb72bafde9c1717"
2679+
integrity sha512-Eq5Xv5+VlSrYWEqKrusxY1C3Hm/hjeAsCGVG3ft7pZahlUAChpGZT/Ms1WmSLnEAisEXszjzu/s+ce6HZB2VHA==
2680+
dependencies:
2681+
node-domexception "^1.0.0"
2682+
web-streams-polyfill "^3.0.3"
2683+
26712684
fetch-cookie@^0.11.0:
26722685
version "0.11.0"
26732686
resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.11.0.tgz#e046d2abadd0ded5804ce7e2cae06d4331c15407"
@@ -2719,6 +2732,13 @@ form-data@^3.0.0:
27192732
combined-stream "^1.0.8"
27202733
mime-types "^2.1.12"
27212734

2735+
formdata-polyfill@^4.0.10:
2736+
version "4.0.10"
2737+
resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423"
2738+
integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==
2739+
dependencies:
2740+
fetch-blob "^3.1.2"
2741+
27222742
fp-ts@^2.6.1:
27232743
version "2.10.5"
27242744
resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.10.5.tgz#7c77868fe8bd9b229743303c1bec505b959f631b"
@@ -3021,6 +3041,11 @@ is-potential-custom-element-name@^1.0.1:
30213041
resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
30223042
integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
30233043

3044+
is-primitive@^3.0.1:
3045+
version "3.0.1"
3046+
resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-3.0.1.tgz#98c4db1abff185485a657fc2905052b940524d05"
3047+
integrity sha512-GljRxhWvlCNRfZyORiH77FwdFwGcMO620o37EOYC0ORWdq+WYNVqW0w2Juzew4M+L81l6/QS3t5gkkihyRqv9w==
3048+
30243049
is-stream@^2.0.0:
30253050
version "2.0.0"
30263051
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
@@ -3732,10 +3757,19 @@ neo-async@^2.6.2:
37323757
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
37333758
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
37343759

3735-
node-fetch@^2.6.1:
3736-
version "2.6.1"
3737-
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
3738-
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
3760+
node-domexception@^1.0.0:
3761+
version "1.0.0"
3762+
resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
3763+
integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
3764+
3765+
node-fetch@>=2.6.7, node-fetch@^2.6.7:
3766+
version "3.2.0"
3767+
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.2.0.tgz#59390db4e489184fa35d4b74caf5510e8dfbaf3b"
3768+
integrity sha512-8xeimMwMItMw8hRrOl3C9/xzU49HV/yE6ORew/l+dxWimO5A4Ra8ld2rerlJvc/O7et5Z1zrWsPX43v1QBjCxw==
3769+
dependencies:
3770+
data-uri-to-buffer "^4.0.0"
3771+
fetch-blob "^3.1.4"
3772+
formdata-polyfill "^4.0.10"
37393773

37403774
node-int64@^0.4.0:
37413775
version "0.4.0"
@@ -4179,12 +4213,13 @@ serialize-javascript@^6.0.0:
41794213
dependencies:
41804214
randombytes "^2.1.0"
41814215

4182-
set-value@^3.0.2:
4183-
version "3.0.2"
4184-
resolved "https://registry.yarnpkg.com/set-value/-/set-value-3.0.2.tgz#74e8ecd023c33d0f77199d415409a40f21e61b90"
4185-
integrity sha512-npjkVoz+ank0zjlV9F47Fdbjfj/PfXyVhZvGALWsyIYU/qrMzpi6avjKW3/7KeSU2Df3I46BrN1xOI1+6vW0hA==
4216+
set-value@^4.0.1:
4217+
version "4.1.0"
4218+
resolved "https://registry.yarnpkg.com/set-value/-/set-value-4.1.0.tgz#aa433662d87081b75ad88a4743bd450f044e7d09"
4219+
integrity sha512-zTEg4HL0RwVrqcWs3ztF+x1vkxfm0lP+MQQFPiMJTKVceBwEV0A569Ou8l9IYQG8jOZdMVI1hGsc0tmeD2o/Lw==
41864220
dependencies:
41874221
is-plain-object "^2.0.4"
4222+
is-primitive "^3.0.1"
41884223

41894224
shallow-clone@^3.0.0:
41904225
version "3.0.1"
@@ -4547,10 +4582,10 @@ uri-js@^4.2.2:
45474582
dependencies:
45484583
punycode "^2.1.0"
45494584

4550-
url-parse@>=1.5.0, url-parse@^1.4.3:
4551-
version "1.5.3"
4552-
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
4553-
integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
4585+
url-parse@>=1.5.6, url-parse@^1.4.3:
4586+
version "1.5.7"
4587+
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.7.tgz#00780f60dbdae90181f51ed85fb24109422c932a"
4588+
integrity sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA==
45544589
dependencies:
45554590
querystringify "^2.1.1"
45564591
requires-port "^1.0.0"
@@ -4598,6 +4633,11 @@ watchpack@^2.2.0:
45984633
glob-to-regexp "^0.4.1"
45994634
graceful-fs "^4.1.2"
46004635

4636+
web-streams-polyfill@^3.0.3:
4637+
version "3.2.0"
4638+
resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz#a6b74026b38e4885869fb5c589e90b95ccfc7965"
4639+
integrity sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA==
4640+
46014641
webidl-conversions@^5.0.0:
46024642
version "5.0.0"
46034643
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"

‎src/Installers/Rpm/Directory.Build.targets

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,13 @@
8585
UseHardlinksIfPossible="False" />
8686

8787
<Message Text="$(TargetPath) -> $(CblMarinerTargetPath)" Importance="high" />
88+
89+
<Copy SourceFiles="$(TargetPath)"
90+
DestinationFiles="$(CblMariner2TargetPath)"
91+
OverwriteReadOnlyFiles="True"
92+
SkipUnchangedFiles="False"
93+
UseHardlinksIfPossible="False" />
94+
95+
<Message Text="$(TargetPath) -> $(CblMariner2TargetPath)" Importance="high" />
8896
</Target>
8997
</Project>

‎src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
<PropertyGroup>
1515
<TargetFileName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)-x64.rpm</TargetFileName>
1616
<CblMarinerTargetFileName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)-cm.1-x64.rpm</CblMarinerTargetFileName>
17+
<CblMariner2TargetFileName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)-cm.2-x64.rpm</CblMariner2TargetFileName>
1718
<TargetPath>$(InstallersOutputPath)$(TargetFileName)</TargetPath>
1819
<CblMarinerTargetPath>$(InstallersOutputPath)$(CblMarinerTargetFileName)</CblMarinerTargetPath>
20+
<CblMariner2TargetPath>$(InstallersOutputPath)$(CblMariner2TargetFileName)</CblMariner2TargetPath>
1921
</PropertyGroup>
2022
</Project>

‎src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@
3131
<PropertyGroup>
3232
<TargetFileName>$(TargetingPackInstallerBaseName)-$(TargetingPackVersion).rpm</TargetFileName>
3333
<CblMarinerTargetFileName>$(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-cm.1.rpm</CblMarinerTargetFileName>
34+
<CblMariner2TargetFileName>$(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-cm.2.rpm</CblMariner2TargetFileName>
3435
<TargetPath>$(InstallersOutputPath)$(TargetFileName)</TargetPath>
3536
<CblMarinerTargetPath>$(InstallersOutputPath)$(CblMarinerTargetFileName)</CblMarinerTargetPath>
37+
<CblMariner2TargetPath>$(InstallersOutputPath)$(CblMariner2TargetFileName)</CblMariner2TargetPath>
3638

3739
<PackageVersion>$(TargetingPackVersionPrefix)</PackageVersion>
3840

‎src/Installers/Windows/SharedFrameworkBundle/1028/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@
5959
<String Id="FilesInUseOkButton">確定(&amp;O)</String>
6060
<String Id="FilesInUseCancelButton">取消(&amp;C)</String>
6161

62-
<String Id="Welcome">歡迎使用 [WixBundle] 安裝程式。</String>
62+
<String Id="Welcome">歡迎使用 [WixBundleName] 安裝程式。</String>
6363
<String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;授權條款&lt;/a&gt;和&lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;隱私權聲明&lt;/a&gt;。</String>
6464
</WixLocalization>

‎src/Installers/Windows/SharedFrameworkBundle/1029/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@
5959
<String Id="FilesInUseOkButton">&amp;OK</String>
6060
<String Id="FilesInUseCancelButton">&amp;Zrušit</String>
6161

62-
<String Id="Welcome">Vítá vás instalační program produktu [WixBundle]</String>
62+
<String Id="Welcome">Vítá vás instalační program produktu [WixBundleName]</String>
6363
<String Id="EulaPrivacy">[WixBundleName] – &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;licenční podmínky&lt;/a&gt; a &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;prohlášení o zásadách ochrany osobních údajů&lt;/a&gt;</String>
6464
</WixLocalization>

‎src/Installers/Windows/SharedFrameworkBundle/1031/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@
5959
<String Id="FilesInUseOkButton">&amp;OK</String>
6060
<String Id="FilesInUseCancelButton">&amp;Abbrechen</String>
6161

62-
<String Id="Welcome">Willkommen beim Setup von [WixBundle].</String>
62+
<String Id="Welcome">Willkommen beim Setup von [WixBundleName].</String>
6363
<String Id="EulaPrivacy">&lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Lizenzbedingungen&lt;/a&gt; und &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;Datenschutzerklärung&lt;/a&gt; für [WixBundleName].</String>
6464
</WixLocalization>

‎src/Installers/Windows/SharedFrameworkBundle/1033/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@
5959
<String Id="FilesInUseOkButton">&amp;OK</String>
6060
<String Id="FilesInUseCancelButton">&amp;Cancel</String>
6161

62-
<String Id="Welcome">Welcome to the [WixBundle] Setup.</String>
62+
<String Id="Welcome">Welcome to the [WixBundleName] Setup.</String>
6363
<String Id="EulaPrivacy">[WixBundleName] &lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;license terms&lt;/a&gt; and &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;privacy statement&lt;/a&gt;.</String>
6464
</WixLocalization>

‎src/Installers/Windows/SharedFrameworkBundle/1036/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@
5959
<String Id="FilesInUseOkButton">&amp;OK</String>
6060
<String Id="FilesInUseCancelButton">&amp;Annuler</String>
6161

62-
<String Id="Welcome">Bienvenue dans le programme d'installation de [WixBundle].</String>
62+
<String Id="Welcome">Bienvenue dans le programme d'installation de [WixBundleName].</String>
6363
<String Id="EulaPrivacy">&lt;a href="https://go.microsoft.com/fwlink/?LinkId=329770"&gt;Termes du contrat de licence&lt;/a&gt; et &lt;a href="https://go.microsoft.com/fwlink/?LinkId=786378"&gt;déclaration de confidentialité&lt;/a&gt; de [WixBundleName].</String>
6464
</WixLocalization>

0 commit comments

Comments
 (0)