Skip to content

Commit e9abaf1

Browse files
Fix mirror build: Revert "Bump Microsoft.VisualStudio.Telemetry from 16.5.6 to 17.9.305… (#13780)
… in /src/vs-bicep (#13683)" This reverts commit e588d82. # Contributing a Pull Request If you haven't already, read the full [contribution guide](https://github.com/Azure/bicep/blob/main/CONTRIBUTING.md). The guide may have changed since the last time you read it, so please double-check. Once you are done and ready to submit your PR, run through the relevant checklist below. ## Contributing to documentation * [ ] All documentation contributions should be made directly in the [Bicep documentation on Microsoft Docs](https://docs.microsoft.com/azure/azure-resource-manager/bicep/). ## Contributing an example We are integrating the Bicep examples into the [Azure QuickStart Templates](https://github.com/Azure/azure-quickstart-templates/blob/master/1-CONTRIBUTION-GUIDE/README.md). If you'd like to contribute new example `.bicep` files that showcase abilities of the language, please follow [these instructions](https://github.com/Azure/azure-quickstart-templates/blob/master/1-CONTRIBUTION-GUIDE/README.md) to add them directly there. We can still take bug reports and fixes for the existing examples for the time being. * [ ] This is a bug fix for an existing example * [ ] I have resolved all warnings and errors shown by the Bicep VS Code extension * [ ] I have checked that all tests are passing by running `dotnet test` * [ ] I have consistent casing for all of my identifiers and am using camelCasing unless I have a justification to use another casing style ## Contributing a feature * [ ] I have opened a new issue for the proposal, or commented on an existing one, and ensured that the Bicep maintainers are good with the design of the feature being implemented * [ ] I have included "Fixes #{issue_number}" in the PR description, so GitHub can link to the issue and close it when the PR is merged * [ ] I have appropriate test coverage of my new feature ## Contributing a snippet * [ ] I have a snippet that is either a single, generic resource or multi resource that uses [parent-child syntax](https://docs.microsoft.com/azure/azure-resource-manager/bicep/child-resource-name-type) * [ ] I have checked that there is not an equivalent snippet already submitted * [ ] I have used camelCasing unless I have a justification to use another casing style * [ ] I have placeholders values that correspond to their property names (e.g. `dnsPrefix: 'dnsPrefix'`), unless it's a property that MUST be changed or parameterized in order to deploy. In that case, I use 'REQUIRED' e.g. [keyData](./src/Bicep.LangServer/Files/SnippetTemplates/res-aks-cluster.bicep#L26) * [ ] I have my symbolic name as the first tab stop ($1) in the snippet. e.g. [res-aks-cluster.bicep](./src/Bicep.LangServer/Files/SnippetTemplates/res-aks-cluster.bicep) * [ ] I have a resource name property equal to "name" * [ ] If applicable, I have set the `location` property to `location: /*${<id>:location}*/'location'` (not `resourceGroup().location`) where `<id>` is a placeholder id, and added `param location string` to the test's main.bicep file so that the resulting main.combined.bicep file used in the tests compiles without errors * [ ] I have verified that the snippet deploys correctly when used in the context of an actual bicep file e.g. ```bicep resource aksCluster 'Microsoft.ContainerService/managedClusters@2021-03-01' = { name: 'name' ``` ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/Azure/bicep/pull/13780)
1 parent 2094f3b commit e9abaf1

File tree

6 files changed

+39
-36
lines changed

6 files changed

+39
-36
lines changed

src/vs-bicep/Bicep.VSLanguageServerClient.IntegrationTests/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@
11611161
"Microsoft.VisualStudio.Shell.Interop": "[17.9.37000, )",
11621162
"Microsoft.VisualStudio.Utilities": "[17.2.32505.113, )",
11631163
"Microsoft.VisualStudio.Workspace.VSIntegration": "[17.1.11-preview-0002, )",
1164-
"Microsoft.Visualstudio.Telemetry": "[17.9.305, )",
1164+
"Microsoft.Visualstudio.Telemetry": "[16.5.6, )",
11651165
"OmniSharp.Extensions.LanguageServer": "[0.19.7, )"
11661166
}
11671167
},

