Skip to content

Commit

Permalink
merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
AlitzelMendez committed Jan 27, 2025
2 parents cb4ef2d + fd65ff3 commit 8b9eb37
Show file tree
Hide file tree
Showing 103 changed files with 10,024 additions and 8,896 deletions.
7 changes: 0 additions & 7 deletions .chronus/changes/ReleaseDashboardsStep3-2024-11-11-11-1-42.md

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
changeKind: feature
packages:
- "@azure-tools/typespec-autorest"
- "@azure-tools/typespec-azure-resource-manager"
---

Add `@externalTypeRef` decorator, to been able to specify an external reference that should be used when emitting.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
changeKind: internal
packages:
- "@azure-tools/azure-http-specs"
- "@azure-tools/typespec-autorest-canonical"
- "@azure-tools/typespec-autorest"
- "@azure-tools/typespec-azure-core"
- "@azure-tools/typespec-azure-portal-core"
- "@azure-tools/typespec-azure-resource-manager"
- "@azure-tools/typespec-azure-rulesets"
- "@azure-tools/typespec-client-generator-core"
---

7 changes: 7 additions & 0 deletions .chronus/changes/fix-duplicate-warning-2025-0-15-11-39-29.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
changeKind: fix
packages:
- "@azure-tools/typespec-azure-resource-manager"
---

Exclude template instances from the `no-response-body` rule.
8 changes: 0 additions & 8 deletions .chronus/changes/rust-client-names-2025-0-6-15-6-10.md

This file was deleted.

7 changes: 0 additions & 7 deletions .chronus/changes/scope-decorator-2024-11-18-12-59-12.md

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

15 changes: 15 additions & 0 deletions .chronus/changes/upgrade-deps-jan-2025-2025-0-22-0-4-39.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
changeKind: dependencies
packages:
- "@azure-tools/azure-http-specs"
- "@azure-tools/typespec-autorest-canonical"
- "@azure-tools/typespec-autorest"
- "@azure-tools/typespec-azure-core"
- "@azure-tools/typespec-azure-portal-core"
- "@azure-tools/typespec-azure-resource-manager"
- "@azure-tools/typespec-azure-rulesets"
- "@azure-tools/typespec-client-generator-core"
---

Upgrade dependencies
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
auto-install-peers=true
manage-package-manager-versions=true
2 changes: 1 addition & 1 deletion core
Submodule core updated 780 files
2 changes: 1 addition & 1 deletion eng/feeds/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"description": "",
"devDependencies": {
"@typespec/compiler": "workspace:~",
"vitest": "^2.1.5"
"vitest": "^3.0.4"
}
}
49 changes: 0 additions & 49 deletions eng/pipelines/deploy-azure-spec-dashboard-storage-account.yml

This file was deleted.

12 changes: 12 additions & 0 deletions eng/pipelines/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,17 @@ extends:
env:
NPM_AUTH_TOKEN: $(azure-sdk-npm-token)
- pwsh: |
$publishSummary = Get-Content "./publish-summary.json" | ConvertFrom-Json
if ($publishSummary.packages.'@azure-tools/azure-http-specs'.published -eq $true) {
Write-Output "Setting PublishAzureHttpSpecs variable to true."
Write-Host "##vso[task.setvariable variable=PublishAzureHttpSpecs]true"
} else {
Write-Output "Setting PublishAzureHttpSpecs variable to false."
Write-Host "##vso[task.setvariable variable=PublishAzureHttpSpecs]false"
}
displayName: "Check if @azure-tools/azure-http-specs was published"
- script: |
echo "Publish summary:"
cat ./publish-summary.json
Expand Down Expand Up @@ -97,6 +108,7 @@ extends:

