diff --git a/Makefile b/Makefile index 8d0c1491e55..a861972d0c0 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ _PREPARE_ARGS = BOOTSTRAP_SOLUTION = Xamarin.Android.BootstrapTasks.sln BOOTSTRAP_BUILD_LOG = bin/Build$(CONFIGURATION)/bootstrap-build.binlog -BOOTSTRAP_MSBUILD_FLAGS = /binaryLogger:"$(BOOTSTRAP_BUILD_LOG)" $(PREPARE_COMMON_MSBUILD_FLAGS) +BOOTSTRAP_MSBUILD_FLAGS = /t:Restore,Build /binaryLogger:"$(BOOTSTRAP_BUILD_LOG)" $(PREPARE_COMMON_MSBUILD_FLAGS) all: $(call MSBUILD_BINLOG,all,$(_SLN_BUILD)) $(MSBUILD_FLAGS) $(SOLUTION) diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj index 9c64a1e25cc..d5c1c629a29 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj @@ -35,12 +35,6 @@ - - ..\..\packages\Mono.Posix.NETStandard.1.0.0\lib\net40\Mono.Posix.NETStandard.dll - - - ..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - @@ -67,6 +61,10 @@ + + + + {7CE69551-BD73-4726-ACAA-AAF89C84BAF8} @@ -77,10 +75,6 @@ Xamarin.Android.Tools.AndroidSdk - - - - diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/packages.config b/build-tools/Xamarin.Android.Tools.BootstrapTasks/packages.config deleted file mode 100644 index e4c135f8ddb..00000000000 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/build-tools/api-xml-adjuster/api-xml-adjuster.targets b/build-tools/api-xml-adjuster/api-xml-adjuster.targets index 3d8708151da..8432970bf27 100644 --- a/build-tools/api-xml-adjuster/api-xml-adjuster.targets +++ b/build-tools/api-xml-adjuster/api-xml-adjuster.targets @@ -1,6 +1,6 @@ - + <_TopDir>$(MSBuildThisFileDirectory)..\.. diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index e8c3b6f4039..86f8c27e38b 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -21,7 +21,7 @@ variables: InstallerArtifactName: installers TestAssembliesArtifactName: test-assemblies NUnitConsoleVersion: 3.9.0 - DotNetCoreVersion: 2.1.701 + DotNetCoreVersion: 3.1.100 HostedMacMojave: Hosted Mac Internal Mojave HostedMac: Hosted Mac Internal HostedWinVS2019: Hosted Windows 2019 with VS2019 @@ -83,23 +83,8 @@ stages: displayName: make jenkins # Build and package test assemblies - - task: MSBuild@1 - displayName: msbuild tests/CodeBehind/UnitTests/CodeBehindUnitTests.csproj - inputs: - solution: $(System.DefaultWorkingDirectory)/tests/CodeBehind/UnitTests/CodeBehindUnitTests.csproj - configuration: $(XA.Build.Configuration) - - - task: MSBuild@1 - displayName: msbuild tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/Xamarin.Android.MakeBundle-UnitTests.csproj - inputs: - solution: $(System.DefaultWorkingDirectory)/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/Xamarin.Android.MakeBundle-UnitTests.csproj - configuration: $(XA.Build.Configuration) - - - task: MSBuild@1 - displayName: msbuild tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/EmbeddedDSO-UnitTests.csproj - inputs: - solution: $(System.DefaultWorkingDirectory)/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/EmbeddedDSO-UnitTests.csproj - configuration: $(XA.Build.Configuration) + - script: make all-tests V=1 CONFIGURATION=$(XA.Build.Configuration) + displayName: make all-tests - script: | cp -r bin/$(XA.Build.Configuration)/bcl-tests bin/Test$(XA.Build.Configuration)/bcl-tests diff --git a/build-tools/automation/build.groovy b/build-tools/automation/build.groovy index 89ae9fd30e9..424509be6e3 100644 --- a/build-tools/automation/build.groovy +++ b/build-tools/automation/build.groovy @@ -174,6 +174,8 @@ timestamps { } } } + // Install .NET Core and temporarily append it to PATH + sh "curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin -version 3.1.100" } utils.stageWithTimeout('build', 6, 'HOURS', XADir, true) { // Typically takes less than one hour except a build on a new bot to populate local caches can take several hours diff --git a/build-tools/automation/yaml-templates/setup-test-environment.yaml b/build-tools/automation/yaml-templates/setup-test-environment.yaml index cb40baedcb8..96f513588cf 100644 --- a/build-tools/automation/yaml-templates/setup-test-environment.yaml +++ b/build-tools/automation/yaml-templates/setup-test-environment.yaml @@ -33,6 +33,10 @@ steps: version: $(DotNetCoreVersion) # Restore solutions for Xamarin.Android.Tools.sln, Xamarin.Android.sln, and Xamarin.Android-Tests.sln +- task: NuGetToolInstaller@0 + inputs: + versionSpec: 5.x + - task: NuGetCommand@2 displayName: nuget restore Xamarin.Android solutions inputs: diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets index 82c459153eb..4d067a50807 100644 --- a/build-tools/installers/create-installers.targets +++ b/build-tools/installers/create-installers.targets @@ -2,8 +2,8 @@ - - + + $(XamarinAndroidSourcePath)bin\$(Configuration)\ diff --git a/build-tools/scripts/MSBuildReferences.projitems b/build-tools/scripts/MSBuildReferences.projitems index dddf241115d..2043be1d37f 100644 --- a/build-tools/scripts/MSBuildReferences.projitems +++ b/build-tools/scripts/MSBuildReferences.projitems @@ -1,24 +1,23 @@ - - $(MSBuildToolsPath) - $([System.IO.Path]::GetFullPath ('$(MSBuildToolsPath)\..\..\..\msbuild\15.0\bin')) - - - $(MSBuildReferencePath)\Microsoft.Build.dll - - - $(MSBuildReferencePath)\Microsoft.Build.Engine.dll - - - $(MSBuildReferencePath)\Microsoft.Build.Framework.dll - - - $(MSBuildReferencePath)\Microsoft.Build.Tasks.Core.dll - - - $(MSBuildReferencePath)\Microsoft.Build.Utilities.Core.dll - + + + + + + + + - \ No newline at end of file + + + + PreserveNewest + + + PreserveNewest + + + diff --git a/build-tools/scripts/XAVersionInfo.targets b/build-tools/scripts/XAVersionInfo.targets index 263a71243b9..cef0321d1b5 100644 --- a/build-tools/scripts/XAVersionInfo.targets +++ b/build-tools/scripts/XAVersionInfo.targets @@ -6,7 +6,7 @@ - + - - ..\..\..\..\packages\System.Runtime.4.1.0\lib\net462\System.Runtime.dll - - - ..\..\..\..\packages\System.Runtime.InteropServices.4.1.0\lib\net462\System.Runtime.InteropServices.dll - - - ..\..\..\..\packages\Xamarin.Build.AsyncTask.0.3.4\lib\netstandard2.0\Xamarin.Build.AsyncTask.dll - ..\..\..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\Xamarin.Android.Cecil.dll - - ..\..\..\..\packages\Mono.Posix.NETStandard.1.0.0\lib\net40\Mono.Posix.NETStandard.dll - - - ..\..\..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - + + + + @@ -86,9 +70,6 @@ Xamarin.Android.Tools.AndroidSdk - - - @@ -131,5 +112,4 @@ - diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/packages.config b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/packages.config deleted file mode 100644 index f09c0e2095f..00000000000 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/packages.config +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs index a2c55bc6bf6..be473ade247 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs @@ -330,7 +330,7 @@ public virtual void NuGetRestore (string directory, string packagesDirectory = n return; var isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT; - var nuget = Path.Combine (Root, "NuGet.exe"); + var nuget = Path.Combine (Root, "nuget", "NuGet.exe"); var psi = new ProcessStartInfo (isWindows ? nuget : "mono") { Arguments = $"{(isWindows ? "" : "\"" + nuget + "\"")} restore -Verbosity Detailed -PackagesDirectory \"{Path.Combine (Root, directory, "..", "packages")}\" \"{Path.Combine (Root, directory, "packages.config")}\"", CreateNoWindow = true, diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj index 52b0c29b98e..5cc2b19b465 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj @@ -32,15 +32,6 @@ - - ..\..\..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll - - - ..\..\..\..\packages\Mono.Posix.NETStandard.1.0.0\lib\net40\Mono.Posix.NETStandard.dll - - - ..\..\..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - @@ -151,8 +142,8 @@ - + nuget\NuGet.exe PreserveNewest @@ -170,5 +161,4 @@ - diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/packages.config b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/packages.config deleted file mode 100644 index 4b471b5d19f..00000000000 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj index ef437c0341c..0388392da1d 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj @@ -1,7 +1,5 @@ - - Debug AnyCPU @@ -40,73 +38,16 @@ - - ..\..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll - - - ..\..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll - - - ..\..\packages\Irony.0.9.1\lib\net40\Irony.dll - - - ..\..\packages\FSharp.Compiler.CodeDom.1.0.0.1\lib\net40\FSharp.Compiler.CodeDom.dll - - - ..\..\packages\FSharp.Core.3.1.2.5\lib\net40\FSharp.Core.dll - - - ..\..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\NuGet.Frameworks.4.6.0\lib\net46\NuGet.Frameworks.dll - - - ..\..\packages\NuGet.Common.4.6.0\lib\net46\NuGet.Common.dll - - - ..\..\packages\NuGet.Configuration.4.6.0\lib\net46\NuGet.Configuration.dll - - - ..\..\packages\NuGet.Versioning.4.6.0\lib\net46\NuGet.Versioning.dll - - - ..\..\packages\NuGet.LibraryModel.4.6.0\lib\net46\NuGet.LibraryModel.dll - - - ..\..\packages\NuGet.Packaging.Core.4.6.0\lib\net46\NuGet.Packaging.Core.dll - - - ..\..\packages\NuGet.Packaging.4.6.0\lib\net46\NuGet.Packaging.dll - - - ..\..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll - - - ..\..\packages\System.Runtime.InteropServices.4.3.0\lib\net462\System.Runtime.InteropServices.dll - - - ..\..\packages\NuGet.Protocol.4.6.0\lib\net46\NuGet.Protocol.dll - - - ..\..\packages\NuGet.DependencyResolver.Core.4.6.0\lib\net46\NuGet.DependencyResolver.Core.dll - - - ..\..\packages\NuGet.ProjectModel.4.6.0\lib\net46\NuGet.ProjectModel.dll - - - ..\..\packages\Xamarin.Build.AsyncTask.0.3.4\lib\netstandard2.0\Xamarin.Build.AsyncTask.dll - ..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\pdb2mdb.exe @@ -119,12 +60,29 @@ ..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\Xamarin.Android.Cecil.Mdb.dll - - ..\..\packages\Mono.Posix.NETStandard.1.0.0\lib\net40\Mono.Posix.NETStandard.dll - - - ..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - + + + + + + + + + + + + + + + + + + + + + + + @@ -625,7 +583,6 @@ - @@ -762,18 +719,10 @@ {94BD81F7-B06F-4295-9636-F8A3B6BDC762} Java.Interop - - {09518DF2-C7B1-4CDB-849A-9F91F4BEA925} - fetch-windows-assemblers - False - {af8ac493-40ac-4195-82f6-b08ee4b4e49e} manifestmerger False - - - diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets index 19e4ac4748b..bfac6f180fb 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets @@ -5,7 +5,7 @@ - + <_SharedRuntimeBuildPath Condition=" '$(_SharedRuntimeBuildPath)' == '' ">$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\ diff --git a/src/Xamarin.Android.Build.Tasks/packages.config b/src/Xamarin.Android.Build.Tasks/packages.config deleted file mode 100644 index 7e11ec8cf75..00000000000 --- a/src/Xamarin.Android.Build.Tasks/packages.config +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj b/src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj index 376edcf6561..93d14b05687 100644 --- a/src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj +++ b/src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj @@ -352,7 +352,7 @@ - + {66CF299A-CE95-4131-BCD8-DB66E30C4BF7} diff --git a/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj b/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj index 330ab859685..81935e2e8d7 100644 --- a/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj +++ b/src/Xamarin.Android.Tools.JavadocImporter/Xamarin.Android.Tools.JavadocImporter.csproj @@ -31,19 +31,10 @@ - - ..\..\packages\Microsoft.Xml.SgmlReader.1.8.14\lib\net45\SgmlReaderDll.dll - ..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\Xamarin.Android.Cecil.dll - - ..\..\packages\Mono.Posix.NETStandard.1.0.0\lib\net40\Mono.Posix.NETStandard.dll - - - ..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - @@ -81,10 +72,11 @@ - + + + - diff --git a/src/Xamarin.Android.Tools.JavadocImporter/packages.config b/src/Xamarin.Android.Tools.JavadocImporter/packages.config deleted file mode 100644 index 9a76d10804c..00000000000 --- a/src/Xamarin.Android.Tools.JavadocImporter/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/monodroid/monodroid.targets b/src/monodroid/monodroid.targets index f68a39eb407..101f7db42c8 100644 --- a/src/monodroid/monodroid.targets +++ b/src/monodroid/monodroid.targets @@ -1,6 +1,6 @@ - + diff --git a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets index ae731c1d40c..d111ca8e0bd 100644 --- a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets +++ b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets @@ -6,7 +6,7 @@ - + diff --git a/tests/CodeBehind/UnitTests/CodeBehindUnitTests.csproj b/tests/CodeBehind/UnitTests/CodeBehindUnitTests.csproj index d3e16e301c2..3ceeff05b8f 100644 --- a/tests/CodeBehind/UnitTests/CodeBehindUnitTests.csproj +++ b/tests/CodeBehind/UnitTests/CodeBehindUnitTests.csproj @@ -26,15 +26,12 @@ - - ..\..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - + diff --git a/tests/CodeBehind/UnitTests/packages.config b/tests/CodeBehind/UnitTests/packages.config deleted file mode 100644 index 803d28fa912..00000000000 --- a/tests/CodeBehind/UnitTests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/Xamarin.Android.MakeBundle-UnitTests.csproj b/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/Xamarin.Android.MakeBundle-UnitTests.csproj index 7f6878f0282..17e4c4a069b 100644 --- a/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/Xamarin.Android.MakeBundle-UnitTests.csproj +++ b/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/Xamarin.Android.MakeBundle-UnitTests.csproj @@ -31,18 +31,12 @@ - - ..\..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - - ..\..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - - + @@ -51,5 +45,4 @@ Xamarin.ProjectTools - diff --git a/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/packages.config b/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/packages.config deleted file mode 100644 index 0ea38d42982..00000000000 --- a/tests/CodeGen-MkBundle/Xamarin.Android.MakeBundle-UnitTests/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/EmbeddedDSO-UnitTests.csproj b/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/EmbeddedDSO-UnitTests.csproj index 63b6aaf3c9f..def9cc81bd4 100644 --- a/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/EmbeddedDSO-UnitTests.csproj +++ b/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/EmbeddedDSO-UnitTests.csproj @@ -31,20 +31,14 @@ - - ..\..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - ..\..\..\bin\$(Configuration)\lib/xamarin.android\xbuild\Xamarin\Android\Xamarin.Android.Build.Tasks.dll + ..\..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\Xamarin.Android.Build.Tasks.dll True - ..\..\..\bin\$(Configuration)\lib/xamarin.android\xbuild\Xamarin\Android\Xamarin.Android.Tools.AndroidSdk.dll + ..\..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\Xamarin.Android.Tools.AndroidSdk.dll True - - ..\..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - @@ -55,7 +49,7 @@ - + @@ -79,5 +73,4 @@ Replacements="@ANDROID_SDK_DIRECTORY@=$(AndroidSdkDirectory);@BUILD_TOOLS_FOLDER@=$(XABuildToolsFolder);@EXECUTABLE_EXTENSION@=$(ExecutableExtension)" /> - diff --git a/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/packages.config b/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/packages.config deleted file mode 100644 index 0ea38d42982..00000000000 --- a/tests/EmbeddedDSOs/EmbeddedDSO-UnitTests/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj index f4de9bfd3ea..33c53c42baf 100644 --- a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj +++ b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj @@ -29,18 +29,6 @@ - - ..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - - ..\..\packages\NodaTime.2.4.5\lib\net45\NodaTime.dll - - - ..\..\packages\Mono.Posix.NETStandard.1.0.0\lib\net40\Mono.Posix.NETStandard.dll - - - ..\..\packages\Xamarin.LibZipSharp.1.0.6\lib\net45\libZipSharp.dll - @@ -55,7 +43,8 @@ - + + @@ -85,5 +74,4 @@ - diff --git a/tests/MSBuildDeviceIntegration/packages.config b/tests/MSBuildDeviceIntegration/packages.config deleted file mode 100644 index 9719367ea39..00000000000 --- a/tests/MSBuildDeviceIntegration/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/tools/xabuild/xabuild.csproj b/tools/xabuild/xabuild.csproj index 66349c36385..1cdd31128b6 100644 --- a/tools/xabuild/xabuild.csproj +++ b/tools/xabuild/xabuild.csproj @@ -13,7 +13,6 @@ <_MSBuildExtension Condition=" '$(OS)' != 'Windows_NT' ">dll - x86 true @@ -33,7 +32,19 @@ - $(MSBuildReferencePath)\MSBuild.$(_MSBuildExtension) + $(MSBuildToolsPath)\MSBuild.$(_MSBuildExtension) + + + $(MSBuildToolsPath)\Microsoft.Build.dll + + + $(MSBuildToolsPath)\Microsoft.Build.Framework.dll + + + $(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll + + + $(MSBuildToolsPath)\Microsoft.Build.Utilities.Core.dll