diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 52f8d31203c..daf78bc9dc6 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -30,23 +30,23 @@ dependencies: specifier: ~3.0.0 version: 3.0.255 '@azure-tools/typespec-autorest': - specifier: 0.59.0 - version: 0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@azure-tools/typespec-azure-resource-manager@0.59.0)(@azure-tools/typespec-client-generator-core@0.59.0)(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/openapi@1.3.0)(@typespec/rest@0.73.0)(@typespec/versioning@0.73.0) + specifier: 0.61.0 + version: 0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@azure-tools/typespec-azure-resource-manager@0.61.0)(@azure-tools/typespec-client-generator-core@0.61.0)(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/openapi@1.5.0)(@typespec/rest@0.75.0)(@typespec/versioning@0.75.0)(@typespec/xml@0.75.0) '@azure-tools/typespec-azure-core': - specifier: 0.59.0 - version: 0.59.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/rest@0.73.0) + specifier: 0.61.0 + version: 0.61.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/rest@0.75.0) '@azure-tools/typespec-azure-resource-manager': - specifier: 0.59.0 - version: 0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/openapi@1.3.0)(@typespec/rest@0.73.0)(@typespec/versioning@0.73.0) + specifier: 0.61.0 + version: 0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/openapi@1.5.0)(@typespec/rest@0.75.0)(@typespec/versioning@0.75.0) '@azure-tools/typespec-azure-rulesets': - specifier: 0.59.0 - version: 0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@azure-tools/typespec-azure-resource-manager@0.59.0)(@azure-tools/typespec-client-generator-core@0.59.0)(@typespec/compiler@1.3.0) + specifier: 0.61.0 + version: 0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@azure-tools/typespec-azure-resource-manager@0.61.0)(@azure-tools/typespec-client-generator-core@0.61.0)(@typespec/compiler@1.5.0) '@azure-tools/typespec-client-generator-core': - specifier: 0.59.0 - version: 0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/openapi@1.3.0)(@typespec/rest@0.73.0)(@typespec/streams@0.73.0)(@typespec/versioning@0.73.0)(@typespec/xml@0.73.0) + specifier: 0.61.0 + version: 0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/openapi@1.5.0)(@typespec/rest@0.75.0)(@typespec/streams@0.75.0)(@typespec/versioning@0.75.0)(@typespec/xml@0.75.0) '@azure-tools/typespec-liftr-base': - specifier: 0.8.0 - version: 0.8.0 + specifier: 0.10.0 + version: 0.10.0 '@azure-tools/uri': specifier: ~3.1.1 version: 3.1.1 @@ -81,26 +81,26 @@ dependencies: specifier: ~5.62.0 version: 5.62.0(eslint@8.12.0)(typescript@5.1.6) '@typespec/compiler': - specifier: 1.3.0 - version: 1.3.0(@types/node@20.14.15) + specifier: 1.5.0 + version: 1.5.0(@types/node@20.14.15) '@typespec/http': - specifier: 1.3.0 - version: 1.3.0(@typespec/compiler@1.3.0)(@typespec/streams@0.73.0) + specifier: 1.5.0 + version: 1.5.0(@typespec/compiler@1.5.0)(@typespec/streams@0.75.0) '@typespec/openapi': - specifier: 1.3.0 - version: 1.3.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0) + specifier: 1.5.0 + version: 1.5.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0) '@typespec/rest': - specifier: 0.73.0 - version: 0.73.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0) + specifier: 0.75.0 + version: 0.75.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0) '@typespec/streams': - specifier: 0.73.0 - version: 0.73.0(@typespec/compiler@1.3.0) + specifier: 0.75.0 + version: 0.75.0(@typespec/compiler@1.5.0) '@typespec/versioning': - specifier: 0.73.0 - version: 0.73.0(@typespec/compiler@1.3.0) + specifier: 0.75.0 + version: 0.75.0(@typespec/compiler@1.5.0) '@typespec/xml': - specifier: 0.73.0 - version: 0.73.0(@typespec/compiler@1.3.0) + specifier: 0.75.0 + version: 0.75.0(@typespec/compiler@1.5.0) autorest: specifier: ~3.6.3 version: 3.6.3 @@ -233,108 +233,113 @@ packages: engines: {node: '>=10.12.0'} dev: false - /@azure-tools/typespec-autorest@0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@azure-tools/typespec-azure-resource-manager@0.59.0)(@azure-tools/typespec-client-generator-core@0.59.0)(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/openapi@1.3.0)(@typespec/rest@0.73.0)(@typespec/versioning@0.73.0): - resolution: {integrity: sha512-IdjicuLJRNFZUWHJd1Z8e9RQUlVUyUb2v7pT1rYkhpxAxFb9uluVVpi09GkUFimkrUZ+HkFO/jI2zbIAptZ2FQ==} + /@azure-tools/typespec-autorest@0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@azure-tools/typespec-azure-resource-manager@0.61.0)(@azure-tools/typespec-client-generator-core@0.61.0)(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/openapi@1.5.0)(@typespec/rest@0.75.0)(@typespec/versioning@0.75.0)(@typespec/xml@0.75.0): + resolution: {integrity: sha512-1/netRFLjltoZaNDJ8QuFzZFtFTyL+u9R+hyU7VsNAgpQy5nn3ax28nO04CdkguQZQ0WGDewZSZW0OhEGCWPOA==} engines: {node: '>=20.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ^0.59.0 - '@azure-tools/typespec-azure-resource-manager': ^0.59.0 - '@azure-tools/typespec-client-generator-core': ^0.59.0 - '@typespec/compiler': ^1.3.0 - '@typespec/http': ^1.3.0 - '@typespec/openapi': ^1.3.0 - '@typespec/rest': ^0.73.0 - '@typespec/versioning': ^0.73.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.59.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/rest@0.73.0) - '@azure-tools/typespec-azure-resource-manager': 0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/openapi@1.3.0)(@typespec/rest@0.73.0)(@typespec/versioning@0.73.0) - '@azure-tools/typespec-client-generator-core': 0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/openapi@1.3.0)(@typespec/rest@0.73.0)(@typespec/streams@0.73.0)(@typespec/versioning@0.73.0)(@typespec/xml@0.73.0) - '@typespec/compiler': 1.3.0(@types/node@20.14.15) - '@typespec/http': 1.3.0(@typespec/compiler@1.3.0)(@typespec/streams@0.73.0) - '@typespec/openapi': 1.3.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0) - '@typespec/rest': 0.73.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0) - '@typespec/versioning': 0.73.0(@typespec/compiler@1.3.0) - dev: false - - /@azure-tools/typespec-azure-core@0.59.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/rest@0.73.0): - resolution: {integrity: sha512-3vTWDTSR+P0qeyFcOKTgXortNOeA3nsyKTPpZqfFZVTtNFiiO17UWAM2Eg3i0IpNQ3qxMMAksIkwt1bqltTDqA==} + '@azure-tools/typespec-azure-core': ^0.61.0 + '@azure-tools/typespec-azure-resource-manager': ^0.61.0 + '@azure-tools/typespec-client-generator-core': ^0.61.0 + '@typespec/compiler': ^1.5.0 + '@typespec/http': ^1.5.0 + '@typespec/openapi': ^1.5.0 + '@typespec/rest': ^0.75.0 + '@typespec/versioning': ^0.75.0 + '@typespec/xml': ^0.75.0 + peerDependenciesMeta: + '@typespec/xml': + optional: true + dependencies: + '@azure-tools/typespec-azure-core': 0.61.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/rest@0.75.0) + '@azure-tools/typespec-azure-resource-manager': 0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/openapi@1.5.0)(@typespec/rest@0.75.0)(@typespec/versioning@0.75.0) + '@azure-tools/typespec-client-generator-core': 0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/openapi@1.5.0)(@typespec/rest@0.75.0)(@typespec/streams@0.75.0)(@typespec/versioning@0.75.0)(@typespec/xml@0.75.0) + '@typespec/compiler': 1.5.0(@types/node@20.14.15) + '@typespec/http': 1.5.0(@typespec/compiler@1.5.0)(@typespec/streams@0.75.0) + '@typespec/openapi': 1.5.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0) + '@typespec/rest': 0.75.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0) + '@typespec/versioning': 0.75.0(@typespec/compiler@1.5.0) + '@typespec/xml': 0.75.0(@typespec/compiler@1.5.0) + dev: false + + /@azure-tools/typespec-azure-core@0.61.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/rest@0.75.0): + resolution: {integrity: sha512-sqOYBUghAtVMBiAWwT3fMRVSDNwR7IU3AQ96n/ErhAthwWjTe7PFVfK/MPjpI1mO3cdyLeS2DGyI3gt/waWP4g==} engines: {node: '>=20.0.0'} peerDependencies: - '@typespec/compiler': ^1.3.0 - '@typespec/http': ^1.3.0 - '@typespec/rest': ^0.73.0 + '@typespec/compiler': ^1.5.0 + '@typespec/http': ^1.5.0 + '@typespec/rest': ^0.75.0 dependencies: - '@typespec/compiler': 1.3.0(@types/node@20.14.15) - '@typespec/http': 1.3.0(@typespec/compiler@1.3.0)(@typespec/streams@0.73.0) - '@typespec/rest': 0.73.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0) + '@typespec/compiler': 1.5.0(@types/node@20.14.15) + '@typespec/http': 1.5.0(@typespec/compiler@1.5.0)(@typespec/streams@0.75.0) + '@typespec/rest': 0.75.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0) dev: false - /@azure-tools/typespec-azure-resource-manager@0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/openapi@1.3.0)(@typespec/rest@0.73.0)(@typespec/versioning@0.73.0): - resolution: {integrity: sha512-q0UkBnwWE4+9ivAkwAOOrDF9kvSb+qRIvMXJdUlqGfwFqDkOvQFwHSzSDeL/mBNK2fB9NIePKPFjDGP9lpC0vQ==} + /@azure-tools/typespec-azure-resource-manager@0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/openapi@1.5.0)(@typespec/rest@0.75.0)(@typespec/versioning@0.75.0): + resolution: {integrity: sha512-m/M6AareRXacDwyR82g9DqMppfX0eEsv0/q4PW2Lii7wGVzFiiU6fLqsiWBdIHl7GaKszTRtZXNRk/IL9HV8Lw==} engines: {node: '>=20.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ^0.59.0 - '@typespec/compiler': ^1.3.0 - '@typespec/http': ^1.3.0 - '@typespec/openapi': ^1.3.0 - '@typespec/rest': ^0.73.0 - '@typespec/versioning': ^0.73.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.59.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/rest@0.73.0) - '@typespec/compiler': 1.3.0(@types/node@20.14.15) - '@typespec/http': 1.3.0(@typespec/compiler@1.3.0)(@typespec/streams@0.73.0) - '@typespec/openapi': 1.3.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0) - '@typespec/rest': 0.73.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0) - '@typespec/versioning': 0.73.0(@typespec/compiler@1.3.0) + '@azure-tools/typespec-azure-core': ^0.61.0 + '@typespec/compiler': ^1.5.0 + '@typespec/http': ^1.5.0 + '@typespec/openapi': ^1.5.0 + '@typespec/rest': ^0.75.0 + '@typespec/versioning': ^0.75.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.61.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/rest@0.75.0) + '@typespec/compiler': 1.5.0(@types/node@20.14.15) + '@typespec/http': 1.5.0(@typespec/compiler@1.5.0)(@typespec/streams@0.75.0) + '@typespec/openapi': 1.5.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0) + '@typespec/rest': 0.75.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0) + '@typespec/versioning': 0.75.0(@typespec/compiler@1.5.0) change-case: 5.4.4 pluralize: 8.0.0 dev: false - /@azure-tools/typespec-azure-rulesets@0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@azure-tools/typespec-azure-resource-manager@0.59.0)(@azure-tools/typespec-client-generator-core@0.59.0)(@typespec/compiler@1.3.0): - resolution: {integrity: sha512-+eKYH25ptj6SZHT+/YfxrX+g6HMAQQTphmHmqOoRCbbfPaE8l855OaDrwEgh5NDLV8WXnHpzTNI0dsYipEp10g==} + /@azure-tools/typespec-azure-rulesets@0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@azure-tools/typespec-azure-resource-manager@0.61.0)(@azure-tools/typespec-client-generator-core@0.61.0)(@typespec/compiler@1.5.0): + resolution: {integrity: sha512-EWArbj6dgTz7Xi0mAkp0ru6PoWqfXLHlk8Kt7BzVcHCPojBYK14JW9RYSxBta+h2fAEQTSQu+X1r7Y7PhJE8rA==} engines: {node: '>=20.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ^0.59.0 - '@azure-tools/typespec-azure-resource-manager': ^0.59.0 - '@azure-tools/typespec-client-generator-core': ^0.59.0 - '@typespec/compiler': ^1.3.0 + '@azure-tools/typespec-azure-core': ^0.61.0 + '@azure-tools/typespec-azure-resource-manager': ^0.61.0 + '@azure-tools/typespec-client-generator-core': ^0.61.0 + '@typespec/compiler': ^1.5.0 dependencies: - '@azure-tools/typespec-azure-core': 0.59.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/rest@0.73.0) - '@azure-tools/typespec-azure-resource-manager': 0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/openapi@1.3.0)(@typespec/rest@0.73.0)(@typespec/versioning@0.73.0) - '@azure-tools/typespec-client-generator-core': 0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/openapi@1.3.0)(@typespec/rest@0.73.0)(@typespec/streams@0.73.0)(@typespec/versioning@0.73.0)(@typespec/xml@0.73.0) - '@typespec/compiler': 1.3.0(@types/node@20.14.15) + '@azure-tools/typespec-azure-core': 0.61.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/rest@0.75.0) + '@azure-tools/typespec-azure-resource-manager': 0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/openapi@1.5.0)(@typespec/rest@0.75.0)(@typespec/versioning@0.75.0) + '@azure-tools/typespec-client-generator-core': 0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/openapi@1.5.0)(@typespec/rest@0.75.0)(@typespec/streams@0.75.0)(@typespec/versioning@0.75.0)(@typespec/xml@0.75.0) + '@typespec/compiler': 1.5.0(@types/node@20.14.15) dev: false - /@azure-tools/typespec-client-generator-core@0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/openapi@1.3.0)(@typespec/rest@0.73.0)(@typespec/streams@0.73.0)(@typespec/versioning@0.73.0)(@typespec/xml@0.73.0): - resolution: {integrity: sha512-5+pVcOr7Uyq4IaZ3oLjLi8jnBuR+t/B8hQF4CZo+goe/uK+WkmDfw1TlY14G2ve7W7v8m9+Sk2nil6bN1uHWEQ==} + /@azure-tools/typespec-client-generator-core@0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/openapi@1.5.0)(@typespec/rest@0.75.0)(@typespec/streams@0.75.0)(@typespec/versioning@0.75.0)(@typespec/xml@0.75.0): + resolution: {integrity: sha512-xm6HXmO2vFJ0BBKrkWGXknNyzhEYQ7eUFhngFMy1Mz7vCTTAprjA/jvtC6GpgjrKwVbmt1aQ0JyGmVKEiwWsMg==} engines: {node: '>=20.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ^0.59.0 - '@typespec/compiler': ^1.3.0 - '@typespec/events': ^0.73.0 - '@typespec/http': ^1.3.0 - '@typespec/openapi': ^1.3.0 - '@typespec/rest': ^0.73.0 - '@typespec/sse': ^0.73.0 - '@typespec/streams': ^0.73.0 - '@typespec/versioning': ^0.73.0 - '@typespec/xml': ^0.73.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.59.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/rest@0.73.0) - '@typespec/compiler': 1.3.0(@types/node@20.14.15) - '@typespec/http': 1.3.0(@typespec/compiler@1.3.0)(@typespec/streams@0.73.0) - '@typespec/openapi': 1.3.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0) - '@typespec/rest': 0.73.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0) - '@typespec/streams': 0.73.0(@typespec/compiler@1.3.0) - '@typespec/versioning': 0.73.0(@typespec/compiler@1.3.0) - '@typespec/xml': 0.73.0(@typespec/compiler@1.3.0) + '@azure-tools/typespec-azure-core': ^0.61.0 + '@typespec/compiler': ^1.5.0 + '@typespec/events': ^0.75.0 + '@typespec/http': ^1.5.0 + '@typespec/openapi': ^1.5.0 + '@typespec/rest': ^0.75.0 + '@typespec/sse': ^0.75.0 + '@typespec/streams': ^0.75.0 + '@typespec/versioning': ^0.75.0 + '@typespec/xml': ^0.75.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.61.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/rest@0.75.0) + '@typespec/compiler': 1.5.0(@types/node@20.14.15) + '@typespec/http': 1.5.0(@typespec/compiler@1.5.0)(@typespec/streams@0.75.0) + '@typespec/openapi': 1.5.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0) + '@typespec/rest': 0.75.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0) + '@typespec/streams': 0.75.0(@typespec/compiler@1.5.0) + '@typespec/versioning': 0.75.0(@typespec/compiler@1.5.0) + '@typespec/xml': 0.75.0(@typespec/compiler@1.5.0) change-case: 5.4.4 pluralize: 8.0.0 yaml: 2.8.0 dev: false - /@azure-tools/typespec-liftr-base@0.8.0: - resolution: {integrity: sha512-xftTTtVjDuxIzugQ9nL/abmttdDM3HAf5HhqKzs9DO0Kl0ZhXQlB2DYlT1hBs/N+IWerMF9k2eKs2RncngA03g==} + /@azure-tools/typespec-liftr-base@0.10.0: + resolution: {integrity: sha512-FcF8IusZcS2vvm1J+CzaeZkv15FgcFOSR+YoFdIusnnm+mlcLudM92NupdxZnuobPYcfZzq+rRvylxzzgWky7A==} dev: false /@azure-tools/uri@3.1.1: @@ -1225,8 +1230,8 @@ packages: eslint-visitor-keys: 3.4.3 dev: false - /@typespec/compiler@1.3.0(@types/node@20.14.15): - resolution: {integrity: sha512-OqpoNP3C2y8riA6C5RofPMvmj9jNiGyyhde0tM2ZE7IBOv7BBaTDqw4CJD22YnC8JEilRfPmvdVCViNrPHEjrA==} + /@typespec/compiler@1.5.0(@types/node@20.14.15): + resolution: {integrity: sha512-REJgZOEZ9g9CC72GGT0+nLbjW+5WVlCfm1d6w18N5RsUo7vLXs8IPXwq7xZJzoqU99Q9B4keqzPuTU4OrDUTrA==} engines: {node: '>=20.0.0'} hasBin: true dependencies: @@ -1251,67 +1256,67 @@ packages: - '@types/node' dev: false - /@typespec/http@1.3.0(@typespec/compiler@1.3.0)(@typespec/streams@0.73.0): - resolution: {integrity: sha512-4W3KsmBHZGgECVbvyh7S7KQG06948XyVVzae+UbVDDxoUj/x4Ry0AXw3q4HmzB2BVhxw6JBrwBuVa5mxjVMzdw==} + /@typespec/http@1.5.0(@typespec/compiler@1.5.0)(@typespec/streams@0.75.0): + resolution: {integrity: sha512-52XLXwqSY2SY6nSvfkiTsNiJzlMeIAZ6MFIVJ5YkoibA21TNAP4DtjTZgC2GieZLY2NNN/rqDCqBX+DyWqTrfQ==} engines: {node: '>=20.0.0'} peerDependencies: - '@typespec/compiler': ^1.3.0 - '@typespec/streams': ^0.73.0 + '@typespec/compiler': ^1.5.0 + '@typespec/streams': ^0.75.0 peerDependenciesMeta: '@typespec/streams': optional: true dependencies: - '@typespec/compiler': 1.3.0(@types/node@20.14.15) - '@typespec/streams': 0.73.0(@typespec/compiler@1.3.0) + '@typespec/compiler': 1.5.0(@types/node@20.14.15) + '@typespec/streams': 0.75.0(@typespec/compiler@1.5.0) dev: false - /@typespec/openapi@1.3.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0): - resolution: {integrity: sha512-BSeshjCZQodVGyVHn7ytcUeIcUGjqbG2Ac0NLOQaaKnISVrhTWNcgo5aFTqxAa24ZL/EuhqlSauLyYce2EV9fw==} + /@typespec/openapi@1.5.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0): + resolution: {integrity: sha512-27sXkSK2r1sAmVMLv+pwlN/Cm+yg9nEK8iuGyJRuEkBk7hcsJDbTnBlsEvlRTI8DqljtzA7YECDHBLK88zZHeg==} engines: {node: '>=20.0.0'} peerDependencies: - '@typespec/compiler': ^1.3.0 - '@typespec/http': ^1.3.0 + '@typespec/compiler': ^1.5.0 + '@typespec/http': ^1.5.0 dependencies: - '@typespec/compiler': 1.3.0(@types/node@20.14.15) - '@typespec/http': 1.3.0(@typespec/compiler@1.3.0)(@typespec/streams@0.73.0) + '@typespec/compiler': 1.5.0(@types/node@20.14.15) + '@typespec/http': 1.5.0(@typespec/compiler@1.5.0)(@typespec/streams@0.75.0) dev: false - /@typespec/rest@0.73.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0): - resolution: {integrity: sha512-28hgFGvreBg34Xuguw+E++pQC/kbRxy1Bpx/9nU7x87Ly6ykns3lpx74gjY9ByE8VYKVbXtC7lzdnp19DRSjIQ==} + /@typespec/rest@0.75.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0): + resolution: {integrity: sha512-rQ+RP0kcrKWjbpCIkBd8hpxYSNc3CfQxl0MLP1+MYGRHlHL8ss4xbwdANIYZXZZ2i2Hqt19B7cEUGD4MLoCHvw==} engines: {node: '>=20.0.0'} peerDependencies: - '@typespec/compiler': ^1.3.0 - '@typespec/http': ^1.3.0 + '@typespec/compiler': ^1.5.0 + '@typespec/http': ^1.5.0 dependencies: - '@typespec/compiler': 1.3.0(@types/node@20.14.15) - '@typespec/http': 1.3.0(@typespec/compiler@1.3.0)(@typespec/streams@0.73.0) + '@typespec/compiler': 1.5.0(@types/node@20.14.15) + '@typespec/http': 1.5.0(@typespec/compiler@1.5.0)(@typespec/streams@0.75.0) dev: false - /@typespec/streams@0.73.0(@typespec/compiler@1.3.0): - resolution: {integrity: sha512-pL4xffHXEIhBQKPlB9L4AKuM0bn44WsGKjnz91wa6wBtP/CbsPrGQicof0Z7GPGdddtDi4G8PWGmJtVFw53V9g==} + /@typespec/streams@0.75.0(@typespec/compiler@1.5.0): + resolution: {integrity: sha512-ubvxCN+SZwN9aEarz8CPtMJgnopeu8dXyut47q0FAPp9nykmXy7s+dmsopR+7OX0Fhcnh8ZFYTQcJzJ3QftOiQ==} engines: {node: '>=20.0.0'} peerDependencies: - '@typespec/compiler': ^1.3.0 + '@typespec/compiler': ^1.5.0 dependencies: - '@typespec/compiler': 1.3.0(@types/node@20.14.15) + '@typespec/compiler': 1.5.0(@types/node@20.14.15) dev: false - /@typespec/versioning@0.73.0(@typespec/compiler@1.3.0): - resolution: {integrity: sha512-cfFvzTsvsu4VpdwZcRULr3p/fawKZnjiJClQxlLcYW0dLs/5k5jh7l0YyPkYvgkOcncUrIB6hIu82tQhKrMDKQ==} + /@typespec/versioning@0.75.0(@typespec/compiler@1.5.0): + resolution: {integrity: sha512-wdLcVx5UW4WRks/OXfqLiaDTtWfAWgv/nj69u99gRJU6iY9ExEvK5x9NQszZQKYnu6tM7nkoYMg4zu+7YBUBaw==} engines: {node: '>=20.0.0'} peerDependencies: - '@typespec/compiler': ^1.3.0 + '@typespec/compiler': ^1.5.0 dependencies: - '@typespec/compiler': 1.3.0(@types/node@20.14.15) + '@typespec/compiler': 1.5.0(@types/node@20.14.15) dev: false - /@typespec/xml@0.73.0(@typespec/compiler@1.3.0): - resolution: {integrity: sha512-vlMM8/L22O/PbI3ovj3qoww/3Z8wNwn7og4jzlGRM93jZBJvrOeDSwZo1Dc4rMJyU6KfjPkP3/l5TLbgW8x0zA==} + /@typespec/xml@0.75.0(@typespec/compiler@1.5.0): + resolution: {integrity: sha512-JVafN1nZE3BcQrKbaAFVWw/IleTRdsJpwT3oZ2m7EfWnG30sKtoR9inF9dRoW+XXIjNzCfeYqjkwzEkEnIrCww==} engines: {node: '>=20.0.0'} peerDependencies: - '@typespec/compiler': ^1.3.0 + '@typespec/compiler': ^1.5.0 dependencies: - '@typespec/compiler': 1.3.0(@types/node@20.14.15) + '@typespec/compiler': 1.5.0(@types/node@20.14.15) dev: false /@vitest/expect@1.6.1: @@ -3455,24 +3460,24 @@ packages: dev: false file:projects/emitter-test.tgz(@types/node@20.14.15): - resolution: {integrity: sha512-CL29bIEtGogkKdBxEqcGWSBY2SgLFe/9xl9vNLQlKS4PXpZTMzlsMDjlPeagN6C0K0Y/U3skHhhg/3Hv80OMyA==, tarball: file:projects/emitter-test.tgz} + resolution: {integrity: sha512-r2ODA0g8y5Yl3IgatXKb02+byUwlM/vBDfFhgasV9rzyxMbNP/TcjewvpA/Znb8aN22u+UexDEOsl1PhgURE/g==, tarball: file:projects/emitter-test.tgz} id: file:projects/emitter-test.tgz name: '@rush-temp/emitter-test' version: 0.0.0 dependencies: - '@azure-tools/typespec-autorest': 0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@azure-tools/typespec-azure-resource-manager@0.59.0)(@azure-tools/typespec-client-generator-core@0.59.0)(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/openapi@1.3.0)(@typespec/rest@0.73.0)(@typespec/versioning@0.73.0) - '@azure-tools/typespec-azure-core': 0.59.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/rest@0.73.0) - '@azure-tools/typespec-azure-resource-manager': 0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/openapi@1.3.0)(@typespec/rest@0.73.0)(@typespec/versioning@0.73.0) - '@azure-tools/typespec-azure-rulesets': 0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@azure-tools/typespec-azure-resource-manager@0.59.0)(@azure-tools/typespec-client-generator-core@0.59.0)(@typespec/compiler@1.3.0) - '@azure-tools/typespec-client-generator-core': 0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/openapi@1.3.0)(@typespec/rest@0.73.0)(@typespec/streams@0.73.0)(@typespec/versioning@0.73.0)(@typespec/xml@0.73.0) - '@azure-tools/typespec-liftr-base': 0.8.0 - '@typespec/compiler': 1.3.0(@types/node@20.14.15) - '@typespec/http': 1.3.0(@typespec/compiler@1.3.0)(@typespec/streams@0.73.0) - '@typespec/openapi': 1.3.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0) - '@typespec/rest': 0.73.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0) - '@typespec/streams': 0.73.0(@typespec/compiler@1.3.0) - '@typespec/versioning': 0.73.0(@typespec/compiler@1.3.0) - '@typespec/xml': 0.73.0(@typespec/compiler@1.3.0) + '@azure-tools/typespec-autorest': 0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@azure-tools/typespec-azure-resource-manager@0.61.0)(@azure-tools/typespec-client-generator-core@0.61.0)(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/openapi@1.5.0)(@typespec/rest@0.75.0)(@typespec/versioning@0.75.0)(@typespec/xml@0.75.0) + '@azure-tools/typespec-azure-core': 0.61.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/rest@0.75.0) + '@azure-tools/typespec-azure-resource-manager': 0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/openapi@1.5.0)(@typespec/rest@0.75.0)(@typespec/versioning@0.75.0) + '@azure-tools/typespec-azure-rulesets': 0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@azure-tools/typespec-azure-resource-manager@0.61.0)(@azure-tools/typespec-client-generator-core@0.61.0)(@typespec/compiler@1.5.0) + '@azure-tools/typespec-client-generator-core': 0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/openapi@1.5.0)(@typespec/rest@0.75.0)(@typespec/streams@0.75.0)(@typespec/versioning@0.75.0)(@typespec/xml@0.75.0) + '@azure-tools/typespec-liftr-base': 0.10.0 + '@typespec/compiler': 1.5.0(@types/node@20.14.15) + '@typespec/http': 1.5.0(@typespec/compiler@1.5.0)(@typespec/streams@0.75.0) + '@typespec/openapi': 1.5.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0) + '@typespec/rest': 0.75.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0) + '@typespec/streams': 0.75.0(@typespec/compiler@1.5.0) + '@typespec/versioning': 0.75.0(@typespec/compiler@1.5.0) + '@typespec/xml': 0.75.0(@typespec/compiler@1.5.0) transitivePeerDependencies: - '@types/node' - '@typespec/events' @@ -3513,7 +3518,7 @@ packages: dev: false file:projects/typespec-powershell.tgz: - resolution: {integrity: sha512-iKN5CelTfSpOWo1MiDccOMEV1V51Y+uuJxQHR1aqqxAoMK7/6EpSiWgBnB27dY1ppgb+3Zq2csno22ELq0CIBw==, tarball: file:projects/typespec-powershell.tgz} + resolution: {integrity: sha512-Z/C9axhN1oe0V9MIKTPefHuS7iNLSfnUKHVBuhgZuIAqEed+kCQknEOmiFlZ1ZUpfVG4xQH2jq5up0NqrG/Qnw==, tarball: file:projects/typespec-powershell.tgz} name: '@rush-temp/typespec-powershell' version: 0.0.0 dependencies: @@ -3526,10 +3531,10 @@ packages: '@azure-tools/codemodel-v3': 3.1.266 '@azure-tools/linq': 3.1.263 '@azure-tools/tasks': 3.0.255 - '@azure-tools/typespec-azure-core': 0.59.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/rest@0.73.0) - '@azure-tools/typespec-azure-resource-manager': 0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/openapi@1.3.0)(@typespec/rest@0.73.0)(@typespec/versioning@0.73.0) - '@azure-tools/typespec-azure-rulesets': 0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@azure-tools/typespec-azure-resource-manager@0.59.0)(@azure-tools/typespec-client-generator-core@0.59.0)(@typespec/compiler@1.3.0) - '@azure-tools/typespec-client-generator-core': 0.59.0(@azure-tools/typespec-azure-core@0.59.0)(@typespec/compiler@1.3.0)(@typespec/http@1.3.0)(@typespec/openapi@1.3.0)(@typespec/rest@0.73.0)(@typespec/streams@0.73.0)(@typespec/versioning@0.73.0)(@typespec/xml@0.73.0) + '@azure-tools/typespec-azure-core': 0.61.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/rest@0.75.0) + '@azure-tools/typespec-azure-resource-manager': 0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/openapi@1.5.0)(@typespec/rest@0.75.0)(@typespec/versioning@0.75.0) + '@azure-tools/typespec-azure-rulesets': 0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@azure-tools/typespec-azure-resource-manager@0.61.0)(@azure-tools/typespec-client-generator-core@0.61.0)(@typespec/compiler@1.5.0) + '@azure-tools/typespec-client-generator-core': 0.61.0(@azure-tools/typespec-azure-core@0.61.0)(@typespec/compiler@1.5.0)(@typespec/http@1.5.0)(@typespec/openapi@1.5.0)(@typespec/rest@0.75.0)(@typespec/streams@0.75.0)(@typespec/versioning@0.75.0)(@typespec/xml@0.75.0) '@testdeck/mocha': 0.3.3 '@types/js-yaml': 3.12.1 '@types/mocha': 5.2.5 @@ -3537,13 +3542,13 @@ packages: '@types/xmlbuilder': 0.0.34 '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.12.0)(typescript@5.1.6) '@typescript-eslint/parser': 5.62.0(eslint@8.12.0)(typescript@5.1.6) - '@typespec/compiler': 1.3.0(@types/node@20.14.15) - '@typespec/http': 1.3.0(@typespec/compiler@1.3.0)(@typespec/streams@0.73.0) - '@typespec/openapi': 1.3.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0) - '@typespec/rest': 0.73.0(@typespec/compiler@1.3.0)(@typespec/http@1.3.0) - '@typespec/streams': 0.73.0(@typespec/compiler@1.3.0) - '@typespec/versioning': 0.73.0(@typespec/compiler@1.3.0) - '@typespec/xml': 0.73.0(@typespec/compiler@1.3.0) + '@typespec/compiler': 1.5.0(@types/node@20.14.15) + '@typespec/http': 1.5.0(@typespec/compiler@1.5.0)(@typespec/streams@0.75.0) + '@typespec/openapi': 1.5.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0) + '@typespec/rest': 0.75.0(@typespec/compiler@1.5.0)(@typespec/http@1.5.0) + '@typespec/streams': 0.75.0(@typespec/compiler@1.5.0) + '@typespec/versioning': 0.75.0(@typespec/compiler@1.5.0) + '@typespec/xml': 0.75.0(@typespec/compiler@1.5.0) ejs: 3.1.10 eslint: 8.12.0 js-yaml: 3.13.1 diff --git a/packages/typespec-powershell/package.json b/packages/typespec-powershell/package.json index a4f55c2972e..6dfcbb7cf95 100644 --- a/packages/typespec-powershell/package.json +++ b/packages/typespec-powershell/package.json @@ -44,17 +44,17 @@ "vitest": "1.6.1" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": ">=0.59.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.59.0 <1.0.0", - "@typespec/compiler": ">=1.3.0 <2.0.0", - "@typespec/http": ">=1.3.0 <2.0.0", - "@typespec/streams": ">=0.72.1 <1.0.0", - "@typespec/xml": ">=0.72.1 <1.0.0", - "@typespec/rest": ">=0.72.1 <1.0.0", - "@typespec/versioning": ">=0.72.1 <1.0.0", - "@typespec/openapi": ">=1.3.0 <2.0.0", - "@azure-tools/typespec-azure-resource-manager": ">=0.59.0 <1.0.0", - "@azure-tools/typespec-azure-rulesets": ">=0.59.0 <1.0.0" + "@azure-tools/typespec-azure-core": ">=0.61.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.61.0 <1.0.0", + "@typespec/compiler": ">=1.5.0 <2.0.0", + "@typespec/http": ">=1.5.0 <2.0.0", + "@typespec/streams": ">=0.75.0 <1.0.0", + "@typespec/xml": ">=0.75.0 <1.0.0", + "@typespec/rest": ">=0.75.0 <1.0.0", + "@typespec/versioning": ">=0.75.0 <1.0.0", + "@typespec/openapi": ">=1.5.0 <2.0.0", + "@azure-tools/typespec-azure-resource-manager": ">=0.61.0 <1.0.0", + "@azure-tools/typespec-azure-rulesets": ">=0.61.0 <1.0.0" }, "scripts": { "build": "tsc", diff --git a/packages/typespec-powershell/src/utils/modelUtils.ts b/packages/typespec-powershell/src/utils/modelUtils.ts index 29d9c3cac22..d4e35cddbc8 100644 --- a/packages/typespec-powershell/src/utils/modelUtils.ts +++ b/packages/typespec-powershell/src/utils/modelUtils.ts @@ -60,8 +60,7 @@ import { createMetadataInfo, Visibility } from "@typespec/http"; -import { getPagedResult, getUnionAsEnum } from "@azure-tools/typespec-azure-core"; -import { extractPagedMetadataNested } from "./operationUtil.js"; +import { getUnionAsEnum } from "@azure-tools/typespec-azure-core"; import { pascalCase, deconstruct } from "@azure-tools/codegen"; import { getDefaultApiVersion, @@ -780,31 +779,7 @@ function getSchemaForModel( // let name = dpgContext.rlcOptions?.enableModelNamespace // ? fullNamespaceName // : model.name; - let name = model.name; - if ( - !overridedModelName && - model.templateMapper && - model.templateMapper.args && - model.templateMapper.args.length > 0 && - getPagedResult(program, model) - ) { - const templateTypes = model.templateMapper.args.filter((it) => - isType(it) - ) as Type[]; - name = - templateTypes - .map((it) => { - switch (it.kind) { - case "Model": - return it.name; - case "String": - return it.value; - default: - return ""; - } - }) - .join("") + "List"; - } + const name = model.name; const modelSchema = new ObjectSchema(overridedModelName ?? name, getDoc(program, model) || ""); // normalized the output name @@ -844,37 +819,6 @@ function getSchemaForModel( // modelSchema.fromCore = true; // } - if (getPagedResult(program, model)) { - const paged = extractPagedMetadataNested(program, model); - if (paged && paged.itemsProperty) { - const items = paged.itemsProperty as unknown as Model; - if (items && items.templateMapper && items.templateMapper.args) { - const templateTypes = items.templateMapper.args.filter((it) => - isType(it) - ) as Type[]; - const templateName = templateTypes - ?.map((it) => { - switch (it.kind) { - case "Model": - return it.name; - case "String": - return it.value; - default: - return ""; - } - }) - .join(""); - // ToDo by xiaogang - // if ( - // paged.itemsProperty.name === "value" && - // paged.nextLinkProperty?.name === "nextLink" - // ) { - // modelSchema.alias = `Paged<${templateName}>`; - // modelSchema.outputAlias = `Paged<${templateName}Output>`; - // } - } - } - } modelSchema.properties = []; // getSchemaOrRef on all children to push them into components.schemas diff --git a/packages/typespec-powershell/src/utils/operationUtil.ts b/packages/typespec-powershell/src/utils/operationUtil.ts index 7563a1ec17f..9533b085243 100644 --- a/packages/typespec-powershell/src/utils/operationUtil.ts +++ b/packages/typespec-powershell/src/utils/operationUtil.ts @@ -27,9 +27,7 @@ import { getHttpOperation } from "@typespec/http"; import { - getLroMetadata, - getPagedResult, - PagedResultMetadata + getLroMetadata } from "@azure-tools/typespec-azure-core"; import { getWireName, @@ -408,36 +406,6 @@ export function hasPagingOperations( return false; } -export function extractPagedMetadataNested( - program: Program, - type: Model -): PagedResultMetadata | undefined { - // This only works for `is Page` not `extends Page`. - let paged = getPagedResult(program, type); - if (paged) { - return paged; - } - if (type.baseModel) { - paged = getPagedResult(program, type.baseModel); - } - if (paged) { - return paged; - } - const templateArguments = type.templateMapper?.args; - if (templateArguments) { - for (const argument of templateArguments) { - const modelArgument = argument as Model; - if (modelArgument) { - paged = extractPagedMetadataNested(program, modelArgument); - if (paged) { - return paged; - } - } - } - } - return paged; -} - export function getSpecialSerializeInfo( paramType: string, paramFormat: string @@ -554,17 +522,6 @@ export function isIgnoredHeaderParam(param: HttpOperationParameter) { ); } -export function parseNextLinkName( - paged: PagedResultMetadata -): string | undefined { - return paged.nextLinkProperty?.name; -} - -export function parseItemName(paged: PagedResultMetadata): string | undefined { - // TODO: support the nested item names - return (paged.itemsSegments ?? [])[0]; -} - export interface PageDetails { nextLinkNames: string[]; itemNames: string[]; @@ -605,19 +562,6 @@ export function extractPageDetails( nextLinkNames: [nextLinkNames], itemNames: [itemNames] }; - } else { - // TODO: remember to remove this once Azure Paging is removed. - for (const response of operation.responses) { - const paged = extractPagedMetadataNested(program, response.type as Model); - if (paged) { - const nextLinkName = parseNextLinkName(paged) ?? "nextLink"; - const itemName = parseItemName(paged) ?? "value"; - return { - nextLinkNames: [nextLinkName], - itemNames: [itemName] - }; - } - } } return undefined; } diff --git a/packages/typespec-powershell/src/utils/pageUtils.ts b/packages/typespec-powershell/src/utils/pageUtils.ts index c460f3a37c6..a0197c13d10 100644 --- a/packages/typespec-powershell/src/utils/pageUtils.ts +++ b/packages/typespec-powershell/src/utils/pageUtils.ts @@ -7,10 +7,7 @@ import { import { ignoreDiagnostics, Model, Program, Type } from "@typespec/compiler"; import { getHttpOperation, HttpOperation } from "@typespec/http"; import { - hasPagingOperations, - extractPagedMetadataNested, - parseNextLinkName, - parseItemName + hasPagingOperations } from "../utils/operationUtil.js"; import { listOperations } from "./clientUtils.js"; @@ -23,56 +20,4 @@ export function getPageable( return program.stateMap(pageableOperationsKey).get(entity); } -export function extractPageDetailFromCore( - program: Program, - client: SdkClient, - dpgContext: SdkContext -) { - if (!hasPagingOperations(program, client, dpgContext)) { - return; - } - const nextLinks = new Set(); - const itemNames = new Set(); - // Add default values - nextLinks.add("nextLink"); - itemNames.add("value"); - const clientOperations = listOperations(client); - for (const clientOp of clientOperations) { - const route = ignoreDiagnostics(getHttpOperation(program, clientOp)); - // ignore overload base operation - if (route.overloads && route.overloads?.length > 0) { - continue; - } - extractPageDetailFromCoreForRoute(route); - } - - function extractPageDetailFromCoreForRoute(route: HttpOperation) { - for (const response of route.responses) { - const paged = extractPagedMetadataNested(program, response.type as Model); - if (paged) { - const nextLinkName = parseNextLinkName(paged); - if (nextLinkName) { - nextLinks.add(nextLinkName); - } - const itemName = parseItemName(paged); - if (itemName) { - itemNames.add(itemName); - } - // Once we find paged metadata, we don't need to processs any further. - continue; - } - } - } - // If there are more than one options for nextLink and item names we need to generate a - // more complex pagination helper. - const isComplexPaging = nextLinks.size > 1 || itemNames.size > 1; - return { - hasPaging: true, - pageDetails: { - itemNames: [...itemNames], - nextLinkNames: [...nextLinks], - isComplexPaging - } - }; -} diff --git a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/main.tsp b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/main.tsp index 2fd2ab5ec2a..761e7db631b 100644 --- a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/main.tsp +++ b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/main.tsp @@ -31,7 +31,5 @@ enum Versions { /** * The 2024-06-27 API version. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2024_06_27: "2024-06-27", } diff --git a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/EvidenceResource.tsp b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/EvidenceResource.tsp index 87db2cccfcc..39273e6ef7a 100644 --- a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/EvidenceResource.tsp +++ b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/EvidenceResource.tsp @@ -37,7 +37,7 @@ model EvidenceResource extends Azure.ResourceManager.Foundations.ProxyResource { * Evidence property. */ #suppress "deprecated" "Legacy flatten" - @Azure.ClientGenerator.Core.flattenProperty + @Azure.ClientGenerator.Core.Legacy.flattenProperty properties: EvidenceProperties; } diff --git a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/ReportResource.tsp b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/ReportResource.tsp index 06b81f93fcf..7b27db2089c 100644 --- a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/ReportResource.tsp +++ b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/ReportResource.tsp @@ -37,7 +37,7 @@ model ReportResource extends Azure.ResourceManager.Foundations.ProxyResource { * Report property. */ #suppress "deprecated" "Legacy flatten" - @Azure.ClientGenerator.Core.flattenProperty + @Azure.ClientGenerator.Core.Legacy.flattenProperty properties: ReportProperties; } diff --git a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/ScopingConfigurationResource.tsp b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/ScopingConfigurationResource.tsp index 27487f8b4cc..a13654075c5 100644 --- a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/ScopingConfigurationResource.tsp +++ b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/ScopingConfigurationResource.tsp @@ -42,7 +42,7 @@ model ScopingConfigurationResource * ScopingConfiguration property. */ #suppress "deprecated" "Legacy flatten" - @Azure.ClientGenerator.Core.flattenProperty + @Azure.ClientGenerator.Core.Legacy.flattenProperty properties: ScopingConfigurationProperties; } diff --git a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/SnapshotResource.tsp b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/SnapshotResource.tsp index f532281e338..282162dc658 100644 --- a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/SnapshotResource.tsp +++ b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/SnapshotResource.tsp @@ -35,7 +35,7 @@ model SnapshotResource extends Azure.ResourceManager.Foundations.ProxyResource { * Snapshot's property. */ #suppress "deprecated" "Legacy flatten" - @Azure.ClientGenerator.Core.flattenProperty + @Azure.ClientGenerator.Core.Legacy.flattenProperty properties?: SnapshotProperties; } diff --git a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/WebhookResource.tsp b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/WebhookResource.tsp index 8a9dec459b3..0414131733c 100644 --- a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/WebhookResource.tsp +++ b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/resources/WebhookResource.tsp @@ -41,7 +41,7 @@ model WebhookResource extends Azure.ResourceManager.Foundations.ProxyResource { * Webhook property. */ #suppress "deprecated" "Legacy flatten" - @Azure.ClientGenerator.Core.flattenProperty + @Azure.ClientGenerator.Core.Legacy.flattenProperty properties: WebhookProperties; // Replace 'WebhookProperties' with the actual type } diff --git a/tests-upgrade/tests-emitter/Astronomer.Astro.Management/LiftrBase.Data/main.tsp b/tests-upgrade/tests-emitter/Astronomer.Astro.Management/LiftrBase.Data/main.tsp index c8cd8e9d1a3..f819739be2a 100644 --- a/tests-upgrade/tests-emitter/Astronomer.Astro.Management/LiftrBase.Data/main.tsp +++ b/tests-upgrade/tests-emitter/Astronomer.Astro.Management/LiftrBase.Data/main.tsp @@ -13,17 +13,14 @@ namespace LiftrBase.Data; @doc("Supported versions for LiftrBase.Data resource model") enum Versions { @doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1 and LiftrBase.Versions.v1_preview") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @useDependency(LiftrBase.Versions.v1_preview) v1_preview: "2023-06-01-preview", @doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1 and LiftrBase.Versions.v2024_08_27_preview") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @useDependency(LiftrBase.Versions.v2024_08_27_preview) v2024_08_27_preview: "2024-08-27-preview", @doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1 and LiftrBase.Versions.v2024_08_27") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @useDependency(LiftrBase.Versions.v2024_08_27) v2024_08_27: "2024-08-27", } diff --git a/tests-upgrade/tests-emitter/Astronomer.Astro.Management/LiftrBase/main.tsp b/tests-upgrade/tests-emitter/Astronomer.Astro.Management/LiftrBase/main.tsp index 0fbe5ae3b28..4a21b7b9162 100644 --- a/tests-upgrade/tests-emitter/Astronomer.Astro.Management/LiftrBase/main.tsp +++ b/tests-upgrade/tests-emitter/Astronomer.Astro.Management/LiftrBase/main.tsp @@ -10,15 +10,12 @@ namespace LiftrBase; @doc("Supported versions for LiftrBase resource model") enum Versions { @doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) v1_preview: "2023-06-01-preview", @doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) v2024_08_27_preview: "2024-08-27-preview", @doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) v2024_08_27: "2024-08-27", } diff --git a/tests-upgrade/tests-emitter/Astronomer.Astro.Management/main.tsp b/tests-upgrade/tests-emitter/Astronomer.Astro.Management/main.tsp index a24ae9f97b5..e5cf2eace89 100644 --- a/tests-upgrade/tests-emitter/Astronomer.Astro.Management/main.tsp +++ b/tests-upgrade/tests-emitter/Astronomer.Astro.Management/main.tsp @@ -20,25 +20,21 @@ namespace Astronomer.Astro; @doc("Supported API versions for the Astronomer.Astro resource provider.") enum Versions { @doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1, LiftrBase.Versions.v1_preview, LiftrBase.Data.Versions.v1_preview") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @useDependency(LiftrBase.Versions.v1_preview) @useDependency(LiftrBase.Data.Versions.v1_preview) v1_preview: "2023-08-01-preview", @doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1, LiftrBase.Versions.v1_preview, LiftrBase.Data.Versions.v1_preview") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @useDependency(LiftrBase.Versions.v1_preview) @useDependency(LiftrBase.Data.Versions.v1_preview) v1: "2023-08-01", @doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1, LiftrBase.Versions.v2024_08_27_preview, LiftrBase.Data.Versions.v2024_08_27_preview") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @useDependency(LiftrBase.Versions.v2024_08_27_preview) @useDependency(LiftrBase.Data.Versions.v2024_08_27_preview) v2024_08_27_preview: "2024-08-27-preview", @doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1, LiftrBase.Versions.v2024_08_27, LiftrBase.Data.Versions.v2024_08_27") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @useDependency(LiftrBase.Versions.v2024_08_27) @useDependency(LiftrBase.Data.Versions.v2024_08_27) v2024_08_27: "2024-08-27", diff --git a/tests-upgrade/tests-emitter/AzureAI.Assets/main.tsp b/tests-upgrade/tests-emitter/AzureAI.Assets/main.tsp index 3714a364801..13109cb7eb2 100644 --- a/tests-upgrade/tests-emitter/AzureAI.Assets/main.tsp +++ b/tests-upgrade/tests-emitter/AzureAI.Assets/main.tsp @@ -45,10 +45,8 @@ namespace Microsoft.MachineLearningServices; @doc("Azure Machine Learning Services api versions.") enum Versions { @doc("Azure Machine Learning Services api version 2024-04-01-preview.") - @useDependency(Azure.Core.Versions.v1_0_Preview_2) `2024-04-01-preview`, @doc("Azure Machine Learning Services api version 2024-05-01-preview.") - @useDependency(Azure.Core.Versions.v1_0_Preview_2) `2024-05-01-preview`, } diff --git a/tests-upgrade/tests-emitter/AzureAI.Assets/model.tsp b/tests-upgrade/tests-emitter/AzureAI.Assets/model.tsp index 67604cfb09d..972ebc72fc9 100644 --- a/tests-upgrade/tests-emitter/AzureAI.Assets/model.tsp +++ b/tests-upgrade/tests-emitter/AzureAI.Assets/model.tsp @@ -45,11 +45,11 @@ model Index is AssetVersion { } @doc("Paged collection of IndexVersion items.") -@pagedResult + model PagedIndex { @doc("The list of Indexes.") @extension("x-ms-identifiers", #[]) - @items + @pageItems value: Index[]; @doc("The link to the next page of items") @@ -68,12 +68,12 @@ model Prompt is AssetVersion { } @doc("Paged collection of PromptVersion items") -@pagedResult + @added(Versions.`2024-05-01-preview`) model PagedPrompt { @doc("The list of Prompts.") @extension("x-ms-identifiers", #[]) - @items + @pageItems value: Prompt[]; @doc("The link to the next page of items") diff --git a/tests-upgrade/tests-emitter/AzureAI.Assets/routes.tsp b/tests-upgrade/tests-emitter/AzureAI.Assets/routes.tsp index 5090bcd55e5..9e91c2179ce 100644 --- a/tests-upgrade/tests-emitter/AzureAI.Assets/routes.tsp +++ b/tests-upgrade/tests-emitter/AzureAI.Assets/routes.tsp @@ -62,6 +62,7 @@ interface Indexes { @doc("List the versions of an Index given the name.") @route("/indexes/{name}/versions") @get + @list list is Azure.Core.Foundations.Operation< { @doc("Name of the index.") @@ -128,6 +129,7 @@ interface Indexes { @doc("List the latest version of each index. Latest is defined by most recent created by date.") @route("/indexes") @get + @list listLatest is Azure.Core.Foundations.Operation< { ...StandardListQueryParameters; @@ -185,6 +187,7 @@ interface Prompts { @doc("List the versions of a Prompt given the name.") @route("/prompts/{name}/versions") @get + @list list is Azure.Core.Foundations.Operation< { @doc("Name of the prompt") @@ -244,6 +247,7 @@ interface Prompts { @doc("List the latest version of each prompt. Latest is defined by most recent created by date.") @route("/prompts") @get + @list listLatest is Azure.Core.Foundations.Operation< { ...StandardListQueryParameters; diff --git a/tests-upgrade/tests-emitter/AzureFleet.Management/fleet.tsp b/tests-upgrade/tests-emitter/AzureFleet.Management/fleet.tsp index 30560ad5c53..572042838df 100644 --- a/tests-upgrade/tests-emitter/AzureFleet.Management/fleet.tsp +++ b/tests-upgrade/tests-emitter/AzureFleet.Management/fleet.tsp @@ -543,6 +543,7 @@ interface Fleets { @listsResource(VirtualMachineScaleSet) @armResourceList(VirtualMachineScaleSet) @get + @list @doc("List VirtualMachineScaleSet resources by Fleet") listVirtualMachineScaleSets( ...ApiVersionParameter, diff --git a/tests-upgrade/tests-emitter/AzureFleet.Management/main.tsp b/tests-upgrade/tests-emitter/AzureFleet.Management/main.tsp index 845f7c95f76..04ec287f2ac 100644 --- a/tests-upgrade/tests-emitter/AzureFleet.Management/main.tsp +++ b/tests-upgrade/tests-emitter/AzureFleet.Management/main.tsp @@ -20,20 +20,14 @@ namespace Microsoft.AzureFleet; /** Api versions */ enum Versions { - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) @doc("Private Preview Api version") v2023_11_01_preview: "2023-11-01-preview", - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) @doc("Public Preview Api version") v2024_05_01_preview: "2024-05-01-preview", - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) @doc("Public Api version") v2024_11_01: "2024-11-01", diff --git a/tests-upgrade/tests-emitter/AzureFleet.Management/virtualMachineScaleSet.tsp b/tests-upgrade/tests-emitter/AzureFleet.Management/virtualMachineScaleSet.tsp index 63cd913813c..822c5ce1d21 100644 --- a/tests-upgrade/tests-emitter/AzureFleet.Management/virtualMachineScaleSet.tsp +++ b/tests-upgrade/tests-emitter/AzureFleet.Management/virtualMachineScaleSet.tsp @@ -50,10 +50,10 @@ model VirtualMachineScaleSet { } @doc("The response of a VirtualMachineScaleSet list operation.") -@pagedResult + model VirtualMachineScaleSetListResult { @doc("The VirtualMachineScaleSet items on this page") - @items + @pageItems value: Array; @doc("The link to the next page of items") diff --git a/tests-upgrade/tests-emitter/AzureLargeInstance.Management/main.tsp b/tests-upgrade/tests-emitter/AzureLargeInstance.Management/main.tsp index fa0c726addb..d1705de1205 100644 --- a/tests-upgrade/tests-emitter/AzureLargeInstance.Management/main.tsp +++ b/tests-upgrade/tests-emitter/AzureLargeInstance.Management/main.tsp @@ -23,17 +23,11 @@ namespace Microsoft.AzureLargeInstance; @doc("Azure Large Instance api versions.") enum Versions { @doc("Azure Large Instance api version 2023-07-20-preview.") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2023_07_20_preview: "2023-07-20-preview", @doc("Azure Large Instance api version 2024-04-10.") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) v2024_04_10: "2024-04-10", @doc("Azure Large Instance api version 2024-08-01-preview.") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) v2024_08_01_preview: "2024-08-01-preview", } diff --git a/tests-upgrade/tests-emitter/Chaos.Management.brown/client.tsp b/tests-upgrade/tests-emitter/Chaos.Management.brown/client.tsp index 2c304199d01..e828a325760 100644 --- a/tests-upgrade/tests-emitter/Chaos.Management.brown/client.tsp +++ b/tests-upgrade/tests-emitter/Chaos.Management.brown/client.tsp @@ -51,16 +51,16 @@ using Microsoft.Chaos; ); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(Experiment.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(Experiment.properties); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(ExperimentExecution.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ExperimentExecution.properties); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(TargetType.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(TargetType.properties); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(Capability.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(Capability.properties); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(CapabilityType.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(CapabilityType.properties); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(ExperimentExecutionDetails.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ExperimentExecutionDetails.properties); @@clientName(Microsoft.Chaos.Operations.list, "listAll", "javascript,python"); diff --git a/tests-upgrade/tests-emitter/Chaos.Management.brown/main.tsp b/tests-upgrade/tests-emitter/Chaos.Management.brown/main.tsp index eb54d61ef2f..13fb8985a40 100644 --- a/tests-upgrade/tests-emitter/Chaos.Management.brown/main.tsp +++ b/tests-upgrade/tests-emitter/Chaos.Management.brown/main.tsp @@ -41,14 +41,10 @@ enum Versions { /** * The 2024-11-01-preview API version. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2024_11_01_preview: "2024-11-01-preview", /** * The 2025-01-01 API version. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2025_01_01: "2025-01-01", } diff --git a/tests-upgrade/tests-emitter/CodeSigning.Management/main.tsp b/tests-upgrade/tests-emitter/CodeSigning.Management/main.tsp index 63d6a6038d8..8f8eb3b0062 100644 --- a/tests-upgrade/tests-emitter/CodeSigning.Management/main.tsp +++ b/tests-upgrade/tests-emitter/CodeSigning.Management/main.tsp @@ -23,8 +23,6 @@ namespace Microsoft.CodeSigning; @doc("The available API versions.") enum Versions { @doc("The 2024-02-05-preview API version.") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2024_02_05_preview: "2024-02-05-preview", v2024_09_30_preview: "2024-09-30-preview", diff --git a/tests-upgrade/tests-emitter/CodeSigning.Management/models.tsp b/tests-upgrade/tests-emitter/CodeSigning.Management/models.tsp index 3e3f3a8ae9c..8f4431cdc6a 100644 --- a/tests-upgrade/tests-emitter/CodeSigning.Management/models.tsp +++ b/tests-upgrade/tests-emitter/CodeSigning.Management/models.tsp @@ -153,7 +153,7 @@ model CodeSigningAccountPatch { #suppress "deprecated" "Legacy flatten" @doc("Properties of the trusted signing account.") - @Azure.ClientGenerator.Core.flattenProperty + @Azure.ClientGenerator.Core.Legacy.flattenProperty properties?: CodeSigningAccountPatchProperties; } @@ -252,7 +252,7 @@ model CertificateProfileProperties { @doc("List of renewed certificates.") @visibility(Lifecycle.Read) @identifiers(#[]) - @Azure.ClientGenerator.Core.flattenProperty + @Azure.ClientGenerator.Core.Legacy.flattenProperty certificates?: Certificate[]; } @@ -282,7 +282,7 @@ model Certificate { #suppress "deprecated" "Legacy flatten" @doc("Revocations history of a certificate.") - @Azure.ClientGenerator.Core.flattenProperty + @Azure.ClientGenerator.Core.Legacy.flattenProperty revocation?: Revocation; } diff --git a/tests-upgrade/tests-emitter/ComputeSchedule.Management/main.tsp b/tests-upgrade/tests-emitter/ComputeSchedule.Management/main.tsp index 19abafa8337..2a112a6906e 100644 --- a/tests-upgrade/tests-emitter/ComputeSchedule.Management/main.tsp +++ b/tests-upgrade/tests-emitter/ComputeSchedule.Management/main.tsp @@ -20,14 +20,10 @@ namespace Microsoft.ComputeSchedule; /** ComputeSchedule API versions */ enum Versions { /** 2024-08-15-preview version */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) `2024-08-15-preview`, /** 2024-10-01 version */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) `2024-10-01`, } diff --git a/tests-upgrade/tests-emitter/Dashboard.Management.brown/back-compatible.tsp b/tests-upgrade/tests-emitter/Dashboard.Management.brown/back-compatible.tsp index 199ca176326..b719c42f64a 100644 --- a/tests-upgrade/tests-emitter/Dashboard.Management.brown/back-compatible.tsp +++ b/tests-upgrade/tests-emitter/Dashboard.Management.brown/back-compatible.tsp @@ -12,10 +12,10 @@ using Azure.Core; ); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(PrivateEndpointConnection.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(PrivateEndpointConnection.properties); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(PrivateLinkResource.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(PrivateLinkResource.properties); @@clientName(ManagedPrivateEndpointModels.create::parameters.resource, "requestBodyParameters" @@ -24,7 +24,7 @@ using Azure.Core; "requestBodyParameters" ); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(ManagedPrivateEndpointModel.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ManagedPrivateEndpointModel.properties); @@clientName(IntegrationFabrics.create::parameters.resource, "requestBodyParameters" @@ -41,7 +41,7 @@ using Azure.Core; ); @@clientName(PrivateEndpointConnections.approve::parameters.resource, "body"); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(ManagedDashboard.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ManagedDashboard.properties); @@alternateType(ManagedPrivateEndpointModelProperties.privateLinkResourceId, armResourceIdentifier ); diff --git a/tests-upgrade/tests-emitter/Dashboard.Management.brown/main.tsp b/tests-upgrade/tests-emitter/Dashboard.Management.brown/main.tsp index d13e7419ffa..71a61c6d263 100644 --- a/tests-upgrade/tests-emitter/Dashboard.Management.brown/main.tsp +++ b/tests-upgrade/tests-emitter/Dashboard.Management.brown/main.tsp @@ -42,8 +42,6 @@ enum Versions { /** * The 2024-11-01-preview API version. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2024_11_01_preview: "2024-11-01-preview", } diff --git a/tests-upgrade/tests-emitter/DataReplication.Management.brown/main.tsp b/tests-upgrade/tests-emitter/DataReplication.Management.brown/main.tsp index 2e7b4678859..43fa0afd88b 100644 --- a/tests-upgrade/tests-emitter/DataReplication.Management.brown/main.tsp +++ b/tests-upgrade/tests-emitter/DataReplication.Management.brown/main.tsp @@ -46,7 +46,5 @@ enum Versions { /** * The 2024-09-01 API version. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2024_09_01: "2024-09-01", } diff --git a/tests-upgrade/tests-emitter/DeviceRegistry.Management/main.tsp b/tests-upgrade/tests-emitter/DeviceRegistry.Management/main.tsp index 3da8aaa76b7..82a4b833688 100644 --- a/tests-upgrade/tests-emitter/DeviceRegistry.Management/main.tsp +++ b/tests-upgrade/tests-emitter/DeviceRegistry.Management/main.tsp @@ -26,20 +26,14 @@ namespace Microsoft.DeviceRegistry; @doc("Microsoft.DeviceRegistry Resource Provider supported API versions.") enum Versions { @doc("Microsoft.DeviceRegistry Resource Provider management API version 2023-11-01-preview.") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v3) v2023_11_01_preview: "2023-11-01-preview", @doc("Microsoft.DeviceRegistry Resource Provider management API version 2024-09-01-preview.") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) v2024_09_01_preview: "2024-09-01-preview", @doc("Microsoft.DeviceRegistry Resource Provider management API version 2024-11-01.") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) v2024_11_01: "2024-11-01", } diff --git a/tests-upgrade/tests-emitter/DocumentDB.MongoCluster.Management/main.tsp b/tests-upgrade/tests-emitter/DocumentDB.MongoCluster.Management/main.tsp index 1c247fd5c10..441ca44a45c 100644 --- a/tests-upgrade/tests-emitter/DocumentDB.MongoCluster.Management/main.tsp +++ b/tests-upgrade/tests-emitter/DocumentDB.MongoCluster.Management/main.tsp @@ -24,22 +24,14 @@ namespace Microsoft.DocumentDB; /** The available API versions. */ enum Versions { /** Azure Cosmos DB for Mongo vCore clusters api version 2024-03-01-preview. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2024_03_01_preview: "2024-03-01-preview", /** Azure Cosmos DB for Mongo vCore clusters api version 2024-06-01-preview. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) v2024_06_01_preview: "2024-06-01-preview", /** Azure Cosmos DB for Mongo vCore clusters api version 2024-07-01. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) v2024_07_01: "2024-07-01", /** Azure Cosmos DB for Mongo vCore clusters api version 2024-10-01. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) v2024_10_01_preview: "2024-10-01-preview", } diff --git a/tests-upgrade/tests-emitter/EdgeZones.Management/main.tsp b/tests-upgrade/tests-emitter/EdgeZones.Management/main.tsp index 4ed93c0a348..58a482194d0 100644 --- a/tests-upgrade/tests-emitter/EdgeZones.Management/main.tsp +++ b/tests-upgrade/tests-emitter/EdgeZones.Management/main.tsp @@ -18,7 +18,6 @@ namespace Microsoft.EdgeZones; /** Api versions */ enum Versions { /** 2024-04-01-preview api version */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) `2024-04-01-preview`, } diff --git a/tests-upgrade/tests-emitter/ElasticSan.brown/back-compatible.tsp b/tests-upgrade/tests-emitter/ElasticSan.brown/back-compatible.tsp index 83efd30f9c0..a9826ec966a 100644 --- a/tests-upgrade/tests-emitter/ElasticSan.brown/back-compatible.tsp +++ b/tests-upgrade/tests-emitter/ElasticSan.brown/back-compatible.tsp @@ -4,10 +4,10 @@ using Azure.ClientGenerator.Core; using Microsoft.ElasticSan; #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(ElasticSanUpdate.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ElasticSanUpdate.properties); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(PrivateLinkResource.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(PrivateLinkResource.properties); @@clientName(EncryptionProperties.identity, "EncryptionIdentity"); @@ -18,37 +18,37 @@ using Microsoft.ElasticSan; @@clientName(VirtualNetworkRule.id, "VirtualNetworkResourceId"); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(VolumeGroupUpdate.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(VolumeGroupUpdate.properties); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(VolumeUpdate.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(VolumeUpdate.properties); @@clientName(ElasticSans.create::parameters.resource, "parameters"); @@clientName(ElasticSans.update::parameters.properties, "parameters"); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(ElasticSan.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ElasticSan.properties); @@clientName(PrivateEndpointConnections.create::parameters.resource, "parameters" ); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(PrivateEndpointConnection.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(PrivateEndpointConnection.properties); @@clientName(VolumeGroups.create::parameters.resource, "parameters"); @@clientName(VolumeGroups.update::parameters.properties, "parameters"); @@clientName(VolumeGroups.preBackup::parameters.body, "parameters"); @@clientName(VolumeGroups.preRestore::parameters.body, "parameters"); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(VolumeGroup.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(VolumeGroup.properties); @@clientName(Snapshots.create::parameters.resource, "parameters"); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(Snapshot.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(Snapshot.properties); @@clientName(Volumes.create::parameters.resource, "parameters"); @@clientName(Volumes.update::parameters.properties, "parameters"); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(Volume.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(Volume.properties); @@clientName(AutoScaleProperties.scaleUpProperties, "ScaleUpProperties"); @@clientName(EncryptionProperties.keyVaultProperties, "KeyVaultProperties"); diff --git a/tests-upgrade/tests-emitter/Fleet.Management.brown/client.tsp b/tests-upgrade/tests-emitter/Fleet.Management.brown/client.tsp index 758c48c9f12..6360bee6756 100644 --- a/tests-upgrade/tests-emitter/Fleet.Management.brown/client.tsp +++ b/tests-upgrade/tests-emitter/Fleet.Management.brown/client.tsp @@ -42,14 +42,14 @@ using Azure.ClientGenerator.Core; ); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(Azure.ResourceManager.TrackedResource.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(Azure.ResourceManager.TrackedResource.properties); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(Azure.ResourceManager.ProxyResource.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(Azure.ResourceManager.ProxyResource.properties); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(Azure.ResourceManager.Foundations.ResourceUpdateModel.properties +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(Azure.ResourceManager.Foundations.ResourceUpdateModel.properties ); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(Azure.ResourceManager.Foundations.ProxyResourceUpdateModel.properties +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(Azure.ResourceManager.Foundations.ProxyResourceUpdateModel.properties ); @@clientName(Microsoft.ContainerService, "ContainerServiceFleetClient", diff --git a/tests-upgrade/tests-emitter/Fleet.Management.brown/main.tsp b/tests-upgrade/tests-emitter/Fleet.Management.brown/main.tsp index 5f91f291175..cfa045fe32c 100644 --- a/tests-upgrade/tests-emitter/Fleet.Management.brown/main.tsp +++ b/tests-upgrade/tests-emitter/Fleet.Management.brown/main.tsp @@ -24,53 +24,34 @@ interface Operations extends Azure.ResourceManager.Operations {} @doc("Azure Kubernetes Fleet Manager api versions.") enum Versions { @doc("Azure Kubernetes Fleet Manager api version 2022-09-02-preview.") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) v2022_09_02_preview: "2022-09-02-preview", @doc("Azure Kubernetes Fleet Manager api version 2023-03-15-preview.") - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) v2023_03_15_preview: "2023-03-15-preview", @doc("Azure Kubernetes Fleet Manager api version 2023-06-15-preview.") - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) v2023_06_15_preview: "2023-06-15-preview", @doc("Azure Kubernetes Fleet Manager api version 2023-08-15-preview.") - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) v2023_08_15_preview: "2023-08-15-preview", @doc("Azure Kubernetes Fleet Manager api version 2023-10-15.") - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) v2023_10_15: "2023-10-15", @doc("Azure Kubernetes Fleet Manager api version 2024-02-02-preview.") - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) v2024_02_02_preview: "2024-02-02-preview", @doc("Azure Kubernetes Fleet Manager api version 2024-04-01.") - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) v2024_04_01: "2024-04-01", @doc("Azure Kubernetes Fleet Manager api version 2024-05-02-preview.") - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) v2024_05_02_preview: "2024-05-02-preview", @doc("Azure Kubernetes Fleet Manager api version 2025-03-01.") - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) v2025_03_01: "2025-03-01", @doc("Azure Kubernetes Fleet Manager api version 2025-04-01-preview.") - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) v2025_04_01_preview: "2025-04-01-preview", } diff --git a/tests-upgrade/tests-emitter/HardwareSecurityModules.Management.brown/back-compatible.tsp b/tests-upgrade/tests-emitter/HardwareSecurityModules.Management.brown/back-compatible.tsp index 1a033625e46..c85b54a3bef 100644 --- a/tests-upgrade/tests-emitter/HardwareSecurityModules.Management.brown/back-compatible.tsp +++ b/tests-upgrade/tests-emitter/HardwareSecurityModules.Management.brown/back-compatible.tsp @@ -4,7 +4,7 @@ using Azure.ClientGenerator.Core; using Microsoft.HardwareSecurityModules; #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(BackupResult.properties, "!python,!java,!csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(BackupResult.properties, "!python,!java,!csharp"); @@clientName(Error.innererror, "innerError"); @@clientName(CloudHsmClusters.createOrUpdate::parameters.resource, "body"); @@clientName(CloudHsmClusters.update::parameters.properties, "body"); @@ -12,18 +12,18 @@ using Microsoft.HardwareSecurityModules; "restoreRequestProperties" ); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(CloudHsmCluster.properties, "!python,!java,!csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(CloudHsmCluster.properties, "!python,!java,!csharp"); @@clientName(PrivateEndpointConnections.create::parameters.resource, "properties" ); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(PrivateEndpointConnection.properties, +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(PrivateEndpointConnection.properties, "!python,!java,!csharp" ); @@clientName(DedicatedHsms.createOrUpdate::parameters.resource, "parameters"); @@clientName(DedicatedHsms.update::parameters.properties, "parameters"); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(DedicatedHsm.properties, "!python,!java,!csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(DedicatedHsm.properties, "!python,!java,!csharp"); @@clientName(CloudHsmClusters.validateBackupProperties::parameters.body, "backupRequestProperties" ); diff --git a/tests-upgrade/tests-emitter/HardwareSecurityModules.Management.brown/main.tsp b/tests-upgrade/tests-emitter/HardwareSecurityModules.Management.brown/main.tsp index dacc2d5ce23..5ac28797baa 100644 --- a/tests-upgrade/tests-emitter/HardwareSecurityModules.Management.brown/main.tsp +++ b/tests-upgrade/tests-emitter/HardwareSecurityModules.Management.brown/main.tsp @@ -39,8 +39,6 @@ enum Versions { /** * The 2025-03-31 API version. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2025_03_31: "2025-03-31", } diff --git a/tests-upgrade/tests-emitter/HealthDataAIServices.Management/main.tsp b/tests-upgrade/tests-emitter/HealthDataAIServices.Management/main.tsp index e726ca68085..fd9b46c9e0c 100644 --- a/tests-upgrade/tests-emitter/HealthDataAIServices.Management/main.tsp +++ b/tests-upgrade/tests-emitter/HealthDataAIServices.Management/main.tsp @@ -17,12 +17,10 @@ namespace Microsoft.HealthDataAIServices; @doc("Supported API versions for the Microsoft.HealthDataAIServices resource provider.") enum Versions { - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) @doc("The 2024-02-28-preview version.") v2024_02_28_preview: "2024-02-28-preview", - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) @doc("The 2024-09-20 version.") v2024_09_20: "2024-09-20", diff --git a/tests-upgrade/tests-emitter/Help.Management.brown/back-compatible.tsp b/tests-upgrade/tests-emitter/Help.Management.brown/back-compatible.tsp index 26a67fce88e..954d8f9e00b 100644 --- a/tests-upgrade/tests-emitter/Help.Management.brown/back-compatible.tsp +++ b/tests-upgrade/tests-emitter/Help.Management.brown/back-compatible.tsp @@ -6,19 +6,19 @@ using Azure.ClientGenerator.Core; using Microsoft.Help; #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(SolutionMetadataResource.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(SolutionMetadataResource.properties); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(SolutionPatchRequestBody.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(SolutionPatchRequestBody.properties); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(SolutionNlpMetadataResource.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(SolutionNlpMetadataResource.properties); @@clientName(DiagnosticResources.create::parameters.resource, "diagnosticResourceRequest" ); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(DiagnosticResource.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(DiagnosticResource.properties); @@clientName(SolutionResources.create::parameters.resource, "solutionRequestBody" @@ -27,19 +27,19 @@ using Microsoft.Help; "solutionPatchRequestBody" ); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(SolutionResource.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(SolutionResource.properties); @@clientName(SimplifiedSolutionsResources.create::parameters.resource, "simplifiedSolutionsRequestBody" ); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(SimplifiedSolutionsResource.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(SimplifiedSolutionsResource.properties); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(TroubleshooterResource.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(TroubleshooterResource.properties); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(SolutionResourceSelfHelp.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(SolutionResourceSelfHelp.properties); @@clientName(DiagnosticResources.create::parameters.resource, "diagnosticResourceRequest" diff --git a/tests-upgrade/tests-emitter/HybridKubernetes.Management.brown/back-compatible.tsp b/tests-upgrade/tests-emitter/HybridKubernetes.Management.brown/back-compatible.tsp index e17cc04b024..cf343602767 100644 --- a/tests-upgrade/tests-emitter/HybridKubernetes.Management.brown/back-compatible.tsp +++ b/tests-upgrade/tests-emitter/HybridKubernetes.Management.brown/back-compatible.tsp @@ -4,7 +4,7 @@ using Azure.ClientGenerator.Core; using Microsoft.Kubernetes; #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(ConnectedClusterPatch.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ConnectedClusterPatch.properties); @@clientName(ConnectedClusters.createOrReplace::parameters.resource, "ConnectedCluster" @@ -16,7 +16,7 @@ using Microsoft.Kubernetes; "Properties" ); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(ConnectedCluster.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ConnectedCluster.properties); @@scope(Operations.list, "!csharp"); diff --git a/tests-upgrade/tests-emitter/HybridKubernetes.Management.brown/main.tsp b/tests-upgrade/tests-emitter/HybridKubernetes.Management.brown/main.tsp index 4e516421bb1..9546d1d0068 100644 --- a/tests-upgrade/tests-emitter/HybridKubernetes.Management.brown/main.tsp +++ b/tests-upgrade/tests-emitter/HybridKubernetes.Management.brown/main.tsp @@ -39,15 +39,11 @@ enum Versions { /** * The 2024-12-01-preview API version. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2024_12_01_preview: "2024-12-01-preview", /** * The 2025-08-01-preview API version. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2025_08_01_preview: "2025-08-01-preview", } diff --git a/tests-upgrade/tests-emitter/Informatica.DataManagement.Management/main.tsp b/tests-upgrade/tests-emitter/Informatica.DataManagement.Management/main.tsp index c009d4df49b..52af699eee4 100644 --- a/tests-upgrade/tests-emitter/Informatica.DataManagement.Management/main.tsp +++ b/tests-upgrade/tests-emitter/Informatica.DataManagement.Management/main.tsp @@ -42,8 +42,6 @@ enum Versions { /** * The 2024-05-08 API version. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2024_05_08: "2024-05-08", } diff --git a/tests-upgrade/tests-emitter/KubernetesRuntime.Management/common.tsp b/tests-upgrade/tests-emitter/KubernetesRuntime.Management/common.tsp index 26e02df8417..aa2fd1fd8b6 100644 --- a/tests-upgrade/tests-emitter/KubernetesRuntime.Management/common.tsp +++ b/tests-upgrade/tests-emitter/KubernetesRuntime.Management/common.tsp @@ -17,8 +17,6 @@ namespace Microsoft.KubernetesRuntime; @doc("Versions of KubernetesRuntime service") enum Versions { - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @doc("2023-10-01-preview") v2023_10_01_preview: "2023-10-01-preview", diff --git a/tests-upgrade/tests-emitter/LambdaTest.HyperExecute.Management/main.tsp b/tests-upgrade/tests-emitter/LambdaTest.HyperExecute.Management/main.tsp index 9e66837e95b..49bf96be3dc 100644 --- a/tests-upgrade/tests-emitter/LambdaTest.HyperExecute.Management/main.tsp +++ b/tests-upgrade/tests-emitter/LambdaTest.HyperExecute.Management/main.tsp @@ -21,8 +21,6 @@ namespace LambdaTest.HyperExecute; /** The available API versions. */ enum Versions { /** 2024-02-01-preview version */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) @useDependency(LiftrBase.Versions.v2_preview) v2024_02_01_preview: "2024-02-01-preview", diff --git a/tests-upgrade/tests-emitter/Liftr.WeightsAndBiases.Management/main.tsp b/tests-upgrade/tests-emitter/Liftr.WeightsAndBiases.Management/main.tsp index e9962ecbfa1..11ebf9a9436 100644 --- a/tests-upgrade/tests-emitter/Liftr.WeightsAndBiases.Management/main.tsp +++ b/tests-upgrade/tests-emitter/Liftr.WeightsAndBiases.Management/main.tsp @@ -21,8 +21,6 @@ namespace Microsoft.WeightsAndBiases; /** The available API versions. */ enum Versions { /** 2024-09-18 version */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) @useDependency(LiftrBase.Versions.v2_preview) v2024_09_18_preview: "2024-09-18-preview", diff --git a/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/client.tsp b/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/client.tsp index 3e79ca33804..9f9ac37faa7 100644 --- a/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/client.tsp +++ b/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/client.tsp @@ -519,73 +519,73 @@ interface PureStoragePolicies extends Microsoft.AVS.PureStoragePolicies {} // flatten #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(Azure.ResourceManager.TrackedResource.properties, +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(Azure.ResourceManager.TrackedResource.properties, "java,python" ); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(Azure.ResourceManager.Foundations.ResourceUpdateModel.properties, +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(Azure.ResourceManager.Foundations.ResourceUpdateModel.properties, "java,python" ); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(Azure.ResourceManager.Foundations.ProxyResourceUpdateModel.properties, +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(Azure.ResourceManager.Foundations.ProxyResourceUpdateModel.properties, "java,python" ); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(Location.properties, "java,python"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(Location.properties, "java,python"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(Cluster.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(Cluster.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(Datastore.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(Datastore.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(HcxEnterpriseSite.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(HcxEnterpriseSite.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(ExpressRouteAuthorization.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ExpressRouteAuthorization.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(GlobalReachConnection.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(GlobalReachConnection.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(WorkloadNetwork.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(WorkloadNetwork.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(WorkloadNetworkSegment.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(WorkloadNetworkSegment.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(WorkloadNetworkGateway.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(WorkloadNetworkGateway.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(WorkloadNetworkPortMirroring.properties, +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(WorkloadNetworkPortMirroring.properties, "java,python,csharp" ); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(WorkloadNetworkVMGroup.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(WorkloadNetworkVMGroup.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(WorkloadNetworkVirtualMachine.properties, +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(WorkloadNetworkVirtualMachine.properties, "java,python,csharp" ); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(WorkloadNetworkDnsService.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(WorkloadNetworkDnsService.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(WorkloadNetworkDnsZone.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(WorkloadNetworkDnsZone.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(WorkloadNetworkPublicIP.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(WorkloadNetworkPublicIP.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(CloudLink.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(CloudLink.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(VirtualMachine.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(VirtualMachine.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(ScriptPackage.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ScriptPackage.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(ScriptCmdlet.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ScriptCmdlet.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(ScriptExecution.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ScriptExecution.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(IscsiPath.properties, "java,python,csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(IscsiPath.properties, "java,python,csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(PrivateCloud.properties, "csharp"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(PrivateCloud.properties, "csharp"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(PrivateCloudUpdate.properties, "java,python"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(PrivateCloudUpdate.properties, "java,python"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(ClusterUpdate.properties, "java,python"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ClusterUpdate.properties, "java,python"); #suppress "deprecated" "property flatten for SDK backward compatibility" -@@flattenProperty(PlacementPolicyUpdate.properties, "java,python"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(PlacementPolicyUpdate.properties, "java,python"); @@alternateType(ScriptExecutionProperties.namedOutputs, Record, diff --git a/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/clusters.tsp b/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/clusters.tsp index 420281e669c..337298980df 100644 --- a/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/clusters.tsp +++ b/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/clusters.tsp @@ -105,7 +105,7 @@ model ClusterUpdate { #suppress "deprecated" "Legacy flatten" @doc("The properties of a cluster resource that may be updated") - @Azure.ClientGenerator.Core.flattenProperty + @Azure.ClientGenerator.Core.Legacy.flattenProperty properties?: ClusterUpdateProperties; } diff --git a/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/main.tsp b/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/main.tsp index 8fecb8bc79e..1cb5a95564c 100644 --- a/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/main.tsp +++ b/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/main.tsp @@ -51,14 +51,10 @@ namespace Microsoft.AVS; @doc("Azure VMware Solution API versions.") enum Versions { @doc("Azure VMware Solution API version 2023-09-01.") - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) v2023_09_01: "2023-09-01", @doc("Azure VMware Solution API version 2024-09-01.") - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) v2024_09_01: "2024-09-01", } diff --git a/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/placementPolicies.tsp b/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/placementPolicies.tsp index 3782168cb46..a011f09391e 100644 --- a/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/placementPolicies.tsp +++ b/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/placementPolicies.tsp @@ -145,7 +145,7 @@ model PlacementPolicyProperties { model PlacementPolicyUpdate { #suppress "deprecated" "Legacy flatten" @doc("The properties of a placement policy resource that may be updated") - @Azure.ClientGenerator.Core.flattenProperty + @Azure.ClientGenerator.Core.Legacy.flattenProperty properties?: PlacementPolicyUpdateProperties; } diff --git a/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/privateClouds.tsp b/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/privateClouds.tsp index 19a21dcf782..f80446c8da4 100644 --- a/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/privateClouds.tsp +++ b/tests-upgrade/tests-emitter/Microsoft.AVS.Management.brown/privateClouds.tsp @@ -191,7 +191,7 @@ model PrivateCloudUpdate { #suppress "deprecated" "Legacy flatten" @doc("The updatable properties of a private cloud resource") - @Azure.ClientGenerator.Core.flattenProperty + @Azure.ClientGenerator.Core.Legacy.flattenProperty properties?: PrivateCloudUpdateProperties; } diff --git a/tests-upgrade/tests-emitter/Microsoft.DevOpsInfrastructure.Management/main.tsp b/tests-upgrade/tests-emitter/Microsoft.DevOpsInfrastructure.Management/main.tsp index 9f40a1341e7..aa14dfe4497 100644 --- a/tests-upgrade/tests-emitter/Microsoft.DevOpsInfrastructure.Management/main.tsp +++ b/tests-upgrade/tests-emitter/Microsoft.DevOpsInfrastructure.Management/main.tsp @@ -20,8 +20,6 @@ namespace Microsoft.DevOpsInfrastructure; /** Api versions */ enum Versions { /** 2025-01-21 version */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) `2025-01-21`, } diff --git a/tests-upgrade/tests-emitter/Neon.Postgres.Management/LiftrBase.Data/main.tsp b/tests-upgrade/tests-emitter/Neon.Postgres.Management/LiftrBase.Data/main.tsp index 940b56869be..0b3241006b7 100644 --- a/tests-upgrade/tests-emitter/Neon.Postgres.Management/LiftrBase.Data/main.tsp +++ b/tests-upgrade/tests-emitter/Neon.Postgres.Management/LiftrBase.Data/main.tsp @@ -13,7 +13,6 @@ namespace LiftrBase.Data; @doc("Supported versions for LiftrBase.Data resource model") enum Versions { @doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1 and LiftrBase.Versions.v1_preview") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @useDependency(LiftrBase.Versions.v1_preview) v1_preview: "2024-08-01-preview", } diff --git a/tests-upgrade/tests-emitter/Neon.Postgres.Management/LiftrBase/main.tsp b/tests-upgrade/tests-emitter/Neon.Postgres.Management/LiftrBase/main.tsp index 6fd92d34cab..9c406a804b6 100644 --- a/tests-upgrade/tests-emitter/Neon.Postgres.Management/LiftrBase/main.tsp +++ b/tests-upgrade/tests-emitter/Neon.Postgres.Management/LiftrBase/main.tsp @@ -10,7 +10,6 @@ namespace LiftrBase; @doc("Supported versions for LiftrBase resource model") enum Versions { @doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) v1_preview: "2024-08-01-preview", } diff --git a/tests-upgrade/tests-emitter/Neon.Postgres.Management/main.tsp b/tests-upgrade/tests-emitter/Neon.Postgres.Management/main.tsp index c31bbba3cf3..3132a919b98 100644 --- a/tests-upgrade/tests-emitter/Neon.Postgres.Management/main.tsp +++ b/tests-upgrade/tests-emitter/Neon.Postgres.Management/main.tsp @@ -19,7 +19,6 @@ namespace Neon.Postgres; @doc("Supported API versions for the Neon.Postgres resource provider.") enum Versions { @doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1, LiftrBase.Versions.v1_preview, LiftrBase.Data.Versions.v1_preview") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @useDependency(LiftrBase.Versions.v1_preview) @useDependency(LiftrBase.Data.Versions.v1_preview) v1_preview: "2024-08-01-preview", diff --git a/tests-upgrade/tests-emitter/NetworkAnalytics.Management/main.tsp b/tests-upgrade/tests-emitter/NetworkAnalytics.Management/main.tsp index d2904ebce8c..701b6402c9c 100644 --- a/tests-upgrade/tests-emitter/NetworkAnalytics.Management/main.tsp +++ b/tests-upgrade/tests-emitter/NetworkAnalytics.Management/main.tsp @@ -22,8 +22,6 @@ interface Operations extends Azure.ResourceManager.Operations {} @doc("The available API versions for the Microsoft.NetworkAnalytics RP.") enum Versions { @doc("The 2023-11-15 stable version.") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) v2023_11_15: "2023-11-15", } diff --git a/tests-upgrade/tests-emitter/Oracle.Database.Management.brown/versions.tsp b/tests-upgrade/tests-emitter/Oracle.Database.Management.brown/versions.tsp index 319b9fbc2cd..0f43809d78e 100644 --- a/tests-upgrade/tests-emitter/Oracle.Database.Management.brown/versions.tsp +++ b/tests-upgrade/tests-emitter/Oracle.Database.Management.brown/versions.tsp @@ -4,43 +4,27 @@ namespace Oracle.Database; @doc("Versions for API") enum Versions { - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @doc("2023-09-01") v20230901: "2023-09-01", - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @doc("2024-06-01-preview") v20240601_preview: "2024-06-01-preview", - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @doc("2024-06-01") v20240601: "2024-06-01", - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @doc("2024-08-01-preview") v20240801_preview: "2024-08-01-preview", - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @doc("2024-10-01-preview") v20241001_preview: "2024-10-01-preview", - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @doc("2024-12-01-preview") v20241201_preview: "2024-12-01-preview", - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @doc("2025-01-01-preview") v20250101_preview: "2025-01-01-preview", - @useDependency(Azure.Core.Versions.v1_0_Preview_2) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @doc("2025-03-01") v20250301: "2025-03-01", } diff --git a/tests-upgrade/tests-emitter/Pinecone.VectorDb.Management/main.tsp b/tests-upgrade/tests-emitter/Pinecone.VectorDb.Management/main.tsp index 1d49e2fc7be..e4d4da295ca 100644 --- a/tests-upgrade/tests-emitter/Pinecone.VectorDb.Management/main.tsp +++ b/tests-upgrade/tests-emitter/Pinecone.VectorDb.Management/main.tsp @@ -21,8 +21,6 @@ namespace Pinecone.VectorDb; /** The available API versions. */ enum Versions { /** 2024-10-22-preview version */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) @useDependency(LiftrBase.Versions.v2_preview) v2024_10_22_preview: "2024-10-22-preview", diff --git a/tests-upgrade/tests-emitter/Qumulo.Storage.Management/LiftrBase.Storage/main.tsp b/tests-upgrade/tests-emitter/Qumulo.Storage.Management/LiftrBase.Storage/main.tsp index 9d9de1e2237..8c9efe4c637 100644 --- a/tests-upgrade/tests-emitter/Qumulo.Storage.Management/LiftrBase.Storage/main.tsp +++ b/tests-upgrade/tests-emitter/Qumulo.Storage.Management/LiftrBase.Storage/main.tsp @@ -21,7 +21,6 @@ namespace LiftrBase.Storage; @doc("Supported versions for LiftrBase.Storage resource model") enum Versions { @doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1 and LiftrBase.Versions.v1_preview") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @useDependency(LiftrBase.Versions.v2_preview) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v3) v2_preview: "2024-02-01-preview", diff --git a/tests-upgrade/tests-emitter/Qumulo.Storage.Management/LiftrBase/main.tsp b/tests-upgrade/tests-emitter/Qumulo.Storage.Management/LiftrBase/main.tsp index 8ade310f3cc..691424afdf2 100644 --- a/tests-upgrade/tests-emitter/Qumulo.Storage.Management/LiftrBase/main.tsp +++ b/tests-upgrade/tests-emitter/Qumulo.Storage.Management/LiftrBase/main.tsp @@ -16,7 +16,6 @@ namespace LiftrBase; @doc("Supported versions for LiftrBase resource model") enum Versions { @doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v3) v2_preview: "2024-02-01-preview", } diff --git a/tests-upgrade/tests-emitter/Qumulo.Storage.Management/main.tsp b/tests-upgrade/tests-emitter/Qumulo.Storage.Management/main.tsp index 8afa224022d..67ecb08e33a 100644 --- a/tests-upgrade/tests-emitter/Qumulo.Storage.Management/main.tsp +++ b/tests-upgrade/tests-emitter/Qumulo.Storage.Management/main.tsp @@ -29,7 +29,6 @@ enum Versions { /** * The 2024-06-19 Stable API version. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) @useDependency(LiftrBase.Versions.v2_preview) @useDependency(LiftrBase.Storage.Versions.v2_preview) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v3) diff --git a/tests-upgrade/tests-emitter/RecoveryServices.brown/back-compatible.tsp b/tests-upgrade/tests-emitter/RecoveryServices.brown/back-compatible.tsp index 11f9f2896a8..8880b2b45ea 100644 --- a/tests-upgrade/tests-emitter/RecoveryServices.brown/back-compatible.tsp +++ b/tests-upgrade/tests-emitter/RecoveryServices.brown/back-compatible.tsp @@ -5,8 +5,9 @@ using Azure.Core; using Azure.ClientGenerator.Core; using Microsoft.RecoveryServices; -#suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(PrivateLinkResource.properties); +#suppress "@azure-tools/typespec-azure-core/no-legacy-usage" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(PrivateLinkResource.properties +); @@clientName(Vaults.createOrUpdate::parameters.resource, "vault"); @@clientName(Vaults.update::parameters.properties, "vault"); @@ -28,8 +29,9 @@ using Microsoft.RecoveryServices; "resourceExtendedInfoDetails", "python" ); -#suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(VaultExtendedInfoResource.properties); +#suppress "@azure-tools/typespec-azure-core/no-legacy-usage" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(VaultExtendedInfoResource.properties +); @@clientName(RecoveryServicesOperationGroup.capabilities::parameters.body, "input" ); diff --git a/tests-upgrade/tests-emitter/ScVmm.Management/VirtualMachineInstance.tsp b/tests-upgrade/tests-emitter/ScVmm.Management/VirtualMachineInstance.tsp index 919a3fa18e6..63ab3c79141 100644 --- a/tests-upgrade/tests-emitter/ScVmm.Management/VirtualMachineInstance.tsp +++ b/tests-upgrade/tests-emitter/ScVmm.Management/VirtualMachineInstance.tsp @@ -38,7 +38,7 @@ model VirtualMachineInstanceUpdate >> { /** The update properties of the VirtualMachineInstance. */ #suppress "deprecated" "Legacy flatten" - @Azure.ClientGenerator.Core.flattenProperty + @Azure.ClientGenerator.Core.Legacy.flattenProperty properties?: VirtualMachineInstanceUpdateProperties; } diff --git a/tests-upgrade/tests-emitter/ScVmm.Management/main.tsp b/tests-upgrade/tests-emitter/ScVmm.Management/main.tsp index 2e06b606995..676df3bb93a 100644 --- a/tests-upgrade/tests-emitter/ScVmm.Management/main.tsp +++ b/tests-upgrade/tests-emitter/ScVmm.Management/main.tsp @@ -29,14 +29,10 @@ namespace Microsoft.ScVmm; /** The available API versions. */ enum Versions { /** Service version 2023-10-07. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) v2023_10_07: "2023-10-07", /** Service version 2024-06-01. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) v2024_06_01: "2024-06-01", } diff --git a/tests-upgrade/tests-emitter/ServiceFabricManagedClusters.Management.brown/client.tsp b/tests-upgrade/tests-emitter/ServiceFabricManagedClusters.Management.brown/client.tsp index 149486ce6da..2781300ad75 100644 --- a/tests-upgrade/tests-emitter/ServiceFabricManagedClusters.Management.brown/client.tsp +++ b/tests-upgrade/tests-emitter/ServiceFabricManagedClusters.Management.brown/client.tsp @@ -21,14 +21,14 @@ using Microsoft.ServiceFabric; ); #suppress "deprecated" "@flattenProperty decorator for backwards compatibility with existing spec" -@@flattenProperty(VMSSExtension.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(VMSSExtension.properties); @@clientName(ApplicationTypes.createOrUpdate::parameters.resource, "parameters" ); @@clientName(ApplicationTypes.update::parameters.properties, "parameters"); #suppress "deprecated" "@flattenProperty decorator for backwards compatibility with existing spec" -@@flattenProperty(ApplicationTypeResource.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ApplicationTypeResource.properties); @@clientName(ApplicationTypeVersions.createOrUpdate::parameters.resource, "parameters" @@ -37,13 +37,13 @@ using Microsoft.ServiceFabric; "parameters" ); #suppress "deprecated" "@flattenProperty decorator for backwards compatibility with existing spec" -@@flattenProperty(ApplicationTypeVersionResource.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ApplicationTypeVersionResource.properties); @@clientName(Applications.createOrUpdate::parameters.resource, "parameters"); @@clientName(Applications.update::parameters.properties, "parameters"); @@clientName(Applications.resumeUpgrade::parameters.body, "parameters"); #suppress "deprecated" "@flattenProperty decorator for backwards compatibility with existing spec" -@@flattenProperty(ApplicationResource.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ApplicationResource.properties); @@clientName(Services.createOrUpdate::parameters.resource, "parameters"); @@clientName(Services.update::parameters.properties, "parameters"); @@ -58,10 +58,10 @@ using Microsoft.ServiceFabric; "parameters" ); #suppress "deprecated" "@flattenProperty decorator for backwards compatibility with existing spec" -@@flattenProperty(ManagedCluster.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ManagedCluster.properties); #suppress "deprecated" "@flattenProperty decorator for backwards compatibility with existing spec" -@@flattenProperty(ManagedClusterCodeVersionResult.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(ManagedClusterCodeVersionResult.properties); @@clientName(NodeTypes.createOrUpdate::parameters.resource, "parameters"); @@clientName(NodeTypes.update::parameters.properties, "parameters"); @@ -75,7 +75,7 @@ using Microsoft.ServiceFabric; @@clientName(NodeTypes.startFaultSimulation::parameters.body, "parameters"); @@clientName(NodeTypes.stopFaultSimulation::parameters.body, "parameters"); #suppress "deprecated" "@flattenProperty decorator for backwards compatibility with existing spec" -@@flattenProperty(NodeType.properties); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(NodeType.properties); @@Azure.ResourceManager.identifiers(FaultSimulationListResult.value, #["simulationId"] diff --git a/tests-upgrade/tests-emitter/ServiceFabricManagedClusters.Management.brown/main.tsp b/tests-upgrade/tests-emitter/ServiceFabricManagedClusters.Management.brown/main.tsp index 2ec9d4a0ac0..ccc1a8b0c82 100644 --- a/tests-upgrade/tests-emitter/ServiceFabricManagedClusters.Management.brown/main.tsp +++ b/tests-upgrade/tests-emitter/ServiceFabricManagedClusters.Management.brown/main.tsp @@ -59,8 +59,6 @@ enum Versions { * The 2024-11-01-preview API version. */ @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v3) - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2024_11_01_preview: "2024-11-01-preview", @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v3) diff --git a/tests-upgrade/tests-emitter/Sphere.Management/main.tsp b/tests-upgrade/tests-emitter/Sphere.Management/main.tsp index 1c831851768..5f8f65c5f69 100644 --- a/tests-upgrade/tests-emitter/Sphere.Management/main.tsp +++ b/tests-upgrade/tests-emitter/Sphere.Management/main.tsp @@ -33,7 +33,5 @@ enum Versions { /** * The 2024-04-01 API version. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2024_04_01: "2024-04-01", } diff --git a/tests-upgrade/tests-emitter/Sphere.Management/models.tsp b/tests-upgrade/tests-emitter/Sphere.Management/models.tsp index 795cd2924c7..4132cda8fac 100644 --- a/tests-upgrade/tests-emitter/Sphere.Management/models.tsp +++ b/tests-upgrade/tests-emitter/Sphere.Management/models.tsp @@ -707,7 +707,7 @@ model ProductUpdate { * The updatable properties of the Product. */ #suppress "deprecated" "Legacy flatten" - @Azure.ClientGenerator.Core.flattenProperty + @Azure.ClientGenerator.Core.Legacy.flattenProperty properties?: ProductUpdateProperties; } @@ -729,7 +729,7 @@ model DeviceGroupUpdate { * The updatable properties of the DeviceGroup. */ #suppress "deprecated" "Legacy flatten" - @Azure.ClientGenerator.Core.flattenProperty + @Azure.ClientGenerator.Core.Legacy.flattenProperty properties?: DeviceGroupUpdateProperties; } @@ -781,7 +781,7 @@ model DeviceUpdate { * The updatable properties of the Device. */ #suppress "deprecated" "Legacy flatten" - @Azure.ClientGenerator.Core.flattenProperty + @Azure.ClientGenerator.Core.Legacy.flattenProperty properties?: DeviceUpdateProperties; } diff --git a/tests-upgrade/tests-emitter/StandbyPool.Management/service.tsp b/tests-upgrade/tests-emitter/StandbyPool.Management/service.tsp index b107c06c8e6..3f9b8b4ea2a 100644 --- a/tests-upgrade/tests-emitter/StandbyPool.Management/service.tsp +++ b/tests-upgrade/tests-emitter/StandbyPool.Management/service.tsp @@ -24,26 +24,18 @@ namespace Microsoft.StandbyPool; @doc("Supported API Versions for Microsoft.StandbyPool") enum Versions { @doc("API Version 2023-12-01-preview.") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) `2023-12-01-preview`, @doc("API Version 2024-03-01-preview.") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) `2024-03-01-preview`, @doc("API Version 2024-03-01.") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) `2024-03-01`, @doc("API Version 2025-03-01.") - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_2) @armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5) `2025-03-01`, } diff --git a/tests-upgrade/tests-emitter/StorageAction.Management.brown/back-compatible.tsp b/tests-upgrade/tests-emitter/StorageAction.Management.brown/back-compatible.tsp index 7c584281c25..7ab496af972 100644 --- a/tests-upgrade/tests-emitter/StorageAction.Management.brown/back-compatible.tsp +++ b/tests-upgrade/tests-emitter/StorageAction.Management.brown/back-compatible.tsp @@ -4,10 +4,10 @@ using Azure.ClientGenerator.Core; using Microsoft.StorageActions; #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(StorageTaskPreviewAction.properties, "!csharp,!java,!python"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(StorageTaskPreviewAction.properties, "!csharp,!java,!python"); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(StorageTaskUpdateParameters.properties, +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(StorageTaskUpdateParameters.properties, "!csharp,!java,!python" ); @@ -18,7 +18,7 @@ using Microsoft.StorageActions; ); @@clientName(StorageTasks.storageTaskAssignmentList, "List"); #suppress "deprecated" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details" -@@flattenProperty(StorageTask.properties, "!csharp,!java,!python"); +@@Azure.ClientGenerator.Core.Legacy.flattenProperty(StorageTask.properties, "!csharp,!java,!python"); // @@clientLocation decorators for operations with custom @operationId // These ensure consistent operationId generation in the output diff --git a/tests-upgrade/tests-emitter/StorageAction.Management.brown/main.tsp b/tests-upgrade/tests-emitter/StorageAction.Management.brown/main.tsp index 26bea4e1cbf..c050e91a300 100644 --- a/tests-upgrade/tests-emitter/StorageAction.Management.brown/main.tsp +++ b/tests-upgrade/tests-emitter/StorageAction.Management.brown/main.tsp @@ -38,8 +38,6 @@ enum Versions { /** * The 2023-01-01 API version. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2023_01_01: "2023-01-01", } diff --git a/tests-upgrade/tests-emitter/Workloads.SAPVirtualInstance.Management/main.tsp b/tests-upgrade/tests-emitter/Workloads.SAPVirtualInstance.Management/main.tsp index 80a11eec895..369a3d58473 100644 --- a/tests-upgrade/tests-emitter/Workloads.SAPVirtualInstance.Management/main.tsp +++ b/tests-upgrade/tests-emitter/Workloads.SAPVirtualInstance.Management/main.tsp @@ -38,7 +38,5 @@ enum Versions { /** * The 2024-09-01 API version. */ - @useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1) - @useDependency(Azure.Core.Versions.v1_0_Preview_1) v2024_09_01: "2024-09-01", } diff --git a/tests-upgrade/tests-emitter/package.json b/tests-upgrade/tests-emitter/package.json index 991441ff754..0e1ddb126b5 100644 --- a/tests-upgrade/tests-emitter/package.json +++ b/tests-upgrade/tests-emitter/package.json @@ -3,19 +3,19 @@ "version": "0.1.0", "type": "module", "dependencies": { - "@typespec/compiler": "1.3.0", - "@azure-tools/typespec-autorest": "0.59.0", - "@azure-tools/typespec-azure-core": "0.59.0", - "@azure-tools/typespec-azure-resource-manager": "0.59.0", - "@azure-tools/typespec-client-generator-core": "0.59.0", - "@azure-tools/typespec-azure-rulesets": "0.59.0", - "@typespec/http": "1.3.0", - "@typespec/openapi": "1.3.0", - "@typespec/rest": "0.73.0", - "@typespec/streams": "0.73.0", - "@typespec/versioning": "0.73.0", - "@typespec/xml": "0.73.0", - "@azure-tools/typespec-liftr-base": "0.8.0" + "@typespec/compiler": "1.5.0", + "@azure-tools/typespec-autorest": "0.61.0", + "@azure-tools/typespec-azure-core": "0.61.0", + "@azure-tools/typespec-azure-resource-manager": "0.61.0", + "@azure-tools/typespec-client-generator-core": "0.61.0", + "@azure-tools/typespec-azure-rulesets": "0.61.0", + "@typespec/http": "1.5.0", + "@typespec/openapi": "1.5.0", + "@typespec/rest": "0.75.0", + "@typespec/streams": "0.75.0", + "@typespec/versioning": "0.75.0", + "@typespec/xml": "0.75.0", + "@azure-tools/typespec-liftr-base": "0.10.0" }, "scripts": { "build": ""