diff --git a/Directory.Build.props b/Directory.Build.props index c0778841e5f..7006a2d902b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -53,19 +53,4 @@ 5.8.9.2 - - - $(Runtime) - .exe - - - - dotnet - .dll - diff --git a/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml deleted file mode 100644 index 0c2c4295c42..00000000000 --- a/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml +++ /dev/null @@ -1,98 +0,0 @@ -# Runs MSBuild tests against a device running on macOS - -parameters: - node_id: 0 - job_name: '' - job_suffix: '' - nunit_categories: '' - target_framework: 'net472' - dotnet_targetframework: $(DotNetStableTargetFramework) - provisionatorChannel: latest - jobCondition: succeeded() - -jobs: - - job: ${{ parameters.job_name }} - displayName: "macOS > Tests > MSBuild+Emulator ${{ parameters.job_suffix }} #${{ parameters.node_id }}" - condition: ${{ parameters.jobCondition }} - pool: - vmImage: $(HostedMacImage) - timeoutInMinutes: 90 - cancelTimeoutInMinutes: 5 - workspace: - clean: all - steps: - - template: setup-test-environment.yaml - parameters: - provisionClassic: ${{ ne(parameters.target_framework, parameters.dotnet_targetframework) }} - provisionatorChannel: ${{ parameters.provisionatorChannel }} - - - template: run-xaprepare.yaml - parameters: - displayName: install emulator - arguments: --s=EmulatorTestDependencies - - - task: DownloadPipelineArtifact@2 - inputs: - artifactName: $(TestAssembliesArtifactName) - downloadPath: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration) - - # Only run on Legacy Node-1 - - ${{ if and(eq(parameters.job_suffix, 'Legacy'), eq(parameters.node_id, 1)) }}: - - task: MSBuild@1 - displayName: build check-boot-times.csproj - inputs: - solution: build-tools/check-boot-times/check-boot-times.csproj - configuration: $(XA.Build.Configuration) - msbuildArguments: /restore /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/build-check-boot-times.binlog - continueOnError: true - - - task: MSBuild@1 - displayName: Run check-boot-times - inputs: - solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj - configuration: $(XA.Build.Configuration) - msbuildArguments: /t:CheckBootTimes /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/run-check-boot-times.binlog - continueOnError: true - - - task: MSBuild@1 - displayName: start emulator - inputs: - solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj - configuration: $(XA.Build.Configuration) - msbuildArguments: /t:AcquireAndroidTarget /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/start-emulator.binlog - - - template: run-nunit-tests.yaml - parameters: - useDotNet: ${{ eq(parameters.target_framework, parameters.dotnet_targetframework) }} - testRunTitle: MSBuildDeviceIntegration On Device - macOS-${{ parameters.node_id }} - ${{ parameters.job_suffix }} - testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/${{ parameters.target_framework }}/MSBuildDeviceIntegration.dll - nunitConsoleExtraArgs: --where "cat == Node-${{ parameters.node_id }} && cat != SystemApplication && cat != TimeZoneInfo && cat != Localization && cat != SmokeTests ${{ parameters.nunit_categories }}" - dotNetTestExtraArgs: --filter "TestCategory = Node-${{ parameters.node_id }} & TestCategory != TimeZoneInfo & TestCategory != Localization ${{ parameters.nunit_categories }}" - testResultsFile: TestResult-MSBuildDeviceIntegration-${{ parameters.job_name }}-$(XA.Build.Configuration).xml - - # Tests with no "Node" category. This should be empty, but just in case! Only run these tests on node 1 - - ${{ if eq(parameters.node_id, 1) }}: - - template: run-nunit-tests.yaml - parameters: - useDotNet: ${{ eq(parameters.target_framework, parameters.dotnet_targetframework) }} - testRunTitle: MSBuildDeviceIntegration On Device - macOS-NoNode - ${{ parameters.job_suffix }} - testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/${{ parameters.target_framework }}/MSBuildDeviceIntegration.dll - nunitConsoleExtraArgs: --where "cat != Node-1 && cat != Node-2 && cat != Node-3 && cat != Node-4 && cat != SystemApplication && cat != TimeZoneInfo && cat != Localization && cat != SmokeTests ${{ parameters.nunit_categories }}" - dotNetTestExtraArgs: --filter "TestCategory != Node-1 & TestCategory != Node-2 & TestCategory != Node-3 & TestCategory != Node-4 & TestCategory != TimeZoneInfo & TestCategory != Localization ${{ parameters.nunit_categories }}" - testResultsFile: TestResult-MSBuildDeviceIntegration-${{ parameters.job_name }}-NoNode-$(XA.Build.Configuration).xml - - - task: MSBuild@1 - displayName: shut down emulator - inputs: - solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj - configuration: $(XA.Build.Configuration) - msbuildArguments: >- - /t:AcquireAndroidTarget,ReleaseAndroidTarget - /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog - condition: always() - - - template: upload-results.yaml - parameters: - artifactName: Test Results - MSBuild With Emulator - macOS-${{ parameters.node_id }} - ${{ parameters.job_suffix }} - - - template: fail-on-issue.yaml diff --git a/build-tools/scripts/PrepareWindows.targets b/build-tools/scripts/PrepareWindows.targets index 09189a7ceb5..cadc50f52d0 100644 --- a/build-tools/scripts/PrepareWindows.targets +++ b/build-tools/scripts/PrepareWindows.targets @@ -4,7 +4,6 @@ Debug <_TopDir>$(MSBuildThisFileDirectory)..\.. - <_XAPrepareExe Condition=" '$(MSBuildRuntimeType)' != 'Core' ">"$(MSBuildThisFileDirectory)..\xaprepare\xaprepare\bin\$(Configuration)\xaprepare.exe" <_XAPrepareExe Condition=" '$(MSBuildRuntimeType)' == 'Core' ">"$(MSBuildThisFileDirectory)..\xaprepare\xaprepare\bin\$(Configuration)\$(DotNetStableTargetFramework)\xaprepare.dll" <_XAPrepareStandardArgs Condition=" '$(RunningOnCI)' == 'true' ">--no-emoji --run-mode=CI -v:d <_XAPrepareStandardArgs Condition=" '$(XA_FORCE_COMPONENT_REFRESH)' == 'true' ">$(_XAPrepareStandardArgs) -refresh @@ -15,7 +14,7 @@ - + @@ -23,7 +22,7 @@ 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 (' '))" /> - + diff --git a/build-tools/xaprepare/xaprepare/xaprepare.csproj b/build-tools/xaprepare/xaprepare/xaprepare.csproj index 6a75be1ba23..2d5dc260e70 100644 --- a/build-tools/xaprepare/xaprepare/xaprepare.csproj +++ b/build-tools/xaprepare/xaprepare/xaprepare.csproj @@ -1,7 +1,7 @@ - net472;$(DotNetStableTargetFramework) + $(DotNetStableTargetFramework) Exe 8.0 Xamarin.Android.Prepare @@ -10,10 +10,6 @@ enable - - false - - diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj index b4596ed2356..19b9d3839f4 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj @@ -1,7 +1,7 @@ - net472;$(DotNetStableTargetFramework) + $(DotNetStableTargetFramework) true ..\..\..\..\bin\Test$(Configuration) true diff --git a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj index a9f9b4d3621..9691bb7b73b 100644 --- a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj +++ b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj @@ -1,7 +1,7 @@ - net472;$(DotNetStableTargetFramework) + $(DotNetStableTargetFramework) Xamarin.Android.Build.Tests true ..\..\bin\Test$(Configuration)\MSBuildDeviceIntegration\