src/vs-bicep/Bicep.VSLanguageServerClient.TestServices/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@
10361036
"Microsoft.VisualStudio.Shell.Interop": "[17.9.37000, )",
10371037
"Microsoft.VisualStudio.Utilities": "[17.2.32505.113, )",
10381038
"Microsoft.VisualStudio.Workspace.VSIntegration": "[17.1.11-preview-0002, )",
1039-
"Microsoft.Visualstudio.Telemetry": "[17.9.305, )",
1039+
"Microsoft.Visualstudio.Telemetry": "[16.5.6, )",
10401040
"OmniSharp.Extensions.LanguageServer": "[0.19.7, )"
10411041
}
10421042
}

src/vs-bicep/Bicep.VSLanguageServerClient.UnitTests/packages.lock.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -480,10 +480,10 @@
480480
},
481481
"Microsoft.VisualStudio.RemoteControl": {
482482
"type": "Transitive",
483-
"resolved": "16.3.52",
484-
"contentHash": "+MgP1+Rtt1uJZyqhf7+H6KAQ57wc7v00ixuLhEgFggIbmW2/29YXfPK7gLvXw+vU7vimuM47cqAHrnB7RWYqtg==",
483+
"resolved": "16.3.44",
484+
"contentHash": "hbc2FxReEyotRXM1dtQSZxt2ccNMBgPbcX6MylKp9UDbHsTPJ0dk5CEuZAqoqOFKUzFtorZL6A7BcRAjP9HU1g==",
485485
"dependencies": {
486-
"Microsoft.VisualStudio.Utilities.Internal": "16.3.42"
486+
"Microsoft.VisualStudio.Utilities.Internal": "16.3.36"
487487
}
488488
},
489489
"Microsoft.VisualStudio.RpcContracts": {
@@ -555,13 +555,14 @@
555555
},
556556
"Microsoft.VisualStudio.Telemetry": {
557557
"type": "Transitive",
558-
"resolved": "17.9.305",
559-
"contentHash": "dWQlTc3o1zvnr0dFD+ZpC04gZtP3pzAMEQBK2oqPZoMRm4n3cj5sSNSlSugDjWHAnVAKzses/ZTvR2SHTyCQNA==",
558+
"resolved": "16.5.6",
559+
"contentHash": "afyxTJBcntD92T9Ce8gZxOgEZBLZXFA7kxQLW1gnbnF5yGBkeF8vdwIlvJ/aw6+Of0cgfjgY9J/bLGZ976puAQ==",
560560
"dependencies": {
561561
"Microsoft.CSharp": "4.7.0",
562-
"Microsoft.VisualStudio.RemoteControl": "16.3.52",
563-
"Microsoft.VisualStudio.Utilities.Internal": "16.3.56",
564-
"Newtonsoft.Json": "13.0.1"
562+
"Microsoft.VisualStudio.RemoteControl": "16.3.44",
563+
"Microsoft.VisualStudio.Utilities.Internal": "16.3.36",
564+
"Newtonsoft.Json": "13.0.1",
565+
"System.Runtime.CompilerServices.Unsafe": "5.0.0"
565566
}
566567
},
567568
"Microsoft.VisualStudio.Threading": {
@@ -578,8 +579,8 @@
578579
},
579580
"Microsoft.VisualStudio.Utilities.Internal": {
580581
"type": "Transitive",
581-
"resolved": "16.3.56",
582-
"contentHash": "QX5UVVk4+/rPu3Xy3QRAntNBy/3VMl2whwSlt73Ksp6MRf5ersUopgmHbkEnWSTX6e/SZf+mfqTmvdk67URH2Q=="
582+
"resolved": "16.3.36",
583+
"contentHash": "tVOE9DJbd4PETSgBW+9448jvRdhm/hNHJFaGyCq6Gtlg+ElELBmfMFxgp2rsrqzUkLjehwnrw6uX4Yj9krOfJQ=="
583584
},
584585
"Microsoft.VisualStudio.Validation": {
585586
"type": "Transitive",
@@ -992,7 +993,7 @@
992993
"Microsoft.VisualStudio.Shell.Interop": "[17.9.37000, )",
993994
"Microsoft.VisualStudio.Utilities": "[17.2.32505.113, )",
994995
"Microsoft.VisualStudio.Workspace.VSIntegration": "[17.1.11-preview-0002, )",
995-
"Microsoft.Visualstudio.Telemetry": "[17.9.305, )",
996+
"Microsoft.Visualstudio.Telemetry": "[16.5.6, )",
996997
"OmniSharp.Extensions.LanguageServer": "[0.19.7, )"
997998
}
998999
}

