Test generic typespec validation template

.gitignore

@@ -164,6 +164,7 @@ pingme.txt
 # TS/Node files
 dist/
 node_modules/
+eng/packages/**/*.tgz
 
 # MSBuild binary log files
 msbuild.binlog

eng/packages/http-client-csharp/.prettierignore

@@ -0,0 +1,2 @@
+dist/
+artifacts/

eng/packages/http-client-csharp/ci.yml

@@ -10,58 +10,39 @@ pr:
     include:
     - eng/packages/http-client-csharp
 
-variables:
-  - template: /eng/pipelines/templates/variables/image.yml
+parameters:
+  - name: BuildPrereleaseVersion
+    displayName: 'Build prerelease version'
+    type: boolean
+    default: true
+  - name: ShouldRegenrate
+    displayName: 'Should regenerate'
+    type: boolean
+    default: true
+  - name: UseTypeSpecNext
+    displayName: 'Use TypeSpec Next'
+    type: boolean
+    default: false
+  - name: PublishTo
+    displayName: 'Publish to'
+    type: string
+    default: 'devops'
+    values: ['none', 'devops', 'public']
 
 extends:
-  template: /eng/pipelines/templates/stages/1es-redirect.yml
+  template: /eng/common/pipelines/templates/archetype-typespec-emitter.yml
   parameters:
-    stages:
-      - stage: 'Build'
-        pool:
-          name: $(WINDOWSPOOL)
-          image: $(WINDOWSVMIMAGE)
-          os: windows
-        jobs:
-          - job: Build
-            timeoutInMinutes: 120
-            steps:
-              - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
-              - task: UseDotNet@2
-                displayName: 'Use .NET Core SDK'
-                retryCountOnTaskFailure: 3
-                inputs:
-                  useGlobalJson: true
-                  performMultiLevelLookup: true
-              - task: NodeTool@0
-                displayName: "Install Node 18.x"
-                inputs:
-                  versionSpec: '18.x'
-              - script: |
-                  npm ci
-                displayName: "Install packages"
-                workingDirectory: $(Build.SourcesDirectory)/eng/packages/http-client-csharp
-              - script: |
-                  npm ls -a
-                displayName: "List packages"
-                workingDirectory: $(Build.SourcesDirectory)/eng/packages/http-client-csharp
-              - script: |
-                  npm run prettier
-                displayName: "Emitter format check"
-                workingDirectory: $(Build.SourcesDirectory)/eng/packages/http-client-csharp/emitter
-              - script: |
-                  npm run lint
-                displayName: "Emitter linter check"
-                workingDirectory: $(Build.SourcesDirectory)/eng/packages/http-client-csharp/emitter
-              - script: |
-                  npm run build
-                displayName: 'Build Azure csharp client emitter and generator'
-                workingDirectory: $(Build.SourcesDirectory)/eng/packages/http-client-csharp/
-              - pwsh: ./eng/packages/http-client-csharp/eng/scripts/CodeGenerationCheck.ps1
-                displayName: "Check if generated code is up-to-date"
-                env:
-                  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-                  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-                  DOTNET_MULTILEVEL_LOOKUP: 0
-              - pwsh: dotnet test $(Build.SourcesDirectory)/eng/packages/http-client-csharp/generator
-                displayName: "Run tests"
+    BuildPrereleaseVersion: ${{ parameters.BuildPrereleaseVersion }}
+    UseTypeSpecNext: ${{ parameters.UseTypeSpecNext }}
+    ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+      ShouldPublish: ${{ ne(parameters.PublishTo, 'none') }}
+      PublishPublic: ${{ eq(parameters.PublishTo, 'public') }}
+      PublishDependsOnTest: ${{ eq(parameters.PublishTo, 'public') }}
+
+      ShouldRegenrate: ${{ parameters.ShouldRegenrate }}
+      RegenerationJobCount: 5
+      MinimumPerJob: 10
+      OnlyGenerateTypespec: true
+    TestMatrix:
+        All:
+          TestArguments: -UnitTests -GenerationChecks -Filter .NET

