diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c978fc8f66d..309e5e37ee4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - 0ce891843a4ee251d356cd429c596ba25ee15dc3 + 8488614afec7497b9e74b47c976af2a97506bb96 - + https://github.com/dotnet/runtime - 9a7db5556f4ad892c611b2e174594db17fdec3af + 888bac304442e1a6883cfb922d21a74df910112d - + https://github.com/dotnet/runtime - 9a7db5556f4ad892c611b2e174594db17fdec3af + 888bac304442e1a6883cfb922d21a74df910112d - + https://github.com/dotnet/emsdk - 31a4a877360713c4345ce48662e5baeeadfda898 + ab09b0b8d6768d58e09c033beea1570d4ca74c1f - + https://github.com/dotnet/cecil - 80d3f38fc59c351fa1942209e66f54a6fc912deb + c32f0be86d4e72dfc0967ef08913889cfdbc8dc4 diff --git a/eng/Versions.props b/eng/Versions.props index d4a3c25a03e..5c2ea2b58ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,15 @@ - 8.0.100-preview.5.23228.7 - 8.0.0-preview.4.23225.14 - 8.0.0-preview.4.23225.14 + 8.0.100-preview.5.23264.2 + 8.0.0-preview.5.23260.3 + 8.0.0-preview.5.23260.3 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 8.0.0-preview.4.23219.1 + 8.0.0-preview.5.23252.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.4-alpha.23218.2 + 0.11.4-alpha.23252.1 $(MicrosoftNETCoreAppRefPackageVersion) diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets index d7883d600d2..ae35d401aee 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets @@ -89,6 +89,7 @@ _ResolveAssemblies MSBuild target. <_AdditionalProperties> _ComputeFilesToPublishForRuntimeIdentifiers=true + ;SelfContained=true ;AppendRuntimeIdentifierToOutputPath=true ;ResolveAssemblyReferencesFindRelatedSatellites=false ;SkipCompilerExecution=true diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets index 8f72ec0b74e..7767b0e23c8 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets @@ -63,6 +63,7 @@ false false + false true true SdkOnly