Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…into dev

# Conflicts:
#	src/TestSite.11/TestSite.11.csproj
  • Loading branch information
jcdcdev committed Apr 7, 2024
2 parents 58dae2a + 268759e commit dab2359
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/TestSite.10/TestSite.10.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Umbraco.Cms" Version="10.4.0"/>
<PackageReference Include="Umbraco.Cms" Version="10.8.5"/>
</ItemGroup>

<ItemGroup>
<!-- Opt-in to app-local ICU to ensure consistent globalization APIs across different platforms -->
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.9"/>
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3"/>
<RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="68.2.0.9" Condition="$(RuntimeIdentifier.StartsWith('linux')) or $(RuntimeIdentifier.StartsWith('win')) or ('$(RuntimeIdentifier)' == '' and !$([MSBuild]::IsOSPlatform('osx')))"/>
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/TestSite.12/TestSite.12.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<!-- Opt-in to app-local ICU to ensure consistent globalization APIs across different platforms -->
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.9"/>
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3"/>
<RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="68.2.0.9" Condition="$(RuntimeIdentifier.StartsWith('linux')) or $(RuntimeIdentifier.StartsWith('win')) or ('$(RuntimeIdentifier)' == '' and !$([MSBuild]::IsOSPlatform('osx')))"/>
</ItemGroup>

Expand Down

0 comments on commit dab2359

Please sign in to comment.