Skip to content

Commit

Permalink
Merge pull request #2644 from Azure/master
Browse files Browse the repository at this point in the history
Merge master into stable for release 2.16.0
  • Loading branch information
gingi committed Feb 3, 2023
2 parents 358eb7d + dd62807 commit c1722ac
Show file tree
Hide file tree
Showing 333 changed files with 5,137 additions and 4,673 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# they will be requested for review when someone opens a
# pull request.

* @cRui861 @dpwatrous @gingi @zfengms @paterasMSFT @seth-barshay @wiboris @skapur12
* @cRui861 @dpwatrous @gingi @zfengms @paterasMSFT @seth-barshay @wiboris @skapur12 @NickKouds
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"request": "attach",
"port": 9222,
"sourceMaps": true,
"webRoot": "${workspaceRoot}/build",
"webRoot": "${workspaceRoot}",
"timeout": 30000,
"presentation": {
"hidden": false,
Expand Down
7 changes: 7 additions & 0 deletions .vsts/common/set-dist-vars.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
steps:

- powershell: $(Build.SourcesDirectory)/scripts/azpipelines/build-type.ps1 "$(Build.SourceBranch)" "$(Build.BuildNumber)"
displayName: Resolve build type

- powershell: $(Build.SourcesDirectory)/scripts/azpipelines/update-build-name.ps1
displayName: Resolve version
1 change: 1 addition & 0 deletions .vsts/darwin/distribution.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
steps:
- template: ../common/set-dist-vars.yml
- template: ./darwin-dependencies.yml
- script: |
set -e
Expand Down
3 changes: 0 additions & 3 deletions .vsts/dependencies.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
steps:
- powershell: ./scripts/azpipelines/build-type.ps1 "$(Build.SourceBranch)" "$(Build.BuildNumber)"
displayName: Resolve build type

- template: ./node-setup.yml
- template: ./python-setup.yml
1 change: 1 addition & 0 deletions .vsts/linux/distribution.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
steps:
- template: ../common/set-dist-vars.yml
- template: ./linux-dependencies.yml
- script: |
set -e
Expand Down
4 changes: 2 additions & 2 deletions .vsts/win/distribution.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
steps:
- template: ../common/set-dist-vars.yml
- template: ./credscan.yml
- template: ./win-dependencies.yml
- powershell: ./scripts/azpipelines/update-build-name.ps1
displayName: Resolve version

- powershell: |
. .vsts/win/exec.ps1
$ErrorActionPreference = "Stop"
Expand Down
6 changes: 6 additions & 0 deletions .vsts/win/sign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ parameters:
pattern: ''

steps:
- task: UseDotNet@2
displayName: 'Use .NET Core sdk'
inputs:
packageType: sdk
version: 2.1.x

- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
displayName: ${{ parameters.name }}
inputs:
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
# 2.16.0

[All items](https://github.com/Azure/BatchExplorer/milestone/50?closed=1)

### Features

* Usability and accessibility improvements [\#2634](https://github.com/Azure/BatchExplorer/issues/2634)
* Link to Italy Accessibility Declarations [\#2638](https://github.com/Azure/BatchExplorer/issues/2638)
* Deprecation warnings for certain images [\#2635](https://github.com/Azure/BatchExplorer/issues/2635)
* Migrates to new Azure Storage SDK [\#2637](https://github.com/Azure/BatchExplorer/issues/2637)
* Security updates [\#2639](https://github.com/Azure/BatchExplorer/issues/2639)

### Bugs

* Storage container Create button in the data menu was broken [\#2636](https://github.com/Azure/BatchExplorer/issues/2636)

# 2.15.0

[All items](https://github.com/Azure/BatchExplorer/milestone/49?closed=1)
Expand Down
619 changes: 358 additions & 261 deletions ThirdPartyNotices.txt

Large diffs are not rendered by default.

11 changes: 3 additions & 8 deletions data/themes/classic.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@
"core-count": "#1c3f95",
"low-priority-core-count": "#a36a00",
"task-start-event": "#a36a00",
"task-complete-event": "#388e3c",
"task-complete-event": "#428000",
"task-fail-event": "#aa3939",
"starting-node-count": "#1c3f95",
"idle-node-count": "#be93d9",
"running-node-count": "#388e3c",
"running-node-count": "#428000",
"start-task-failed-node-count": "#aa3939",
"rebooting-node-count": "#ff755c"
},
Expand All @@ -74,10 +74,5 @@
"disabled-text": "var(--color-text-primary)",
"disabled-background": "#e5e5e5"
},
"chart-colors": [
"#003f5c",
"#aa3939",
"#4caf50",
"#ffa600"
]
"chart-colors": ["#003f5c", "#aa3939", "#4caf50", "#ffa600"]
}
4 changes: 2 additions & 2 deletions i18n/resources.de.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
"profile-button.profile": "Profil",
"profile-button.settings": "Einstellungen",
"profile-button.viewLogs": "Logs anzeigen",
"programatic-usage.authenticationType": "Authentifizierungstyp",
"programatic-usage.credentials": "Anmeldeinformationen",
"programmatic-usage.authenticationType": "Authentifizierungstyp",
"programmatic-usage.credentials": "Anmeldeinformationen",
"rerun-task-form.action": "Erneut ausführen",
"resource-permission-button.none": "NONE",
"resource-permission-button.permission": "Berechtigung",
Expand Down
4 changes: 2 additions & 2 deletions i18n/resources.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@
"profile-button.settings": "Configuración",
"profile-button.viewLogs": "Ver registros",
"profile-button.viewTheme": "Ver colores del tema",
"programatic-usage.authenticationType": "Tipo de autenticación",
"programatic-usage.credentials": "Credenciales",
"programmatic-usage.authenticationType": "Tipo de autenticación",
"programmatic-usage.credentials": "Credenciales",
"rerun-task-form.action": "Volver a ejecutar",
"rerun-task-form.title": "Volver a ejecutar tarea",
"resource-permission-button.giveRole": "Papel de dar {rol}",
Expand Down
4 changes: 2 additions & 2 deletions i18n/resources.fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@
"profile-button.settings": "Paramètres",
"profile-button.thirdPartyNotices": "Avis de tiers",
"profile-button.viewTheme": "Couleurs de thème d’affichage",
"programatic-usage.authenticationType": "Type d'authentification ",
"programatic-usage.credentials": "Informations d'identification",
"programmatic-usage.authenticationType": "Type d'authentification ",
"programmatic-usage.credentials": "Informations d'identification",
"rerun-task-form.action": "Réexécuter",
"rerun-task-form.title": "Réexécuter la tâche",
"resource-permission-button.none": "Aucun(e)",
Expand Down
8 changes: 4 additions & 4 deletions i18n/resources.it.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@
"profile-button.settings": "Impostazioni",
"profile-button.viewLogs": "Visualizza i log",
"profile-button.viewTheme": "Mostra colori del tema",
"programatic-usage.authenticationType": "Tipo di autenticazione",
"programatic-usage.credentials": "Credenziali",
"programatic-usage.setup": "setup",
"programatic-usage.title": "Credenziali ed esempi di codice per questo account batch",
"programmatic-usage.authenticationType": "Tipo di autenticazione",
"programmatic-usage.credentials": "Credenziali",
"programmatic-usage.setup": "setup",
"programmatic-usage.title": "Credenziali ed esempi di codice per questo account batch",
"rerun-task-form.action": "Riesegui",
"rerun-task-form.subtitle": "Questo eliminerà il task e ne creerà uno nuovo con lo stesso id.",
"rerun-task-form.title": "Riesegui attività",
Expand Down
8 changes: 4 additions & 4 deletions i18n/resources.ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,10 @@
"profile-button.thirdPartyNotices": "サードパーティ通知",
"profile-button.viewLogs": "ログの表示",
"profile-button.viewTheme": "テーマカラーの表示",
"programatic-usage.authenticationType": "認証の種類",
"programatic-usage.credentials": "資格情報",
"programatic-usage.setup": "セットアップ",
"programatic-usage.title": "資格情報とこのバッチ アカウントのコード サンプル",
"programmatic-usage.authenticationType": "認証の種類",
"programmatic-usage.credentials": "資格情報",
"programmatic-usage.setup": "セットアップ",
"programmatic-usage.title": "資格情報とこのバッチ アカウントのコード サンプル",
"rerun-task-form.action": "再実行",
"rerun-task-form.subtitle": "タスクを削除し、同じ id で新しいタスクを作成します。",
"rerun-task-form.title": "タスクの再実行",
Expand Down
8 changes: 4 additions & 4 deletions i18n/resources.ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,10 @@
"profile-button.thirdPartyNotices": "제 3자 통지",
"profile-button.viewLogs": "로그 보기",
"profile-button.viewTheme": "테마 색상 보기",
"programatic-usage.authenticationType": "인증 유형",
"programatic-usage.credentials": "자격 증명",
"programatic-usage.setup": "설치",
"programatic-usage.title": "이 배치 계정의 자격증명 및 코드샘플",
"programmatic-usage.authenticationType": "인증 유형",
"programmatic-usage.credentials": "자격 증명",
"programmatic-usage.setup": "설치",
"programmatic-usage.title": "이 배치 계정의 자격증명 및 코드샘플",
"rerun-task-form.action": "재실행",
"rerun-task-form.subtitle": "이렇게 하면 작업이 삭제되고 동일한 ID로 새 작업이 생성됩니다.",
"rerun-task-form.title": "작업 재실행",
Expand Down
8 changes: 4 additions & 4 deletions i18n/resources.pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,10 @@
"profile-button.thirdPartyNotices": "Anúncios de terceiros",
"profile-button.viewLogs": "Exibição de Logs",
"profile-button.viewTheme": "Exibição de cores de tema",
"programatic-usage.authenticationType": "Tipo de autenticação",
"programatic-usage.credentials": "Credenciais",
"programatic-usage.setup": "Configuração",
"programatic-usage.title": "Credenciais e exemplos de código para esta conta de lote",
"programmatic-usage.authenticationType": "Tipo de autenticação",
"programmatic-usage.credentials": "Credenciais",
"programmatic-usage.setup": "Configuração",
"programmatic-usage.title": "Credenciais e exemplos de código para esta conta de lote",
"rerun-task-form.action": "Reexecutar",
"rerun-task-form.subtitle": "Isto irá excluir a tarefa e criar uma nova com o mesmo id.",
"rerun-task-form.title": "Reexecutar tarefa",
Expand Down
6 changes: 3 additions & 3 deletions i18n/resources.pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@
"profile-button.settings": "Definições",
"profile-button.thirdPartyNotices": "Avisos de terceiros",
"profile-button.viewLogs": "Ver Registos",
"programatic-usage.authenticationType": "Tipo de autenticação",
"programatic-usage.credentials": "Credenciais",
"programatic-usage.setup": "Configuração",
"programmatic-usage.authenticationType": "Tipo de autenticação",
"programmatic-usage.credentials": "Credenciais",
"programmatic-usage.setup": "Configuração",
"rerun-task-form.action": "Voltar a executar",
"resource-permission-button.none": "Nenhum",
"resource-permission-button.removeAccess": "Remover acesso",
Expand Down
4 changes: 2 additions & 2 deletions i18n/resources.ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
"pool-picker.reset": "Сброс",
"profile-button.profile": "Профиль",
"profile-button.settings": "Параметры",
"programatic-usage.authenticationType": "Тип проверки подлинности",
"programatic-usage.credentials": "Учетные данные",
"programmatic-usage.authenticationType": "Тип проверки подлинности",
"programmatic-usage.credentials": "Учетные данные",
"resource-permission-button.none": "NONE",
"resource-permission-button.permission": "Разрешение",
"settings.general": "Общее",
Expand Down
8 changes: 4 additions & 4 deletions i18n/resources.zh-Hans.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,10 @@
"profile-button.thirdPartyNotices": "第三方通知",
"profile-button.viewLogs": "查看日志",
"profile-button.viewTheme": "查看主题颜色",
"programatic-usage.authenticationType": "身份验证类型",
"programatic-usage.credentials": "凭据",
"programatic-usage.setup": "设置",
"programatic-usage.title": "这批帐户的凭据和代码示例",
"programmatic-usage.authenticationType": "身份验证类型",
"programmatic-usage.credentials": "凭据",
"programmatic-usage.setup": "设置",
"programmatic-usage.title": "这批帐户的凭据和代码示例",
"rerun-task-form.action": "重新运行",
"rerun-task-form.subtitle": "这将删除该任务并创建一个具有相同ID的新任务。",
"rerun-task-form.title": "重新运行任务",
Expand Down
6 changes: 3 additions & 3 deletions i18n/resources.zh-Hant.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
"profile-button.report": "回報 bug 或功能請求",
"profile-button.settings": "設定",
"profile-button.viewLogs": "查看日誌",
"programatic-usage.authenticationType": "驗證類型",
"programatic-usage.credentials": "認證",
"programmatic-usage.authenticationType": "驗證類型",
"programmatic-usage.credentials": "認證",
"resource-permission-button.giveRole": "給 {role} 角色",
"resource-permission-button.none": "",
"resource-permission-button.permission": "使用權限",
Expand All @@ -88,4 +88,4 @@
"task-resource-files.fileMode": "檔案模式",
"user-account-picker.password": "密碼",
"user-account-picker.username": "使用者名稱"
}
}
1 change: 0 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ module.exports = function(config) {
{ type: "cobertura", subdir: ".", file: "cobertura.xml" },
]
},
// Can't enable yet has a conflict in dependency with azure-storage
junitReporter: {
outputDir: "./coverage"
}
Expand Down
Loading

0 comments on commit c1722ac

Please sign in to comment.