diff --git a/docs/release-checklist.md b/docs/release-checklist.md index d955bbdc03d..91f2d74820a 100644 --- a/docs/release-checklist.md +++ b/docs/release-checklist.md @@ -33,13 +33,13 @@ 1. Upload copyleft dependency source to 3rd party disclosure site. See [instructions](https://msazure.visualstudio.com/One/_wiki/wikis/Azure%20Deployments%20Team%20Wiki/369910/Bicep-release-step-Upload-copyleft-source-to-3rd-party-disclosure-site). 1. Upload vscode-bicep.VSIX to the VS marketplace [here](https://marketplace.visualstudio.com/manage). You may need access permissions, request help in the team channel. 1. Click on the ... for Bicep, then Update, then upload the .vsix file. The site will verify it then the version number should be updated to the right one. -1. ⚠️ **[READ THIS BEFORE PROCEED] Copy/paste the text from the current version of src\vs-bicep\README.md over the existing text in the "Overview" field (this can only be changed on the marketplace when publishing a new version)** +1. ⚠️ **[READ THIS BEFORE PROCEED] Copy/paste the text from the current version of [src\vs-bicep\README.md](https://github.com/Azure/bicep/blob/main/src/vs-bicep/README.md) over the existing text in the "Overview" field for the next step of uploading vs-bicep.vsix to the VS marketplace (this can only be changed on the marketplace when publishing a new version)** 1. Upload vs-bicep.VSIX to VS marketplace 1. Click on the ... for Bicep for Visual Studio, then Edit. 1. Upload the new vs-bicep.VSIX file at the top. This should update the Version number automatically for you. Verify that it does. 1. Scroll to the bottom and hit Save and Upload. -1. Upload NuGet packages to nuget.org via `BicepMirror/scripts/PublishPackages.ps1`. This is an almost identical process to publishing the BicepMirror-Types-Az nuget packages so look at that previous step above. (Make sure to include CLI packages.) This can be done one of two ways: - 1. Easiest is to use the `__assets` directory created by the `UploadSignedReleaseArtifacts.ps1` script. +1. Upload NuGet packages to nuget.org via `BicepMirror/scripts/UploadPackages.ps1`. This is an almost identical process to publishing the BicepMirror-Types-Az nuget packages so look at that previous step above. (Make sure to include CLI packages.) This can be done one of two ways: + 1. Easiest is to use the `__assets` directory created by the `UploadSignedReleaseArtifacts.ps1` script. This will be in the temporary folder you created before. (Example command: `.\scripts\UploadPackages.ps1 -PackageDirectory .\temporary\__assets\ -NuGetPath C:\NugetTool\`) 2. You can also download all the files from the published release into a separate folder and run the script using that folder. (The script looks for files ending in *.nupkg) 1. Update homebrew by going here [here](https://github.com/Azure/homebrew-bicep/actions/workflows/update-homebrew.yml) and clicking on `Run workflow` - A PR will be auto created by this action (example [here](https://github.com/Azure/homebrew-bicep/pull/40)). Approve and merge it. diff --git a/src/Bicep.Cli.IntegrationTests/Bicep.Cli.IntegrationTests.csproj b/src/Bicep.Cli.IntegrationTests/Bicep.Cli.IntegrationTests.csproj index 36f38390726..aea58e05a7f 100644 --- a/src/Bicep.Cli.IntegrationTests/Bicep.Cli.IntegrationTests.csproj +++ b/src/Bicep.Cli.IntegrationTests/Bicep.Cli.IntegrationTests.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Bicep.Cli.IntegrationTests/packages.lock.json b/src/Bicep.Cli.IntegrationTests/packages.lock.json index e77c6d3776a..ad06766bafb 100644 --- a/src/Bicep.Cli.IntegrationTests/packages.lock.json +++ b/src/Bicep.Cli.IntegrationTests/packages.lock.json @@ -51,12 +51,12 @@ }, "MSTest.TestAdapter": { "type": "Direct", - "requested": "[3.6.4, )", - "resolved": "3.6.4", - "contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==", + "requested": "[3.7.3, )", + "resolved": "3.7.3", + "contentHash": "Ro3TnkC+TfovOTFd93DnzDF/ickJkkAYVmnzrjvY3FUduRcTJLIOJee9kiP1o3q1aPqmJSK6CobdvyWXubajWw==", "dependencies": { - "Microsoft.Testing.Extensions.VSTestBridge": "1.4.3", - "Microsoft.Testing.Platform.MSBuild": "1.4.3" + "Microsoft.Testing.Extensions.VSTestBridge": "1.5.3", + "Microsoft.Testing.Platform.MSBuild": "1.5.3" } }, "MSTest.TestFramework": { @@ -675,44 +675,44 @@ }, "Microsoft.Testing.Extensions.Telemetry": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==", + "resolved": "1.5.3", + "contentHash": "U9pGd5DQuX1PfkrdFI+xH34JGgQ2nes5QAwIITTk+MQfLvRITqsZjJeHTjpGWh33D/0q1l7aA8/LQHR7UuCgLQ==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.TrxReport.Abstractions": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==", + "resolved": "1.5.3", + "contentHash": "h34zKNpGyni66VH738mRHeXSnf3klSShUdavUWNhSfWICUUi5aXeI0LBvoX/ad93N0+9xBDU3Fyi6WfxrwKQGw==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.VSTestBridge": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==", + "resolved": "1.5.3", + "contentHash": "cJD67YfDT98wEWyazKVD/yPVW6+H1usXeuselCnRes7JZBTIYWtrCchcOzOahnmajT79eDKqt9sta7DXwTDU4Q==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.TestPlatform.ObjectModel": "17.11.1", - "Microsoft.Testing.Extensions.Telemetry": "1.4.3", - "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.TestPlatform.ObjectModel": "17.12.0", + "Microsoft.Testing.Extensions.Telemetry": "1.5.3", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.5.3", + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Platform": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA==" + "resolved": "1.5.3", + "contentHash": "WqJydnJ99dEKtquR9HwINz104ehWJKTXbQQrydGatlLRw14bmsx0pa8+E6KUXMYXZAimN0swWlDmcJGjjW4TIg==" }, "Microsoft.Testing.Platform.MSBuild": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==", + "resolved": "1.5.3", + "contentHash": "bOtpRMSPeT5YLQo+NNY8EtdNTphAUcmALjW4ABU7P0rb6yR2XAZau3TzNieLmR3lRuwudguWzzBhgcLRXwZh0A==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.TestPlatform.ObjectModel": { @@ -1647,7 +1647,7 @@ "type": "Project", "dependencies": { "FluentAssertions": "[7.0.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )", "bicep": "[1.0.0, )" @@ -1659,7 +1659,7 @@ "Azure.Bicep.Core": "[1.0.0, )", "Bicep.Core.UnitTests": "[1.0.0, )", "FluentAssertions": "[7.0.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )" } @@ -1672,7 +1672,7 @@ "DiffPlex": "[1.7.2, )", "FluentAssertions": "[7.0.0, )", "JsonDiffPatch.Net": "[2.3.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )", "Moq": "[4.20.72, )", diff --git a/src/Bicep.Cli.UnitTests/Bicep.Cli.UnitTests.csproj b/src/Bicep.Cli.UnitTests/Bicep.Cli.UnitTests.csproj index 5d602d58422..44ed8bb8d66 100644 --- a/src/Bicep.Cli.UnitTests/Bicep.Cli.UnitTests.csproj +++ b/src/Bicep.Cli.UnitTests/Bicep.Cli.UnitTests.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Bicep.Cli.UnitTests/packages.lock.json b/src/Bicep.Cli.UnitTests/packages.lock.json index fbea1f3e837..0a9b6923c88 100644 --- a/src/Bicep.Cli.UnitTests/packages.lock.json +++ b/src/Bicep.Cli.UnitTests/packages.lock.json @@ -51,12 +51,12 @@ }, "MSTest.TestAdapter": { "type": "Direct", - "requested": "[3.6.4, )", - "resolved": "3.6.4", - "contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==", + "requested": "[3.7.3, )", + "resolved": "3.7.3", + "contentHash": "Ro3TnkC+TfovOTFd93DnzDF/ickJkkAYVmnzrjvY3FUduRcTJLIOJee9kiP1o3q1aPqmJSK6CobdvyWXubajWw==", "dependencies": { - "Microsoft.Testing.Extensions.VSTestBridge": "1.4.3", - "Microsoft.Testing.Platform.MSBuild": "1.4.3" + "Microsoft.Testing.Extensions.VSTestBridge": "1.5.3", + "Microsoft.Testing.Platform.MSBuild": "1.5.3" } }, "MSTest.TestFramework": { @@ -647,44 +647,44 @@ }, "Microsoft.Testing.Extensions.Telemetry": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==", + "resolved": "1.5.3", + "contentHash": "U9pGd5DQuX1PfkrdFI+xH34JGgQ2nes5QAwIITTk+MQfLvRITqsZjJeHTjpGWh33D/0q1l7aA8/LQHR7UuCgLQ==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.TrxReport.Abstractions": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==", + "resolved": "1.5.3", + "contentHash": "h34zKNpGyni66VH738mRHeXSnf3klSShUdavUWNhSfWICUUi5aXeI0LBvoX/ad93N0+9xBDU3Fyi6WfxrwKQGw==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.VSTestBridge": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==", + "resolved": "1.5.3", + "contentHash": "cJD67YfDT98wEWyazKVD/yPVW6+H1usXeuselCnRes7JZBTIYWtrCchcOzOahnmajT79eDKqt9sta7DXwTDU4Q==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.TestPlatform.ObjectModel": "17.11.1", - "Microsoft.Testing.Extensions.Telemetry": "1.4.3", - "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.TestPlatform.ObjectModel": "17.12.0", + "Microsoft.Testing.Extensions.Telemetry": "1.5.3", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.5.3", + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Platform": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA==" + "resolved": "1.5.3", + "contentHash": "WqJydnJ99dEKtquR9HwINz104ehWJKTXbQQrydGatlLRw14bmsx0pa8+E6KUXMYXZAimN0swWlDmcJGjjW4TIg==" }, "Microsoft.Testing.Platform.MSBuild": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==", + "resolved": "1.5.3", + "contentHash": "bOtpRMSPeT5YLQo+NNY8EtdNTphAUcmALjW4ABU7P0rb6yR2XAZau3TzNieLmR3lRuwudguWzzBhgcLRXwZh0A==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.TestPlatform.ObjectModel": { diff --git a/src/Bicep.Core.IntegrationTests/Bicep.Core.IntegrationTests.csproj b/src/Bicep.Core.IntegrationTests/Bicep.Core.IntegrationTests.csproj index f857fd812ca..fb078307cca 100644 --- a/src/Bicep.Core.IntegrationTests/Bicep.Core.IntegrationTests.csproj +++ b/src/Bicep.Core.IntegrationTests/Bicep.Core.IntegrationTests.csproj @@ -18,7 +18,7 @@ - + all diff --git a/src/Bicep.Core.IntegrationTests/ScenarioTests.cs b/src/Bicep.Core.IntegrationTests/ScenarioTests.cs index df1ec4fa5ba..55bcf8e4f96 100644 --- a/src/Bicep.Core.IntegrationTests/ScenarioTests.cs +++ b/src/Bicep.Core.IntegrationTests/ScenarioTests.cs @@ -6748,6 +6748,36 @@ param descriptionParam string }); } + [TestMethod] + public void Test_Issue16219() + { + // https://www.github.com/Azure/bicep/issues/16219 + var result = CompilationHelper.Compile(""" + @description('Required. The name of the Public IP Address.') + param name string + + resource publicIpAddress 'Microsoft.Network/publicIPAddresses@2023-09-01' = { + name: name + location: resourceGroup().location + sku: { + name: 'Basic' + tier: 'Regional' + } + properties: { + publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Static' + idleTimeoutInMinutes: 4 + ipTags: [] + } + } + + @description('The public IP address of the public IP address resource.') + output ipAddress string = contains(publicIpAddress.properties, 'ipAddress') ? publicIpAddress.properties.ipAddress : '' + """); + + result.ExcludingDiagnostics("use-safe-access").Should().NotHaveAnyDiagnostics(); + } + [TestMethod] public void Test_Issue16230() { diff --git a/src/Bicep.Core.IntegrationTests/packages.lock.json b/src/Bicep.Core.IntegrationTests/packages.lock.json index 99f4223eeb3..43586830217 100644 --- a/src/Bicep.Core.IntegrationTests/packages.lock.json +++ b/src/Bicep.Core.IntegrationTests/packages.lock.json @@ -51,12 +51,12 @@ }, "MSTest.TestAdapter": { "type": "Direct", - "requested": "[3.6.4, )", - "resolved": "3.6.4", - "contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==", + "requested": "[3.7.3, )", + "resolved": "3.7.3", + "contentHash": "Ro3TnkC+TfovOTFd93DnzDF/ickJkkAYVmnzrjvY3FUduRcTJLIOJee9kiP1o3q1aPqmJSK6CobdvyWXubajWw==", "dependencies": { - "Microsoft.Testing.Extensions.VSTestBridge": "1.4.3", - "Microsoft.Testing.Platform.MSBuild": "1.4.3" + "Microsoft.Testing.Extensions.VSTestBridge": "1.5.3", + "Microsoft.Testing.Platform.MSBuild": "1.5.3" } }, "MSTest.TestFramework": { @@ -642,44 +642,44 @@ }, "Microsoft.Testing.Extensions.Telemetry": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==", + "resolved": "1.5.3", + "contentHash": "U9pGd5DQuX1PfkrdFI+xH34JGgQ2nes5QAwIITTk+MQfLvRITqsZjJeHTjpGWh33D/0q1l7aA8/LQHR7UuCgLQ==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.TrxReport.Abstractions": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==", + "resolved": "1.5.3", + "contentHash": "h34zKNpGyni66VH738mRHeXSnf3klSShUdavUWNhSfWICUUi5aXeI0LBvoX/ad93N0+9xBDU3Fyi6WfxrwKQGw==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.VSTestBridge": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==", + "resolved": "1.5.3", + "contentHash": "cJD67YfDT98wEWyazKVD/yPVW6+H1usXeuselCnRes7JZBTIYWtrCchcOzOahnmajT79eDKqt9sta7DXwTDU4Q==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.TestPlatform.ObjectModel": "17.11.1", - "Microsoft.Testing.Extensions.Telemetry": "1.4.3", - "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.TestPlatform.ObjectModel": "17.12.0", + "Microsoft.Testing.Extensions.Telemetry": "1.5.3", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.5.3", + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Platform": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA==" + "resolved": "1.5.3", + "contentHash": "WqJydnJ99dEKtquR9HwINz104ehWJKTXbQQrydGatlLRw14bmsx0pa8+E6KUXMYXZAimN0swWlDmcJGjjW4TIg==" }, "Microsoft.Testing.Platform.MSBuild": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==", + "resolved": "1.5.3", + "contentHash": "bOtpRMSPeT5YLQo+NNY8EtdNTphAUcmALjW4ABU7P0rb6yR2XAZau3TzNieLmR3lRuwudguWzzBhgcLRXwZh0A==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.TestPlatform.ObjectModel": { @@ -1562,7 +1562,7 @@ "Azure.Bicep.Core": "[1.0.0, )", "Bicep.Core.UnitTests": "[1.0.0, )", "FluentAssertions": "[7.0.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )" } @@ -1575,7 +1575,7 @@ "DiffPlex": "[1.7.2, )", "FluentAssertions": "[7.0.0, )", "JsonDiffPatch.Net": "[2.3.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )", "Moq": "[4.20.72, )", diff --git a/src/Bicep.Core.Samples/Bicep.Core.Samples.csproj b/src/Bicep.Core.Samples/Bicep.Core.Samples.csproj index a8ed45148d2..67026c3f299 100644 --- a/src/Bicep.Core.Samples/Bicep.Core.Samples.csproj +++ b/src/Bicep.Core.Samples/Bicep.Core.Samples.csproj @@ -16,7 +16,7 @@ - + all diff --git a/src/Bicep.Core.Samples/packages.lock.json b/src/Bicep.Core.Samples/packages.lock.json index 145f054ed49..e217ae7a968 100644 --- a/src/Bicep.Core.Samples/packages.lock.json +++ b/src/Bicep.Core.Samples/packages.lock.json @@ -51,12 +51,12 @@ }, "MSTest.TestAdapter": { "type": "Direct", - "requested": "[3.6.4, )", - "resolved": "3.6.4", - "contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==", + "requested": "[3.7.3, )", + "resolved": "3.7.3", + "contentHash": "Ro3TnkC+TfovOTFd93DnzDF/ickJkkAYVmnzrjvY3FUduRcTJLIOJee9kiP1o3q1aPqmJSK6CobdvyWXubajWw==", "dependencies": { - "Microsoft.Testing.Extensions.VSTestBridge": "1.4.3", - "Microsoft.Testing.Platform.MSBuild": "1.4.3" + "Microsoft.Testing.Extensions.VSTestBridge": "1.5.3", + "Microsoft.Testing.Platform.MSBuild": "1.5.3" } }, "MSTest.TestFramework": { @@ -642,44 +642,44 @@ }, "Microsoft.Testing.Extensions.Telemetry": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==", + "resolved": "1.5.3", + "contentHash": "U9pGd5DQuX1PfkrdFI+xH34JGgQ2nes5QAwIITTk+MQfLvRITqsZjJeHTjpGWh33D/0q1l7aA8/LQHR7UuCgLQ==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.TrxReport.Abstractions": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==", + "resolved": "1.5.3", + "contentHash": "h34zKNpGyni66VH738mRHeXSnf3klSShUdavUWNhSfWICUUi5aXeI0LBvoX/ad93N0+9xBDU3Fyi6WfxrwKQGw==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.VSTestBridge": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==", + "resolved": "1.5.3", + "contentHash": "cJD67YfDT98wEWyazKVD/yPVW6+H1usXeuselCnRes7JZBTIYWtrCchcOzOahnmajT79eDKqt9sta7DXwTDU4Q==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.TestPlatform.ObjectModel": "17.11.1", - "Microsoft.Testing.Extensions.Telemetry": "1.4.3", - "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.TestPlatform.ObjectModel": "17.12.0", + "Microsoft.Testing.Extensions.Telemetry": "1.5.3", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.5.3", + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Platform": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA==" + "resolved": "1.5.3", + "contentHash": "WqJydnJ99dEKtquR9HwINz104ehWJKTXbQQrydGatlLRw14bmsx0pa8+E6KUXMYXZAimN0swWlDmcJGjjW4TIg==" }, "Microsoft.Testing.Platform.MSBuild": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==", + "resolved": "1.5.3", + "contentHash": "bOtpRMSPeT5YLQo+NNY8EtdNTphAUcmALjW4ABU7P0rb6yR2XAZau3TzNieLmR3lRuwudguWzzBhgcLRXwZh0A==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.TestPlatform.ObjectModel": { @@ -1564,7 +1564,7 @@ "DiffPlex": "[1.7.2, )", "FluentAssertions": "[7.0.0, )", "JsonDiffPatch.Net": "[2.3.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )", "Moq": "[4.20.72, )", diff --git a/src/Bicep.Core.UnitTests/Bicep.Core.UnitTests.csproj b/src/Bicep.Core.UnitTests/Bicep.Core.UnitTests.csproj index 35d93d47c68..583b144b2e7 100644 --- a/src/Bicep.Core.UnitTests/Bicep.Core.UnitTests.csproj +++ b/src/Bicep.Core.UnitTests/Bicep.Core.UnitTests.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Bicep.Core.UnitTests/Diagnostics/Linter/Common/FindPossibleSecretsVisitorTests.cs b/src/Bicep.Core.UnitTests/Diagnostics/Linter/Common/FindPossibleSecretsVisitorTests.cs index bea6636c0f4..fe69fa992e9 100644 --- a/src/Bicep.Core.UnitTests/Diagnostics/Linter/Common/FindPossibleSecretsVisitorTests.cs +++ b/src/Bicep.Core.UnitTests/Diagnostics/Linter/Common/FindPossibleSecretsVisitorTests.cs @@ -105,7 +105,6 @@ param storageName string output test = v.listAnything().keys[0].value " )] - /* TODO: blocked by https://github.com/Azure/bicep/issues/4833 [DataRow(@" param storageName string @@ -119,8 +118,8 @@ param storageName string value: storage.listAnything().keys[0].value } ", - "Outputs should not contain secrets. function 'listAnything'" - )]*/ + "function 'listAnything'" + )] [DataRow( @" param storageName string diff --git a/src/Bicep.Core.UnitTests/packages.lock.json b/src/Bicep.Core.UnitTests/packages.lock.json index 466b555d000..4579ccf0e3d 100644 --- a/src/Bicep.Core.UnitTests/packages.lock.json +++ b/src/Bicep.Core.UnitTests/packages.lock.json @@ -75,12 +75,12 @@ }, "MSTest.TestAdapter": { "type": "Direct", - "requested": "[3.6.4, )", - "resolved": "3.6.4", - "contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==", + "requested": "[3.7.3, )", + "resolved": "3.7.3", + "contentHash": "Ro3TnkC+TfovOTFd93DnzDF/ickJkkAYVmnzrjvY3FUduRcTJLIOJee9kiP1o3q1aPqmJSK6CobdvyWXubajWw==", "dependencies": { - "Microsoft.Testing.Extensions.VSTestBridge": "1.4.3", - "Microsoft.Testing.Platform.MSBuild": "1.4.3" + "Microsoft.Testing.Extensions.VSTestBridge": "1.5.3", + "Microsoft.Testing.Platform.MSBuild": "1.5.3" } }, "MSTest.TestFramework": { @@ -677,44 +677,44 @@ }, "Microsoft.Testing.Extensions.Telemetry": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==", + "resolved": "1.5.3", + "contentHash": "U9pGd5DQuX1PfkrdFI+xH34JGgQ2nes5QAwIITTk+MQfLvRITqsZjJeHTjpGWh33D/0q1l7aA8/LQHR7UuCgLQ==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.TrxReport.Abstractions": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==", + "resolved": "1.5.3", + "contentHash": "h34zKNpGyni66VH738mRHeXSnf3klSShUdavUWNhSfWICUUi5aXeI0LBvoX/ad93N0+9xBDU3Fyi6WfxrwKQGw==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.VSTestBridge": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==", + "resolved": "1.5.3", + "contentHash": "cJD67YfDT98wEWyazKVD/yPVW6+H1usXeuselCnRes7JZBTIYWtrCchcOzOahnmajT79eDKqt9sta7DXwTDU4Q==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.TestPlatform.ObjectModel": "17.11.1", - "Microsoft.Testing.Extensions.Telemetry": "1.4.3", - "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.TestPlatform.ObjectModel": "17.12.0", + "Microsoft.Testing.Extensions.Telemetry": "1.5.3", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.5.3", + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Platform": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA==" + "resolved": "1.5.3", + "contentHash": "WqJydnJ99dEKtquR9HwINz104ehWJKTXbQQrydGatlLRw14bmsx0pa8+E6KUXMYXZAimN0swWlDmcJGjjW4TIg==" }, "Microsoft.Testing.Platform.MSBuild": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==", + "resolved": "1.5.3", + "contentHash": "bOtpRMSPeT5YLQo+NNY8EtdNTphAUcmALjW4ABU7P0rb6yR2XAZau3TzNieLmR3lRuwudguWzzBhgcLRXwZh0A==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.TestPlatform.ObjectModel": { diff --git a/src/Bicep.Core/Analyzers/Linter/Common/FindPossibleSecretsVisitor.cs b/src/Bicep.Core/Analyzers/Linter/Common/FindPossibleSecretsVisitor.cs index e15dae42e5a..c7f14697ae9 100644 --- a/src/Bicep.Core/Analyzers/Linter/Common/FindPossibleSecretsVisitor.cs +++ b/src/Bicep.Core/Analyzers/Linter/Common/FindPossibleSecretsVisitor.cs @@ -17,6 +17,7 @@ public record PossibleSecret(SyntaxBase Syntax, string FoundMessage) { } private readonly SemanticModel semanticModel; private readonly List possibleSecrets = new(); + private readonly HashSet currentlyProcessing = new(); private uint trailingAccessExpressions = 0; /// @@ -70,18 +71,16 @@ public override void VisitArrayAccessSyntax(ArrayAccessSyntax syntax) private static string PossibleSecretMessage(string possibleSecretName) => string.Format(CoreResources.PossibleSecretMessageSecureParam, possibleSecretName); - private IEnumerable FindPathsToSecureTypeComponents(TypeSymbol type) => FindPathsToSecureTypeComponents(type, "", new()); + private IEnumerable FindPathsToSecureTypeComponents(TypeSymbol type) => FindPathsToSecureTypeComponents(type, ""); - private IEnumerable FindPathsToSecureTypeComponents(TypeSymbol type, string path, HashSet visited) + private IEnumerable FindPathsToSecureTypeComponents(TypeSymbol type, string path) { // types can be recursive. cut out early if we've already seen this type - if (visited.Contains(type)) + if (!currentlyProcessing.Add(type)) { yield break; } - visited.Add(type); - if (type.ValidationFlags.HasFlag(TypeSymbolValidationFlags.IsSecure)) { yield return path; @@ -89,7 +88,7 @@ private IEnumerable FindPathsToSecureTypeComponents(TypeSymbol type, str if (type is UnionType union) { - foreach (var variantPath in union.Members.SelectMany(m => FindPathsToSecureTypeComponents(m.Type, path, visited))) + foreach (var variantPath in union.Members.SelectMany(m => FindPathsToSecureTypeComponents(m.Type, path))) { yield return variantPath; } @@ -118,25 +117,25 @@ private IEnumerable FindPathsToSecureTypeComponents(TypeSymbol type, str case ObjectType obj: if (obj.AdditionalProperties?.TypeReference.Type is TypeSymbol addlPropsType) { - foreach (var dictMemberPath in FindPathsToSecureTypeComponents(addlPropsType, $"{path}.*", visited)) + foreach (var dictMemberPath in FindPathsToSecureTypeComponents(addlPropsType, $"{path}.*")) { yield return dictMemberPath; } } - foreach (var propertyPath in obj.Properties.SelectMany(p => FindPathsToSecureTypeComponents(p.Value.TypeReference.Type, $"{path}.{p.Key}", visited))) + foreach (var propertyPath in obj.Properties.SelectMany(p => FindPathsToSecureTypeComponents(p.Value.TypeReference.Type, $"{path}.{p.Key}"))) { yield return propertyPath; } break; case TupleType tuple: - foreach (var pathFromIndex in tuple.Items.SelectMany((ITypeReference typeAtIndex, int index) => FindPathsToSecureTypeComponents(typeAtIndex.Type, $"{path}[{index}]", visited))) + foreach (var pathFromIndex in tuple.Items.SelectMany((ITypeReference typeAtIndex, int index) => FindPathsToSecureTypeComponents(typeAtIndex.Type, $"{path}[{index}]"))) { yield return pathFromIndex; } break; case ArrayType array: - foreach (var pathFromElement in FindPathsToSecureTypeComponents(array.Item.Type, $"{path}[*]", visited)) + foreach (var pathFromElement in FindPathsToSecureTypeComponents(array.Item.Type, $"{path}[*]")) { yield return pathFromElement; } @@ -144,7 +143,7 @@ private IEnumerable FindPathsToSecureTypeComponents(TypeSymbol type, str } } - visited.Remove(type); + currentlyProcessing.Remove(type); } diff --git a/src/Bicep.Core/Emit/ExpressionConverter.cs b/src/Bicep.Core/Emit/ExpressionConverter.cs index ab7b3d69ab6..a75412cd2c1 100644 --- a/src/Bicep.Core/Emit/ExpressionConverter.cs +++ b/src/Bicep.Core/Emit/ExpressionConverter.cs @@ -448,9 +448,9 @@ LanguageExpression getResourceInfoExpression() case "outputs": var moduleSymbol = reference.Module; - var hasSecureValues = expression.SourceSyntax is null - || FindPossibleSecretsVisitor.FindPossibleSecretsInExpression(context.SemanticModel, expression.SourceSyntax).Any(); - if (context.SemanticModel.Features.SecureOutputsEnabled && hasSecureValues) + if (context.SemanticModel.Features.SecureOutputsEnabled && + (expression.SourceSyntax is null || + FindPossibleSecretsVisitor.FindPossibleSecretsInExpression(context.SemanticModel, expression.SourceSyntax).Any())) { var deploymentResourceId = GetFullyQualifiedResourceId(moduleSymbol, reference.IndexContext?.Index); var apiVersion = new JTokenExpression(EmitConstants.NestedDeploymentResourceApiVersion); diff --git a/src/Bicep.Core/TypeSystem/TypeHelper.cs b/src/Bicep.Core/TypeSystem/TypeHelper.cs index 4705d867aca..a829fe76923 100644 --- a/src/Bicep.Core/TypeSystem/TypeHelper.cs +++ b/src/Bicep.Core/TypeSystem/TypeHelper.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. +using System.Collections.Concurrent; using System.Collections.Immutable; using System.Diagnostics.CodeAnalysis; using System.Globalization; @@ -693,14 +694,30 @@ private static ObjectType TransformProperties(ObjectType input, Func TransformProperties(input, p => p with { Flags = p.Flags & ~TypePropertyFlags.Required }); - public static TypeSymbol RemovePropertyFlagsRecursively(TypeSymbol type, TypePropertyFlags flagsToRemove) => type switch - { - ObjectType @object => TransformProperties(@object, property => new( + public static TypeSymbol RemovePropertyFlagsRecursively(TypeSymbol type, TypePropertyFlags flagsToRemove) + => RemovePropertyFlagsRecursively(type, flagsToRemove, new()); + + private static TypeSymbol RemovePropertyFlagsRecursively( + TypeSymbol type, + TypePropertyFlags flagsToRemove, + ConcurrentDictionary transformedObjectCache) => type switch + { + ObjectType @object => transformedObjectCache.GetOrAdd( + @object, + obj => RemovePropertyFlagsRecursively(obj, flagsToRemove, transformedObjectCache)), + _ => type, + }; + + private static ObjectType RemovePropertyFlagsRecursively( + ObjectType @object, + TypePropertyFlags flagsToRemove, + ConcurrentDictionary cache) => TransformProperties(@object, property => new( property.Name, - new DeferredTypeReference(() => RemovePropertyFlagsRecursively(property.TypeReference.Type, flagsToRemove)), + new DeferredTypeReference(() => RemovePropertyFlagsRecursively( + property.TypeReference.Type, + flagsToRemove, + cache)), property.Flags & ~flagsToRemove, - property.Description)), - _ => type, - }; + property.Description)); } } diff --git a/src/Bicep.Decompiler.IntegrationTests/Bicep.Decompiler.IntegrationTests.csproj b/src/Bicep.Decompiler.IntegrationTests/Bicep.Decompiler.IntegrationTests.csproj index becd450c84c..55ed6742c42 100644 --- a/src/Bicep.Decompiler.IntegrationTests/Bicep.Decompiler.IntegrationTests.csproj +++ b/src/Bicep.Decompiler.IntegrationTests/Bicep.Decompiler.IntegrationTests.csproj @@ -12,7 +12,7 @@ - + all diff --git a/src/Bicep.Decompiler.IntegrationTests/packages.lock.json b/src/Bicep.Decompiler.IntegrationTests/packages.lock.json index 145f054ed49..e217ae7a968 100644 --- a/src/Bicep.Decompiler.IntegrationTests/packages.lock.json +++ b/src/Bicep.Decompiler.IntegrationTests/packages.lock.json @@ -51,12 +51,12 @@ }, "MSTest.TestAdapter": { "type": "Direct", - "requested": "[3.6.4, )", - "resolved": "3.6.4", - "contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==", + "requested": "[3.7.3, )", + "resolved": "3.7.3", + "contentHash": "Ro3TnkC+TfovOTFd93DnzDF/ickJkkAYVmnzrjvY3FUduRcTJLIOJee9kiP1o3q1aPqmJSK6CobdvyWXubajWw==", "dependencies": { - "Microsoft.Testing.Extensions.VSTestBridge": "1.4.3", - "Microsoft.Testing.Platform.MSBuild": "1.4.3" + "Microsoft.Testing.Extensions.VSTestBridge": "1.5.3", + "Microsoft.Testing.Platform.MSBuild": "1.5.3" } }, "MSTest.TestFramework": { @@ -642,44 +642,44 @@ }, "Microsoft.Testing.Extensions.Telemetry": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==", + "resolved": "1.5.3", + "contentHash": "U9pGd5DQuX1PfkrdFI+xH34JGgQ2nes5QAwIITTk+MQfLvRITqsZjJeHTjpGWh33D/0q1l7aA8/LQHR7UuCgLQ==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.TrxReport.Abstractions": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==", + "resolved": "1.5.3", + "contentHash": "h34zKNpGyni66VH738mRHeXSnf3klSShUdavUWNhSfWICUUi5aXeI0LBvoX/ad93N0+9xBDU3Fyi6WfxrwKQGw==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.VSTestBridge": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==", + "resolved": "1.5.3", + "contentHash": "cJD67YfDT98wEWyazKVD/yPVW6+H1usXeuselCnRes7JZBTIYWtrCchcOzOahnmajT79eDKqt9sta7DXwTDU4Q==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.TestPlatform.ObjectModel": "17.11.1", - "Microsoft.Testing.Extensions.Telemetry": "1.4.3", - "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.TestPlatform.ObjectModel": "17.12.0", + "Microsoft.Testing.Extensions.Telemetry": "1.5.3", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.5.3", + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Platform": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA==" + "resolved": "1.5.3", + "contentHash": "WqJydnJ99dEKtquR9HwINz104ehWJKTXbQQrydGatlLRw14bmsx0pa8+E6KUXMYXZAimN0swWlDmcJGjjW4TIg==" }, "Microsoft.Testing.Platform.MSBuild": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==", + "resolved": "1.5.3", + "contentHash": "bOtpRMSPeT5YLQo+NNY8EtdNTphAUcmALjW4ABU7P0rb6yR2XAZau3TzNieLmR3lRuwudguWzzBhgcLRXwZh0A==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.TestPlatform.ObjectModel": { @@ -1564,7 +1564,7 @@ "DiffPlex": "[1.7.2, )", "FluentAssertions": "[7.0.0, )", "JsonDiffPatch.Net": "[2.3.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )", "Moq": "[4.20.72, )", diff --git a/src/Bicep.Decompiler.UnitTests/Bicep.Decompiler.UnitTests.csproj b/src/Bicep.Decompiler.UnitTests/Bicep.Decompiler.UnitTests.csproj index 9b94fea1f55..b25e5116150 100644 --- a/src/Bicep.Decompiler.UnitTests/Bicep.Decompiler.UnitTests.csproj +++ b/src/Bicep.Decompiler.UnitTests/Bicep.Decompiler.UnitTests.csproj @@ -7,7 +7,7 @@ - + all diff --git a/src/Bicep.Decompiler.UnitTests/packages.lock.json b/src/Bicep.Decompiler.UnitTests/packages.lock.json index 145f054ed49..e217ae7a968 100644 --- a/src/Bicep.Decompiler.UnitTests/packages.lock.json +++ b/src/Bicep.Decompiler.UnitTests/packages.lock.json @@ -51,12 +51,12 @@ }, "MSTest.TestAdapter": { "type": "Direct", - "requested": "[3.6.4, )", - "resolved": "3.6.4", - "contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==", + "requested": "[3.7.3, )", + "resolved": "3.7.3", + "contentHash": "Ro3TnkC+TfovOTFd93DnzDF/ickJkkAYVmnzrjvY3FUduRcTJLIOJee9kiP1o3q1aPqmJSK6CobdvyWXubajWw==", "dependencies": { - "Microsoft.Testing.Extensions.VSTestBridge": "1.4.3", - "Microsoft.Testing.Platform.MSBuild": "1.4.3" + "Microsoft.Testing.Extensions.VSTestBridge": "1.5.3", + "Microsoft.Testing.Platform.MSBuild": "1.5.3" } }, "MSTest.TestFramework": { @@ -642,44 +642,44 @@ }, "Microsoft.Testing.Extensions.Telemetry": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==", + "resolved": "1.5.3", + "contentHash": "U9pGd5DQuX1PfkrdFI+xH34JGgQ2nes5QAwIITTk+MQfLvRITqsZjJeHTjpGWh33D/0q1l7aA8/LQHR7UuCgLQ==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.TrxReport.Abstractions": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==", + "resolved": "1.5.3", + "contentHash": "h34zKNpGyni66VH738mRHeXSnf3klSShUdavUWNhSfWICUUi5aXeI0LBvoX/ad93N0+9xBDU3Fyi6WfxrwKQGw==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.VSTestBridge": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==", + "resolved": "1.5.3", + "contentHash": "cJD67YfDT98wEWyazKVD/yPVW6+H1usXeuselCnRes7JZBTIYWtrCchcOzOahnmajT79eDKqt9sta7DXwTDU4Q==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.TestPlatform.ObjectModel": "17.11.1", - "Microsoft.Testing.Extensions.Telemetry": "1.4.3", - "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.TestPlatform.ObjectModel": "17.12.0", + "Microsoft.Testing.Extensions.Telemetry": "1.5.3", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.5.3", + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Platform": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA==" + "resolved": "1.5.3", + "contentHash": "WqJydnJ99dEKtquR9HwINz104ehWJKTXbQQrydGatlLRw14bmsx0pa8+E6KUXMYXZAimN0swWlDmcJGjjW4TIg==" }, "Microsoft.Testing.Platform.MSBuild": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==", + "resolved": "1.5.3", + "contentHash": "bOtpRMSPeT5YLQo+NNY8EtdNTphAUcmALjW4ABU7P0rb6yR2XAZau3TzNieLmR3lRuwudguWzzBhgcLRXwZh0A==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.TestPlatform.ObjectModel": { @@ -1564,7 +1564,7 @@ "DiffPlex": "[1.7.2, )", "FluentAssertions": "[7.0.0, )", "JsonDiffPatch.Net": "[2.3.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )", "Moq": "[4.20.72, )", diff --git a/src/Bicep.IO.UnitTests/Bicep.IO.UnitTests.csproj b/src/Bicep.IO.UnitTests/Bicep.IO.UnitTests.csproj index ce5073f0780..0cc0c54b101 100644 --- a/src/Bicep.IO.UnitTests/Bicep.IO.UnitTests.csproj +++ b/src/Bicep.IO.UnitTests/Bicep.IO.UnitTests.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Bicep.IO.UnitTests/packages.lock.json b/src/Bicep.IO.UnitTests/packages.lock.json index f1c9c78d30d..6b58960f620 100644 --- a/src/Bicep.IO.UnitTests/packages.lock.json +++ b/src/Bicep.IO.UnitTests/packages.lock.json @@ -51,12 +51,12 @@ }, "MSTest.TestAdapter": { "type": "Direct", - "requested": "[3.6.4, )", - "resolved": "3.6.4", - "contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==", + "requested": "[3.7.3, )", + "resolved": "3.7.3", + "contentHash": "Ro3TnkC+TfovOTFd93DnzDF/ickJkkAYVmnzrjvY3FUduRcTJLIOJee9kiP1o3q1aPqmJSK6CobdvyWXubajWw==", "dependencies": { - "Microsoft.Testing.Extensions.VSTestBridge": "1.4.3", - "Microsoft.Testing.Platform.MSBuild": "1.4.3" + "Microsoft.Testing.Extensions.VSTestBridge": "1.5.3", + "Microsoft.Testing.Platform.MSBuild": "1.5.3" } }, "MSTest.TestFramework": { @@ -105,44 +105,44 @@ }, "Microsoft.Testing.Extensions.Telemetry": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==", + "resolved": "1.5.3", + "contentHash": "U9pGd5DQuX1PfkrdFI+xH34JGgQ2nes5QAwIITTk+MQfLvRITqsZjJeHTjpGWh33D/0q1l7aA8/LQHR7UuCgLQ==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.TrxReport.Abstractions": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==", + "resolved": "1.5.3", + "contentHash": "h34zKNpGyni66VH738mRHeXSnf3klSShUdavUWNhSfWICUUi5aXeI0LBvoX/ad93N0+9xBDU3Fyi6WfxrwKQGw==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.VSTestBridge": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==", + "resolved": "1.5.3", + "contentHash": "cJD67YfDT98wEWyazKVD/yPVW6+H1usXeuselCnRes7JZBTIYWtrCchcOzOahnmajT79eDKqt9sta7DXwTDU4Q==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.TestPlatform.ObjectModel": "17.11.1", - "Microsoft.Testing.Extensions.Telemetry": "1.4.3", - "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.TestPlatform.ObjectModel": "17.12.0", + "Microsoft.Testing.Extensions.Telemetry": "1.5.3", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.5.3", + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Platform": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA==" + "resolved": "1.5.3", + "contentHash": "WqJydnJ99dEKtquR9HwINz104ehWJKTXbQQrydGatlLRw14bmsx0pa8+E6KUXMYXZAimN0swWlDmcJGjjW4TIg==" }, "Microsoft.Testing.Platform.MSBuild": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==", + "resolved": "1.5.3", + "contentHash": "bOtpRMSPeT5YLQo+NNY8EtdNTphAUcmALjW4ABU7P0rb6yR2XAZau3TzNieLmR3lRuwudguWzzBhgcLRXwZh0A==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.TestPlatform.ObjectModel": { diff --git a/src/Bicep.LangServer.IntegrationTests/Bicep.LangServer.IntegrationTests.csproj b/src/Bicep.LangServer.IntegrationTests/Bicep.LangServer.IntegrationTests.csproj index 0aceedfdd95..eb2d1134175 100644 --- a/src/Bicep.LangServer.IntegrationTests/Bicep.LangServer.IntegrationTests.csproj +++ b/src/Bicep.LangServer.IntegrationTests/Bicep.LangServer.IntegrationTests.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Bicep.LangServer.IntegrationTests/packages.lock.json b/src/Bicep.LangServer.IntegrationTests/packages.lock.json index 96851b2aae8..f5f4177f12a 100644 --- a/src/Bicep.LangServer.IntegrationTests/packages.lock.json +++ b/src/Bicep.LangServer.IntegrationTests/packages.lock.json @@ -70,12 +70,12 @@ }, "MSTest.TestAdapter": { "type": "Direct", - "requested": "[3.6.4, )", - "resolved": "3.6.4", - "contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==", + "requested": "[3.7.3, )", + "resolved": "3.7.3", + "contentHash": "Ro3TnkC+TfovOTFd93DnzDF/ickJkkAYVmnzrjvY3FUduRcTJLIOJee9kiP1o3q1aPqmJSK6CobdvyWXubajWw==", "dependencies": { - "Microsoft.Testing.Extensions.VSTestBridge": "1.4.3", - "Microsoft.Testing.Platform.MSBuild": "1.4.3" + "Microsoft.Testing.Extensions.VSTestBridge": "1.5.3", + "Microsoft.Testing.Platform.MSBuild": "1.5.3" } }, "MSTest.TestFramework": { @@ -673,44 +673,44 @@ }, "Microsoft.Testing.Extensions.Telemetry": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==", + "resolved": "1.5.3", + "contentHash": "U9pGd5DQuX1PfkrdFI+xH34JGgQ2nes5QAwIITTk+MQfLvRITqsZjJeHTjpGWh33D/0q1l7aA8/LQHR7UuCgLQ==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.TrxReport.Abstractions": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==", + "resolved": "1.5.3", + "contentHash": "h34zKNpGyni66VH738mRHeXSnf3klSShUdavUWNhSfWICUUi5aXeI0LBvoX/ad93N0+9xBDU3Fyi6WfxrwKQGw==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.VSTestBridge": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==", + "resolved": "1.5.3", + "contentHash": "cJD67YfDT98wEWyazKVD/yPVW6+H1usXeuselCnRes7JZBTIYWtrCchcOzOahnmajT79eDKqt9sta7DXwTDU4Q==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.TestPlatform.ObjectModel": "17.11.1", - "Microsoft.Testing.Extensions.Telemetry": "1.4.3", - "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.TestPlatform.ObjectModel": "17.12.0", + "Microsoft.Testing.Extensions.Telemetry": "1.5.3", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.5.3", + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Platform": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA==" + "resolved": "1.5.3", + "contentHash": "WqJydnJ99dEKtquR9HwINz104ehWJKTXbQQrydGatlLRw14bmsx0pa8+E6KUXMYXZAimN0swWlDmcJGjjW4TIg==" }, "Microsoft.Testing.Platform.MSBuild": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==", + "resolved": "1.5.3", + "contentHash": "bOtpRMSPeT5YLQo+NNY8EtdNTphAUcmALjW4ABU7P0rb6yR2XAZau3TzNieLmR3lRuwudguWzzBhgcLRXwZh0A==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.TestPlatform.ObjectModel": { @@ -1573,7 +1573,7 @@ "Azure.Bicep.Core": "[1.0.0, )", "Bicep.Core.UnitTests": "[1.0.0, )", "FluentAssertions": "[7.0.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )" } @@ -1586,7 +1586,7 @@ "DiffPlex": "[1.7.2, )", "FluentAssertions": "[7.0.0, )", "JsonDiffPatch.Net": "[2.3.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )", "Moq": "[4.20.72, )", diff --git a/src/Bicep.LangServer.UnitTests/Bicep.LangServer.UnitTests.csproj b/src/Bicep.LangServer.UnitTests/Bicep.LangServer.UnitTests.csproj index cfef904156c..8fbb9e256c2 100644 --- a/src/Bicep.LangServer.UnitTests/Bicep.LangServer.UnitTests.csproj +++ b/src/Bicep.LangServer.UnitTests/Bicep.LangServer.UnitTests.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Bicep.LangServer.UnitTests/packages.lock.json b/src/Bicep.LangServer.UnitTests/packages.lock.json index 7fd5d406b8a..bff175a6961 100644 --- a/src/Bicep.LangServer.UnitTests/packages.lock.json +++ b/src/Bicep.LangServer.UnitTests/packages.lock.json @@ -60,12 +60,12 @@ }, "MSTest.TestAdapter": { "type": "Direct", - "requested": "[3.6.4, )", - "resolved": "3.6.4", - "contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==", + "requested": "[3.7.3, )", + "resolved": "3.7.3", + "contentHash": "Ro3TnkC+TfovOTFd93DnzDF/ickJkkAYVmnzrjvY3FUduRcTJLIOJee9kiP1o3q1aPqmJSK6CobdvyWXubajWw==", "dependencies": { - "Microsoft.Testing.Extensions.VSTestBridge": "1.4.3", - "Microsoft.Testing.Platform.MSBuild": "1.4.3" + "Microsoft.Testing.Extensions.VSTestBridge": "1.5.3", + "Microsoft.Testing.Platform.MSBuild": "1.5.3" } }, "MSTest.TestFramework": { @@ -678,44 +678,44 @@ }, "Microsoft.Testing.Extensions.Telemetry": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==", + "resolved": "1.5.3", + "contentHash": "U9pGd5DQuX1PfkrdFI+xH34JGgQ2nes5QAwIITTk+MQfLvRITqsZjJeHTjpGWh33D/0q1l7aA8/LQHR7UuCgLQ==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.TrxReport.Abstractions": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==", + "resolved": "1.5.3", + "contentHash": "h34zKNpGyni66VH738mRHeXSnf3klSShUdavUWNhSfWICUUi5aXeI0LBvoX/ad93N0+9xBDU3Fyi6WfxrwKQGw==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.VSTestBridge": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==", + "resolved": "1.5.3", + "contentHash": "cJD67YfDT98wEWyazKVD/yPVW6+H1usXeuselCnRes7JZBTIYWtrCchcOzOahnmajT79eDKqt9sta7DXwTDU4Q==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.TestPlatform.ObjectModel": "17.11.1", - "Microsoft.Testing.Extensions.Telemetry": "1.4.3", - "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.TestPlatform.ObjectModel": "17.12.0", + "Microsoft.Testing.Extensions.Telemetry": "1.5.3", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.5.3", + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Platform": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA==" + "resolved": "1.5.3", + "contentHash": "WqJydnJ99dEKtquR9HwINz104ehWJKTXbQQrydGatlLRw14bmsx0pa8+E6KUXMYXZAimN0swWlDmcJGjjW4TIg==" }, "Microsoft.Testing.Platform.MSBuild": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==", + "resolved": "1.5.3", + "contentHash": "bOtpRMSPeT5YLQo+NNY8EtdNTphAUcmALjW4ABU7P0rb6yR2XAZau3TzNieLmR3lRuwudguWzzBhgcLRXwZh0A==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.TestPlatform.ObjectModel": { @@ -1582,7 +1582,7 @@ "Azure.Bicep.Core": "[1.0.0, )", "Bicep.Core.UnitTests": "[1.0.0, )", "FluentAssertions": "[7.0.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )" } @@ -1595,7 +1595,7 @@ "DiffPlex": "[1.7.2, )", "FluentAssertions": "[7.0.0, )", "JsonDiffPatch.Net": "[2.3.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )", "Moq": "[4.20.72, )", @@ -1624,7 +1624,7 @@ "Bicep.Core.UnitTests": "[1.0.0, )", "Bicep.LangServer": "[1.0.0, )", "FluentAssertions": "[7.0.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )", "Microsoft.VisualStudio.Threading": "[17.12.19, )", diff --git a/src/Bicep.Local.Deploy.IntegrationTests/Bicep.Local.Deploy.IntegrationTests.csproj b/src/Bicep.Local.Deploy.IntegrationTests/Bicep.Local.Deploy.IntegrationTests.csproj index e4925b31c70..2eef0300e4a 100644 --- a/src/Bicep.Local.Deploy.IntegrationTests/Bicep.Local.Deploy.IntegrationTests.csproj +++ b/src/Bicep.Local.Deploy.IntegrationTests/Bicep.Local.Deploy.IntegrationTests.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Bicep.Local.Deploy.IntegrationTests/packages.lock.json b/src/Bicep.Local.Deploy.IntegrationTests/packages.lock.json index 67915bc7451..33ba9f00c74 100644 --- a/src/Bicep.Local.Deploy.IntegrationTests/packages.lock.json +++ b/src/Bicep.Local.Deploy.IntegrationTests/packages.lock.json @@ -69,12 +69,12 @@ }, "MSTest.TestAdapter": { "type": "Direct", - "requested": "[3.6.4, )", - "resolved": "3.6.4", - "contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==", + "requested": "[3.7.3, )", + "resolved": "3.7.3", + "contentHash": "Ro3TnkC+TfovOTFd93DnzDF/ickJkkAYVmnzrjvY3FUduRcTJLIOJee9kiP1o3q1aPqmJSK6CobdvyWXubajWw==", "dependencies": { - "Microsoft.Testing.Extensions.VSTestBridge": "1.4.3", - "Microsoft.Testing.Platform.MSBuild": "1.4.3" + "Microsoft.Testing.Extensions.VSTestBridge": "1.5.3", + "Microsoft.Testing.Platform.MSBuild": "1.5.3" } }, "MSTest.TestFramework": { @@ -660,44 +660,44 @@ }, "Microsoft.Testing.Extensions.Telemetry": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==", + "resolved": "1.5.3", + "contentHash": "U9pGd5DQuX1PfkrdFI+xH34JGgQ2nes5QAwIITTk+MQfLvRITqsZjJeHTjpGWh33D/0q1l7aA8/LQHR7UuCgLQ==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.TrxReport.Abstractions": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==", + "resolved": "1.5.3", + "contentHash": "h34zKNpGyni66VH738mRHeXSnf3klSShUdavUWNhSfWICUUi5aXeI0LBvoX/ad93N0+9xBDU3Fyi6WfxrwKQGw==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.VSTestBridge": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==", + "resolved": "1.5.3", + "contentHash": "cJD67YfDT98wEWyazKVD/yPVW6+H1usXeuselCnRes7JZBTIYWtrCchcOzOahnmajT79eDKqt9sta7DXwTDU4Q==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.TestPlatform.ObjectModel": "17.11.1", - "Microsoft.Testing.Extensions.Telemetry": "1.4.3", - "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.TestPlatform.ObjectModel": "17.12.0", + "Microsoft.Testing.Extensions.Telemetry": "1.5.3", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.5.3", + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Platform": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA==" + "resolved": "1.5.3", + "contentHash": "WqJydnJ99dEKtquR9HwINz104ehWJKTXbQQrydGatlLRw14bmsx0pa8+E6KUXMYXZAimN0swWlDmcJGjjW4TIg==" }, "Microsoft.Testing.Platform.MSBuild": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==", + "resolved": "1.5.3", + "contentHash": "bOtpRMSPeT5YLQo+NNY8EtdNTphAUcmALjW4ABU7P0rb6yR2XAZau3TzNieLmR3lRuwudguWzzBhgcLRXwZh0A==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.TestPlatform.ObjectModel": { @@ -1574,7 +1574,7 @@ "DiffPlex": "[1.7.2, )", "FluentAssertions": "[7.0.0, )", "JsonDiffPatch.Net": "[2.3.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )", "Moq": "[4.20.72, )", diff --git a/src/Bicep.RegistryModuleTool.IntegrationTests/Bicep.RegistryModuleTool.IntegrationTests.csproj b/src/Bicep.RegistryModuleTool.IntegrationTests/Bicep.RegistryModuleTool.IntegrationTests.csproj index 6dcbdd0cdda..b9fc73dc77b 100644 --- a/src/Bicep.RegistryModuleTool.IntegrationTests/Bicep.RegistryModuleTool.IntegrationTests.csproj +++ b/src/Bicep.RegistryModuleTool.IntegrationTests/Bicep.RegistryModuleTool.IntegrationTests.csproj @@ -2,7 +2,7 @@ - + all diff --git a/src/Bicep.RegistryModuleTool.IntegrationTests/packages.lock.json b/src/Bicep.RegistryModuleTool.IntegrationTests/packages.lock.json index 0d2170351cc..64ec6a8c53d 100644 --- a/src/Bicep.RegistryModuleTool.IntegrationTests/packages.lock.json +++ b/src/Bicep.RegistryModuleTool.IntegrationTests/packages.lock.json @@ -42,12 +42,12 @@ }, "MSTest.TestAdapter": { "type": "Direct", - "requested": "[3.6.4, )", - "resolved": "3.6.4", - "contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==", + "requested": "[3.7.3, )", + "resolved": "3.7.3", + "contentHash": "Ro3TnkC+TfovOTFd93DnzDF/ickJkkAYVmnzrjvY3FUduRcTJLIOJee9kiP1o3q1aPqmJSK6CobdvyWXubajWw==", "dependencies": { - "Microsoft.Testing.Extensions.VSTestBridge": "1.4.3", - "Microsoft.Testing.Platform.MSBuild": "1.4.3" + "Microsoft.Testing.Extensions.VSTestBridge": "1.5.3", + "Microsoft.Testing.Platform.MSBuild": "1.5.3" } }, "MSTest.TestFramework": { @@ -794,44 +794,44 @@ }, "Microsoft.Testing.Extensions.Telemetry": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==", + "resolved": "1.5.3", + "contentHash": "U9pGd5DQuX1PfkrdFI+xH34JGgQ2nes5QAwIITTk+MQfLvRITqsZjJeHTjpGWh33D/0q1l7aA8/LQHR7UuCgLQ==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.TrxReport.Abstractions": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==", + "resolved": "1.5.3", + "contentHash": "h34zKNpGyni66VH738mRHeXSnf3klSShUdavUWNhSfWICUUi5aXeI0LBvoX/ad93N0+9xBDU3Fyi6WfxrwKQGw==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.VSTestBridge": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==", + "resolved": "1.5.3", + "contentHash": "cJD67YfDT98wEWyazKVD/yPVW6+H1usXeuselCnRes7JZBTIYWtrCchcOzOahnmajT79eDKqt9sta7DXwTDU4Q==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.TestPlatform.ObjectModel": "17.11.1", - "Microsoft.Testing.Extensions.Telemetry": "1.4.3", - "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.TestPlatform.ObjectModel": "17.12.0", + "Microsoft.Testing.Extensions.Telemetry": "1.5.3", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.5.3", + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Platform": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA==" + "resolved": "1.5.3", + "contentHash": "WqJydnJ99dEKtquR9HwINz104ehWJKTXbQQrydGatlLRw14bmsx0pa8+E6KUXMYXZAimN0swWlDmcJGjjW4TIg==" }, "Microsoft.Testing.Platform.MSBuild": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==", + "resolved": "1.5.3", + "contentHash": "bOtpRMSPeT5YLQo+NNY8EtdNTphAUcmALjW4ABU7P0rb6yR2XAZau3TzNieLmR3lRuwudguWzzBhgcLRXwZh0A==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.TestPlatform.ObjectModel": { @@ -1800,7 +1800,7 @@ "DiffPlex": "[1.7.2, )", "FluentAssertions": "[7.0.0, )", "JsonDiffPatch.Net": "[2.3.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )", "Moq": "[4.20.72, )", diff --git a/src/Bicep.RegistryModuleTool.TestFixtures/packages.lock.json b/src/Bicep.RegistryModuleTool.TestFixtures/packages.lock.json index 390f4f4d987..56246c3bf9a 100644 --- a/src/Bicep.RegistryModuleTool.TestFixtures/packages.lock.json +++ b/src/Bicep.RegistryModuleTool.TestFixtures/packages.lock.json @@ -782,44 +782,44 @@ }, "Microsoft.Testing.Extensions.Telemetry": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==", + "resolved": "1.5.3", + "contentHash": "U9pGd5DQuX1PfkrdFI+xH34JGgQ2nes5QAwIITTk+MQfLvRITqsZjJeHTjpGWh33D/0q1l7aA8/LQHR7UuCgLQ==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.TrxReport.Abstractions": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==", + "resolved": "1.5.3", + "contentHash": "h34zKNpGyni66VH738mRHeXSnf3klSShUdavUWNhSfWICUUi5aXeI0LBvoX/ad93N0+9xBDU3Fyi6WfxrwKQGw==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.VSTestBridge": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==", + "resolved": "1.5.3", + "contentHash": "cJD67YfDT98wEWyazKVD/yPVW6+H1usXeuselCnRes7JZBTIYWtrCchcOzOahnmajT79eDKqt9sta7DXwTDU4Q==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.TestPlatform.ObjectModel": "17.11.1", - "Microsoft.Testing.Extensions.Telemetry": "1.4.3", - "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.TestPlatform.ObjectModel": "17.12.0", + "Microsoft.Testing.Extensions.Telemetry": "1.5.3", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.5.3", + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Platform": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA==" + "resolved": "1.5.3", + "contentHash": "WqJydnJ99dEKtquR9HwINz104ehWJKTXbQQrydGatlLRw14bmsx0pa8+E6KUXMYXZAimN0swWlDmcJGjjW4TIg==" }, "Microsoft.Testing.Platform.MSBuild": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==", + "resolved": "1.5.3", + "contentHash": "bOtpRMSPeT5YLQo+NNY8EtdNTphAUcmALjW4ABU7P0rb6yR2XAZau3TzNieLmR3lRuwudguWzzBhgcLRXwZh0A==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.TestPlatform.ObjectModel": { @@ -919,11 +919,11 @@ }, "MSTest.TestAdapter": { "type": "Transitive", - "resolved": "3.6.4", - "contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==", + "resolved": "3.7.3", + "contentHash": "Ro3TnkC+TfovOTFd93DnzDF/ickJkkAYVmnzrjvY3FUduRcTJLIOJee9kiP1o3q1aPqmJSK6CobdvyWXubajWw==", "dependencies": { - "Microsoft.Testing.Extensions.VSTestBridge": "1.4.3", - "Microsoft.Testing.Platform.MSBuild": "1.4.3" + "Microsoft.Testing.Extensions.VSTestBridge": "1.5.3", + "Microsoft.Testing.Platform.MSBuild": "1.5.3" } }, "MSTest.TestFramework": { @@ -1794,7 +1794,7 @@ "DiffPlex": "[1.7.2, )", "FluentAssertions": "[7.0.0, )", "JsonDiffPatch.Net": "[2.3.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )", "Moq": "[4.20.72, )", diff --git a/src/Bicep.RegistryModuleTool.UnitTests/Bicep.RegistryModuleTool.UnitTests.csproj b/src/Bicep.RegistryModuleTool.UnitTests/Bicep.RegistryModuleTool.UnitTests.csproj index ef8c96c6d00..c2bc6cd3f9b 100644 --- a/src/Bicep.RegistryModuleTool.UnitTests/Bicep.RegistryModuleTool.UnitTests.csproj +++ b/src/Bicep.RegistryModuleTool.UnitTests/Bicep.RegistryModuleTool.UnitTests.csproj @@ -6,7 +6,7 @@ - + all diff --git a/src/Bicep.RegistryModuleTool.UnitTests/packages.lock.json b/src/Bicep.RegistryModuleTool.UnitTests/packages.lock.json index 0d2170351cc..64ec6a8c53d 100644 --- a/src/Bicep.RegistryModuleTool.UnitTests/packages.lock.json +++ b/src/Bicep.RegistryModuleTool.UnitTests/packages.lock.json @@ -42,12 +42,12 @@ }, "MSTest.TestAdapter": { "type": "Direct", - "requested": "[3.6.4, )", - "resolved": "3.6.4", - "contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==", + "requested": "[3.7.3, )", + "resolved": "3.7.3", + "contentHash": "Ro3TnkC+TfovOTFd93DnzDF/ickJkkAYVmnzrjvY3FUduRcTJLIOJee9kiP1o3q1aPqmJSK6CobdvyWXubajWw==", "dependencies": { - "Microsoft.Testing.Extensions.VSTestBridge": "1.4.3", - "Microsoft.Testing.Platform.MSBuild": "1.4.3" + "Microsoft.Testing.Extensions.VSTestBridge": "1.5.3", + "Microsoft.Testing.Platform.MSBuild": "1.5.3" } }, "MSTest.TestFramework": { @@ -794,44 +794,44 @@ }, "Microsoft.Testing.Extensions.Telemetry": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==", + "resolved": "1.5.3", + "contentHash": "U9pGd5DQuX1PfkrdFI+xH34JGgQ2nes5QAwIITTk+MQfLvRITqsZjJeHTjpGWh33D/0q1l7aA8/LQHR7UuCgLQ==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.TrxReport.Abstractions": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==", + "resolved": "1.5.3", + "contentHash": "h34zKNpGyni66VH738mRHeXSnf3klSShUdavUWNhSfWICUUi5aXeI0LBvoX/ad93N0+9xBDU3Fyi6WfxrwKQGw==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.VSTestBridge": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==", + "resolved": "1.5.3", + "contentHash": "cJD67YfDT98wEWyazKVD/yPVW6+H1usXeuselCnRes7JZBTIYWtrCchcOzOahnmajT79eDKqt9sta7DXwTDU4Q==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.TestPlatform.ObjectModel": "17.11.1", - "Microsoft.Testing.Extensions.Telemetry": "1.4.3", - "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.TestPlatform.ObjectModel": "17.12.0", + "Microsoft.Testing.Extensions.Telemetry": "1.5.3", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.5.3", + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Platform": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA==" + "resolved": "1.5.3", + "contentHash": "WqJydnJ99dEKtquR9HwINz104ehWJKTXbQQrydGatlLRw14bmsx0pa8+E6KUXMYXZAimN0swWlDmcJGjjW4TIg==" }, "Microsoft.Testing.Platform.MSBuild": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==", + "resolved": "1.5.3", + "contentHash": "bOtpRMSPeT5YLQo+NNY8EtdNTphAUcmALjW4ABU7P0rb6yR2XAZau3TzNieLmR3lRuwudguWzzBhgcLRXwZh0A==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.TestPlatform.ObjectModel": { @@ -1800,7 +1800,7 @@ "DiffPlex": "[1.7.2, )", "FluentAssertions": "[7.0.0, )", "JsonDiffPatch.Net": "[2.3.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )", "Moq": "[4.20.72, )", diff --git a/src/Bicep.Tools.Benchmark/packages.lock.json b/src/Bicep.Tools.Benchmark/packages.lock.json index f59024d7608..b8a69b56cfc 100644 --- a/src/Bicep.Tools.Benchmark/packages.lock.json +++ b/src/Bicep.Tools.Benchmark/packages.lock.json @@ -711,44 +711,44 @@ }, "Microsoft.Testing.Extensions.Telemetry": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==", + "resolved": "1.5.3", + "contentHash": "U9pGd5DQuX1PfkrdFI+xH34JGgQ2nes5QAwIITTk+MQfLvRITqsZjJeHTjpGWh33D/0q1l7aA8/LQHR7UuCgLQ==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.TrxReport.Abstractions": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==", + "resolved": "1.5.3", + "contentHash": "h34zKNpGyni66VH738mRHeXSnf3klSShUdavUWNhSfWICUUi5aXeI0LBvoX/ad93N0+9xBDU3Fyi6WfxrwKQGw==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Extensions.VSTestBridge": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==", + "resolved": "1.5.3", + "contentHash": "cJD67YfDT98wEWyazKVD/yPVW6+H1usXeuselCnRes7JZBTIYWtrCchcOzOahnmajT79eDKqt9sta7DXwTDU4Q==", "dependencies": { "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.TestPlatform.ObjectModel": "17.11.1", - "Microsoft.Testing.Extensions.Telemetry": "1.4.3", - "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3", - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.TestPlatform.ObjectModel": "17.12.0", + "Microsoft.Testing.Extensions.Telemetry": "1.5.3", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.5.3", + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.Testing.Platform": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA==" + "resolved": "1.5.3", + "contentHash": "WqJydnJ99dEKtquR9HwINz104ehWJKTXbQQrydGatlLRw14bmsx0pa8+E6KUXMYXZAimN0swWlDmcJGjjW4TIg==" }, "Microsoft.Testing.Platform.MSBuild": { "type": "Transitive", - "resolved": "1.4.3", - "contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==", + "resolved": "1.5.3", + "contentHash": "bOtpRMSPeT5YLQo+NNY8EtdNTphAUcmALjW4ABU7P0rb6yR2XAZau3TzNieLmR3lRuwudguWzzBhgcLRXwZh0A==", "dependencies": { - "Microsoft.Testing.Platform": "1.4.3" + "Microsoft.Testing.Platform": "1.5.3" } }, "Microsoft.TestPlatform.ObjectModel": { @@ -853,11 +853,11 @@ }, "MSTest.TestAdapter": { "type": "Transitive", - "resolved": "3.6.4", - "contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==", + "resolved": "3.7.3", + "contentHash": "Ro3TnkC+TfovOTFd93DnzDF/ickJkkAYVmnzrjvY3FUduRcTJLIOJee9kiP1o3q1aPqmJSK6CobdvyWXubajWw==", "dependencies": { - "Microsoft.Testing.Extensions.VSTestBridge": "1.4.3", - "Microsoft.Testing.Platform.MSBuild": "1.4.3" + "Microsoft.Testing.Extensions.VSTestBridge": "1.5.3", + "Microsoft.Testing.Platform.MSBuild": "1.5.3" } }, "MSTest.TestFramework": { @@ -1658,7 +1658,7 @@ "Azure.Bicep.Core": "[1.0.0, )", "Bicep.Core.UnitTests": "[1.0.0, )", "FluentAssertions": "[7.0.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )" } @@ -1671,7 +1671,7 @@ "DiffPlex": "[1.7.2, )", "FluentAssertions": "[7.0.0, )", "JsonDiffPatch.Net": "[2.3.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )", "Moq": "[4.20.72, )", @@ -1700,7 +1700,7 @@ "Bicep.Core.UnitTests": "[1.0.0, )", "Bicep.LangServer": "[1.0.0, )", "FluentAssertions": "[7.0.0, )", - "MSTest.TestAdapter": "[3.6.4, )", + "MSTest.TestAdapter": "[3.7.3, )", "MSTest.TestFramework": "[3.6.4, )", "Microsoft.NET.Test.Sdk": "[17.12.0, )", "Microsoft.VisualStudio.Threading": "[17.12.19, )", diff --git a/src/vscode-bicep-ui/apps/deploy-pane/src/__tests__/App.test.tsx b/src/vscode-bicep-ui/apps/deploy-pane/src/__tests__/App.test.tsx index 880565b4f30..acef45dd706 100644 --- a/src/vscode-bicep-ui/apps/deploy-pane/src/__tests__/App.test.tsx +++ b/src/vscode-bicep-ui/apps/deploy-pane/src/__tests__/App.test.tsx @@ -1,17 +1,37 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -import { beforeEach, describe, expect, it, vi } from 'vitest' -import { render, waitFor, fireEvent, screen, act } from '@testing-library/react' -import { App } from '../components/App' -import { vscode } from '../vscode' -import { createDeploymentDataMessage, createGetAccessTokenMessage, createGetAccessTokenResultMessage, createGetDeploymentScopeMessage, createGetDeploymentScopeResultMessage, createGetStateMessage, createGetStateResultMessage, createReadyMessage, type VscodeMessage } from '../messages'; -import { fileUri, getDeploymentOperations, getDeployResponse, getValidateResponse, getWhatIfResponse, parametersJson, scope, templateJson } from './mockData'; +import type { VscodeMessage } from "../messages"; + +import { act, fireEvent, render, screen, waitFor } from "@testing-library/react"; +import { beforeEach, describe, expect, it, vi } from "vitest"; +import { App } from "../components/App"; +import { + createDeploymentDataMessage, + createGetAccessTokenMessage, + createGetAccessTokenResultMessage, + createGetDeploymentScopeMessage, + createGetDeploymentScopeResultMessage, + createGetStateMessage, + createGetStateResultMessage, + createReadyMessage, +} from "../messages"; +import { vscode } from "../vscode"; +import { + fileUri, + getDeploymentOperations, + getDeployResponse, + getValidateResponse, + getWhatIfResponse, + parametersJson, + scope, + templateJson, +} from "./mockData"; const mockClient = { deployments: { beginCreateOrUpdateAtScope: vi.fn(async () => { - return { + return { isDone: vi.fn(() => true), getResult: vi.fn(getDeployResponse), }; @@ -21,106 +41,108 @@ const mockClient = { }, deploymentOperations: { listAtScope: vi.fn(getDeploymentOperations), - } -} + }, +}; beforeEach(() => { - vi.mock('@azure/arm-resources', async (importOriginal) => { + vi.mock("@azure/arm-resources", async (importOriginal) => { // eslint-disable-next-line @typescript-eslint/no-explicit-any const mod: any = await importOriginal(); return { ...mod, ResourceManagementClient: vi.fn(() => mockClient), }; - }) - vi.mock('../components/hooks/time', () => ({ - getDate: () => '1737601964200', + }); + vi.mock("../components/hooks/time", () => ({ + getDate: () => "1737601964200", })); }); -describe('App', () => { - it('renders the loading spinner before initialization', async () => { +describe("App", () => { + it("renders the loading spinner before initialization", async () => { const { container } = render(); expect(container).toMatchSnapshot(); }); - it('renders the App component with deployment state', async () => { + it("renders the App component with deployment state", async () => { const { container } = render(); - + await initialize(); expect(container).toMatchSnapshot(); }); - it('runs a deployment', async () => { + it("runs a deployment", async () => { const { container } = render(); - + const scope = await initialize(); - const deployButton = screen.getByText('Deploy'); + const deployButton = screen.getByText("Deploy"); fireEvent.click(deployButton); await act(async () => { await waitFor(() => expect(vscode.postMessage).toBeCalledWith(createGetAccessTokenMessage(scope))); sendMessage(getAccessTokenResultMessage()); - }) - + }); + expect(container).toMatchSnapshot(); }); - it('validates a deployment', async () => { + it("validates a deployment", async () => { const { container } = render(); - + const scope = await initialize(); - const validateButton = screen.getByText('Validate'); + const validateButton = screen.getByText("Validate"); fireEvent.click(validateButton); await act(async () => { await waitFor(() => expect(vscode.postMessage).toBeCalledWith(createGetAccessTokenMessage(scope))); sendMessage(getAccessTokenResultMessage()); - }) - + }); + expect(container).toMatchSnapshot(); }); - it('what-ifs a deployment', async () => { + it("what-ifs a deployment", async () => { const { container } = render(); const scope = await initialize(); - const whatIfButton = screen.getByText('What-If'); + const whatIfButton = screen.getByText("What-If"); fireEvent.click(whatIfButton); await act(async () => { await waitFor(() => expect(vscode.postMessage).toBeCalledWith(createGetAccessTokenMessage(scope))); sendMessage(getAccessTokenResultMessage()); - }) - + }); + expect(container).toMatchSnapshot(); }); - it('supports the scope picker', async () => { + it("supports the scope picker", async () => { const { container } = render(); - + const scope = await initialize(); - const changeScopeButton = screen.getByText('Change Scope'); + const changeScopeButton = screen.getByText("Change Scope"); fireEvent.click(changeScopeButton); await act(async () => { await waitFor(() => expect(vscode.postMessage).toBeCalledWith(createGetDeploymentScopeMessage("resourceGroup"))); - sendMessage(createGetDeploymentScopeResultMessage({ - ...scope, - tenantId: 'newTenantId', - subscriptionId: 'newSubscriptionId', - resourceGroup: 'newResourceGroup', - })); - }) - + sendMessage( + createGetDeploymentScopeResultMessage({ + ...scope, + tenantId: "newTenantId", + subscriptionId: "newSubscriptionId", + resourceGroup: "newResourceGroup", + }), + ); + }); + expect(container).toMatchSnapshot(); }); -}) +}); async function initialize() { const stateResult = getStateResultMessage(); @@ -130,23 +152,17 @@ async function initialize() { await waitFor(() => expect(vscode.postMessage).toBeCalledWith(createGetStateMessage())); sendMessage(stateResult); - }) + }); return scope; } function sendMessage(message: VscodeMessage) { - fireEvent( - window, - new MessageEvent("message", { data: message })); + fireEvent(window, new MessageEvent("message", { data: message })); } function getDeploymentDataMessage() { - return createDeploymentDataMessage( - fileUri, - false, - templateJson, - parametersJson); + return createDeploymentDataMessage(fileUri, false, templateJson, parametersJson); } function getStateResultMessage() { @@ -158,6 +174,6 @@ function getStateResultMessage() { function getAccessTokenResultMessage() { return createGetAccessTokenResultMessage({ expiresOnTimestamp: 1737601964200, - token: 'mockAccessToken' + token: "mockAccessToken", }); -} \ No newline at end of file +} diff --git a/src/vscode-bicep-ui/apps/deploy-pane/src/__tests__/mockData.ts b/src/vscode-bicep-ui/apps/deploy-pane/src/__tests__/mockData.ts index 1a8d793a722..9c6c501a4e4 100644 --- a/src/vscode-bicep-ui/apps/deploy-pane/src/__tests__/mockData.ts +++ b/src/vscode-bicep-ui/apps/deploy-pane/src/__tests__/mockData.ts @@ -1,10 +1,15 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -import type { DeploymentExtended, DeploymentOperation, DeploymentValidateResult, WhatIfOperationResult } from "@azure/arm-resources"; +import type { + DeploymentExtended, + DeploymentOperation, + DeploymentValidateResult, + WhatIfOperationResult, +} from "@azure/arm-resources"; import type { DeploymentScope } from "../models"; -export const fileUri = 'file:///my/deployment.bicep'; +export const fileUri = "file:///my/deployment.bicep"; export const templateJson = `{ "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", @@ -38,7 +43,7 @@ export const parametersJson = `{ } }`; -export const scope: DeploymentScope & {scopeType: "resourceGroup"} = { +export const scope: DeploymentScope & { scopeType: "resourceGroup" } = { scopeType: "resourceGroup", tenantId: "9eeeb42f-40a5-4229-849f-a71fae26c89f", subscriptionId: "a790367f-228f-43fd-a660-ed9abb7258ef", @@ -52,19 +57,19 @@ export function getDeployResponse(): DeploymentExtended { properties: { outputs: { foo: { - value: 'bar' - } - } - } + value: "bar", + }, + }, + }, }; } export function getValidateResponse(): DeploymentValidateResult { return { error: { - code: 'InvalidTemplate', - message: 'The template is invalid' - } + code: "InvalidTemplate", + message: "The template is invalid", + }, }; } @@ -72,35 +77,37 @@ export function getWhatIfResponse(): WhatIfOperationResult { return { changes: [ { - changeType: 'Create', + changeType: "Create", resourceId: `/subscriptions/${scope.subscriptionId}/resourceGroups/${scope.resourceGroup}/providers/Microsoft.Storage/storageAccounts/fooAccount`, - delta: [{ - propertyChangeType: 'Create', - path: 'properties', - before: { - accountType: 'Standard_LRS', - enableHttpsTrafficOnly: false + delta: [ + { + propertyChangeType: "Create", + path: "properties", + before: { + accountType: "Standard_LRS", + enableHttpsTrafficOnly: false, + }, + after: { + accountType: "Standard_ZRS", + enableHttpsTrafficOnly: true, + }, }, - after: { - accountType: 'Standard_ZRS', - enableHttpsTrafficOnly: true - } - }] - } - ] - } + ], + }, + ], + }; } export async function* getDeploymentOperations(): AsyncIterable { yield { properties: { provisioningOperation: "Create", - provisioningState: 'Succeeded', + provisioningState: "Succeeded", targetResource: { - resourceType: 'Microsoft.Storage/storageAccounts', - resourceName: 'fooAccount', - id: `/subscriptions/${scope.subscriptionId}/resourceGroups/${scope.resourceGroup}/providers/Microsoft.Storage/storageAccounts/fooAccount` + resourceType: "Microsoft.Storage/storageAccounts", + resourceName: "fooAccount", + id: `/subscriptions/${scope.subscriptionId}/resourceGroups/${scope.resourceGroup}/providers/Microsoft.Storage/storageAccounts/fooAccount`, }, - } - } -} \ No newline at end of file + }, + }; +} diff --git a/src/vscode-bicep-ui/apps/deploy-pane/src/__tests__/setupGlobals.ts b/src/vscode-bicep-ui/apps/deploy-pane/src/__tests__/setupGlobals.ts index e301b9606d3..54bb1472d89 100644 --- a/src/vscode-bicep-ui/apps/deploy-pane/src/__tests__/setupGlobals.ts +++ b/src/vscode-bicep-ui/apps/deploy-pane/src/__tests__/setupGlobals.ts @@ -2,6 +2,7 @@ // Licensed under the MIT License. import { vi } from "vitest"; + import "element-internals-polyfill"; global.ResizeObserver = vi.fn(() => ({ diff --git a/src/vscode-bicep-ui/apps/deploy-pane/src/components/hooks/time.ts b/src/vscode-bicep-ui/apps/deploy-pane/src/components/hooks/time.ts index 2014d6e5ebc..dde47d8df91 100644 --- a/src/vscode-bicep-ui/apps/deploy-pane/src/components/hooks/time.ts +++ b/src/vscode-bicep-ui/apps/deploy-pane/src/components/hooks/time.ts @@ -1,4 +1,4 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -export const getDate = () => Date.now(); \ No newline at end of file +export const getDate = () => Date.now(); diff --git a/src/vscode-bicep-ui/apps/deploy-pane/vite.config.ts b/src/vscode-bicep-ui/apps/deploy-pane/vite.config.ts index 50a3c1e00c7..4b84eb2bc40 100644 --- a/src/vscode-bicep-ui/apps/deploy-pane/vite.config.ts +++ b/src/vscode-bicep-ui/apps/deploy-pane/vite.config.ts @@ -2,8 +2,8 @@ // Licensed under the MIT License. import react from "@vitejs/plugin-react"; -import { coverageConfigDefaults, defineConfig } from "vitest/config"; import { ViteEjsPlugin } from "vite-plugin-ejs"; +import { coverageConfigDefaults, defineConfig } from "vitest/config"; // https://vitejs.dev/config/ export default defineConfig({ @@ -21,14 +21,14 @@ export default defineConfig({ globals: true, watch: false, restoreMocks: true, - environment: 'jsdom', + environment: "jsdom", coverage: { enabled: true, exclude: ["src/index.tsx", ...coverageConfigDefaults.exclude], }, setupFiles: ["src/__tests__/setupGlobals.ts"], deps: { - inline: ['@vscode-elements/react-elements'], - } - } + inline: ["@vscode-elements/react-elements"], + }, + }, });