Skip to content

Commit 964746e

Browse files
Bump to dotnet/installer@8488614afe 8.0.100-preview.5.23264.2 (#8018)
Fixes: dotnet/sdk#32539 Changes: dotnet/installer@0ce8918...8488614 Changes: dotnet/runtime@9a7db55...888bac3 Changes: dotnet/emsdk@31a4a87...ab09b0b Changes: dotnet/cecil@80d3f38...c32f0be Updates: * Microsoft.Dotnet.Sdk.Internal: from 8.0.100-preview.5.23228.7 to 8.0.100-preview.5.23264.2 * Microsoft.NETCore.App.Ref: from 8.0.0-preview.4.23225.14 to 8.0.0-preview.5.23260.3 * Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport: from 8.0.0-preview.4.23219.1 to 8.0.0-preview.5.23252.1 * Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.4.23225.14 to 8.0.0-preview.5.23260.3 * Microsoft.DotNet.Cecil: from 0.11.4-alpha.23218.2 to 0.11.4-alpha.23252.1 ~~ Other changes ~~ In [dotnet/sdk#30038][0], the default value for `$(SelfContained)` was changed for various types of projects. Unforunately, this broke `Release` builds on Android. Opting into non-self-contained builds triggers: error XALNS7028: System.IO.FileNotFoundException: Could not load assembly 'mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e'. Perhaps it doesn't exist in the Mono for Android profile? But we can solve the issues by: * Pass `$(SelfContained)` as `true` for all "inner builds" that run for each `$(RuntimeIdentifier)`. * Set `$(UseCurrentRuntimeIdentifier)` by default, so we don't opt into the Host's RID. Builds would select `win-x64` or `osx-64` otherwise. [0]: dotnet/sdk#30038 Co-authored-by: Jonathan Peppers <[email protected]>
1 parent ff5455c commit 964746e

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

Diff for: eng/Version.Details.xml

+10-10
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.5.23228.7">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.5.23264.2">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>0ce891843a4ee251d356cd429c596ba25ee15dc3</Sha>
5+
<Sha>8488614afec7497b9e74b47c976af2a97506bb96</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.4.23225.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.5.23260.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/runtime</Uri>
9-
<Sha>9a7db5556f4ad892c611b2e174594db17fdec3af</Sha>
9+
<Sha>888bac304442e1a6883cfb922d21a74df910112d</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.4.23225.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.5.23260.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>9a7db5556f4ad892c611b2e174594db17fdec3af</Sha>
13+
<Sha>888bac304442e1a6883cfb922d21a74df910112d</Sha>
1414
</Dependency>
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">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.5.23252.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>31a4a877360713c4345ce48662e5baeeadfda898</Sha>
17+
<Sha>ab09b0b8d6768d58e09c033beea1570d4ca74c1f</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23218.2" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
19+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23252.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
2020
<Uri>https://github.com/dotnet/cecil</Uri>
21-
<Sha>80d3f38fc59c351fa1942209e66f54a6fc912deb</Sha>
21+
<Sha>c32f0be86d4e72dfc0967ef08913889cfdbc8dc4</Sha>
2222
</Dependency>
2323
</ProductDependencies>
2424
<ToolsetDependencies>

Diff for: eng/Versions.props

+5-5
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.5.23228.7</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.4.23225.14</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.4.23225.14</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.5.23264.2</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.5.23260.3</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.5.23260.3</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.23219.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
9+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.5.23252.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
12-
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23218.2</MicrosoftDotNetCecilPackageVersion>
12+
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23252.1</MicrosoftDotNetCecilPackageVersion>
1313
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
1414
</PropertyGroup>
1515
<PropertyGroup>

Diff for: src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ _ResolveAssemblies MSBuild target.
8989
<PropertyGroup>
9090
<_AdditionalProperties>
9191
_ComputeFilesToPublishForRuntimeIdentifiers=true
92+
;SelfContained=true
9293
;AppendRuntimeIdentifierToOutputPath=true
9394
;ResolveAssemblyReferencesFindRelatedSatellites=false
9495
;SkipCompilerExecution=true

Diff for: src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
<PropertyGroup Condition=" '$(AndroidApplication)' == 'true' ">
6464
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
6565
<PublishReferencesDocumentationFiles Condition=" '$(PublishReferencesDocumentationFiles)' == '' ">false</PublishReferencesDocumentationFiles>
66+
<UseCurrentRuntimeIdentifier>false</UseCurrentRuntimeIdentifier>
6667
<PublishTrimmed Condition=" '$(PublishTrimmed)' == '' and ('$(AndroidLinkMode)' == 'SdkOnly' or '$(AndroidLinkMode)' == 'Full') ">true</PublishTrimmed>
6768
<PublishTrimmed Condition=" '$(PublishTrimmed)' == '' and '$(Configuration)' == 'Release' and '$(AndroidLinkMode)' != 'None' ">true</PublishTrimmed>
6869
<AndroidLinkMode Condition=" '$(AndroidLinkMode)' == '' and '$(PublishTrimmed)' == 'true' ">SdkOnly</AndroidLinkMode>

0 commit comments

Comments
 (0)