Merge remote-tracking branch 'upstream/main' into mgmt_sync_stack

Author: XiaofeiCao

.gitignore

@@ -106,6 +106,7 @@ typespec-tests/package-lock.json
 /typespec-tests/src/main/resources/META-INF/*apiview_properties.json
 
 # typespec-extension
-/typespec-extension/src
+/typespec-extension/src/*
+!/typespec-extension/src/options.ts
 /typespec-extension/test
 /typespec-extension/generator

Build-TypeSpec.ps1

@@ -22,15 +22,15 @@ Write-Host "Copy JAR and TypeSpec code to './typespec-extension' directory"
 New-Item -ItemType File -Path ./typespec-extension/generator/http-client-generator/target/emitter.jar -Force
 Copy-Item ./core/packages/http-client-java/generator/http-client-generator/target/emitter.jar ./typespec-extension/generator/http-client-generator/target/emitter.jar -Force
 # Copy TypeScript code
-Copy-Item -Path ./core/packages/http-client-java/emitter/src -Destination ./typespec-extension/ -Recurse -Force
+Copy-Item -Path ./core/packages/http-client-java/emitter/src -Destination ./typespec-extension/ -Exclude "options.ts" -Recurse -Force
 Copy-Item -Path ./core/packages/http-client-java/emitter/test -Destination ./typespec-extension/ -Recurse -Force
 
 Write-Host "Build and Pack typespec-java"
 Push-Location ./typespec-extension/
 try {
   npm ci
   npm run build
-  npm run lint
+  # npm run lint
   # npm run check-format
   npm pack
   if ($LASTEXITCODE -ne 0) {

Generate-TypeSpec.ps1

@@ -26,8 +26,6 @@ function invokeExpressionAndCaptureOutput([string]$expression) {
   Write-Host $output
 }
 
-pwsh ./Build-TypeSpec.ps1
-
 Write-Host "Installing TypeSpec ('npm install -g @typespec/compiler')"
 invokeExpressionAndCaptureOutput("npm install -g @typespec/compiler")
 
@@ -36,7 +34,7 @@ Push-Location ./typespec-tests
 
 try {
   Write-Host "Generating code ('Generate.ps1' in './typespec-tests')"
-  pwsh ./Generate.ps1 -Parallelization $Parallelization
+  & ./Generate.ps1 -Parallelization $Parallelization
 
 #   Write-Host "Checking format of generated code ('npm run check-format')"
 #   invokeExpressionAndCaptureOutput("npm run check-format")

core.diff

@@ -1,17 +1,5 @@
-diff --git a/packages/http-client-java/emitter/src/lib.ts b/packages/http-client-java/emitter/src/lib.ts
-index 2d9134c3d..c9ef91f87 100644
---- a/packages/http-client-java/emitter/src/lib.ts
-+++ b/packages/http-client-java/emitter/src/lib.ts
-@@ -1,6 +1,6 @@
- import { createTypeSpecLibrary, JSONSchemaType, paramMessage } from "@typespec/compiler";
- 
--export const LIB_NAME = "@typespec/http-client-java";
-+export const LIB_NAME = "@azure-tools/typespec-java";
- 
- export interface DevOptions {
-   "generate-code-model"?: boolean;
 diff --git a/packages/http-client-java/generator/http-client-generator-core/pom.xml b/packages/http-client-java/generator/http-client-generator-core/pom.xml
-index ce40ac91d..c3ee24c92 100644
+index b4139191e..d1b75d5ae 100644
 --- a/packages/http-client-java/generator/http-client-generator-core/pom.xml
 +++ b/packages/http-client-java/generator/http-client-generator-core/pom.xml
 @@ -21,6 +21,11 @@
@@ -27,7 +15,7 @@ index ce40ac91d..c3ee24c92 100644
        <groupId>com.azure</groupId>
        <artifactId>azure-core</artifactId>
 diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java
-index d44ce8ec4..7953870bc 100644
+index 4aad12e27..67e5f7ef1 100644
 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java
 +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java
 @@ -3,9 +3,9 @@

eng/pipelines/ci-typespec-java-dev-nightly.yaml

@@ -12,7 +12,7 @@ pr: none
 jobs:
   - job: Build
 
-    timeoutInMinutes: 30
+    timeoutInMinutes: 60
 
     variables:
       - template: /eng/pipelines/variables/globals.yml
@@ -25,14 +25,6 @@ jobs:
       - checkout: self
         submodules: true
 
-      - task: PowerShell@2
-        displayName: 'Disable Warning on Deprecation'
-        inputs:
-          targetType: inline
-          script: >
-            (Get-Content '.eslintrc.cjs') -replace '(?<="deprecation/deprecation": ")[^"]*', 'off' | Set-Content '.eslintrc.cjs'
-          workingDirectory: ./typespec-extension
-
       - task: NodeTool@0
         displayName: 'Install Node.js $(NodeVersion)'
         inputs:
@@ -91,7 +83,7 @@ jobs:
         displayName: 'Start Spector Test Server'
         workingDirectory: ./typespec-tests
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Run TypeSpec Tests'
         inputs:
           mavenPomFile: pom.xml

eng/pipelines/ci-typespec-java.yaml

@@ -26,7 +26,7 @@ pr:
 jobs:
   - job: Build
 
-    timeoutInMinutes: 30
+    timeoutInMinutes: 60
 
     variables:
       - template: /eng/pipelines/variables/globals.yml
@@ -57,20 +57,21 @@ jobs:
           pwsh: true
           filePath: Generate-TypeSpec.ps1
 
-      - script: npm run test
-        displayName: 'Run TypeScript Unit Tests'
-        workingDirectory: ./typespec-extension
-
       - script: |
           git status
           git diff
         displayName: 'Git Diff'
 
+      # - script: |
+      #     npm run test
+      #   displayName: 'Run TypeScript Unit Tests'
+      #   workingDirectory: ./typespec-extension
+
       # - script: |
       #     [ -z "`git status --porcelain -- :!package-lock.json`" ]
       #   displayName: 'Check no Diff'
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Verify Test Code'
         inputs:
           mavenPomFile: 'typespec-tests/pom.xml'
@@ -87,7 +88,7 @@ jobs:
         displayName: 'Start Spector Test Server'
         workingDirectory: ./typespec-tests
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Run TypeSpec Tests'
         inputs:
           mavenPomFile: pom.xml

eng/pipelines/ci.yaml

@@ -50,7 +50,7 @@ jobs:
         parameters:
           JobType: 'Autorest'
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Build and Package'
         inputs:
           mavenPomFile: pom.xml
@@ -86,7 +86,7 @@ jobs:
           npm run testserver-run &
         displayName: 'Start Testserver'
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Run Vanilla Tests'
         inputs:
           mavenPomFile: pom.xml
@@ -105,7 +105,7 @@ jobs:
           searchFolder: '$(System.DefaultWorkingDirectory)/vanilla-tests/'
         condition: always()
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Run Azure Tests'
         inputs:
           mavenPomFile: pom.xml
@@ -124,7 +124,7 @@ jobs:
           searchFolder: '$(System.DefaultWorkingDirectory)/azure-tests/'
         condition: always()
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Run Protocol Tests'
         inputs:
           mavenPomFile: pom.xml
@@ -153,7 +153,7 @@ jobs:
           cat coverage/report-dpg.json || true
         displayName: 'Display Coverage Data'
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Verify Javadoc of Protocol Tests'
         inputs:
           mavenPomFile: protocol-tests/pom.xml
@@ -165,7 +165,7 @@ jobs:
           jdkArchitectureOption: 'x64'
           publishJUnitResults: false
 
-      - task: Maven@3
+      - task: Maven@4
         displayName: 'Run Protocol Resilience Tests'
         inputs:
           mavenPomFile: protocol-resilience-test/pom.xml

eng/pipelines/fluent_integration.yaml

@@ -48,7 +48,7 @@ jobs:
     parameters:
       JobType: 'Fluent Integration'
 
-  - task: Maven@3
+  - task: Maven@4
     displayName: 'Build and Package'
     inputs:
       mavenPomFile: pom.xml
@@ -67,7 +67,7 @@ jobs:
       filePath: fluent-tests/Initialize-Tests.ps1
       workingDirectory: ./fluent-tests
 
-  - task: Maven@3
+  - task: Maven@4
     displayName: 'Run Tests'
     inputs:
       mavenPomFile: 'pom.xml'

eng/pipelines/publish-autorest-java.yaml

@@ -40,7 +40,7 @@ extends:
                 parameters:
                   JobType: 'Publish Autorest'
 
-              - task: Maven@3
+              - task: Maven@4
                 displayName: 'Build JAR'
                 inputs:
                   mavenPomFile: pom.xml

eng/scripts/Build-Packages.ps1

@@ -26,7 +26,7 @@ $packagesPath = New-Item -ItemType Directory -Force -Path $packagesPath | Select
 
 Push-Location $RepoRoot
 try {
-  invoke "pwsh Build-TypeSpec.ps1"
+  & ./Build-TypeSpec.ps1
 
   Push-Location "./typespec-extension"
   try {