Merge branch 'main' into blazor-hang

* main: [tests] Remove `net472` multitargeting (dotnet#7932) [monodroid] Fix `ld` build error on Nightly Builds. (dotnet#7925) Bump to xamarin/Java.Interop/main@0355acf (dotnet#7931) [tests] Use msftconnecttest.com in QuoteInvalidQuoteUrlsShouldWork (dotnet#7919) [ci] Don't set demands for megapipeline (dotnet#7929)
grendello · Apr 3, 2023 · 8b05e39 · 8b05e39
2 parents 3732378 + 3f756cc
commit 8b05e39
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 127 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -53,19 +53,4 @@
     <MdocPackageVersion Condition=" '$(MdocPackageVersion)' == '' ">5.8.9.2</MdocPackageVersion>
   </PropertyGroup>
 
-  <!-- Properties to help us run managed assemblies on various runtimes.
-       Ex:
-       * Mono: mono xaprepare.exe
-       * Windows .NET: xaprepare.exe
-       * dotnet: dotnet xaprepare.dll
--->
-  <PropertyGroup Condition=" '$(MSBuildRuntimeType)' != 'Core' ">
-    <ManagedToolInvocationRuntime>$(Runtime) </ManagedToolInvocationRuntime>
-    <ManagedToolInvocationExtension>.exe</ManagedToolInvocationExtension>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(MSBuildRuntimeType)' == 'Core' ">
-    <ManagedToolInvocationRuntime>dotnet </ManagedToolInvocationRuntime>
-    <ManagedToolInvocationExtension>.dll</ManagedToolInvocationExtension>
-  </PropertyGroup>
 </Project>
diff --git a/build-tools/automation/yaml-templates/build-macos.yaml b/build-tools/automation/yaml-templates/build-macos.yaml
@@ -32,7 +32,7 @@ stages:
     pool:
       name: ${{ parameters.buildPoolName }}
       vmImage: ${{ parameters.buildPoolImage }}
-      ${{ if or(and(ne(variables['Build.DefinitionName'],'Xamarin.Android'), ne(variables['Build.DefinitionName'], 'Xamarin.Android-Private')), eq(variables['Build.Reason'], 'PullRequest')) }}:
+      ${{ if or(and(ne(variables['Build.DefinitionName'],'Xamarin.Android'), ne(variables['Build.DefinitionName'], 'Xamarin.Android-Private'), ne(variables['Build.DefinitionName'], 'xamarin.megapipeline')), eq(variables['Build.Reason'], 'PullRequest')) }}:
         demands: macOS.Name -equals Monterey
     timeoutInMinutes: 240
     cancelTimeoutInMinutes: 5

diff --git a/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml
diff --git a/build-tools/scripts/PrepareWindows.targets b/build-tools/scripts/PrepareWindows.targets
@@ -4,7 +4,6 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <_TopDir>$(MSBuildThisFileDirectory)..\..</_TopDir>
-    <_XAPrepareExe Condition=" '$(MSBuildRuntimeType)' != 'Core' ">"$(MSBuildThisFileDirectory)..\xaprepare\xaprepare\bin\$(Configuration)\xaprepare.exe"</_XAPrepareExe>
     <_XAPrepareExe Condition=" '$(MSBuildRuntimeType)' == 'Core' ">"$(MSBuildThisFileDirectory)..\xaprepare\xaprepare\bin\$(Configuration)\$(DotNetStableTargetFramework)\xaprepare.dll"</_XAPrepareExe>
     <_XAPrepareStandardArgs Condition=" '$(RunningOnCI)' == 'true' ">--no-emoji --run-mode=CI -v:d</_XAPrepareStandardArgs>
     <_XAPrepareStandardArgs Condition=" '$(XA_FORCE_COMPONENT_REFRESH)' == 'true' ">$(_XAPrepareStandardArgs) -refresh</_XAPrepareStandardArgs>
@@ -15,15 +14,15 @@
   </Target>
   <Target Name="PrepareExternal"
           DependsOnTargets="_BuildXAPrepare">
-    <Exec Command="$(ManagedToolInvocationRuntime)$(_XAPrepareExe) -s:PrepareExternalGitDependencies $(_XAPrepareStandardArgs)" />
+    <Exec Command="dotnet $(_XAPrepareExe) -s:PrepareExternalGitDependencies $(_XAPrepareStandardArgs)" />
   </Target>
   <Target Name="Prepare"
           DependsOnTargets="_BuildXAPrepare">
     <Error
         Text="The specified `%24(AndroidToolchainDirectory)` '$(AndroidToolchainDirectory)' contains a space. Android NDK commands do not support this. Please create a Configuration.Override.props file that sets the AndroidToolchainDirectory property to a different path."
         Condition="$(AndroidToolchainDirectory.Contains (' '))"
     />
-    <Exec Command="$(ManagedToolInvocationRuntime)$(_XAPrepareExe) $(_XAPrepareStandardArgs) -a" WorkingDirectory="$(_TopDir)" />
+    <Exec Command="dotnet $(_XAPrepareExe) $(_XAPrepareStandardArgs) -a" WorkingDirectory="$(_TopDir)" />
     <MSBuild Projects="$(_TopDir)\Xamarin.Android.BootstrapTasks.sln" Targets="Restore;Build" />
   </Target>
 </Project>
diff --git a/build-tools/xaprepare/xaprepare/xaprepare.csproj b/build-tools/xaprepare/xaprepare/xaprepare.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;$(DotNetStableTargetFramework)</TargetFrameworks>
+    <TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
     <OutputType>Exe</OutputType>
     <LangVersion>8.0</LangVersion>
     <RootNamespace>Xamarin.Android.Prepare</RootNamespace>
@@ -10,10 +10,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-  </PropertyGroup>
-
   <Import Project="../../../Configuration.props" />
 
   <ItemGroup>

diff --git a/external/Java.Interop b/external/Java.Interop
diff --git a/....Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj b/....Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;$(DotNetStableTargetFramework)</TargetFrameworks>
+    <TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
     <LibZipSharpBundleAllNativeLibraries>true</LibZipSharpBundleAllNativeLibraries>
     <OutputPath>..\..\..\..\bin\Test$(Configuration)</OutputPath>
     <SignAssembly>true</SignAssembly>

diff --git a/src/monodroid/CMakeLists.txt b/src/monodroid/CMakeLists.txt
@@ -40,8 +40,10 @@ option(ENABLE_CLANG_UBSAN "Enable the clang UndefinedBehaviorSanitizer support"
 
 if(ENABLE_CLANG_ASAN OR ENABLE_CLANG_UBSAN)
   set(STRIP_DEBUG_DEFAULT OFF)
+  set(ANALYZERS_ENABLED ON)
 else()
   set(STRIP_DEBUG_DEFAULT ON)
+  set(ANALYZERS_ENABLED OFF)
 endif()
 
 option(ENABLE_NET "Enable compilation for .NET 6+" OFF)
@@ -751,7 +753,7 @@ target_link_libraries(
   ${LINK_LIBS} xamarin-app
   )
 
-if(ANDROID AND ENABLE_NET)
+if(ANDROID AND ENABLE_NET AND (NOT ANALYZERS_ENABLED))
   add_library(
     c
     SHARED ${XAMARIN_STUB_LIB_SOURCES}

diff --git a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;$(DotNetStableTargetFramework)</TargetFrameworks>
+    <TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
     <RootNamespace>Xamarin.Android.Build.Tests</RootNamespace>
     <LibZipSharpBundleAllNativeLibraries>true</LibZipSharpBundleAllNativeLibraries>
     <OutputPath>..\..\bin\Test$(Configuration)\MSBuildDeviceIntegration\</OutputPath>

diff --git a/tests/Mono.Android-Tests/System.Net/ProxyTest.cs b/tests/Mono.Android-Tests/System.Net/ProxyTest.cs
@@ -13,7 +13,7 @@ public class ProxyTest {
 		[Test]
 		public void QuoteInvalidQuoteUrlsShouldWork ()
 		{
-			string url      = "https://bing.com/?query&foo|bar";
+			string url      = "http://www.msftconnecttest.com/connecttest.txt?query&foo|bar";
 			var request     = (HttpWebRequest) WebRequest.Create (url);
 			request.Method  = "GET";
 			var response    = (HttpWebResponse) request.GetResponse ();