Merge branch 'main' into typespec-next

Azure · Aug 9, 2023 · 5389609 · 5389609
2 parents 16fdc61 + a5e7ff5
commit 5389609
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 15 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,2 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
+# Use unix line endings always, even on Windows
+* text=auto eol=lf
diff --git a/eng/pipelines/typespec-validation-all.yml b/eng/pipelines/typespec-validation-all.yml
@@ -8,9 +8,19 @@ pr: none
 
 jobs:
 - job: Validate_All_Specs
+
+  strategy:
+    matrix:
+      Linux:
+        Pool: azsdk-pool-mms-ubuntu-2204-general
+        OsVmImage: ubuntu-22.04
+      Windows:
+        Pool: azsdk-pool-mms-win-2022-general
+        OsVmImage: windows-2022
+
   pool:
-    name: azsdk-pool-mms-ubuntu-2204-general
-    vmImage: ubuntu-22.04
+    name: $(Pool)
+    vmImage: $(OSVmImage)
 
   steps:
   - script: git merge origin/main

diff --git a/.../data-plane/Microsoft.Synapse/preview/2022-03-01-preview/examples/RunNotebook_Cancel.json b/.../data-plane/Microsoft.Synapse/preview/2022-03-01-preview/examples/RunNotebook_Cancel.json
@@ -18,7 +18,7 @@
         "result": {
           "runId": "4b200abf-c90c-43cf-98ae-b9f2bcf90373",
           "runStatus": "Cancelled",
-          "sessionId": -1,
+          "sessionId": "-1",
           "sparkPool": "exampleSparkpool",
           "lastCheckedOn": "0001-01-01T00:00:00"
         }
@@ -37,7 +37,7 @@
         "result": {
           "runId": "4b200abf-c90c-43cf-98ae-b9f2bcf90373",
           "runStatus": "SnapshotTaken",
-          "sessionId": -1,
+          "sessionId": "-1",
           "sparkPool": "exampleSparkpool"
         }
       }

diff --git a/.../data-plane/Microsoft.Synapse/preview/2022-03-01-preview/examples/RunNotebook_Create.json b/.../data-plane/Microsoft.Synapse/preview/2022-03-01-preview/examples/RunNotebook_Create.json
@@ -39,7 +39,7 @@
         "result": {
           "runId": "4b200abf-c90c-43cf-98ae-b9f2bcf90373",
           "runStatus": "Starting",
-          "sessionId": -1,
+          "sessionId": "-1",
           "sparkPool": "exampleSparkpool",
           "lastCheckedOn": "0001-01-01T00:00:00"
         }

diff --git a/...-plane/Microsoft.Synapse/preview/2022-03-01-preview/examples/RunNotebook_GetSnapshot.json b/...-plane/Microsoft.Synapse/preview/2022-03-01-preview/examples/RunNotebook_GetSnapshot.json
@@ -232,7 +232,7 @@
           },
           "runId": "e4221395-55ae-4c6d-9756-fae966d84350",
           "runStatus": "Succeeded",
-          "sessionId": 1,
+          "sessionId": "1",
           "sparkPool": "exampleSparkpool",
           "lastCheckedOn": "0001-01-01T00:00:00"
         }

diff --git a/...ta-plane/Microsoft.Synapse/preview/2022-03-01-preview/examples/RunNotebook_GetStatus.json b/...ta-plane/Microsoft.Synapse/preview/2022-03-01-preview/examples/RunNotebook_GetStatus.json
@@ -82,7 +82,7 @@
           "exitValue": null,
           "runId": "4b200abf-c90c-43cf-98ae-b9f2bcf90373",
           "runStatus": "Starting",
-          "sessionId": 2,
+          "sessionId": "2",
           "sparkPool": "exampleSparkpool",
           "lastCheckedOn": "2021-09-06T11:23:58.3733333"
         }

diff --git a/...fication/synapse/data-plane/Microsoft.Synapse/preview/2022-03-01-preview/runNotebook.json b/...fication/synapse/data-plane/Microsoft.Synapse/preview/2022-03-01-preview/runNotebook.json
@@ -242,8 +242,7 @@
         },
         "sessionId": {
           "description": "Livy session id.",
-          "type": "integer",
-          "format": "int64"
+          "type": "string"
         },
         "sparkPool": {
           "description": "SparkPool name.",
@@ -331,8 +330,7 @@
         },
         "sessionId": {
           "description": "Livy session id.",
-          "type": "integer",
-          "format": "int64"
+          "type": "string"
         },
         "sparkPool": {
           "description": "SparkPool name.",
@@ -378,8 +376,7 @@
         },
         "sessionId": {
           "description": "Livy session id.",
-          "type": "integer",
-          "format": "int64"
+          "type": "string"
         },
         "sparkPool": {
           "description": "SparkPool name.",