diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c955e3add76..fe6969de56a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 2047768c55865642b1b930bbc6e1260825ace624 https://github.com/dotnet/dotnet @@ -40,13 +40,13 @@ - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 2047768c55865642b1b930bbc6e1260825ace624 diff --git a/eng/Versions.props b/eng/Versions.props index 5d0f25ed02c..e7665204dc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,17 +1,17 @@ - 10.0.103-servicing.26065.102 + 10.0.200-preview.0.26077.126 $(MicrosoftNETSdkPackageVersion) 10.0.3-servicing.26065.102 10.0.3 7.0.0-beta.22103.1 - 10.0.0-beta.26065.102 + 10.0.0-beta.26077.126 10.0.103 10.0.103 $(MicrosoftNETWorkloadMonoToolChainCurrentManifest100100PackageVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion) - 10.0.103 + 10.0.200-preview.26077.126 0.11.5-alpha.26065.102 9.0.4 @@ -24,9 +24,9 @@ \-(preview|rc|alpha).\d+ $(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), $(VersionSuffixRegex))) $(DotNetPreviewVersionBand) - $(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftNETWorkloadMonoToolChainPackageVersion), $(VersionSuffixRegex))) - $(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftNETWorkloadEmscriptenPackageVersion), $(VersionSuffixRegex))) - - $(DotNetPreviewVersionBand) + + 10.0.100 + 10.0.100 + 10.0.100 diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets index a738a9c1e70..cc8b9c9247a 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets @@ -8,6 +8,11 @@ Condition=" $([MSBuild]::VersionLessThanOrEquals($(TargetFrameworkVersion), '8.0')) " /> + + + false + +