- task: AzureCLI@2
displayName: Upload scenario manifest
condition: eq(variables['PublishAzureHttpSpecs'], 'true')
inputs:
azureSubscription: "TypeSpec Storage"
scriptType: "bash"
Expand Down
4 changes: 1 addition & 3 deletions eng/pipelines/templates/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ steps:
key: 'pnpm | "$(Agent.OS)" | pnpm-lock.yaml'
path: ${{ parameters.pnpmStorePath }}
displayName: Cache pnpm store
- script: |
corepack enable
corepack prepare pnpm --activate
- script: npm install -g pnpm # Pnpm manage-package-manager-versions will respect packageManager field
displayName: Install pnpm
- script: pnpm config set store-dir ${{ parameters.pnpmStorePath }}
displayName: Setup pnpm cache dir
Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,29 @@
"upload-manifest": "pnpm -r --filter=@azure-tools/azure-http-specs run upload-manifest"
},
"devDependencies": {
"@chronus/chronus": "^0.13.0",
"@chronus/github": "^0.4.4",
"@eslint/js": "^9.15.0",
"@chronus/chronus": "^0.14.0",
"@chronus/github": "^0.4.5",
"@eslint/js": "^9.18.0",
"@pnpm/find-workspace-packages": "^6.0.9",
"@types/node": "~22.7.9",
"@vitest/coverage-v8": "^2.1.5",
"c8": "^10.1.2",
"cspell": "^8.16.0",
"eslint": "^9.15.0",
"@types/node": "~22.10.10",
"@vitest/coverage-v8": "^3.0.4",
"c8": "^10.1.3",
"cspell": "^8.17.2",
"eslint": "^9.18.0",
"eslint-plugin-deprecation": "^3.0.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-unicorn": "^56.0.1",
"eslint-plugin-vitest": "^0.5.4",
"playwright": "^1.49.0",
"prettier": "~3.3.3",
"playwright": "^1.50.0",
"prettier": "~3.4.2",
"prettier-plugin-astro": "^0.14.1",
"prettier-plugin-organize-imports": "~4.1.0",
"rimraf": "~6.0.1",
"syncpack": "^13.0.0",
"tsx": "^4.19.2",
"typescript": "~5.6.3",
"typescript-eslint": "^8.15.0",
"vitest": "^2.1.5"
"typescript": "~5.7.3",
"typescript-eslint": "^8.21.0",
"vitest": "^3.0.4"
},
"syncpack": {
"dependencyTypes": [
Expand Down
15 changes: 15 additions & 0 deletions packages/azure-http-specs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# @azure-tools/azure-http-specs

## 0.1.0-alpha.5

### Bug Fixes

- [#2039](https://github.com/Azure/typespec-azure/pull/2039) Add Rust to client naming scenarios

### Features

- [#1929](https://github.com/Azure/typespec-azure/pull/1929) Add test scenario for clientNamespace
- [#1934](https://github.com/Azure/typespec-azure/pull/1934) Added CheckNameAvailability operations case for ARM tests.
- [#1924](https://github.com/Azure/typespec-azure/pull/1924) Added ExtensionResource case for ARM tests.
- [#1933](https://github.com/Azure/typespec-azure/pull/1933) Added listing available operations case for ARM tests.
- [#1932](https://github.com/Azure/typespec-azure/pull/1932) Added Location-based Resource case for ARM tests.


## 0.1.0-alpha.4

### Bug Fixes
Expand Down
24 changes: 12 additions & 12 deletions packages/azure-http-specs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@azure-tools/azure-http-specs",
"version": "0.1.0-alpha.4",
"version": "0.1.0-alpha.5",
"description": "Azure Spec scenarios and mock apis",
"main": "dist/index.js",
"type": "module",
Expand Down Expand Up @@ -35,27 +35,27 @@
},
"homepage": "https://azure.github.io/typespec-azure",
"dependencies": {
"@typespec/spector": "workspace:~",
"@typespec/spec-api": "workspace:~"
"@typespec/spec-api": "workspace:~",
"@typespec/spector": "workspace:~"
},
"devDependencies": {
"@azure-tools/typespec-autorest": "workspace:~",
"@azure-tools/typespec-azure-resource-manager": "workspace:~",
"@azure-tools/typespec-client-generator-core": "workspace:~",
"@azure-tools/typespec-autorest": "workspace:~",
"@typespec/openapi3": "workspace:~",
"@typespec/openapi": "workspace:~",
"@types/multer": "^1.4.10",
"@types/node": "~22.7.9",
"concurrently": "^9.0.1",
"typescript": "~5.6.3",
"rimraf": "~6.0.1"
"@types/node": "~22.10.10",
"@typespec/openapi": "workspace:~",
"@typespec/openapi3": "workspace:~",
"concurrently": "^9.1.2",
"rimraf": "~6.0.1",
"typescript": "~5.7.3"
},
"peerDependencies": {
"@azure-tools/typespec-azure-core": "workspace:~",
"@typespec/versioning": "workspace:~",
"@typespec/compiler": "workspace:~",
"@typespec/rest": "workspace:~",
"@typespec/http": "workspace:~",
"@typespec/rest": "workspace:~",
"@typespec/versioning": "workspace:~",
"@typespec/xml": "workspace:~"
}
}
Loading

0 comments on commit 8b9eb37

Please sign in to comment.