src/vs-bicep/Bicep.VSLanguageServerClient.Vsix/packages.lock.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -655,10 +655,10 @@
655655
},
656656
"Microsoft.VisualStudio.RemoteControl": {
657657
"type": "Transitive",
658-
"resolved": "16.3.52",
659-
"contentHash": "+MgP1+Rtt1uJZyqhf7+H6KAQ57wc7v00ixuLhEgFggIbmW2/29YXfPK7gLvXw+vU7vimuM47cqAHrnB7RWYqtg==",
658+
"resolved": "16.3.44",
659+
"contentHash": "hbc2FxReEyotRXM1dtQSZxt2ccNMBgPbcX6MylKp9UDbHsTPJ0dk5CEuZAqoqOFKUzFtorZL6A7BcRAjP9HU1g==",
660660
"dependencies": {
661-
"Microsoft.VisualStudio.Utilities.Internal": "16.3.42"
661+
"Microsoft.VisualStudio.Utilities.Internal": "16.3.36"
662662
}
663663
},
664664
"Microsoft.VisualStudio.RpcContracts": {
@@ -786,13 +786,14 @@
786786
},
787787
"Microsoft.VisualStudio.Telemetry": {
788788
"type": "Transitive",
789-
"resolved": "17.9.305",
790-
"contentHash": "dWQlTc3o1zvnr0dFD+ZpC04gZtP3pzAMEQBK2oqPZoMRm4n3cj5sSNSlSugDjWHAnVAKzses/ZTvR2SHTyCQNA==",
789+
"resolved": "16.5.6",
790+
"contentHash": "afyxTJBcntD92T9Ce8gZxOgEZBLZXFA7kxQLW1gnbnF5yGBkeF8vdwIlvJ/aw6+Of0cgfjgY9J/bLGZ976puAQ==",
791791
"dependencies": {
792792
"Microsoft.CSharp": "4.7.0",
793-
"Microsoft.VisualStudio.RemoteControl": "16.3.52",
794-
"Microsoft.VisualStudio.Utilities.Internal": "16.3.56",
795-
"Newtonsoft.Json": "13.0.1"
793+
"Microsoft.VisualStudio.RemoteControl": "16.3.44",
794+
"Microsoft.VisualStudio.Utilities.Internal": "16.3.36",
795+
"Newtonsoft.Json": "13.0.1",
796+
"System.Runtime.CompilerServices.Unsafe": "5.0.0"
796797
}
797798
},
798799
"Microsoft.VisualStudio.Text.Data": {
@@ -958,8 +959,8 @@
958959
},
959960
"Microsoft.VisualStudio.Utilities.Internal": {
960961
"type": "Transitive",
961-
"resolved": "16.3.56",
962-
"contentHash": "QX5UVVk4+/rPu3Xy3QRAntNBy/3VMl2whwSlt73Ksp6MRf5ersUopgmHbkEnWSTX6e/SZf+mfqTmvdk67URH2Q=="
962+
"resolved": "16.3.36",
963+
"contentHash": "tVOE9DJbd4PETSgBW+9448jvRdhm/hNHJFaGyCq6Gtlg+ElELBmfMFxgp2rsrqzUkLjehwnrw6uX4Yj9krOfJQ=="
963964
},
964965
"Microsoft.VisualStudio.Validation": {
965966
"type": "Transitive",
@@ -1468,7 +1469,7 @@
14681469
"Microsoft.VisualStudio.Shell.Interop": "[17.9.37000, )",
14691470
"Microsoft.VisualStudio.Utilities": "[17.2.32505.113, )",
14701471
"Microsoft.VisualStudio.Workspace.VSIntegration": "[17.1.11-preview-0002, )",
1471-
"Microsoft.Visualstudio.Telemetry": "[17.9.305, )",
1472+
"Microsoft.Visualstudio.Telemetry": "[16.5.6, )",
14721473
"OmniSharp.Extensions.LanguageServer": "[0.19.7, )"
14731474
}
14741475
}

