Skip to content

Commit 931250f

Browse files
flick9000flick9000
authored
Merge branch 'microsoft:master' into master
2 parents 0dbb495 + 5ecb346 commit 931250f

File tree

10,743 files changed

+170984
-107164
lines changed

Some content is hidden

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

10,743 files changed

+170984
-107164
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/PRTest.ps1‎

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# This script does a checkout of a Pull Request using the GitHub CLI, and then runs it using SandboxTest.ps1.
2-
[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingWriteHost', '', Justification = 'This script is not intended to have any outputs piped')]
32

43
Param(
54
[Parameter(Position = 0, HelpMessage = 'The Pull Request to checkout.', Mandatory = $true)]
@@ -16,38 +15,45 @@ Param(
1615
[switch] $Clean
1716
)
1817

19-
$PullRequest = $PullRequest.TrimStart('#')
18+
# Virtual Terminal
19+
filter Initialize-VirtualTerminalSequence {
20+
# https://learn.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
21+
if ($script:vtSupported) {
22+
return "$([char]0x001B)[${_}m"
23+
}
24+
}
2025

21-
$ErrorActionPreference = 'Stop'
26+
# Flags
27+
Write-Debug 'Checking for supported features'
28+
$script:vtSupported = (Get-Host).UI.SupportsVirtualTerminal
29+
$script:GitIsPresent = Get-Command 'git' -ErrorAction SilentlyContinue
30+
$script:GhIsPresent = Get-Command 'gh' -ErrorAction SilentlyContinue
31+
$script:SandboxIsPresent = Get-Command 'WindowsSandbox' -ErrorAction SilentlyContinue
2232

23-
$repositoryRoot = 'https://github.com/microsoft/winget-pkgs/'
33+
Write-Debug 'Initializing Virtual Terminal Sequences'
34+
$script:vtDefault = 0 | Initialize-VirtualTerminalSequence
35+
$script:vtForegroundGreen = 32 | Initialize-VirtualTerminalSequence
2436

37+
Write-Debug 'Creating internal state'
38+
$PullRequest = $PullRequest.TrimStart('#')
39+
$ErrorActionPreference = 'Stop'
40+
$repositoryRoot = 'https://github.com/microsoft/winget-pkgs/'
2541
$rootDirectory = ((Resolve-Path (git rev-parse --show-toplevel)).ToString() + '\')
2642

27-
if (-Not (Get-Command 'gh' -ErrorAction 'SilentlyContinue')) {
28-
Write-Host "The GitHub CLI is not installed. Install it via 'winget install GitHub.cli' and come back here!" -ForegroundColor Red
29-
return
30-
}
31-
32-
if (-Not (Get-Command 'git' -ErrorAction 'SilentlyContinue')) {
33-
Write-Host "Git is not installed. Install it via 'winget install Git.Git' and come back here!" -ForegroundColor Red
34-
return
35-
}
43+
Write-Verbose 'Ensuring Dependencies are Present'
44+
if (!$script:GhIsPresent) { Write-Error "The GitHub CLI is not installed. Install it via 'winget install GitHub.cli' and come back here!" -ErrorAction Stop }
45+
if (!$script:GitIsPresent) { Write-Error "Git is not installed. Install it via 'winget install Git.Git' and come back here!" -ErrorAction Stop }
46+
if (!$script:SandboxIsPresent) { Write-Error 'Windows Sandbox is not enabled. Enable it and come back here!' -ErrorAction Stop }
3647

48+
Write-Verbose 'Checking out PR'
3749
gh pr checkout $PullRequest $(if (!$KeepBranch) { '--detach' }) -f -R $repositoryRoot | Out-Null
50+
if ($LASTEXITCODE -ne 0) { Write-Error "There was an error checking out the PR. Make sure you're logged into GitHub via 'gh auth login' and come back here!" -ErrorAction Stop }
3851

39-
if ($LASTEXITCODE -ne 0) {
40-
Write-Host "There was an error checking out the PR. Make sure you're logged into GitHub via 'gh auth login' and come back here!" -ForegroundColor Red
41-
return
42-
}
43-
44-
$manifest = (git diff --name-only HEAD~1..HEAD)
45-
if ($manifest.GetType().Name -eq 'Object[]') {
46-
$path = (Get-Item (Resolve-Path ($rootDirectory + $manifest[0]))).Directory
47-
} else {
48-
$path = (Get-Item (Resolve-Path ($rootDirectory + $manifest))).Directory
49-
}
52+
Write-Verbose 'Parsing changed files'
53+
$manifest = @(gh pr diff $PullRequest --name-only)
54+
$path = (Get-Item (Resolve-Path ($rootDirectory + $manifest[0]))).Directory
5055

56+
Write-Verbose 'Passing execution to SandboxTest.ps1'
5157
$sandboxTestPath = (Resolve-Path ($PSScriptRoot.ToString() + '\SandboxTest.ps1')).ToString()
5258
$params = @{
5359
Manifest = $path
@@ -63,6 +69,7 @@ $params = @{
6369
& $sandboxTestPath @params
6470

6571
if ($Review) {
66-
Write-Host "Opening $PullRequest in browser..." -ForegroundColor Green
67-
Start-Process ($repositoryRoot + 'pull/' + $PullRequest + '/files')
72+
Write-Information "${script:vtForegroundGreen}" -InformationAction 'Continue'
73+
& gh pr diff --web $PullRequest
74+
Write-Information "${script:vtDefault}" -InformationAction 'Continue'
6875
}

‎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

‎manifests/1/115/115Chrome/35.10.0.2/115.115Chrome.installer.yaml‎

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

‎manifests/1/115/115Chrome/35.10.0.2/115.115Chrome.locale.en-US.yaml‎

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

‎manifests/1/115/115Chrome/35.10.0.2/115.115Chrome.locale.zh-CN.yaml‎

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

‎manifests/1/115/115Chrome/35.10.0.2/115.115Chrome.yaml‎

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

‎manifests/1/115/115Chrome/35.11.0.3/115.115Chrome.installer.yaml‎

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.11.0.3
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-21
34+
Installers:
35+
- Architecture: x86
36+
InstallerUrl: https://down.115.com/client/win/115br_v35.11.0.3.exe
37+
InstallerSha256: 7605E1FED4217D488DF446EBC3AF88BA3CC261E9652D723CCA605E4D7929AFBD
38+
ManifestType: installer
39+
ManifestVersion: 1.9.0

‎manifests/1/115/115Chrome/35.11.0.3/115.115Chrome.locale.en-US.yaml‎

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.11.0.3
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://115.com/115/T504444.html
37+
PurchaseUrl: https://vip.115.com/
38+
ManifestType: defaultLocale
39+
ManifestVersion: 1.9.0

0 commit comments

Comments
 (0)