Skip to content

Commit c4acfe1

Browse files
PckgrBotPckgrBot
authored
Merge branch 'microsoft:master' into master
2 parents c9febba + 384c474 commit c4acfe1

File tree

1,834 files changed

+36399
-7720
lines changed

Some content is hidden

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

1,834 files changed

+36399
-7720
lines changed

‎DevOpsPipelineDefinitions/publish-pipeline.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,19 @@ extends:
4545

4646
steps:
4747

48+
- powershell: |
49+
Start-Process msiexec -ArgumentList ' /x {37CCEB8D-306A-4DB4-B25B-7608A093D184} /qn' -NoNewWindow -Wait
50+
displayName: "Uninstall Azure CLI"
51+
52+
- powershell: |
53+
Invoke-WebRequest -Uri "https://azurecliprod.blob.core.windows.net/msi/azure-cli-2.76.0-x64.msi" -OutFile "azure-cli-2.76.0.msi"
54+
Start-Process msiexec -ArgumentList '/i "azure-cli-2.76.0.msi" /quiet /norestart' -NoNewWindow -Wait
55+
displayName: "Install Azure CLI 2.76.0"
56+
57+
- script: |
58+
az version
59+
displayName: "Check Azure CLI version"
60+
4861
# Downloads all the setup files and its dependencies.
4962
- task: AzureCLI@2
5063
displayName: 'Azure Setup'

‎DevOpsPipelineDefinitions/rebuild-pipeline.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,19 @@ extends:
4646
persistCredentials: true
4747
clean: true
4848

49+
- powershell: |
50+
Start-Process msiexec -ArgumentList ' /x {37CCEB8D-306A-4DB4-B25B-7608A093D184} /qn' -NoNewWindow -Wait
51+
displayName: "Uninstall Azure CLI"
52+
53+
- powershell: |
54+
Invoke-WebRequest -Uri "https://azurecliprod.blob.core.windows.net/msi/azure-cli-2.76.0-x64.msi" -OutFile "azure-cli-2.76.0.msi"
55+
Start-Process msiexec -ArgumentList '/i "azure-cli-2.76.0.msi" /quiet /norestart' -NoNewWindow -Wait
56+
displayName: "Install Azure CLI 2.76.0"
57+
58+
- script: |
59+
az version
60+
displayName: "Check Azure CLI version"
61+
4962
# Downloads all the setup files and its dependencies.
5063
- task: AzureCLI@2
5164
displayName: 'Azure Setup'

‎DevOpsPipelineDefinitions/rebuild-rest-pipeline.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,19 @@ extends:
3838
- checkout: none
3939
persistCredentials: true
4040

41+
- powershell: |
42+
Start-Process msiexec -ArgumentList ' /x {37CCEB8D-306A-4DB4-B25B-7608A093D184} /qn' -NoNewWindow -Wait
43+
displayName: "Uninstall Azure CLI"
44+
45+
- powershell: |
46+
Invoke-WebRequest -Uri "https://azurecliprod.blob.core.windows.net/msi/azure-cli-2.76.0-x64.msi" -OutFile "azure-cli-2.76.0.msi"
47+
Start-Process msiexec -ArgumentList '/i "azure-cli-2.76.0.msi" /quiet /norestart' -NoNewWindow -Wait
48+
displayName: "Install Azure CLI 2.76.0"
49+
50+
- script: |
51+
az version
52+
displayName: "Check Azure CLI version"
53+
4154
# Downloads all the setup files and its dependencies.
4255
- task: AzureCLI@1
4356
displayName: 'Azure Setup'

‎DevOpsPipelineDefinitions/validation-pipeline.yaml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,20 @@ extends:
4646

4747
steps:
4848
- checkout: self
49-
persistCredentials: true
49+
persistCredentials:
50+
51+
- powershell: |
52+
Start-Process msiexec -ArgumentList ' /x {37CCEB8D-306A-4DB4-B25B-7608A093D184} /qn' -NoNewWindow -Wait
53+
displayName: "Uninstall Azure CLI"
54+
55+
- powershell: |
56+
Invoke-WebRequest -Uri "https://azurecliprod.blob.core.windows.net/msi/azure-cli-2.76.0-x64.msi" -OutFile "azure-cli-2.76.0.msi"
57+
Start-Process msiexec -ArgumentList '/i "azure-cli-2.76.0.msi" /quiet /norestart' -NoNewWindow -Wait
58+
displayName: "Install Azure CLI 2.76.0"
59+
60+
- script: |
61+
az version
62+
displayName: "Check Azure CLI version"
5063
5164
# Downloads all the setup files and its dependencies.
5265
- task: AzureCLI@2

