Skip to content

Commit 15bb5cc

Browse files
authored
Restrict Microsoft.ICU.ICU4C.Runtime to only Windows on ARM64 (#3135)
1 parent 1dc066f commit 15bb5cc

File tree

2 files changed

+1
-39
lines changed

2 files changed

+1
-39
lines changed

src/SIL.XForge.Scripture/SIL.XForge.Scripture.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.14" />
3535
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="4.0.0" />
3636
<!-- Use a version of ICU on Windows that supports ARM64, x86, and x64 -->
37-
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" Condition="$([MSBuild]::IsOsPlatform('Windows'))" />
37+
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" Condition="$([MSBuild]::IsOsPlatform('Windows')) AND '$(RuntimeIdentifier)' == 'win-arm64'" />
3838
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
3939
<PackageReference Include="NPOI" Version="2.7.3" />
4040
<!-- When using a new major or minor version of ParatextData, update where dependencies.yml copies the

src/SIL.XForge.Scripture/packages.lock.json

-38
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,6 @@
6767
"Microsoft.FeatureManagement": "4.0.0"
6868
}
6969
},
70-
"Microsoft.ICU.ICU4C.Runtime": {
71-
"type": "Direct",
72-
"requested": "[72.1.0.3, )",
73-
"resolved": "72.1.0.3",
74-
"contentHash": "Z42uzvs0TN9Y02xgHtRgPcumLRnvK3MHVHZ0Pr3OrnvyZYhBwqDgdYBOvoELcTsayUgwqrPLb+C5Fqqk66zlUg==",
75-
"dependencies": {
76-
"Microsoft.ICU.ICU4C.Runtime.linux-arm64": "72.1.0.3",
77-
"Microsoft.ICU.ICU4C.Runtime.linux-x64": "72.1.0.3",
78-
"Microsoft.ICU.ICU4C.Runtime.win-arm64": "72.1.0.3",
79-
"Microsoft.ICU.ICU4C.Runtime.win-x64": "72.1.0.3",
80-
"Microsoft.ICU.ICU4C.Runtime.win-x86": "72.1.0.3"
81-
}
82-
},
8370
"Microsoft.VisualStudio.Azure.Containers.Tools.Targets": {
8471
"type": "Direct",
8572
"requested": "[1.21.2, )",
@@ -741,31 +728,6 @@
741728
"System.Diagnostics.DiagnosticSource": "8.0.1"
742729
}
743730
},
744-
"Microsoft.ICU.ICU4C.Runtime.linux-arm64": {
745-
"type": "Transitive",
746-
"resolved": "72.1.0.3",
747-
"contentHash": "u/2cPX6JBgSgTOeDjkb2A672LsL3zQo60ViYUTqHOrxuFOIx0ag6bFu2WgN4zRZ71K6L0fubnrlS1HpN+k5kyA=="
748-
},
749-
"Microsoft.ICU.ICU4C.Runtime.linux-x64": {
750-
"type": "Transitive",
751-
"resolved": "72.1.0.3",
752-
"contentHash": "q1iHc4EGCBYbpb+gfMZGn6L/WuBei/la52pRbxlVy4ed7FdB9UmvUXhoRzv6OsYa6E4VlTlj6EKgYvrwPkVGKQ=="
753-
},
754-
"Microsoft.ICU.ICU4C.Runtime.win-arm64": {
755-
"type": "Transitive",
756-
"resolved": "72.1.0.3",
757-
"contentHash": "/h8OPK1fqrI9t8hKNmpnSy7MYssGB1CtoXANsduFqf0Sc+OOtfoCIvRp2Mt9Fk80CmtU/53TldGvt1oCH7KpEA=="
758-
},
759-
"Microsoft.ICU.ICU4C.Runtime.win-x64": {
760-
"type": "Transitive",
761-
"resolved": "72.1.0.3",
762-
"contentHash": "7j6NsmvKuVxgoFsoy0Ty7I09V/tvrQBZN+ddfHtz/OWNRaEIy7PsAguGoyD4AcQZh/KkfT9RQlHoQJ4xVQPr6g=="
763-
},
764-
"Microsoft.ICU.ICU4C.Runtime.win-x86": {
765-
"type": "Transitive",
766-
"resolved": "72.1.0.3",
767-
"contentHash": "xTHoHJKtgHDsYkQ/RU3o4U36ktjQqnR+ML00HDDK2SWr+9nMekxnXvtLZ2I4cqF8s51frxqTRgx1jDVtIzCf3w=="
768-
},
769731
"Microsoft.IdentityModel.Abstractions": {
770732
"type": "Transitive",
771733
"resolved": "8.0.1",

0 commit comments

Comments
 (0)