diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4f8f77fdb1..709d1154425 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,28 +1,28 @@ - + https://github.com/dotnet/dotnet - 36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9 + a66d14e1fcfc6474837f9c951759d049c380bc59 - + https://github.com/dotnet/dotnet - 36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9 + a66d14e1fcfc6474837f9c951759d049c380bc59 - + https://github.com/dotnet/dotnet - 36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9 + a66d14e1fcfc6474837f9c951759d049c380bc59 - + https://github.com/dotnet/dotnet - 36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9 + a66d14e1fcfc6474837f9c951759d049c380bc59 - + https://github.com/dotnet/dotnet - 36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9 + a66d14e1fcfc6474837f9c951759d049c380bc59 - + https://github.com/dotnet/dotnet - 36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9 + a66d14e1fcfc6474837f9c951759d049c380bc59 @@ -36,13 +36,13 @@ - + https://github.com/dotnet/dotnet - 36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9 + a66d14e1fcfc6474837f9c951759d049c380bc59 - + https://github.com/dotnet/dotnet - 36ea4de4a4409ace6bdf48c2dae2b6713f47c1b9 + a66d14e1fcfc6474837f9c951759d049c380bc59 diff --git a/eng/Versions.props b/eng/Versions.props index 6bff9d8d45b..fdc0047e868 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,20 +1,20 @@ - 11.0.100-preview.3.26124.102 + 11.0.100-preview.3.26151.104 $(MicrosoftNETSdkPackageVersion) - 11.0.0-preview.3.26124.102 - 11.0.0-preview.3.26124.102 + 11.0.0-preview.3.26151.104 + 11.0.0-preview.3.26151.104 7.0.0-beta.22103.1 11.0.0-beta.26060.102 - 11.0.0-beta.26124.102 - 11.0.100-preview.3.26124.102 - 11.0.100-preview.3.26124.102 + 11.0.0-beta.26151.104 + 11.0.0-preview.3.26151.104 + 11.0.100-preview.3.26151.104 $(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion) - 11.0.100-preview.3.26124.102 - 0.11.5-preview.26124.102 + 11.0.100-preview.3.26151.104 + 0.11.5-preview.26151.104 9.0.4 11.0.0-preview.1.26104.118 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 b1717d2b0fe..6b627177c5e 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 @@ -47,6 +47,16 @@ _ResolveAssemblies MSBuild target. RuntimeIdentifier="$(RuntimeIdentifier)" /> + + + + + + + + <_PrivateAndroidNaotResolvedAssemblyFiles Include="@(ResolvedFileToPublish->Distinct())" Condition=" '%(ResolvedFileToPublish.Extension)' == '.dll' " /> + + <_PrivateAndroidNaotResolvedAssemblyFiles + Update="@(_PrivateAndroidNaotResolvedAssemblyFiles)" + Condition=" '%(_PrivateAndroidNaotResolvedAssemblyFiles.RuntimeIdentifier)' == '' " + RuntimeIdentifier="$(RuntimeIdentifier)" + />