Skip to content

Commit

Permalink
Bump to dotnet/installer@8488614afe 8.0.100-preview.5.23264.2 (#8018)
Browse files Browse the repository at this point in the history 
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 <jonathan.peppers@microsoft.com>
  • Loading branch information
@dotnet-maestro @jonathanpeppers
dotnet-maestro[bot] and jonathanpeppers authored May 16, 2023
1 parent ff5455c commit 964746e
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.5.23228.7">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.5.23264.2">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>0ce891843a4ee251d356cd429c596ba25ee15dc3</Sha>
<Sha>8488614afec7497b9e74b47c976af2a97506bb96</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.4.23225.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.5.23260.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9a7db5556f4ad892c611b2e174594db17fdec3af</Sha>
<Sha>888bac304442e1a6883cfb922d21a74df910112d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.4.23225.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.5.23260.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9a7db5556f4ad892c611b2e174594db17fdec3af</Sha>
<Sha>888bac304442e1a6883cfb922d21a74df910112d</Sha>
</Dependency>
<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">
<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">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>31a4a877360713c4345ce48662e5baeeadfda898</Sha>
<Sha>ab09b0b8d6768d58e09c033beea1570d4ca74c1f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23218.2" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23252.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>80d3f38fc59c351fa1942209e66f54a6fc912deb</Sha>
<Sha>c32f0be86d4e72dfc0967ef08913889cfdbc8dc4</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.5.23228.7</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.4.23225.14</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.4.23225.14</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.5.23264.2</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.5.23260.3</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.5.23260.3</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.4.23219.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.5.23252.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23218.2</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23252.1</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions ...uild.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ _ResolveAssemblies MSBuild target.
<PropertyGroup>
<_AdditionalProperties>
_ComputeFilesToPublishForRuntimeIdentifiers=true
;SelfContained=true
;AppendRuntimeIdentifierToOutputPath=true
;ResolveAssemblyReferencesFindRelatedSatellites=false
;SkipCompilerExecution=true
Expand Down
1 change: 1 addition & 0 deletions ...Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
<PropertyGroup Condition=" '$(AndroidApplication)' == 'true' ">
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<PublishReferencesDocumentationFiles Condition=" '$(PublishReferencesDocumentationFiles)' == '' ">false</PublishReferencesDocumentationFiles>
<UseCurrentRuntimeIdentifier>false</UseCurrentRuntimeIdentifier>
<PublishTrimmed Condition=" '$(PublishTrimmed)' == '' and ('$(AndroidLinkMode)' == 'SdkOnly' or '$(AndroidLinkMode)' == 'Full') ">true</PublishTrimmed>
<PublishTrimmed Condition=" '$(PublishTrimmed)' == '' and '$(Configuration)' == 'Release' and '$(AndroidLinkMode)' != 'None' ">true</PublishTrimmed>
<AndroidLinkMode Condition=" '$(AndroidLinkMode)' == '' and '$(PublishTrimmed)' == 'true' ">SdkOnly</AndroidLinkMode>
Expand Down

0 comments on commit 964746e

Please sign in to comment.