bicep: fix building on arm64-linux and x86_64-darwin by downgrading Grpc.Tools (#383277)

This commit is contained in:
Dillon Beliveau
2025-02-19 16:31:44 +01:00
committed by GitHub
parent f8053a7d4b
commit f0d609cff8
3 changed files with 39 additions and 2 deletions
@@ -0,0 +1,33 @@
diff --git a/src/Bicep.Local.Extension/Bicep.Local.Extension.csproj b/src/Bicep.Local.Extension/Bicep.Local.Extension.csproj
index e02412540..7e0fb5e90 100644
--- a/src/Bicep.Local.Extension/Bicep.Local.Extension.csproj
+++ b/src/Bicep.Local.Extension/Bicep.Local.Extension.csproj
@@ -17,7 +17,7 @@
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="Google.Protobuf" Version="3.29.2" />
- <PackageReference Include="Grpc.Tools" Version="2.69.0">
+ <PackageReference Include="Grpc.Tools" Version="2.68.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
diff --git a/src/Bicep.Local.Extension/packages.lock.json b/src/Bicep.Local.Extension/packages.lock.json
index e7297d0af..c262f0849 100644
--- a/src/Bicep.Local.Extension/packages.lock.json
+++ b/src/Bicep.Local.Extension/packages.lock.json
@@ -32,9 +32,9 @@
},
"Grpc.Tools": {
"type": "Direct",
- "requested": "[2.69.0, )",
- "resolved": "2.69.0",
- "contentHash": "W5hW4R1h19FCzKb8ToqIJMI5YxnQqGmREEpV8E5XkfCtLPIK5MSHztwQ8gZUfG8qu9fg5MhItjzyPRqQBjnrbA=="
+ "requested": "[2.68.1, )",
+ "resolved": "2.68.1",
+ "contentHash": "BZ96s7ijKAhJoRpIK+pqCeLaGaSwyc5/CAZFwgCcBuAnkU2naYvH0P6qnYCkl0pWDY/JBOnE2RvX9IvRX1Yc5Q=="
},
"Microsoft.CodeAnalysis.BannedApiAnalyzers": {
"type": "Direct",
--
2.47.2
+2 -2
View File
@@ -156,8 +156,8 @@
},
{
"pname": "Grpc.Tools",
"version": "2.69.0",
"hash": "sha256-3nye4UcU2J7tnruKhoacD0S+fPN6d0A34K1yxlYrfxI="
"version": "2.68.1",
"hash": "sha256-sbJWCrzK2UAcHdWw/wRY+hmwcqoTc02+fYsFHG6tiFY="
},
{
"pname": "Humanizer.Core",
+4
View File
@@ -19,6 +19,10 @@ buildDotnetModule rec {
hash = "sha256-5XrFIgblr2WIMBPoVwRZ6X2dokbXw+nS8J7WzhHEzpU=";
};
patches = [
./0001-Revert-Bump-Grpc.Tools-from-2.68.1-to-2.69.0-16097.patch
];
postPatch = ''
substituteInPlace src/Directory.Build.props --replace-fail "<TreatWarningsAsErrors>true</TreatWarningsAsErrors>" ""
# Upstream uses rollForward = disable, which pins to an *exact* .NET SDK version.