Skip to content

Commit

Permalink
Removed explicit references and updated .net sdk version (#14527)
Browse files Browse the repository at this point in the history
  • Loading branch information
davidcho23 authored Jul 10, 2024
1 parent bdbd493 commit 8cf5ce4
Show file tree
Hide file tree
Showing 28 changed files with 35 additions and 189 deletions.
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"sdk": {
"allowPrerelease": false,
"version": "8.0.302",
"version": "8.0.303",
"rollForward": "latestFeature"
}
}
13 changes: 2 additions & 11 deletions src/Bicep.Cli.IntegrationTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -653,11 +653,6 @@
"resolved": "6.35.0",
"contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg=="
},
"Microsoft.NET.ILLink.Tasks": {
"type": "Transitive",
"resolved": "8.0.7",
"contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ=="
},
"Microsoft.NET.StringTools": {
"type": "Transitive",
"resolved": "17.4.0",
Expand Down Expand Up @@ -1640,7 +1635,6 @@
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )",
"Microsoft.Extensions.Http": "[8.0.0, )",
"Microsoft.Graph.Bicep.Types": "[0.1.6-preview, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )",
"Microsoft.PowerPlatform.ResourceStack": "[7.0.0.2007, )",
"Newtonsoft.Json": "[13.0.3, )",
"Semver": "[2.3.0, )",
Expand All @@ -1652,8 +1646,7 @@
"Azure.Bicep.Decompiler": {
"type": "Project",
"dependencies": {
"Azure.Bicep.Core": "[1.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Azure.Bicep.Core": "[1.0.0, )"
}
},
"Azure.Bicep.Local.Deploy": {
Expand All @@ -1663,8 +1656,7 @@
"Azure.Bicep.Local.Extension": "[1.0.0, )",
"Azure.Deployments.Engine": "[1.54.0, )",
"Azure.Deployments.Extensibility.Core": "[0.1.55, )",
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )"
}
},
"Azure.Bicep.Local.Extension": {
Expand All @@ -1682,7 +1674,6 @@
"Azure.Bicep.Decompiler": "[1.0.0, )",
"Azure.Bicep.Local.Deploy": "[1.0.0, )",
"Microsoft.Extensions.Logging": "[8.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )",
"Sarif.Sdk": "[4.5.4, )",
"StreamJsonRpc": "[2.18.48, )"
}
Expand Down
13 changes: 2 additions & 11 deletions src/Bicep.Cli.UnitTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -615,11 +615,6 @@
"resolved": "6.35.0",
"contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg=="
},
"Microsoft.NET.ILLink.Tasks": {
"type": "Transitive",
"resolved": "8.0.7",
"contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ=="
},
"Microsoft.NET.StringTools": {
"type": "Transitive",
"resolved": "17.4.0",
Expand Down Expand Up @@ -1511,7 +1506,6 @@
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )",
"Microsoft.Extensions.Http": "[8.0.0, )",
"Microsoft.Graph.Bicep.Types": "[0.1.6-preview, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )",
"Microsoft.PowerPlatform.ResourceStack": "[7.0.0.2007, )",
"Newtonsoft.Json": "[13.0.3, )",
"Semver": "[2.3.0, )",
Expand All @@ -1523,8 +1517,7 @@
"Azure.Bicep.Decompiler": {
"type": "Project",
"dependencies": {
"Azure.Bicep.Core": "[1.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Azure.Bicep.Core": "[1.0.0, )"
}
},
"Azure.Bicep.Local.Deploy": {
Expand All @@ -1534,8 +1527,7 @@
"Azure.Bicep.Local.Extension": "[1.0.0, )",
"Azure.Deployments.Engine": "[1.54.0, )",
"Azure.Deployments.Extensibility.Core": "[0.1.55, )",
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )"
}
},
"Azure.Bicep.Local.Extension": {
Expand All @@ -1553,7 +1545,6 @@
"Azure.Bicep.Decompiler": "[1.0.0, )",
"Azure.Bicep.Local.Deploy": "[1.0.0, )",
"Microsoft.Extensions.Logging": "[8.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )",
"Sarif.Sdk": "[4.5.4, )",
"StreamJsonRpc": "[2.18.48, )"
}
Expand Down
3 changes: 0 additions & 3 deletions src/Bicep.Cli/Bicep.Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Sarif.Sdk" Version="4.5.4" />
<PackageReference Include="StreamJsonRpc" Version="2.18.48" />

