diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0e2c593990..beb0e85b169 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/sdk - aca4b810e2be4b6b8aed3bcaf9e36bf3d1962a47 + d6bc7918c0be5005426fbbff43dfb622fc295142 - + https://github.com/dotnet/runtime - 6c58f7992cfd628a53d9b90f258ac123cb803644 + e51af404d1ea26be4a3d8e51fe21cf2f09ad34dd - + https://github.com/dotnet/runtime - 6c58f7992cfd628a53d9b90f258ac123cb803644 + e51af404d1ea26be4a3d8e51fe21cf2f09ad34dd https://github.com/dotnet/emsdk 0de3165cb0d56323b6caaf8e9916d4d9e72da32d - + https://github.com/dotnet/cecil - 9e8bd520939ddfee686261267a1646c1b113d9e1 + 2d5c8fb9aa8bd4c7fc085a73520061075c601655 diff --git a/eng/Versions.props b/eng/Versions.props index fe49c0c8a3a..d2294fc794a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,16 +1,16 @@ - 10.0.100-alpha.1.25069.2 + 10.0.100-preview.2.25102.3 $(MicrosoftNETSdkPackageVersion) - 10.0.0-alpha.1.25067.10 - 10.0.0-alpha.1.25067.10 + 10.0.0-preview.2.25101.4 + 10.0.0-preview.2.25101.4 7.0.0-beta.22103.1 10.0.0-beta.24476.2 10.0.0-alpha.1.25059.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.5-alpha.24627.1 + 0.11.5-alpha.25069.2 $(MicrosoftNETCoreAppRefPackageVersion) 35.0.24 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 1433d3efd6e..c6cc7b24ef3 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 @@ -138,6 +138,9 @@ True + + + <_AndroidUseLibZipSharp Condition=" '$(_AndroidUseLibZipSharp)' == '' ">true diff --git a/tests/TestRunner.NUnit/Properties/AssemblyInfo.cs b/tests/TestRunner.NUnit/Properties/AssemblyInfo.cs deleted file mode 100644 index 8b2e16fa71a..00000000000 --- a/tests/TestRunner.NUnit/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("TestRunner.NUnit")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Microsoft, Inc")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.0.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/tests/TestRunner.NUnit/TestRunner.NUnit.NET.csproj b/tests/TestRunner.NUnit/TestRunner.NUnit.NET.csproj index ff395a25370..a89367dfe38 100644 --- a/tests/TestRunner.NUnit/TestRunner.NUnit.NET.csproj +++ b/tests/TestRunner.NUnit/TestRunner.NUnit.NET.csproj @@ -6,7 +6,6 @@ Library Xamarin.Android.UnitTests.NUnit TestRunner.NUnit.NET - false