Merge branch 'microsoft:master' into sgovoni/samples/features/optimized-locking

Author: segovoni

samples/databases/wide-world-importers/wwi-app/wwwroot/lib/webcomponentsjs/package-lock.json

@@ -272,7 +272,7 @@
                 "\r\n",
                 "Read Throughput for physical disk I/O: <font color =\"red\">**~24Gb/sec**</font>\r\n",
                 "\r\n",
-                "Rows processed per second: <font color=\"red\">**448,717,9024 rows/sec** (*Over a 400 million rows per second*)</font>\r\n",
+                "Rows processed per second: <font color=\"red\">**448,717,9024 rows/sec** (*Over 400 million rows per second*)</font>\r\n",
                 "\r\n",
                 ""
             ],
@@ -381,4 +381,5 @@
             "execution_count": 1
         }
     ]
-}
+
+}

samples/demos/azure-sql-edge-demos/Wind Turbine Demo/webappsrc/SqlDbEdgeDemoWeb/SqlDbEdgeDemo.Web/ClientApp/package-lock.json

@@ -432,8 +432,12 @@ foreach ($sub in $subscriptions) {
 
             if (-not $ReportOnly) {
                 If ($WriteSettings) {
-                    try { 
-                        $ext | Set-AzConnectedMachineExtension -Name $setID.Name -ResourceGroupName $setID.ResourceGroup -MachineName $setID.MachineName -NoWait -ErrorAction SilentlyContinue | Out-Null
+                    try {
+                        $settings = @{}
+                        foreach ($h in $ext.Setting.Keys) {
+                           $settings[$h]=$($ext.Setting[$h])
+                        }                        
+                        Set-AzConnectedMachineExtension -Name $setID.Name -ResourceGroupName $setID.ResourceGroup -MachineName $setID.MachineName -Setting $settings -NoWait -ErrorAction SilentlyContinue | Out-Null
                         Write-Output "Updated -- Resource group: [$($setID.ResourceGroup)], Connected machine: [$($setID.MachineName)]"
                     } catch {
                         write-Output "The request to modify the extension object failed with the following error:"
@@ -464,4 +468,4 @@ $scriptEndTime = Get-Date
 $executionDuration = $scriptEndTime - $scriptStartTime
 Write-Output "Script execution ended at: $($scriptEndTime.ToString('yyyy-MM-dd HH:mm:ss'))"
 Write-Output "Total execution time: $($executionDuration.ToString('hh\:mm\:ss'))"
-Stop-Transcript
+Stop-Transcript

samples/features/sql2019notebooks/OneTrillionRowsCold.ipynb

@@ -26,7 +26,7 @@
     <dependency>
         <groupId>com.microsoft.sqlserver</groupId>
         <artifactId>mssql-jdbc</artifactId>
-        <version>7.0.0.jre8</version>
+        <version>11.1.0.jre8-preview</version>
     </dependency>
 <dependency>
     <groupId>com.azure</groupId>

samples/manage/azure-arc-enabled-sql-server/modify-license-type/modify-arc-sql-license-type.ps1

@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.microsoft.sqlserver</groupId>
       <artifactId>mssql-jdbc</artifactId>
-      <version>6.2.2.jre8</version>
+      <version>11.1.0.jre8-preview</version>
     </dependency>
   </dependencies>
 </project>