diff --git a/NuGet.config b/NuGet.config index 93f3dbf589d..e770d026e2c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,8 @@ - - @@ -19,11 +17,6 @@ - - - - - diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 342637aff4a..61be4053073 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -25,7 +25,7 @@ resources: - repository: maui type: github name: dotnet/maui - ref: refs/heads/net10.0 + ref: refs/heads/main endpoint: xamarin parameters: @@ -120,6 +120,8 @@ extends: clean: all variables: BuildVersion: $(Build.BuildId) + # Ignore MAUI's public API analyzer errors (RS0016) - dotnet/android does not care about those + PublicApiType: Generate steps: - checkout: maui clean: true diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93ef9b92595..bf18bb6ced9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/dotnet - 1e7efacf690950614a46f9e40bb3efa61231f9f8 + 695853e77c90c85e2ad501d2ed148d7819eef80e https://github.com/dotnet/dotnet @@ -40,13 +40,13 @@ - + https://github.com/dotnet/dotnet - 1e7efacf690950614a46f9e40bb3efa61231f9f8 + 695853e77c90c85e2ad501d2ed148d7819eef80e - + https://github.com/dotnet/dotnet - 1e7efacf690950614a46f9e40bb3efa61231f9f8 + 695853e77c90c85e2ad501d2ed148d7819eef80e diff --git a/eng/Versions.props b/eng/Versions.props index 25900e53d08..83c862d69aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,17 +1,17 @@ - 10.0.300-preview.26156.117 + 10.0.300-preview.0.26165.106 $(MicrosoftNETSdkPackageVersion) 10.0.3-servicing.26065.102 10.0.3 7.0.0-beta.22103.1 - 10.0.0-beta.26156.117 + 10.0.0-beta.26165.106 10.0.104 10.0.104 $(MicrosoftNETWorkloadMonoToolChainCurrentManifest100100PackageVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion) - 10.0.300-preview.26156.117 + 10.0.300-preview.26165.106 0.11.5-alpha.26065.102 9.0.4 diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs index a3f0ae63fe8..af412c959c5 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs @@ -44,6 +44,10 @@ protected Process ExecuteProcess (string [] args, string workingDirectory = null p.StartInfo.WorkingDirectory = workingDirectory; } p.StartInfo.SetEnvironmentVariable ("DOTNET_MULTILEVEL_LOOKUP", "0"); + // Workaround for dotnet/msbuild#13175: the MSBuild app host needs DOTNET_HOST_PATH + // to bootstrap the .NET runtime when spawning TaskHostFactory task hosts (e.g. ILLink). + // Without this, builds fail with MSB4221 when using a locally-installed SDK. + p.StartInfo.SetEnvironmentVariable ("DOTNET_HOST_PATH", p.StartInfo.FileName); p.StartInfo.SetEnvironmentVariable ("PATH", TestEnvironment.DotNetPreviewDirectory + Path.PathSeparator + Environment.GetEnvironmentVariable ("PATH")); if (TestEnvironment.UseLocalBuildOutput) { p.StartInfo.SetEnvironmentVariable ("DOTNETSDK_WORKLOAD_MANIFEST_ROOTS", TestEnvironment.WorkloadManifestOverridePath);