‎manifests/3/360/360Ent/13.3.4000.55/360.360Ent.installer.yaml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Created with YamlCreate.ps1 Dumplings Mod
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.10.0.schema.json
3+
4+
PackageIdentifier: 360.360Ent
5+
PackageVersion: 13.3.4000.55
6+
InstallerType: exe
7+
InstallModes:
8+
- interactive
9+
- silent
10+
InstallerSwitches:
11+
Silent: --silent-install
12+
SilentWithProgress: --silent-install
13+
InstallLocation: --install-path="<INSTALLPATH>"
14+
Upgrade: --full-install-update
15+
ExpectedReturnCodes:
16+
- InstallerReturnCode: 1
17+
ReturnResponse: downgrade
18+
- InstallerReturnCode: 22
19+
ReturnResponse: cancelledByUser
20+
- InstallerReturnCode: 405
21+
ReturnResponse: installInProgress
22+
- InstallerReturnCode: 431
23+
ReturnResponse: alreadyInstalled
24+
- InstallerReturnCode: 661
25+
ReturnResponse: cancelledByUser
26+
UpgradeBehavior: install
27+
Protocols:
28+
- 360enturl
29+
- browser360url
30+
- ftp
31+
- htmlfile
32+
- http
33+
- https
34+
FileExtensions:
35+
- crx
36+
- htm
37+
- html
38+
- mht
39+
- mhtm
40+
- mhtml
41+
- pdf
42+
- shtm
43+
- shtml
44+
- xht
45+
- xhtml
46+
ProductCode: 360ent
47+
Installers:
48+
- Architecture: x86
49+
Scope: user
50+
InstallerUrl: https://gedown.360safe.com/360browser_saas/360ent_13.3.4000.55_x86.exe
51+
InstallerSha256: C4DFBF1726894A7627924E357647914634D27F91758C5847F20152593B3F05F8
52+
- Architecture: x86
53+
Scope: machine
54+
InstallerUrl: https://gedown.360safe.com/360browser_saas/360ent_13.3.4000.55_x86.exe
55+
InstallerSha256: C4DFBF1726894A7627924E357647914634D27F91758C5847F20152593B3F05F8
56+
InstallerSwitches:
57+
Custom: --system-level
58+
ManifestType: installer
59+
ManifestVersion: 1.10.0

‎manifests/3/360/360Ent/13.3.4000.55/360.360Ent.locale.en-US.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Created with YamlCreate.ps1 Dumplings Mod
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.10.0.schema.json
3+
4+
PackageIdentifier: 360.360Ent
5+
PackageVersion: 13.3.4000.55
6+
PackageLocale: en-US
7+
Publisher: 360安全中心
8+
PublisherUrl: https://browser.360.cn/
9+
PublisherSupportUrl: https://saas.browser.360.net/book/
10+
PrivacyUrl: https://www.360.cn/privacy/v3/bpscommonxy.html
11+
Author: Beijing Qihoo Technology Co., Ltd.
12+
PackageName: 360企业安全浏览器
13+
PackageUrl: https://browser.360.net/
14+
License: Proprietary
15+
LicenseUrl: https://www.360.cn/xukexieyi.html#ent
16+
Copyright: (C) 360.cn All Rights Reserved.
17+
CopyrightUrl: https://www.360.cn/about/banquanshengming.html
18+
ShortDescription: The secure business platform of the new infrastructure era.
19+
Description: A cross-platform unified business platform based on the browser that targets government and enterprise clients and aims at supporting the national network security strategy, improving overall efficiency, reducing collaboration costs and protecting information and data security.
20+
Moniker: 360ent
21+
Tags:
22+
- browser
23+
- chromium
24+
- ie
25+
- internet-explorer
26+
- web
27+
- webpage
28+
ReleaseNotesUrl: https://saas.browser.360.net/book/version/UPDATELOG.html
29+
ManifestType: defaultLocale
30+
ManifestVersion: 1.10.0