eng/packages/http-client-csharp/package.json

@@ -9,11 +9,11 @@
   "scripts": {
     "clean": "rimraf ./dist ./emitter/temp && dotnet clean ./generator",
     "build:emitter": "tsc -p ./emitter/tsconfig.build.json",
-    "build:generator": "dotnet build ./generator",
-    "build": "npm run build:emitter && npm run build:generator && copyfiles -u 5 ./node_modules/@typespec/http-client-csharp/dist/generator/Microsoft.Generator.CSharp.runtimeconfig.json ./dist/generator",
+    "build:generator": "dotnet build ./generator && copyfiles -u 5 ./node_modules/@typespec/http-client-csharp/dist/generator/Microsoft.Generator.CSharp.runtimeconfig.json ./dist/generator",
+    "build": "npm run build:emitter && npm run build:generator",
     "test:emitter": "vitest run -c ./emitter/vitest.config.ts",
-    "test:generator": "dotnet test ./generator",
-    "test": "npm run test:emitter && npm run test:generator",
+    "test:generator": "dotnet test ./generator --logger \"trx;LogFileName=debug.trx\"",
+    "test": "npm run test:generator && npm run test:emitter",
     "lint": "eslint . --max-warnings=0",
     "lint:fix": "eslint . --fix",
     "prettier:fix": "prettier --write --config .prettierrc.json ./**/*.ts",
@@ -25,24 +25,12 @@
   "dependencies": {
     "@typespec/http-client-csharp": "0.1.9-alpha.20241010.1"
   },
-  "peerDependencies": {
-    "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
-    "@azure-tools/typespec-client-generator-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
-    "@typespec/compiler": ">=0.60.0 <1.0.0 || ~0.61.0-0",
-    "@typespec/http": ">=0.60.0 <1.0.0 || ~0.61.0-0",
-    "@typespec/openapi": ">=0.60.0 <1.0.0 || ~0.61.0-0",
-    "@typespec/rest": ">=0.60.0 <1.0.0 || ~0.61.0-0",
-    "@typespec/versioning": ">=0.60.0 <1.0.0 || ~0.61.0-0"
-  },
   "devDependencies": {
     "@azure-tools/typespec-azure-core": "0.46.0",
     "@azure-tools/typespec-client-generator-core": "0.46.2",
     "@azure-tools/typespec-azure-resource-manager": "0.46.1",
     "@azure-tools/typespec-azure-rulesets": "0.46.0",
     "@azure-tools/typespec-autorest": "0.46.0",
-    "@eslint/js": "^9.2.0",
-    "@types/node": "~22.7.5",
-    "@types/prettier": "^2.6.3",
     "@typespec/compiler": "0.60.0",
     "@typespec/http": "0.60.0",
     "@typespec/json-schema": "0.60.0",
@@ -51,6 +39,9 @@
     "@typespec/rest": "0.60.0",
     "@typespec/versioning": "0.60.0",
     "@typespec/xml": "0.60.0",
+
+    "@types/node": "~22.7.5",
+    "@types/prettier": "^2.6.3",
     "@vitest/coverage-v8": "^1.4.0",
     "@vitest/ui": "^1.4.0",
     "c8": "^9.1.0",
@@ -59,7 +50,17 @@
     "vitest": "^1.4.0",
     "copyfiles": "^2.4.1",
     "eslint": "^8.57.0",
+    "@eslint/js": "^9.2.0",
     "prettier": "~3.0.3",
     "typescript-eslint": "^7.8.0"
-  }
+  },
+  "azure-sdk/emitter-package-json-pinning": [
+    "@azure-tools/typespec-azure-core",
+    "@azure-tools/typespec-client-generator-core",
+    "@typespec/compiler",
+    "@typespec/http",
+    "@typespec/openapi",
+    "@typespec/rest",
+    "@typespec/versioning"
+  ]
 }

eng/scripts/typespec/Build-Emitter.ps1

