Merge branch 'main' into shenglol/update-deployment-package

Azure · Oct 21, 2024 · f99f848 · f99f848
2 parents c262148 + 5ae1c00
commit f99f848
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 95 deletions.
diff --git a/src/Bicep.LangServer.IntegrationTests/ExpressionAndTypeExtractorTests.cs b/src/Bicep.LangServer.IntegrationTests/ExpressionAndTypeExtractorTests.cs
@@ -37,7 +37,7 @@ public class ExpressionAndTypeExtractorTests : CodeActionTestBase
 {
     private const string ExtractToVariableTitle = "[Preview] Extract variable";
     private const string ExtractToParameterTitle = "[Preview] Extract parameter";
-    private const string ExtractToTypeTitle = "[Preview] Create type for ";
+    private const string ExtractToTypeTitle = "[Preview] Create user-defined type for ";
     private const string PostExtractionCommandName = "bicep.internal.postExtraction";
     private const string Tab = "\t";
 
@@ -2143,7 +2143,7 @@ public async Task VarsAndParams_ShouldInsertBeforeStatementTrivia(string fileWit
     //   Has a newline before the existing declaration (or at beginning of file)
     //   Has a newline after the existing declaration (or at end of file)
     //   Is there already a newline after the new declaration?
-    // 
+    //
     // ==== No existing declaration
     [DataRow(
         """
@@ -2452,7 +2452,7 @@ public async Task VarsAndParams_ShouldInsertBeforeStatementTrivia(string fileWit
             // comment
             @description('v1')
             /* comment
-            
+
             */
             var v2 = [
                 1,
@@ -2487,7 +2487,7 @@ public async Task VarsAndParams_ShouldInsertBeforeStatementTrivia(string fileWit
             // comment
             @description('v1')
             /* comment
-            
+
             */
             var v2 = [
                 1,
@@ -2523,7 +2523,7 @@ public async Task VarsAndParams_ShouldInsertBeforeStatementTrivia(string fileWit
             // comment
             @description('v1')
             /* comment
-            
+
             */
             var v2 = [
                 1,
@@ -2794,7 +2794,7 @@ public void TestCheckLineContent()
                 COMMENT /* cruel, cruel world
                 COMMENT
                 COMMENT */
-                
+
                 CONTENT @description('description')
                 CONTENT @allowed([
                     CONTENT 'abc'
@@ -2808,39 +2808,39 @@ CONTENT ]
                     CONTENT a: 'abc'
                     COMMENT // hi
                     CONTENT COMMENT b: /*comment*/ 'bcd'
-                
+
                     CONTENT b: [
                         CONTENT 1, 2
-                
+
                         CONTENT 3
                         CONTENT 4
                 CONTENT  ]
                 CONTENT}
-                
-                
+
+
                 CONTENT COMMENT /*hello*/ resource stg 'Microsoft.Storage/storageAccounts@2019-04-01' = {
                   CONTENT name: '${storagePrefix}${uniqueString(resourceGroup().id)}'
                   CONTENT location: location
                   CONTENT sku: {
                     CONTENT name: storageSKU
                   CONTENT }
-                
+
                   CONTENT kind: 'StorageV2'
                   CONTENT properties: {
                     COMMENT // supportsHttpsTrafficOnly: true
                   CONTENT }
                 CONTENT }
                 {{Tab}}   {{Tab}}
                 CONTENT output storageEndpoint object = stg.properties.|primaryEndpoints
-                
+
                 COMMENT // Comments are not empty
-                
+
                 COMMENT /* Not even
-                COMMENT 
+                COMMENT
                 COMMENT this one
-                COMMENT 
+                COMMENT
                 COMMENT */
-                
+
                 CONTENT         param p2 string
                 CONTENT param p3 int            {{Tab}}
                 """;

diff --git a/src/Bicep.LangServer/Refactor/ExpressionAndTypeExtractor.cs b/src/Bicep.LangServer/Refactor/ExpressionAndTypeExtractor.cs
@@ -193,7 +193,7 @@ private IEnumerable<CodeFixWithCommand> CreateAllExtractions(ExtractionContext e
             yield return CreateExtraction(
                 extractionContext,
                 ExtractionKind.Type,
-                $"[Preview] Create type for {GetQuotedText(stringifiedUserDefinedType)}",
+                $"[Preview] Create user-defined type for {GetQuotedText(stringifiedUserDefinedType)}",
                 stringifiedUserDefinedType);
         }
     }

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -48,7 +48,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.143" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.146" PrivateAssets="All" />
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4"  PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20" PrivateAssets="All"/>

diff --git a/src/vs-bicep/Bicep.VSLanguageServerClient.IntegrationTests/packages.lock.json b/src/vs-bicep/Bicep.VSLanguageServerClient.IntegrationTests/packages.lock.json
@@ -249,9 +249,9 @@
       },
       "Nerdbank.GitVersioning": {
         "type": "Direct",
-        "requested": "[3.6.143, )",
-        "resolved": "3.6.143",
-        "contentHash": "N24MtdLq4PmdJ2woTQd9515q0I1jeO/DlimYCB/GoRd510Fc9dk9H6YaN8MPPrVF8RHrIalCUfWbWvcoarYeoQ=="
+        "requested": "[3.6.146, )",
+        "resolved": "3.6.146",
+        "contentHash": "W1eQ8hD9Y/cZ2+ilgxECl003xr1hybpN3fMxoTlMqg++BixETBMWzS4y9s08oHJKXgKtudsoxhITNOEf1OR66w=="
       },
       "MediatR": {
         "type": "Transitive",

diff --git a/src/vs-bicep/Bicep.VSLanguageServerClient.ItemTemplate/packages.lock.json b/src/vs-bicep/Bicep.VSLanguageServerClient.ItemTemplate/packages.lock.json
@@ -50,9 +50,9 @@
       },
       "Nerdbank.GitVersioning": {
         "type": "Direct",
-        "requested": "[3.6.143, )",
-        "resolved": "3.6.143",
-        "contentHash": "N24MtdLq4PmdJ2woTQd9515q0I1jeO/DlimYCB/GoRd510Fc9dk9H6YaN8MPPrVF8RHrIalCUfWbWvcoarYeoQ=="
+        "requested": "[3.6.146, )",
+        "resolved": "3.6.146",
+        "contentHash": "W1eQ8hD9Y/cZ2+ilgxECl003xr1hybpN3fMxoTlMqg++BixETBMWzS4y9s08oHJKXgKtudsoxhITNOEf1OR66w=="
       },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "Transitive",

diff --git a/src/vs-bicep/Bicep.VSLanguageServerClient.TestServices/packages.lock.json b/src/vs-bicep/Bicep.VSLanguageServerClient.TestServices/packages.lock.json
@@ -248,9 +248,9 @@
       },
       "Nerdbank.GitVersioning": {
         "type": "Direct",
-        "requested": "[3.6.143, )",
-        "resolved": "3.6.143",
-        "contentHash": "N24MtdLq4PmdJ2woTQd9515q0I1jeO/DlimYCB/GoRd510Fc9dk9H6YaN8MPPrVF8RHrIalCUfWbWvcoarYeoQ=="
+        "requested": "[3.6.146, )",
+        "resolved": "3.6.146",
+        "contentHash": "W1eQ8hD9Y/cZ2+ilgxECl003xr1hybpN3fMxoTlMqg++BixETBMWzS4y9s08oHJKXgKtudsoxhITNOEf1OR66w=="
       },
       "MediatR": {
         "type": "Transitive",

diff --git a/src/vs-bicep/Bicep.VSLanguageServerClient.UnitTests/packages.lock.json b/src/vs-bicep/Bicep.VSLanguageServerClient.UnitTests/packages.lock.json
@@ -133,9 +133,9 @@
       },
       "Nerdbank.GitVersioning": {
         "type": "Direct",
-        "requested": "[3.6.143, )",
-        "resolved": "3.6.143",
-        "contentHash": "N24MtdLq4PmdJ2woTQd9515q0I1jeO/DlimYCB/GoRd510Fc9dk9H6YaN8MPPrVF8RHrIalCUfWbWvcoarYeoQ=="
+        "requested": "[3.6.146, )",
+        "resolved": "3.6.146",
+        "contentHash": "W1eQ8hD9Y/cZ2+ilgxECl003xr1hybpN3fMxoTlMqg++BixETBMWzS4y9s08oHJKXgKtudsoxhITNOEf1OR66w=="
       },
       "Castle.Core": {
         "type": "Transitive",

diff --git a/src/vs-bicep/Bicep.VSLanguageServerClient.Vsix/Bicep.VSLanguageServerClient.Vsix.csproj b/src/vs-bicep/Bicep.VSLanguageServerClient.Vsix/Bicep.VSLanguageServerClient.Vsix.csproj
@@ -63,7 +63,7 @@
     <PackageReference Include="Microsoft.VisualStudio.SDK">
       <Version>17.11.40262</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.11.435">
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.12.2069">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/vs-bicep/Bicep.VSLanguageServerClient.Vsix/packages.lock.json b/src/vs-bicep/Bicep.VSLanguageServerClient.Vsix/packages.lock.json
@@ -164,19 +164,19 @@
       },
       "Microsoft.VSSDK.BuildTools": {
         "type": "Direct",
-        "requested": "[17.11.435, )",
-        "resolved": "17.11.435",
-        "contentHash": "u62AmujlY7r5so93Cz0KKkzHJvcJ6/UM9/DWRS/zqINz8nlRTB9svwndg1sedrboPggf5uGHoxD5rmj5O/Z0mA==",
+        "requested": "[17.12.2069, )",
+        "resolved": "17.12.2069",
+        "contentHash": "pXOjfaoC926Z2ApbbXBNWWlTPJPDiJdp+kb+bdx5xxOr68yHwTgDD/i3q7JMtKJkHddufYYItRFr3P0/ylP4Sg==",
         "dependencies": {
-          "Microsoft.VisualStudio.SDK.Analyzers": "17.7.41",
-          "Microsoft.VsSDK.CompatibilityAnalyzer": "17.11.435"
+          "Microsoft.VisualStudio.SDK.Analyzers": "17.7.47",
+          "Microsoft.VsSDK.CompatibilityAnalyzer": "17.12.2069"
         }
       },
       "Nerdbank.GitVersioning": {
         "type": "Direct",
-        "requested": "[3.6.143, )",
-        "resolved": "3.6.143",
-        "contentHash": "N24MtdLq4PmdJ2woTQd9515q0I1jeO/DlimYCB/GoRd510Fc9dk9H6YaN8MPPrVF8RHrIalCUfWbWvcoarYeoQ=="
+        "requested": "[3.6.146, )",
+        "resolved": "3.6.146",
+        "contentHash": "W1eQ8hD9Y/cZ2+ilgxECl003xr1hybpN3fMxoTlMqg++BixETBMWzS4y9s08oHJKXgKtudsoxhITNOEf1OR66w=="
       },
       "envdte": {
         "type": "Transitive",
@@ -917,8 +917,8 @@
       },
       "Microsoft.VisualStudio.SDK.Analyzers": {
         "type": "Transitive",
-        "resolved": "17.7.41",
-        "contentHash": "m+z9Li+FThM9BtsvsAEcZP4563DnmfxyCGItaMJHFmfSKMjuZ0t8g8yNdySGB69oKfS3vcA2vOReDHixdSSclQ=="
+        "resolved": "17.7.47",
+        "contentHash": "dP4SOup0OMy8s1cTD4oYXlLd6JrDb8Gp4+1fR+vUuvgLDSuGFWS/8B23GQ670NICw5AadUUK9T9sCvYmpW8/Ig=="
       },
       "Microsoft.VisualStudio.Setup.Configuration.Interop": {
         "type": "Transitive",
@@ -1445,8 +1445,8 @@
       },
       "Microsoft.VsSDK.CompatibilityAnalyzer": {
         "type": "Transitive",
-        "resolved": "17.11.435",
-        "contentHash": "EZbEMCAFA5rVXPHiIth4q9iKZqDbkBYqG/GRT8COUS5/0kSTQ/e1foz4K6xIpjdBsu2qeLg0hCPl/pmiMLhl1g=="
+        "resolved": "17.12.2069",
+        "contentHash": "kQB0zReJK0ezXxi8cGBpMr7r1x2vnftuEn2Qp7pvZnFsP2mTQVauBYioptxStvGcbX9sIfo2YSenYQiShsh+vA=="
       },
       "Microsoft.Win32.Primitives": {
         "type": "Transitive",

diff --git a/src/vs-bicep/Bicep.VSLanguageServerClient/packages.lock.json b/src/vs-bicep/Bicep.VSLanguageServerClient/packages.lock.json
@@ -218,9 +218,9 @@
       },
       "Nerdbank.GitVersioning": {
         "type": "Direct",
-        "requested": "[3.6.143, )",
-        "resolved": "3.6.143",
-        "contentHash": "N24MtdLq4PmdJ2woTQd9515q0I1jeO/DlimYCB/GoRd510Fc9dk9H6YaN8MPPrVF8RHrIalCUfWbWvcoarYeoQ=="
+        "requested": "[3.6.146, )",
+        "resolved": "3.6.146",
+        "contentHash": "W1eQ8hD9Y/cZ2+ilgxECl003xr1hybpN3fMxoTlMqg++BixETBMWzS4y9s08oHJKXgKtudsoxhITNOEf1OR66w=="
       },
       "OmniSharp.Extensions.LanguageServer": {
         "type": "Direct",

diff --git a/src/vscode-bicep/package-lock.json b/src/vscode-bicep/package-lock.json
diff --git a/src/vscode-bicep/package.json b/src/vscode-bicep/package.json
@@ -809,7 +809,7 @@
     "@azure/arm-subscriptions": "^5.1.0",
     "@azure/identity": "^4.4.1",
     "@microsoft/vscode-azext-azureutils": "^3.1.1",
-    "@microsoft/vscode-azext-utils": "^2.5.9",
+    "@microsoft/vscode-azext-utils": "^2.5.10",
     "@vscode-bicep-ui/components": "file:../vscode-bicep-ui/packages/components",
     "@vscode/webview-ui-toolkit": "^1.4.0",
     "cytoscape": "^3.30.2",