‎manifests/3/360/360Ent/13.3.4000.55/360.360Ent.locale.zh-CN.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Created with YamlCreate.ps1 Dumplings Mod
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.locale.1.10.0.schema.json
3+
4+
PackageIdentifier: 360.360Ent
5+
PackageVersion: 13.3.4000.55
6+
PackageLocale: zh-CN
7+
Publisher: 360安全中心
8+
PublisherUrl: https://browser.360.cn/
9+
PublisherSupportUrl: https://saas.browser.360.net/book/
10+
PrivacyUrl: https://www.360.cn/privacy/v3/bpscommonxy.html
11+
Author: 北京奇虎科技有限公司
12+
PackageName: 360企业安全浏览器
13+
PackageUrl: https://browser.360.net/
14+
License: 专有软件
15+
LicenseUrl: https://www.360.cn/xukexieyi.html#ent
16+
Copyright: (C) 360.cn All Rights Reserved.
17+
CopyrightUrl: https://www.360.cn/about/banquanshengming.html
18+
ShortDescription: 新基建时代的安全办公平台
19+
Description: 以浏览器为载体的专用办公入口，面向政企领域客户，以支持国家网络安全大战略、提高整体效率，降低协作成本，保护信息数据安全为主要目标的跨平台统一办公平台。
20+
Tags:
21+
- chromium
22+
- ie
23+
- internet-explorer
24+
- 浏览器
25+
- 网页
26+
ReleaseNotesUrl: https://saas.browser.360.net/book/version/UPDATELOG.html
27+
ManifestType: locale
28+
ManifestVersion: 1.10.0

‎manifests/3/360/360Ent/13.3.4000.55/360.360Ent.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.10.0.schema.json
3+
4+
PackageIdentifier: 360.360Ent
5+
PackageVersion: 13.3.4000.55
6+
DefaultLocale: en-US
7+
ManifestType: version
8+
ManifestVersion: 1.10.0

‎manifests/3/360/NamiAI/1.3.1483.64/360.NamiAI.installer.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Created with YamlCreate.ps1 Dumplings Mod
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.10.0.schema.json
3+
4+
PackageIdentifier: 360.NamiAI
5+
PackageVersion: 1.3.1483.64
6+
InstallerType: exe
7+
InstallModes:
8+
- interactive
9+
- silent
10+
InstallerSwitches:
11+
Silent: --silent-install
12+
SilentWithProgress: --silent-install
13+
InstallLocation: --install-path="<INSTALLPATH>"
14+
Upgrade: --full-install-update
15+
ExpectedReturnCodes:
16+
- InstallerReturnCode: 1
17+
ReturnResponse: downgrade
18+
- InstallerReturnCode: 22
19+
ReturnResponse: cancelledByUser
20+
- InstallerReturnCode: 405
21+
ReturnResponse: installInProgress
22+
- InstallerReturnCode: 431
23+
ReturnResponse: alreadyInstalled
24+
- InstallerReturnCode: 5042
25+
ReturnResponse: cancelledByUser
26+
UpgradeBehavior: install
27+
Protocols:
28+
- nami
29+
ProductCode: Freedom 1.3.1483.64
30+
Installers:
31+
- Architecture: x64
32+
Scope: user
33+
InstallerUrl: https://down.360safe.com/se/360namiai1.3.1483.64.exe
34+
InstallerSha256: 8828C3FCF857C3DDD1D1823EB8B168CAC82DECF83E2DD0F30AFFFA57EEF18A7E
35+
- Architecture: x64
36+
Scope: machine
37+
InstallerUrl: https://down.360safe.com/se/360namiai1.3.1483.64.exe
38+
InstallerSha256: 8828C3FCF857C3DDD1D1823EB8B168CAC82DECF83E2DD0F30AFFFA57EEF18A7E
39+
InstallerSwitches:
40+
Custom: --system-level
41+
ManifestType: installer
42+
ManifestVersion: 1.10.0

‎manifests/3/360/NamiAI/1.3.1483.64/360.NamiAI.locale.en-US.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Created with YamlCreate.ps1 Dumplings Mod
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.locale.1.10.0.schema.json
3+
4+
PackageIdentifier: 360.NamiAI
5+
PackageVersion: 1.3.1483.64
6+
PackageLocale: en-US
7+
Author: Beijing Qihoo Technology Co., Ltd.
8+
License: Freeware
9+
ShortDescription: Next-gen super search, delivering expert-level results instantly
10+
Tags:
11+
- ai
12+
- chatbot
13+
- large-language-model
14+
- llm
15+
ManifestType: locale
16+
ManifestVersion: 1.10.0

0 commit comments

Comments
 (0)