upgrade cadl to 0.39 (#3046)

* upgrade cadl to 0.39

* update package-lock.json

* remove the usage != None check for model generation

* add a test case

* update test

* update test

* don't generate Serailization class when model usage is none

* update test

* update emitter options for sample project

---------

Co-authored-by: ArcturusZhang <[email protected]>

Author: chunyu3

eng/Generate.ps1

@@ -250,7 +250,7 @@ if (!($Exclude -contains "Samples"))
         $cadlMain = Join-Path $projectDirectory "main.cadl"
         $cadlClient = Join-Path $projectDirectory "client.cadl"
         $mainCadlFile = If (Test-Path "$cadlClient") { Resolve-Path "$cadlClient" } Else { Resolve-Path "$cadlMain"}
-        Add-Cadl $projectName $projectDirectory $mainCadlFile "--option @azure-tools/cadl-csharp.generateConvenienceAPI=true --option @azure-tools/cadl-csharp.unreferenced-types-handling=keepAll"
+        Add-Cadl $projectName $projectDirectory $mainCadlFile "--option @azure-tools/cadl-csharp.generateConvenienceAPI=true"
     }
 }
 

package-lock.json

@@ -6,23 +6,17 @@
 #nullable disable
 
 using System;
-using Azure.Core;
 
 namespace AnomalyDetector.Models
 {
     /// <summary> Response of getting a model. </summary>
     public partial class AnomalyDetectionModel
     {
         /// <summary> Initializes a new instance of AnomalyDetectionModel. </summary>
-        /// <param name="modelId"> Model identifier. </param>
         /// <param name="createdTime"> Date and time (UTC) when the model was created. </param>
         /// <param name="lastUpdatedTime"> Date and time (UTC) when the model was last updated. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="modelId"/> is null. </exception>
-        internal AnomalyDetectionModel(string modelId, DateTimeOffset createdTime, DateTimeOffset lastUpdatedTime)
+        internal AnomalyDetectionModel(DateTimeOffset createdTime, DateTimeOffset lastUpdatedTime)
         {
-            Argument.AssertNotNull(modelId, nameof(modelId));
-
-            ModelId = modelId;
             CreatedTime = createdTime;
             LastUpdatedTime = lastUpdatedTime;
         }

samples/AnomalyDetector/Generated/Configuration.json

@@ -16,17 +16,14 @@ namespace AnomalyDetector.Models
     public partial class MultivariateDetectionResult
     {
         /// <summary> Initializes a new instance of MultivariateDetectionResult. </summary>
-        /// <param name="resultId"> Result identifier, which is used to fetch the results of an inference call. </param>
         /// <param name="summary"> Multivariate anomaly detection status. </param>
         /// <param name="results"> Detection result for each timestamp. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="resultId"/>, <paramref name="summary"/> or <paramref name="results"/> is null. </exception>
-        internal MultivariateDetectionResult(string resultId, MultivariateBatchDetectionResultSummary summary, IEnumerable<AnomalyState> results)
+        /// <exception cref="ArgumentNullException"> <paramref name="summary"/> or <paramref name="results"/> is null. </exception>
+        internal MultivariateDetectionResult(MultivariateBatchDetectionResultSummary summary, IEnumerable<AnomalyState> results)
         {
-            Argument.AssertNotNull(resultId, nameof(resultId));
             Argument.AssertNotNull(summary, nameof(summary));
             Argument.AssertNotNull(results, nameof(results));
 
-            ResultId = resultId;
             Summary = summary;
             Results = results.ToList();
         }

samples/AnomalyDetector/Generated/Models/AnomalyDetectionModel.cs

@@ -930,7 +930,7 @@
       "IsNullable": false
      },
      "IsRequired": true,
-     "IsReadOnly": false,
+     "IsReadOnly": true,
      "IsDiscriminator": false
     },
     {
@@ -1783,7 +1783,7 @@
       "IsNullable": false
      },
      "IsRequired": true,
-     "IsReadOnly": false,
+     "IsReadOnly": true,
      "IsDiscriminator": false
     },
     {

samples/AnomalyDetector/Generated/Models/ModelList.Serialization.cs

@@ -51,6 +51,7 @@ enum ModelStatus {
 model MultivariateDetectionResult {
   @doc("Result identifier, which is used to fetch the results of an inference call.")
   @key
+  @visibility("read")
   @format("uuid")
   resultId: string;
 
@@ -309,6 +310,7 @@ epoch.
 model AnomalyDetectionModel {
   @doc("Model identifier.")
   @key
+  @visibility("read")
   @format("uuid")
   modelId: string;
 

samples/AnomalyDetector/Generated/Models/ModelList.cs

@@ -29,7 +29,10 @@ public void WriteSerialization(CodeWriter writer, TypeProvider schema)
             switch (schema)
             {
                 case SerializableObjectType objectSchema:
-                    WriteObjectSerialization(writer, objectSchema);
+                    if (objectSchema.IncludeSerializer || objectSchema.IncludeDeserializer)
+                    {
+                        WriteObjectSerialization(writer, objectSchema);
+                    }
                     break;
                 case EnumType { IsExtensible: false } sealedChoiceSchema:
                     WriteEnumSerialization(writer, sealedChoiceSchema);