diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25fed2b37bc..007e3034471 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ https://github.com/dotnet/dotnet b4b350a66ea5dcf13420747036d8b263cdf6cbef - + https://github.com/dotnet/dotnet - b4b350a66ea5dcf13420747036d8b263cdf6cbef + 50dbab4de210e882172b07934e9666313b7065f1 - + https://github.com/dotnet/dotnet - b4b350a66ea5dcf13420747036d8b263cdf6cbef + 50dbab4de210e882172b07934e9666313b7065f1 - + https://github.com/dotnet/dotnet - b4b350a66ea5dcf13420747036d8b263cdf6cbef + 50dbab4de210e882172b07934e9666313b7065f1 https://github.com/dotnet/dotnet @@ -36,17 +36,17 @@ - + https://github.com/dotnet/dotnet - b4b350a66ea5dcf13420747036d8b263cdf6cbef + 50dbab4de210e882172b07934e9666313b7065f1 - + https://github.com/dotnet/dotnet - b4b350a66ea5dcf13420747036d8b263cdf6cbef + 50dbab4de210e882172b07934e9666313b7065f1 - + https://github.com/dotnet/dotnet - b4b350a66ea5dcf13420747036d8b263cdf6cbef + 50dbab4de210e882172b07934e9666313b7065f1 https://github.com/microsoft/testfx diff --git a/eng/Versions.props b/eng/Versions.props index 2c55d9d43db..48b4abd3d1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,18 +3,18 @@ 11.0.100-preview.7.26355.102 $(MicrosoftNETSdkPackageVersion) - 11.0.0-preview.7.26355.102 - 11.0.0-preview.7.26355.102 + 11.0.0-preview.7.26360.111 + 11.0.0-preview.7.26360.111 7.0.0-beta.22103.1 11.0.0-beta.26060.102 - 11.0.0-beta.26355.102 + 11.0.0-beta.26360.111 11.0.100-preview.4.26215.121 11.0.100-preview.4.26215.121 $(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview4PackageVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion) - 11.0.100-preview.7.26355.102 - 0.11.5-preview.26355.102 + 11.0.100-preview.7.26360.111 + 0.11.5-preview.26360.111 4.4.0-preview.26360.5 10.0.9 11.0.0-preview.1.26104.118 diff --git a/global.json b/global.json index 04333540172..d6f5a6f1e8f 100644 --- a/global.json +++ b/global.json @@ -4,6 +4,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.134", - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26355.102" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26360.111" } } diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildAssetsTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildAssetsTest.cs index 091dfa4a33e..646a1592c27 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildAssetsTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildAssetsTest.cs @@ -193,9 +193,6 @@ public void FullPrefixRaisesError(string prefix) }, }; var app = new XamarinAndroidApplicationProject { - References = { - new BuildItem ("ProjectReference", "..\\Library1\\Library1.csproj"), - }, OtherBuildItems = { new AndroidItem.AndroidAsset ("Assets\\asset2.txt") { TextContent = () => "foo", diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index fabd888d41e..09b459c8835 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs @@ -655,7 +655,7 @@ public void BuildApplicationWithSpacesInPath ([Values (true, false)] bool enable IsRelease = isRelease, AotAssemblies = aotAssemblies, LinkTool = linkTool, - References = { new BuildItem ("ProjectReference", $"..\\{folderName}Library1\\Library1.csproj") }, + References = { new BuildItem ("ProjectReference", $"..\\{TestName}Library1\\Library1.csproj") }, }; proj.SetRuntime (runtime); proj.OtherBuildItems.Add (new BuildItem ("AndroidJavaLibrary", "Hello (World).jar") { BinaryContent = () => Convert.FromBase64String (@"