@@ -0,0 +1,77 @@
+#Requires -Version 7.0
+
+param(
+    [string] $BuildNumber,
+    [string] $OutputDirectory,
+    [switch] $Prerelease,
+    [switch] $TargetNpmJsFeed
+)
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 3.0
+. "$PSScriptRoot/../../common/scripts/common.ps1"
+Set-ConsoleEncoding
+
+$packageRoot = Resolve-Path "$RepoRooot/eng/packages/http-client-csharp"
+$outputPath = $OutputDirectory ? $OutputDirectory : (Join-Path $packageRoot "artifacts" "build")
+
+Push-Location $packageRoot
+try {
+    Write-Host "Working in $PWD"
+
+    $outputPath = New-Item -ItemType Directory -Force -Path $outputPath | Select-Object -ExpandProperty FullName
+
+    $emitterVersion = (npm pkg get version).Trim('"')
+
+    if ($BuildNumber) {
+        # set package versions
+        $versionTag = $Prerelease ? "-alpha" : "-beta"
+
+        $emitterVersion = "$($emitterVersion.Split('-')[0])$versionTag.$BuildNumber"
+        Write-Host "Setting output variable 'emitterVersion' to $emitterVersion"
+        Write-Host "##vso[task.setvariable variable=emitterVersion;isoutput=true]$emitterVersion"
+    }
+
+    # build and pack the emitter
+    Invoke-LoggedCommand "npm run build" -GroupOutput
+
+    if ($BuildNumber) {
+        Write-Host "Updating version package.json to the new emitter version`n"
+        Invoke-LoggedCommand "npm pkg set version=$emitterVersion"
+    }
+
+    # remove any existing tarballs
+    Remove-Item -Path "./*.tgz" -Force | Out-Null
+
+    #pack the emitter
+    Invoke-LoggedCommand "npm pack"
+    $file = Get-ChildItem -Filter "*.tgz" | Select-Object -ExpandProperty FullName
+
+    # ensure the packages directory exists
+    New-Item -ItemType Directory -Force -Path "$outputPath/packages" | Out-Null
+
+    Write-Host "Copying $file to $outputPath/packages"
+    Copy-Item $file -Destination "$outputPath/packages"
+
+    if ($TargetNpmJsFeed) {
+        $overrides = @{}
+    }
+    else {
+        $feedUrl = "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest/npm/registry"
+
+        $overrides = @{
+            "@azure-typespec/http-client-csharp" = "$feedUrl/@azure-typespec/http-client-csharp/-/http-client-csharp-$emitterVersion.tgz"
+        }
+    }
+
+    $overrides | ConvertTo-Json | Set-Content "$outputPath/overrides.json"
+
+    $packageMatrix = [ordered]@{
+        "emitter" = $emitterVersion
+    }
+
+    $packageMatrix | ConvertTo-Json | Set-Content "$outputPath/package-versions.json"
+}
+finally {
+    Pop-Location
+}

eng/packages/http-client-csharp/eng/scripts/CodeGenerationCheck.ps1 → eng/scripts/typespec/Check-CodeGeneration.ps1

@@ -1,16 +1,14 @@
-#Requires -Version 6.0
+#Requires -Version 7.0
 
 $ErrorActionPreference = 'Stop'
-Set-StrictMode -Version 1
+Set-StrictMode -Version 3.0
 
-Write-Host "Generating test projects ..."
-& (Join-Path $PSScriptRoot 'Generate.ps1') -reset
-Write-Host 'Code generation is completed.'
+& "$PSScriptRoot/Generate-Code.ps1"
 
 Write-Host 'Checking generated files difference...'
 git -c core.safecrlf=false diff --ignore-space-at-eol --exit-code
 if ($LastExitCode -ne 0) {
-    Write-Error 'Generated codes are not up to date. Please run: eng/packages/http-client-csharp/eng/Generate.ps1'
+    Write-Error 'Generated codes are not up to date. Please run: eng/scripts/typespec/Generate-Code.ps1'
     exit 1
 }
 Write-Host 'Done. No change is detected.'