src/vs-bicep/Bicep.VSLanguageServerClient/Bicep.VSLanguageServerClient.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol" Version="17.2.8" />
1616
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.9.2164" />
1717
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop" Version="17.9.37000" />
18-
<PackageReference Include="Microsoft.Visualstudio.Telemetry" Version="17.9.305" />
18+
<PackageReference Include="Microsoft.Visualstudio.Telemetry" Version="16.5.6" />
1919
<PackageReference Include="Microsoft.VisualStudio.Utilities" Version="17.2.32505.113" />
2020
<PackageReference Include="Microsoft.VisualStudio.Workspace.VSIntegration" Version="17.1.11-preview-0002" />
2121
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.7" />

src/vs-bicep/Bicep.VSLanguageServerClient/packages.lock.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,15 @@
6969
},
7070
"Microsoft.VisualStudio.Telemetry": {
7171
"type": "Direct",
72-
"requested": "[17.9.305, )",
73-
"resolved": "17.9.305",
74-
"contentHash": "dWQlTc3o1zvnr0dFD+ZpC04gZtP3pzAMEQBK2oqPZoMRm4n3cj5sSNSlSugDjWHAnVAKzses/ZTvR2SHTyCQNA==",
72+
"requested": "[16.5.6, )",
73+
"resolved": "16.5.6",
74+
"contentHash": "afyxTJBcntD92T9Ce8gZxOgEZBLZXFA7kxQLW1gnbnF5yGBkeF8vdwIlvJ/aw6+Of0cgfjgY9J/bLGZ976puAQ==",
7575
"dependencies": {
7676
"Microsoft.CSharp": "4.7.0",
77-
"Microsoft.VisualStudio.RemoteControl": "16.3.52",
78-
"Microsoft.VisualStudio.Utilities.Internal": "16.3.56",
79-
"Newtonsoft.Json": "13.0.1"
77+
"Microsoft.VisualStudio.RemoteControl": "16.3.44",
78+
"Microsoft.VisualStudio.Utilities.Internal": "16.3.36",
79+
"Newtonsoft.Json": "13.0.1",
80+
"System.Runtime.CompilerServices.Unsafe": "5.0.0"
8081
}
8182
},
8283
"Microsoft.VisualStudio.Threading.Analyzers": {
@@ -432,10 +433,10 @@
432433
},
433434
"Microsoft.VisualStudio.RemoteControl": {
434435
"type": "Transitive",
435-
"resolved": "16.3.52",
436-
"contentHash": "+MgP1+Rtt1uJZyqhf7+H6KAQ57wc7v00ixuLhEgFggIbmW2/29YXfPK7gLvXw+vU7vimuM47cqAHrnB7RWYqtg==",
436+
"resolved": "16.3.44",
437+
"contentHash": "hbc2FxReEyotRXM1dtQSZxt2ccNMBgPbcX6MylKp9UDbHsTPJ0dk5CEuZAqoqOFKUzFtorZL6A7BcRAjP9HU1g==",
437438
"dependencies": {
438-
"Microsoft.VisualStudio.Utilities.Internal": "16.3.42"
439+
"Microsoft.VisualStudio.Utilities.Internal": "16.3.36"
439440
}
440441
},
441442
"Microsoft.VisualStudio.RpcContracts": {
@@ -506,8 +507,8 @@
506507
},
507508
"Microsoft.VisualStudio.Utilities.Internal": {
508509
"type": "Transitive",
509-
"resolved": "16.3.56",
510-
"contentHash": "QX5UVVk4+/rPu3Xy3QRAntNBy/3VMl2whwSlt73Ksp6MRf5ersUopgmHbkEnWSTX6e/SZf+mfqTmvdk67URH2Q=="
510+
"resolved": "16.3.36",
511+
"contentHash": "tVOE9DJbd4PETSgBW+9448jvRdhm/hNHJFaGyCq6Gtlg+ElELBmfMFxgp2rsrqzUkLjehwnrw6uX4Yj9krOfJQ=="
511512
},
512513
"Microsoft.VisualStudio.Validation": {
513514
"type": "Transitive",

0 commit comments

Comments
 (0)