Skip to content

Commit

Permalink
Fix vs-bicep build (security updates and required related updates) (#…
Browse files Browse the repository at this point in the history 
…15647)

###### Microsoft Reviewers: [Open in
CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/Azure/bicep/pull/15647)
  • Loading branch information
@StephenWeatherford
StephenWeatherford authored Nov 22, 2024
1 parent e085d02 commit 345c642
Show file tree
Hide file tree
Showing 65 changed files with 2,556 additions and 2,254 deletions.
8 changes: 4 additions & 4 deletions src/Bicep.Cli.IntegrationTests/Bicep.Cli.IntegrationTests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<IsPackable>false</IsPackable>
Expand All @@ -14,10 +14,10 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
</ItemGroup>

<ItemGroup>
Expand Down
133 changes: 71 additions & 62 deletions src/Bicep.Cli.IntegrationTests/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
},
"FluentAssertions": {
"type": "Direct",
"requested": "[6.12.1, )",
"resolved": "6.12.1",
"contentHash": "hciWwryyLw3eonfqhFpOMTXyM1/auJChYslEBA+iGJyuBs5O3t/kA8YaeH4iRo/2Fe3ElSYL86C0miivtZ0f3g==",
"requested": "[6.12.2, )",
"resolved": "6.12.2",
"contentHash": "8YE+xJmT8wgzEpFuzJ4S62oFhEL/AKouMz1RWPEMEUhy9H11aRQlGIWcHurH5BEy7tbF6gb0CJrs0wOw/AtDcQ==",
"dependencies": {
"System.Configuration.ConfigurationManager": "4.4.0"
}
Expand Down Expand Up @@ -45,25 +45,25 @@
},
"Microsoft.VisualStudio.Threading.Analyzers": {
"type": "Direct",
"requested": "[17.11.20, )",
"resolved": "17.11.20",
"contentHash": "yI80R8Ja4ipU7/fyVAMCu0oGTN/u97OgL99gd/8ycGnCF58Kn93iBU3T7rkxGMnlsHf5vEgRu95dujtYcgwf9Q=="
"requested": "[17.12.19, )",
"resolved": "17.12.19",
"contentHash": "v3IYeedjoktvZ+GqYmLudxZJngmf/YWIxNT2Uy6QMMN19cvw+nkWoip1Gr1RtnFkUo1MPUVMis4C8Kj8d8DpSQ=="
},
"MSTest.TestAdapter": {
"type": "Direct",
"requested": "[3.6.2, )",
"resolved": "3.6.2",
"contentHash": "AvxOG6APObsUlTqB5j87VWT522Cqfr7B448HcMDz0jI0nZtTjokGFj7kdc0FBLkmS0yslypP3t3Lt1ieWl9NsQ==",
"requested": "[3.6.3, )",
"resolved": "3.6.3",
"contentHash": "i3KbdAjLO0W9xlvbhZa9u0wh6X+VZ1yTBsUVlVKtx8B9CXa4rFXPcx3yPysB9gbALmhgAjFza4RRoNyXY9IoXQ==",
"dependencies": {
"Microsoft.Testing.Extensions.VSTestBridge": "1.4.2",
"Microsoft.Testing.Platform.MSBuild": "1.4.2"
"Microsoft.Testing.Extensions.VSTestBridge": "1.4.3",
"Microsoft.Testing.Platform.MSBuild": "1.4.3"
}
},
"MSTest.TestFramework": {
"type": "Direct",
"requested": "[3.6.2, )",
"resolved": "3.6.2",
"contentHash": "01RwzjfZRAMPuk9c+Xlcb14fdkgrnYNj4ud4/YMR72VDwnbVLqjQFDLfT6lYq28lCplEuOVYxtN2PeuHS20kRA=="
"requested": "[3.6.3, )",
"resolved": "3.6.3",
"contentHash": "jockRcUoLJMeHzLqFcMnZBrWy7tS32JP7shlepDDJuf5A6HO2PwAefXzhvprcWNkfpEwmR0KihSO2HRXwNbTng=="
},
"Nerdbank.GitVersioning": {
"type": "Direct",
Expand Down Expand Up @@ -457,18 +457,18 @@
},
"Microsoft.Extensions.Configuration.Abstractions": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==",
"resolved": "9.0.0",
"contentHash": "lqvd7W3FGKUO1+ZoUEMaZ5XDJeWvjpy2/M/ptCGz3tXLD4HWVaSzjufsAsjemasBEg+2SxXVtYVvGt5r2nKDlg==",
"dependencies": {
"Microsoft.Extensions.Primitives": "8.0.0"
"Microsoft.Extensions.Primitives": "9.0.0"
}
},
"Microsoft.Extensions.Configuration.Binder": {
"type": "Transitive",
"resolved": "8.0.2",
"contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==",
"resolved": "9.0.0",
"contentHash": "RiScL99DcyngY9zJA2ROrri7Br8tn5N4hP4YNvGdTN/bvg1A3dwvDOxHnNZ3Im7x2SJ5i4LkX1uPiR/MfSFBLQ==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
"Microsoft.Extensions.Configuration.Abstractions": "9.0.0"
}
},
"Microsoft.Extensions.Configuration.FileExtensions": {
Expand Down Expand Up @@ -608,8 +608,8 @@
},
"Microsoft.Extensions.Primitives": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g=="
"resolved": "9.0.0",
"contentHash": "N3qEBzmLMYiASUlKxxFIISP4AiwuPTHF5uCh+2CWSwwzAJiIYx0kBJsS30cp1nvhSySFAVi30jecD307jV+8Kg=="
},
"Microsoft.Graph.Bicep.Types": {
"type": "Transitive",
Expand Down Expand Up @@ -642,6 +642,11 @@
"resolved": "6.35.0",
"contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg=="
},
"Microsoft.NET.ILLink.Tasks": {
"type": "Transitive",
"resolved": "8.0.11",
"contentHash": "zk5lnZrYJgtuJG8L4v17Ej8rZ3PUcR2iweNV08BaO5LbYHIi2wNaVNcJoLxvqgQdnjLlKnCCfVGLDr6QHeAarQ=="
},
"Microsoft.NET.StringTools": {
"type": "Transitive",
"resolved": "17.4.0",
Expand Down Expand Up @@ -677,44 +682,44 @@
},
"Microsoft.Testing.Extensions.Telemetry": {
"type": "Transitive",
"resolved": "1.4.2",
"contentHash": "JsBE6YJ7JDWz8QekV+/N+XWz8k33X2fpVjDSTt2zy0bzHwHA+GKLKPgwwW0dpp8NA45x6gcQWBm4EciiCR5cMQ==",
"resolved": "1.4.3",
"contentHash": "dh8jnqWikxQXJ4kWy8B82PtSAlQCnvDKh1128arDmSW5OU5xWA84HwruV3TanXi3ZjIHn1wWFCgtMOhcDNwBow==",
"dependencies": {
"Microsoft.ApplicationInsights": "2.22.0",
"Microsoft.Testing.Platform": "1.4.2"
"Microsoft.Testing.Platform": "1.4.3"
}
},
"Microsoft.Testing.Extensions.TrxReport.Abstractions": {
"type": "Transitive",
"resolved": "1.4.2",
"contentHash": "5ijsQJR+OIwM3PA/RgjlIJI8E3pjknQFA6OZ4udC4pLTmRVuBuD0Z1iGeGtaDmACKp5MR4J348c4+RMzQfBeTw==",
"resolved": "1.4.3",
"contentHash": "16sWznD6ZMok/zgW+vrO6zerCFMD9N+ey9bi1iV/e9xxsQb4V4y/aW6cY/Y7E9jA7pc+aZ6ffZby43yxQOoYZA==",
"dependencies": {
"Microsoft.Testing.Platform": "1.4.2"
"Microsoft.Testing.Platform": "1.4.3"
}
},
"Microsoft.Testing.Extensions.VSTestBridge": {
"type": "Transitive",
"resolved": "1.4.2",
"contentHash": "SyV6yuR/jzGFAT7Nz3VjVu4xpBpxEzOUsAWo7Sgg18UAsp7rfWRy0qXLxbRy81IgsuuYtTi6bX3E4VCPBFQriA==",
"resolved": "1.4.3",
"contentHash": "xZ6oyNYh2aM5Wb+HJAy1fj2C4CNRVhINXHCjlWs/2C8hEIpdqVSpP3y6HWUN40KpFqyGD4myHGR1Rflm28UpcQ==",
"dependencies": {
"Microsoft.ApplicationInsights": "2.22.0",
"Microsoft.TestPlatform.ObjectModel": "17.11.1",
"Microsoft.Testing.Extensions.Telemetry": "1.4.2",
"Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.2",
"Microsoft.Testing.Platform": "1.4.2"
"Microsoft.Testing.Extensions.Telemetry": "1.4.3",
"Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.3",
"Microsoft.Testing.Platform": "1.4.3"
}
},
"Microsoft.Testing.Platform": {
"type": "Transitive",
"resolved": "1.4.2",
"contentHash": "rgBNwCe9AmCLyDSWzf20Mlh6wGT6XbJrFeSiCmDtQEIs+qxDf0BEomYOD91WISdkkQ9LLY2Tf4N+jmMEKnO+sg=="
"resolved": "1.4.3",
"contentHash": "NedIbwl1T7+ZMeg7gwk0Db8/RFLf0siyVpeTcRMMOle6Xl/ujaYOM4Aduo8rEfVqNj3kcQ7blegpyT3dHi+0PA=="
},
"Microsoft.Testing.Platform.MSBuild": {
"type": "Transitive",
"resolved": "1.4.2",
"contentHash": "/PsQKIIeWQ7+CtYiG/gp8sk6uCFZKWzEXS7igIeYzlwpN4ttrjAXhU6tKbzLSjQtJwnBe/tHXc+x7k0Po3tMKQ==",
"resolved": "1.4.3",
"contentHash": "1gGqgHtiZ6tZn/6Tby+qlKpNe5Ye/5LnxlSsyl4XMZ4m4V+Cu1K1m+gD1zxoxHIvLjgX8mCnQRK95MGBBFuumw==",
"dependencies": {
"Microsoft.Testing.Platform": "1.4.2"
"Microsoft.Testing.Platform": "1.4.3"
}
},
"Microsoft.TestPlatform.ObjectModel": {
Expand Down Expand Up @@ -1009,8 +1014,8 @@
},
"StreamJsonRpc": {
"type": "Transitive",
"resolved": "2.19.27",
"contentHash": "om/+aUQ+OAskHf6Tl8Jgg4+/2P/P5ZDzn9/epiLHmxB/0HaBa8Jebaj3pdPu5o2kAbM9SZblwx8xbwMeeevntw==",
"resolved": "2.20.17",
"contentHash": "AOVxkrwRqe7lPUDhYRMnaSSupdk8lxiHyXuoL+bZzUdzaA2Fnle+Os/gWGEGRGah1CTMmm5vdv9TyimCThXzoQ==",
"dependencies": {
"MessagePack": "2.5.108",
"Microsoft.VisualStudio.Threading": "17.10.48",
Expand Down Expand Up @@ -1186,10 +1191,10 @@
},
"System.IO.Abstractions.TestingHelpers": {
"type": "Transitive",
"resolved": "21.0.29",
"contentHash": "FJewjsi4ggl0vFAmeATPaLORfegsVpJA5Jv1x/i0cTCI+puUwe+nygOBSj+pSxy0br7ZnpAHbpgdRidbZJnmnw==",
"resolved": "21.1.3",
"contentHash": "2EcDkDtYXem8IqFrbg/tMIgEiwql7kMeU5ttoE7Au79BIhmpqSUZqEEBJe6B7kJmY9EI6YXOUccx+ce3+wQWMQ==",
"dependencies": {
"TestableIO.System.IO.Abstractions.TestingHelpers": "21.0.29"
"TestableIO.System.IO.Abstractions.TestingHelpers": "21.1.3"
}
},
"System.IO.FileSystem.Primitives": {
Expand Down Expand Up @@ -1560,11 +1565,11 @@
},
"TestableIO.System.IO.Abstractions.TestingHelpers": {
"type": "Transitive",
"resolved": "21.0.29",
"contentHash": "mm5ktVlPX4KJoadtQRYeibEnaAsXGyqhkFo4EKhcrVIcqKUmeYi5evZyb7//urUpD6kSAOXGQCGzAP+31FUXvA==",
"resolved": "21.1.3",
"contentHash": "sMRPFcqvmSeocHtb5JVf7heBqvBsaFGiodEOoysIB0KneV4+3Yg0ka1421kzBLjRW+itU3FVjjqAAa9fqvUmhA==",
"dependencies": {
"TestableIO.System.IO.Abstractions": "21.0.29",
"TestableIO.System.IO.Abstractions.Wrappers": "21.0.29"
"TestableIO.System.IO.Abstractions": "21.1.3",
"TestableIO.System.IO.Abstractions.Wrappers": "21.1.3"
}
},
"TestableIO.System.IO.Abstractions.Wrappers": {
Expand All @@ -1589,11 +1594,12 @@
"JsonPatch.Net": "[3.1.1, )",
"JsonPath.Net": "[1.1.6, )",
"Microsoft.Extensions.Configuration": "[8.0.0, )",
"Microsoft.Extensions.Configuration.Binder": "[8.0.2, )",
"Microsoft.Extensions.Configuration.Binder": "[9.0.0, )",
"Microsoft.Extensions.Configuration.Json": "[8.0.1, )",
"Microsoft.Extensions.DependencyInjection": "[8.0.1, )",
"Microsoft.Extensions.Http": "[8.0.1, )",
"Microsoft.Graph.Bicep.Types": "[0.1.7-preview, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.11, )",
"Microsoft.PowerPlatform.ResourceStack": "[7.0.0.2076, )",
"Newtonsoft.Json": "[13.0.3, )",
"Semver": "[3.0.0, )",
Expand All @@ -1605,7 +1611,8 @@
"Azure.Bicep.Decompiler": {
"type": "Project",
"dependencies": {
"Azure.Bicep.Core": "[1.0.0, )"
"Azure.Bicep.Core": "[1.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.11, )"
}
},
"Azure.Bicep.Local.Deploy": {
Expand All @@ -1615,7 +1622,8 @@
"Azure.Bicep.Local.Extension": "[1.0.0, )",
"Azure.Deployments.Engine": "[1.195.0, )",
"Azure.Deployments.Extensibility.Core": "[0.1.55, )",
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )"
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.11, )"
}
},
"Azure.Bicep.Local.Extension": {
Expand All @@ -1633,16 +1641,17 @@
"Azure.Bicep.Decompiler": "[1.0.0, )",
"Azure.Bicep.Local.Deploy": "[1.0.0, )",
"Microsoft.Extensions.Logging": "[8.0.1, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.11, )",
"Sarif.Sdk": "[4.5.4, )",
"StreamJsonRpc": "[2.19.27, )"
"StreamJsonRpc": "[2.20.17, )"
}
},
"bicep.cli.unittests": {
"type": "Project",
"dependencies": {
"FluentAssertions": "[6.12.1, )",
"MSTest.TestAdapter": "[3.6.2, )",
"MSTest.TestFramework": "[3.6.2, )",
"FluentAssertions": "[6.12.2, )",
"MSTest.TestAdapter": "[3.6.3, )",
"MSTest.TestFramework": "[3.6.3, )",
"Microsoft.NET.Test.Sdk": "[17.11.1, )",
"bicep": "[1.0.0, )"
}
Expand All @@ -1652,9 +1661,9 @@
"dependencies": {
"Azure.Bicep.Core": "[1.0.0, )",
"Bicep.Core.UnitTests": "[1.0.0, )",
"FluentAssertions": "[6.12.1, )",
"MSTest.TestAdapter": "[3.6.2, )",
"MSTest.TestFramework": "[3.6.2, )",
"FluentAssertions": "[6.12.2, )",
"MSTest.TestAdapter": "[3.6.3, )",
"MSTest.TestFramework": "[3.6.3, )",
"Microsoft.NET.Test.Sdk": "[17.11.1, )"
}
},
Expand All @@ -1664,21 +1673,21 @@
"Azure.Bicep.Core": "[1.0.0, )",
"Bicep.LangServer": "[1.0.0, )",
"DiffPlex": "[1.7.2, )",
"FluentAssertions": "[6.12.1, )",
"FluentAssertions": "[6.12.2, )",
"JsonDiffPatch.Net": "[2.3.0, )",
"MSTest.TestAdapter": "[3.6.2, )",
"MSTest.TestFramework": "[3.6.2, )",
"MSTest.TestAdapter": "[3.6.3, )",
"MSTest.TestFramework": "[3.6.3, )",
"Microsoft.NET.Test.Sdk": "[17.11.1, )",
"Moq": "[4.20.72, )",
"Newtonsoft.Json.Schema": "[4.0.1, )",
"RichardSzalay.MockHttp": "[7.0.0, )",
"System.IO.Abstractions.TestingHelpers": "[21.0.29, )"
"System.IO.Abstractions.TestingHelpers": "[21.1.3, )"
}
},
"bicep.io": {
"type": "Project",
"dependencies": {
"System.IO.Abstractions": "[21.0.29, )"
"System.IO.Abstractions": "[21.1.3, )"
}
},
"bicep.langserver": {
Expand Down
8 changes: 4 additions & 4 deletions src/Bicep.Cli.UnitTests/Bicep.Cli.UnitTests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<IsPackable>false</IsPackable>
Expand All @@ -9,10 +9,10 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit 345c642

Please sign in to comment.