<!-- need to explicitly reference this because it was upgraded to 8.0.7 but dotnet SDK version 8.3.0.2 tracks 8.0.6 https://github.com/dotnet/sdk/issues/38200-->
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="8.0.7" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 2 additions & 5 deletions src/Bicep.Cli/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1404,7 +1404,6 @@
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )",
"Microsoft.Extensions.Http": "[8.0.0, )",
"Microsoft.Graph.Bicep.Types": "[0.1.6-preview, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )",
"Microsoft.PowerPlatform.ResourceStack": "[7.0.0.2007, )",
"Newtonsoft.Json": "[13.0.3, )",
"Semver": "[2.3.0, )",
Expand All @@ -1416,8 +1415,7 @@
"Azure.Bicep.Decompiler": {
"type": "Project",
"dependencies": {
"Azure.Bicep.Core": "[1.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Azure.Bicep.Core": "[1.0.0, )"
}
},
"Azure.Bicep.Local.Deploy": {
Expand All @@ -1427,8 +1425,7 @@
"Azure.Bicep.Local.Extension": "[1.0.0, )",
"Azure.Deployments.Engine": "[1.54.0, )",
"Azure.Deployments.Extensibility.Core": "[0.1.55, )",
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )"
}
},
"Azure.Bicep.Local.Extension": {
Expand Down
12 changes: 2 additions & 10 deletions src/Bicep.Core.IntegrationTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -615,11 +615,6 @@
"resolved": "6.35.0",
"contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg=="
},
"Microsoft.NET.ILLink.Tasks": {
"type": "Transitive",
"resolved": "8.0.7",
"contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
"resolved": "1.1.1",
Expand Down Expand Up @@ -1543,7 +1538,6 @@
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )",
"Microsoft.Extensions.Http": "[8.0.0, )",
"Microsoft.Graph.Bicep.Types": "[0.1.6-preview, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )",
"Microsoft.PowerPlatform.ResourceStack": "[7.0.0.2007, )",
"Newtonsoft.Json": "[13.0.3, )",
"Semver": "[2.3.0, )",
Expand All @@ -1555,8 +1549,7 @@
"Azure.Bicep.Decompiler": {
"type": "Project",
"dependencies": {
"Azure.Bicep.Core": "[1.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Azure.Bicep.Core": "[1.0.0, )"
}
},
"Azure.Bicep.Local.Deploy": {
Expand All @@ -1566,8 +1559,7 @@
"Azure.Bicep.Local.Extension": "[1.0.0, )",
"Azure.Deployments.Engine": "[1.54.0, )",
"Azure.Deployments.Extensibility.Core": "[0.1.55, )",
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )"
}
},
"Azure.Bicep.Local.Extension": {
Expand Down
12 changes: 2 additions & 10 deletions src/Bicep.Core.Samples/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -602,11 +602,6 @@
"resolved": "6.35.0",
"contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg=="
},
"Microsoft.NET.ILLink.Tasks": {
"type": "Transitive",
"resolved": "8.0.7",
"contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
"resolved": "1.1.1",
Expand Down Expand Up @@ -1490,7 +1485,6 @@
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )",
"Microsoft.Extensions.Http": "[8.0.0, )",
"Microsoft.Graph.Bicep.Types": "[0.1.6-preview, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )",
"Microsoft.PowerPlatform.ResourceStack": "[7.0.0.2007, )",
"Newtonsoft.Json": "[13.0.3, )",
"Semver": "[2.3.0, )",
Expand All @@ -1502,8 +1496,7 @@
"Azure.Bicep.Decompiler": {
"type": "Project",
"dependencies": {
"Azure.Bicep.Core": "[1.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Azure.Bicep.Core": "[1.0.0, )"
}
},
"Azure.Bicep.Local.Deploy": {
Expand All @@ -1513,8 +1506,7 @@
"Azure.Bicep.Local.Extension": "[1.0.0, )",
"Azure.Deployments.Engine": "[1.54.0, )",
"Azure.Deployments.Extensibility.Core": "[0.1.55, )",
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )"
}
},
"Azure.Bicep.Local.Extension": {
Expand Down
12 changes: 2 additions & 10 deletions src/Bicep.Core.UnitTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -637,11 +637,6 @@
"resolved": "6.35.0",
"contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg=="
},
"Microsoft.NET.ILLink.Tasks": {
"type": "Transitive",
"resolved": "8.0.7",
"contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
"resolved": "1.1.1",
Expand Down Expand Up @@ -1496,7 +1491,6 @@
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )",
"Microsoft.Extensions.Http": "[8.0.0, )",
"Microsoft.Graph.Bicep.Types": "[0.1.6-preview, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )",
"Microsoft.PowerPlatform.ResourceStack": "[7.0.0.2007, )",
"Newtonsoft.Json": "[13.0.3, )",
"Semver": "[2.3.0, )",
Expand All @@ -1508,8 +1502,7 @@
"Azure.Bicep.Decompiler": {
"type": "Project",
"dependencies": {
"Azure.Bicep.Core": "[1.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Azure.Bicep.Core": "[1.0.0, )"
}
},
"Azure.Bicep.Local.Deploy": {
Expand All @@ -1519,8 +1512,7 @@
"Azure.Bicep.Local.Extension": "[1.0.0, )",
"Azure.Deployments.Engine": "[1.54.0, )",
"Azure.Deployments.Extensibility.Core": "[0.1.55, )",
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )"
}
},
"Azure.Bicep.Local.Extension": {
Expand Down
5 changes: 1 addition & 4 deletions src/Bicep.Core/Bicep.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,7 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<!-- force an upgrade of this dependency as it seems to cause build flakiness for unknown reasons -->
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />

<!-- need to explicitly reference this because it was upgraded to 8.0.7 but dotnet SDK version 8.3.0.2 tracks 8.0.6 https://github.com/dotnet/sdk/issues/38200-->
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<Compile Update="CoreResources.Designer.cs">
Expand Down
12 changes: 2 additions & 10 deletions src/Bicep.Decompiler.IntegrationTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -615,11 +615,6 @@
"resolved": "6.35.0",
"contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg=="
},
"Microsoft.NET.ILLink.Tasks": {
"type": "Transitive",
"resolved": "8.0.7",
"contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
"resolved": "1.1.1",
Expand Down Expand Up @@ -1543,7 +1538,6 @@
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )",
"Microsoft.Extensions.Http": "[8.0.0, )",
"Microsoft.Graph.Bicep.Types": "[0.1.6-preview, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )",
"Microsoft.PowerPlatform.ResourceStack": "[7.0.0.2007, )",
"Newtonsoft.Json": "[13.0.3, )",
"Semver": "[2.3.0, )",
Expand All @@ -1555,8 +1549,7 @@
"Azure.Bicep.Decompiler": {
"type": "Project",
"dependencies": {
"Azure.Bicep.Core": "[1.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Azure.Bicep.Core": "[1.0.0, )"
}
},
"Azure.Bicep.Local.Deploy": {
Expand All @@ -1566,8 +1559,7 @@
"Azure.Bicep.Local.Extension": "[1.0.0, )",
"Azure.Deployments.Engine": "[1.54.0, )",
"Azure.Deployments.Extensibility.Core": "[0.1.55, )",
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )"
}
},
"Azure.Bicep.Local.Extension": {
Expand Down
12 changes: 2 additions & 10 deletions src/Bicep.Decompiler.UnitTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -615,11 +615,6 @@
"resolved": "6.35.0",
"contentHash": "xuR8E4Rd96M41CnUSCiOJ2DBh+z+zQSmyrYHdYhD6K4fXBcQGVnRCFQ0efROUYpP+p0zC1BLKr0JRpVuujTZSg=="
},
"Microsoft.NET.ILLink.Tasks": {
"type": "Transitive",
"resolved": "8.0.7",
"contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
"resolved": "1.1.1",
Expand Down Expand Up @@ -1543,7 +1538,6 @@
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )",
"Microsoft.Extensions.Http": "[8.0.0, )",
"Microsoft.Graph.Bicep.Types": "[0.1.6-preview, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )",
"Microsoft.PowerPlatform.ResourceStack": "[7.0.0.2007, )",
"Newtonsoft.Json": "[13.0.3, )",
"Semver": "[2.3.0, )",
Expand All @@ -1555,8 +1549,7 @@
"Azure.Bicep.Decompiler": {
"type": "Project",
"dependencies": {
"Azure.Bicep.Core": "[1.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Azure.Bicep.Core": "[1.0.0, )"
}
},
"Azure.Bicep.Local.Deploy": {
Expand All @@ -1566,8 +1559,7 @@
"Azure.Bicep.Local.Extension": "[1.0.0, )",
"Azure.Deployments.Engine": "[1.54.0, )",
"Azure.Deployments.Extensibility.Core": "[0.1.55, )",
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )"
"Microsoft.AspNet.WebApi.Client": "[6.0.0, )"
}
},
"Azure.Bicep.Local.Extension": {
Expand Down
3 changes: 0 additions & 3 deletions src/Bicep.Decompiler/Bicep.Decompiler.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@

<ItemGroup>
<ProjectReference Include="..\Bicep.Core\Bicep.Core.csproj" />

<!-- need to explicitly reference this because it was upgraded to 8.0.7 but dotnet SDK version 8.3.0.2 tracks 8.0.6 https://github.com/dotnet/sdk/issues/38200-->
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="8.0.7" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Bicep.Decompiler/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,6 @@
"Microsoft.Extensions.DependencyInjection": "[8.0.0, )",
"Microsoft.Extensions.Http": "[8.0.0, )",
"Microsoft.Graph.Bicep.Types": "[0.1.6-preview, )",
"Microsoft.NET.ILLink.Tasks": "[8.0.7, )",
"Microsoft.PowerPlatform.ResourceStack": "[7.0.0.2007, )",
"Newtonsoft.Json": "[13.0.3, )",
"Semver": "[2.3.0, )",
Expand Down
Loading

0 comments on commit 8cf5ce4

Please sign in to comment.