Skip to content

Commit c332cfc

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/installer@0ce891843a 8.0.100-preview.5.23228.7 (#7994)
Changes: dotnet/installer@f876fb5...0ce8918 Changes: dotnet/runtime@ab2b80d...9a7db55 Changes: dotnet/emsdk@2327f6b...31a4a87 Changes: dotnet/cecil@9a7551f...80d3f38 Updates: * Microsoft.Dotnet.Sdk.Internal: from 8.0.100-preview.4.23224.14 to 8.0.100-preview.5.23228.7 * Microsoft.NETCore.App.Ref: from 8.0.0-preview.4.23221.1 to 8.0.0-preview.4.23225.14 * Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport: from 8.0.0-preview.4.23218.1 to 8.0.0-preview.4.23219.1 * Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.4.23221.1 to 8.0.0-preview.4.23225.14 * Microsoft.DotNet.Cecil: from 0.11.4-alpha.23178.1 to 0.11.4-alpha.23218.2 Other changes: A new `libSystem.Globalization.Native.so` file was introduced in the Mono runtime pack in: dotnet/runtime#82393 Android doesn't actually need this file. * Introduce a new private `@(_MonoExcludedLibraries)` item group * Add exclusion for `libSystem.Globalization.Native` Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
1 parent d00b779 commit c332cfc

File tree

4 files changed

+23
-15
lines changed

4 files changed

+23
-15
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.4.23224.14">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.5.23228.7">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>f876fb51a4fb6bc4b8db13d05e88e846ae1dad21</Sha>
5+
<Sha>0ce891843a4ee251d356cd429c596ba25ee15dc3</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.4.23221.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.4.23225.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/runtime</Uri>
9-
<Sha>ab2b80d06dd4d997df5ffa72a3c4a99cb36ccbff</Sha>
9+
<Sha>9a7db5556f4ad892c611b2e174594db17fdec3af</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.4.23221.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.4.23225.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>ab2b80d06dd4d997df5ffa72a3c4a99cb36ccbff</Sha>
13+
<Sha>9a7db5556f4ad892c611b2e174594db17fdec3af</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.4.23218.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.4.23219.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>2327f6b63d887979222f5bcf15f3322f800b9695</Sha>
17+
<Sha>31a4a877360713c4345ce48662e5baeeadfda898</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23178.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
19+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23218.2" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
2020
<Uri>https://github.com/dotnet/cecil</Uri>
21-
<Sha>9a7551fa7ba8218affbc1148eabc4b5c9f4e1151</Sha>
21+
<Sha>80d3f38fc59c351fa1942209e66f54a6fc912deb</Sha>
2222
</Dependency>
2323
</ProductDependencies>
2424
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.4.23224.14</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.4.23221.1</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.4.23221.1</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.5.23228.7</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.4.23225.14</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.4.23225.14</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.4.23218.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
9+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.4.23219.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
12-
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23178.1</MicrosoftDotNetCecilPackageVersion>
12+
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23218.2</MicrosoftDotNetCecilPackageVersion>
1313
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
1414
</PropertyGroup>
1515
<PropertyGroup>

‎src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,12 @@ _ResolveAssemblies MSBuild target.
216216
<_MonoComponent Condition=" '$(AndroidUseInterpreter)' == 'true' " Include="hot_reload" />
217217
<_MonoComponent Condition=" '$(AndroidIncludeDebugSymbols)' == 'true' " Include="debugger" />
218218
<_MonoComponent Condition=" '$(_AndroidExcludeMarshalIlgenComponent)' != 'true' " Include="marshal-ilgen" />
219+
<!-- Filename without extension -->
220+
<_MonoExcludedLibraries Condition=" '$(_AndroidIncludeSystemGlobalizationNative)' != 'true' " Include="libSystem.Globalization.Native" />
219221
</ItemGroup>
220222
<ProcessNativeLibraries
221223
InputLibraries="@(_ResolvedNativeLibraries)"
224+
ExcludedLibraries="@(_MonoExcludedLibraries)"
222225
Components="@(_MonoComponent->Distinct())"
223226
IncludeDebugSymbols="$(AndroidIncludeDebugSymbols)">
224227
<Output TaskParameter="OutputLibraries" ItemName="FrameworkNativeLibrary" />

‎src/Xamarin.Android.Build.Tasks/Tasks/ProcessNativeLibraries.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.IO;
4+
using System.Linq;
45
using Microsoft.Build.Framework;
56
using Microsoft.Android.Build.Tasks;
67

@@ -26,6 +27,7 @@ public class ProcessNativeLibraries : AndroidTask
2627
/// </summary>
2728
public ITaskItem [] InputLibraries { get; set; }
2829
public ITaskItem [] Components { get; set; }
30+
public string [] ExcludedLibraries { get; set; }
2931

3032
public bool IncludeDebugSymbols { get; set; }
3133

@@ -80,6 +82,9 @@ public override bool RunTask ()
8082
if (!wantedComponents.Contains (fileName)) {
8183
continue;
8284
}
85+
} else if (ExcludedLibraries != null && ExcludedLibraries.Contains (fileName, StringComparer.OrdinalIgnoreCase)) {
86+
Log.LogDebugMessage ($"Excluding '{library.ItemSpec}'");
87+
continue;
8388
}
8489

8590
output.Add (library);

0 commit comments

Comments
 (0)