Skip to content

Commit 24a1555

Browse files
authored
Merge branch 'microsoft:master' into master
2 parents b754711 + aac497b commit 24a1555

File tree

7,673 files changed

+121786
-73832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,673 files changed

+121786
-73832
lines changed

.github/policies/labelManagement.issueOpened.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ configuration:
106106
- not:
107107
filesMatchPattern:
108108
pattern: ^.configurations/.*
109+
- not:
110+
filesMatchPattern:
111+
pattern: ^.github/.*
109112
- filesMatchPattern:
110113
pattern: ^.*\.yaml
111114
then:

.github/workflows/scriptAnalyzer.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: PSScriptAnalyzer
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
branches:
66
- master
77
paths:
@@ -32,7 +32,7 @@ jobs:
3232
}
3333
3434
# If errors are found, exit with a non-zero exit code to fail the job
35-
if ($results.where({$_.Severity-eq 'Error'})) {
35+
if ($results.where({$_.Severity -eq 'Error'})) {
3636
Write-Host "Found script issues (errors)."
3737
exit 1 # Exit with a non-zero status to fail the job
3838
} else {

Tools/SandboxTest.ps1

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ $script:HostGeoID = (Get-WinHomeLocation).GeoID
8989

9090
# Misc
9191
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
92-
$script:WebClient = New-Object System.Net.WebClient
92+
$script:HttpClient = New-Object System.Net.Http.HttpClient
9393
$script:CleanupPaths = @()
9494

9595
# The experimental features get updated later based on a switch that is set
@@ -114,7 +114,7 @@ function Invoke-CleanExit {
114114
[int] $ExitCode
115115
)
116116
Invoke-FileCleanup -FilePaths $script:CleanupPaths
117-
$script:WebClient.Dispose()
117+
$script:HttpClient.Dispose()
118118
Write-Debug "Exiting ($ExitCode)"
119119
exit $ExitCode
120120
}
@@ -186,7 +186,8 @@ function Get-RemoteContent {
186186
Write-Debug "Remote content will be stored at $($localFile.FullName)"
187187
$script:CleanupPaths += $Raw ? @($localFile.FullName) : @() # Mark the file for cleanup when the script ends if the raw data was requested
188188
try {
189-
$script:WebClient.DownloadFile($URL, $localFile.FullName)
189+
$downloadTask = $script:HttpClient.GetByteArrayAsync($URL)
190+
[System.IO.File]::WriteAllBytes($localfile.FullName, $downloadTask.Result)
190191
}
191192
catch {
192193
# If the download fails, write a zero-byte file anyways
@@ -295,7 +296,7 @@ if (!$SkipManifestValidation -and ![String]::IsNullOrWhiteSpace($Manifest)) {
295296
Invoke-CleanExit -ExitCode 3
296297
}
297298
Write-Information "--> Validating Manifest"
298-
$validateCommandOutput =
299+
$validateCommandOutput =
299300
& {
300301
# Store current output encoding setting
301302
$prevOutEnc = [Console]::OutputEncoding
@@ -306,7 +307,7 @@ if (!$SkipManifestValidation -and ![String]::IsNullOrWhiteSpace($Manifest)) {
306307

307308
# Reset the encoding to the previous values
308309
[Console]::OutputEncoding = $prevOutEnc
309-
}
310+
}
310311
switch ($LASTEXITCODE) {
311312
'-1978335191' {
312313
($validateCommandOutput | Select-Object -Skip 1 -SkipLast 1) | Write-Information # Skip the first line and the empty last line
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Created with YamlCreate.ps1 Dumplings Mod
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.9.0.schema.json
3+
4+
PackageIdentifier: 115.115Chrome
5+
PackageVersion: 35.10.0.2
6+
InstallerType: nullsoft
7+
Scope: user
8+
InstallerSwitches:
9+
Custom: -disable-auto-start
10+
UpgradeBehavior: install
11+
Protocols:
12+
- browser115
13+
- ftp
14+
- http
15+
- https
16+
- mailto
17+
- tel
18+
FileExtensions:
19+
- crx
20+
- htm
21+
- html
22+
- mht
23+
- mhtm
24+
- mhtml
25+
- pdf
26+
- shtml
27+
- svg
28+
- torrent
29+
- webp
30+
- xht
31+
- xhtml
32+
ProductCode: 115Chrome
33+
ReleaseDate: 2025-03-14
34+
Installers:
35+
- Architecture: x86
36+
InstallerUrl: https://down.115.com/client/win/115br_v35.10.0.2.exe
37+
InstallerSha256: 7E13EB62469434F4E8D7511459FA8C6426EAD0E66FF45374903C43A5753A0260
38+
ManifestType: installer
39+
ManifestVersion: 1.9.0
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Created with YamlCreate.ps1 Dumplings Mod
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.9.0.schema.json
3+
4+
PackageIdentifier: 115.115Chrome
5+
PackageVersion: 35.10.0.2
6+
PackageLocale: en-US
7+
Publisher: 广东一一五科技股份有限公司
8+
PublisherUrl: https://115.com
9+
PublisherSupportUrl: https://115.com/115115
10+
PrivacyUrl: https://115.com/privacy.html
11+
Author: Guangdong 115 Technology Co., Ltd.
12+
PackageName: 115浏览器
13+
PackageUrl: https://pc.115.com/browser.html
14+
License: Proprietary
15+
LicenseUrl: https://115.com/pc_agreement.html
16+
Copyright: Copyright 2024 The 115Browser Authors. All rights reserved.
17+
ShortDescription: A PC client that integrates 115, 115 Organization and browser
18+
Description: |-
19+
115 Browser is a PC client that perfectly integrates multiple platforms including 115, 115 organization and browser.
20+
It supports 115 account quick login, favorites synchronization, files backup by dragging and dropping, batch uploading and downloading, etc.; supports 115 organization affairs notification, so you can keep track of the organization's collaboration; supports browser quick search and built-in utilities and extensions, giving you a high-speed, refreshing, and smooth Internet experience.
21+
Tags:
22+
- backup
23+
- browser
24+
- chromium
25+
- cloud
26+
- cloud-drive
27+
- download
28+
- drive
29+
- file
30+
- netdisk
31+
- share
32+
- sync
33+
- upload
34+
- web
35+
- webpage
36+
ReleaseNotesUrl: https://q.115.com/115/T852365.html
37+
PurchaseUrl: https://vip.115.com/
38+
ManifestType: defaultLocale
39+
ManifestVersion: 1.9.0
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Created with YamlCreate.ps1 Dumplings Mod
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.locale.1.9.0.schema.json
3+
4+
PackageIdentifier: 115.115Chrome
5+
PackageVersion: 35.10.0.2
6+
PackageLocale: zh-CN
7+
Publisher: 广东一一五科技股份有限公司
8+
PublisherUrl: https://115.com
9+
PublisherSupportUrl: https://115.com/115115
10+
PrivacyUrl: https://115.com/privacy.html
11+
Author: 广东一一五科技股份有限公司
12+
PackageName: 115浏览器
13+
PackageUrl: https://pc.115.com/browser.html
14+
License: 专有软件
15+
LicenseUrl: https://115.com/pc_agreement.html
16+
Copyright: Copyright 2024 The 115Browser Authors. All rights reserved.
17+
ShortDescription: 集合 115、115 组织、浏览器的 PC 客户端
18+
Description: 115 浏览器是一个集合 115、115 组织、浏览器的 PC 客户端,多端平台完美整合。支持 115 账号快捷登录、收藏夹云同步、文件拖拽备份、批量上传下载等功能;支持 115 组织事务通知,让你随时掌握组织协作动态;支持浏览器快速搜索,内置实用小工具及扩展应用,给你高速、清爽、流畅的上网体验。
19+
Tags:
20+
- chromium
21+
- 上传
22+
- 下载
23+
-
24+
- 云盘
25+
- 共享
26+
- 分享
27+
- 同步
28+
- 备份
29+
- 文件
30+
- 浏览器
31+
- 网盘
32+
- 网页
33+
ReleaseNotes: 1. 修复若干已知问题,产品性能更稳定。
34+
ReleaseNotesUrl: https://q.115.com/115/T852365.html
35+
PurchaseUrl: https://vip.115.com
36+
ManifestType: locale
37+
ManifestVersion: 1.9.0
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Created with YamlCreate.ps1 Dumplings Mod
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.9.0.schema.json
3+
4+
PackageIdentifier: 115.115Chrome
5+
PackageVersion: 35.10.0.2
6+
DefaultLocale: en-US
7+
ManifestType: version
8+
ManifestVersion: 1.9.0
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Automatically updated by the winget bot at 2025/Mar/12
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.10.0.schema.json
3+
4+
PackageIdentifier: 1357310795.JboxTransfer
5+
PackageVersion: 2.0.2
6+
InstallerType: inno
7+
UpgradeBehavior: install
8+
ProductCode: '{2477F80A-1B72-49E7-AC2E-A05BCC23D484}_is1'
9+
ReleaseDate: 2025-03-11
10+
Installers:
11+
- Architecture: x64
12+
Scope: user
13+
InstallerUrl: https://github.com/1357310795/JboxTransfer/releases/download/v2.0.2/JboxTransfer.Webview2.Installer-win-any-no-runtime.exe
14+
InstallerSha256: ED93F7E445E03646F87EF3A5481FE6BDB20E99640798A0EC152B14C1E454BE1E
15+
InstallerSwitches:
16+
Custom: /CURRENTUSER
17+
- Architecture: x64
18+
Scope: machine
19+
InstallerUrl: https://github.com/1357310795/JboxTransfer/releases/download/v2.0.2/JboxTransfer.Webview2.Installer-win-any-no-runtime.exe
20+
InstallerSha256: ED93F7E445E03646F87EF3A5481FE6BDB20E99640798A0EC152B14C1E454BE1E
21+
InstallerSwitches:
22+
Custom: /ALLUSERS
23+
ManifestType: installer
24+
ManifestVersion: 1.10.0
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Automatically updated by the winget bot at 2025/Mar/12
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.10.0.schema.json
3+
4+
PackageIdentifier: 1357310795.JboxTransfer
5+
PackageVersion: 2.0.2
6+
PackageLocale: en-US
7+
Publisher: SJTU
8+
PublisherUrl: https://github.com/1357310795
9+
PublisherSupportUrl: https://pan.sjtu.edu.cn/jboxtransfer/feedback.html
10+
PackageName: JboxTransfer
11+
PackageUrl: https://pan.sjtu.edu.cn/jboxtransfer/
12+
License: GPL-3.0
13+
LicenseUrl: https://github.com/1357310795/JboxTransfer/blob/HEAD/LICENSE.txt
14+
ShortDescription: Efficiently, securely, and conveniently migrate your files
15+
Description: |-
16+
The new generation of SJTU Pan is coming. Due to the big difference in storage strategy, it is even difficult to migrate files from the old cloud drive (i.e. jBox), while the vendor could not provide an ideal solution. It would be extremely inconvenient for users to migrate files manually, which would greatly affect the reputation of Pan and may also increase the maintenance burden of jBox.
17+
Therefore, the JboxTransfer project was founded. We aim to build an efficient, secure and convenient application to automate and help users to better migrate files from jBox to Pan. Users can migrate files with one click after jAccount authorization without taking up local disk space or manually downloading and uploading files.
18+
Tags:
19+
- jbox
20+
- pan
21+
- sjtu
22+
ReleaseNotes: 'Full Changelog: https://github.com/1357310795/JboxTransfer/compare/v2.0.1...v2.0.2'
23+
ReleaseNotesUrl: https://github.com/1357310795/JboxTransfer/releases/tag/v2.0.2
24+
Documentations:
25+
- DocumentLabel: Documentation
26+
DocumentUrl: https://pan.sjtu.edu.cn/jboxtransfer/download.html
27+
ManifestType: defaultLocale
28+
ManifestVersion: 1.10.0
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Automatically updated by the winget bot at 2025/Mar/12
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.locale.1.10.0.schema.json
3+
4+
PackageIdentifier: 1357310795.JboxTransfer
5+
PackageVersion: 2.0.2
6+
PackageLocale: zh-CN
7+
Publisher: SJTU
8+
PublisherUrl: https://github.com/1357310795
9+
PublisherSupportUrl: https://pan.sjtu.edu.cn/jboxtransfer/feedback.html
10+
PackageName: JboxTransfer
11+
PackageUrl: https://pan.sjtu.edu.cn/jboxtransfer/
12+
License: GPL-3.0
13+
LicenseUrl: https://github.com/1357310795/JboxTransfer/blob/HEAD/LICENSE.txt
14+
ShortDescription: 高效、安全、便捷地转移您的文件
15+
Description: |-
16+
在新一代交大云盘即将推出之际,由于与旧云盘(以下简称 jBox)存储策略有较大差异,文件转移较为困难,厂商无法给出理想的解决方案。若完全依赖于用户自行转移文件,对用户而言极为不便,且极大影响了新云盘的口碑,还可能增加旧云盘的维护时间。
17+
故 JboxTransfer 项目就此成立,我们的目标是推出一款高效、安全、便捷的应用程序,自动化地帮助用户更好地从 jBox 向 新云盘 迁移文件。用户在进行 jAccount 授权后可以一键迁移文件,无需占用本地磁盘空间,无需手动下载上传文件。
18+
Tags:
19+
- jbox
20+
- 上海交大
21+
- 上海交通大学
22+
- 交大
23+
- 交大云盘
24+
ReleaseNotesUrl: https://github.com/1357310795/JboxTransfer/releases/tag/v2.0.2
25+
Documentations:
26+
- DocumentLabel: 文档
27+
DocumentUrl: https://pan.sjtu.edu.cn/jboxtransfer/download.html
28+
ManifestType: locale
29+
ManifestVersion: 1.10.0

0 commit comments

Comments
 (0)