From e24ff72edd1c833a913b7e78f75ce989f97210d7 Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Fri, 1 May 2020 15:20:27 -0700 Subject: [PATCH] Updated from netcoreapp5.0 to net5.0. --- Directory.Build.props | 2 +- Directory.Build.targets | 10 ++---- .../Microsoft.Toolkit.Services.csproj | 8 ++--- .../Microsoft.Toolkit.Uwp.Connectivity.csproj | 2 +- ...icrosoft.Toolkit.Uwp.DeveloperTools.csproj | 2 +- ....Toolkit.UWP.Input.GazeInteraction.vcxproj | 8 ++--- .../packages.config | 2 +- ...oolkit.Uwp.Notifications.JavaScript.csproj | 2 +- ...Microsoft.Toolkit.Uwp.Notifications.csproj | 2 +- .../Microsoft.Toolkit.Uwp.Services.csproj | 2 +- ...Microsoft.Toolkit.Uwp.UI.Animations.csproj | 2 +- ...kit.Uwp.UI.Controls.DataGrid.Design.csproj | 8 ++--- ...ft.Toolkit.Uwp.UI.Controls.DataGrid.csproj | 2 +- ...soft.Toolkit.Uwp.UI.Controls.Design.csproj | 8 ++--- .../Microsoft.Toolkit.Uwp.UI.Controls.csproj | 2 +- .../Microsoft.Toolkit.Uwp.UI.Media.csproj | 2 +- .../Microsoft.Toolkit.Uwp.UI.csproj | 4 +-- .../Microsoft.Toolkit.Uwp.csproj | 2 +- .../UnitTests.Notifications.NetCore.csproj | 2 +- .../UnitTests.XamlIslands.csproj | 2 +- UnitTests/UnitTests/UnitTests.csproj | 2 +- Windows Community Toolkit.sln | 22 +++++-------- build/build.cake | 31 +++++++++++++------ 23 files changed, 65 insertions(+), 64 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 14f64f65e..631340399 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -104,7 +104,7 @@ - 3.0.0-preview1.200430.3-CI + 3.0.0-preview1.200501.0-nightly diff --git a/Directory.Build.targets b/Directory.Build.targets index 5df347284..2b90f4d73 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,17 +1,13 @@ - - + + uap10.0.$(DefaultTargetPlatformMinVersion) - + - - - uap10.0.$(DefaultTargetPlatformMinVersion) - diff --git a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj index c351fd407..aa96153b0 100644 --- a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj +++ b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj @@ -1,7 +1,7 @@  - netcoreapp5.0;netstandard2.0 + net5.0;netstandard2.0 Windows Community Toolkit .NET Standard Services This .NET standard library enables access to different data sources such as Microsoft Graph, OneDrive, Twitter, Microsoft Translator, and LinkedIn. It is part of the Windows Community Toolkit. @@ -14,7 +14,7 @@ CS8002;CS0618 - + $(DefineConstants);WINRT @@ -28,7 +28,7 @@ - + @@ -63,7 +63,7 @@ --> - + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj b/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj index adc796a46..31ed3a8c8 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj +++ b/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj @@ -1,7 +1,7 @@  - netcoreapp5.0 + net5.0 Windows Community Toolkit Devices This library enables easier consumption of connectivity Devices/Peripherals and handle its connection to Windows devices. It contains BluetoothLE and Network connectivity helpers. UWP Toolkit Windows Devices Bluetooth BluetoothLE BLE Networking diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj b/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj index 118f9301e..1e486bfd0 100644 --- a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj +++ b/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj @@ -1,7 +1,7 @@  - netcoreapp5.0 + net5.0 Windows Community Toolkit Developer Tools This library provides XAML user controls and services to help developers build their app. It is part of the Windows Community Toolkit. diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj index 1458e767b..be1df8fc3 100644 --- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj +++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj @@ -1,6 +1,6 @@  - + @@ -408,7 +408,7 @@ - + @@ -416,7 +416,7 @@ - - + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/packages.config b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/packages.config index 0cefb6214..b199290fa 100644 --- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/packages.config +++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.Notifications.JavaScript/Microsoft.Toolkit.Uwp.Notifications.JavaScript.csproj b/Microsoft.Toolkit.Uwp.Notifications.JavaScript/Microsoft.Toolkit.Uwp.Notifications.JavaScript.csproj index 57c4a6322..a5645aef3 100644 --- a/Microsoft.Toolkit.Uwp.Notifications.JavaScript/Microsoft.Toolkit.Uwp.Notifications.JavaScript.csproj +++ b/Microsoft.Toolkit.Uwp.Notifications.JavaScript/Microsoft.Toolkit.Uwp.Notifications.JavaScript.csproj @@ -1,7 +1,7 @@  - netcoreapp5.0 + net5.0 false Windows Community Toolkit Notifications for JavaScript diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj index 0ab953c82..a5af89e1e 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj @@ -1,7 +1,7 @@  - netcoreapp5.0;net461 + net5.0;net461 $(DefineConstants);NETFX_CORE Windows Community Toolkit Notifications diff --git a/Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj b/Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj index 9c55f0eda..88f3b94c0 100644 --- a/Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj +++ b/Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj @@ -1,7 +1,7 @@  - netcoreapp5.0 + net5.0 Windows Community Toolkit Services This library enables access to Facebook. It is part of the Windows Community Toolkit. UWP Toolkit Windows OAuth Facebook diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj b/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj index 86cdc1e05..ec653a7c4 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj @@ -1,7 +1,7 @@  - netcoreapp5.0 + net5.0 Windows Community Toolkit Animations This library provides helpers and extensions on top of Windows Composition and XAML storyboards. It is part of the Windows Community Toolkit. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj index bc28796b2..9e007002e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj @@ -12,20 +12,20 @@ v4.7.2 512 - $(AssetTargetFallback);netcoreapp5.0 + $(AssetTargetFallback);net5.0 $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\EmptyMsAppxPackage.Targets')) true - ..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Debug\netcoreapp5.0\Design\ + ..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Debug\net5.0\Design\ full false DEBUG;TRACE x86 - ..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Release\netcoreapp5.0\Design\ + ..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Release\net5.0\Design\ pdbonly x86 true @@ -112,7 +112,7 @@ - + Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.xml Designer diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj index 9c3810fe6..f2c5599cb 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj @@ -1,6 +1,6 @@  - netcoreapp5.0 + net5.0 Windows Community Toolkit Controls DataGrid This library provides a XAML DataGrid control. It is part of the Windows Community Toolkit. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj index df1b97b5e..efca6b540 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj @@ -13,20 +13,20 @@ 512 $(NoWarn);0618 - $(AssetTargetFallback);netcoreapp5.0 + $(AssetTargetFallback);net5.0 $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\EmptyMsAppxPackage.Targets')) true - ..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Debug\netcoreapp5.0\Design\ + ..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Debug\net5.0\Design\ full false DEBUG;TRACE x86 - ..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Release\netcoreapp5.0\Design\ + ..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Release\net5.0\Design\ pdbonly x86 true @@ -139,7 +139,7 @@ - + Microsoft.Toolkit.Uwp.UI.Controls.xml Designer diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj index 1a8c561a8..b79fb77b9 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj @@ -1,7 +1,7 @@  - netcoreapp5.0 + net5.0 Windows Community Toolkit Controls This library provides XAML templated controls. It is part of the Windows Community Toolkit. diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj index 06b54d1c1..1715f5024 100644 --- a/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj @@ -1,7 +1,7 @@  - netcoreapp5.0 + net5.0 Windows Community Toolkit UI Media This library provides UI brushes. It is part of the Windows Community Toolkit. diff --git a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj index 6d350a694..54926ea90 100644 --- a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj +++ b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj @@ -1,7 +1,7 @@  - netcoreapp5.0 + net5.0 Windows Community Toolkit UI This library provides UI components, such as XAML extensions, helpers, converters and more. It is part of the Windows Community Toolkit. @@ -53,5 +53,5 @@ - + diff --git a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj index 6eb5d8cc1..64b979f6c 100644 --- a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj +++ b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj @@ -1,7 +1,7 @@  - netcoreapp5.0 + net5.0 Windows Community Toolkit This package includes code only helpers such as Colors conversion tool, Storage file handling, a Stream helper class, etc. UWP Toolkit Windows diff --git a/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj b/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj index e2fa93f4e..806b7771d 100644 --- a/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj +++ b/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj @@ -1,7 +1,7 @@  - netcoreapp5.0 + net5.0 false diff --git a/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj index 185e4c921..5b128e10f 100644 --- a/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj +++ b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj @@ -16,7 +16,7 @@ - 3.0.0-preview1.200430.3-CI + 3.0.0-preview1.200501.0-nightly diff --git a/UnitTests/UnitTests/UnitTests.csproj b/UnitTests/UnitTests/UnitTests.csproj index fe05b8e74..b6e7a0f0d 100644 --- a/UnitTests/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests/UnitTests.csproj @@ -1,7 +1,7 @@  - netcoreapp5.0 + net5.0 10.0.18362.0 false x86;x64 diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln index d5d10f15a..08e8eda69 100644 --- a/Windows Community Toolkit.sln +++ b/Windows Community Toolkit.sln @@ -126,12 +126,8 @@ Global {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.ActiveCfg = Debug|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.Build.0 = Debug|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.Deploy.0 = Debug|x86 - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.ActiveCfg = Debug|ARM - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.Build.0 = Debug|ARM - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.Deploy.0 = Debug|ARM - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM64.Build.0 = Debug|ARM64 - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.ActiveCfg = Debug|x86 + {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM64.ActiveCfg = Debug|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x64.ActiveCfg = Debug|x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x64.Build.0 = Debug|x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x64.Deploy.0 = Debug|x64 @@ -139,17 +135,15 @@ Global {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Build.0 = Debug|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Deploy.0 = Debug|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|Any CPU.ActiveCfg = Release|x86 - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|ARM.ActiveCfg = Release|ARM - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|ARM64.ActiveCfg = Release|ARM64 + {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|ARM.ActiveCfg = Release|x64 + {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|ARM.Build.0 = Release|x64 + {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|ARM64.ActiveCfg = Release|x64 + {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|ARM64.Build.0 = Release|x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|x64.ActiveCfg = Release|x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|x86.ActiveCfg = Release|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.ActiveCfg = Release|x86 - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.ActiveCfg = Release|ARM - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Build.0 = Release|ARM - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Deploy.0 = Release|ARM - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM64.ActiveCfg = Release|ARM64 - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM64.Build.0 = Release|ARM64 - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM64.Deploy.0 = Release|ARM64 + {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.ActiveCfg = Release|x86 + {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM64.ActiveCfg = Release|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|x64.ActiveCfg = Release|x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|x64.Build.0 = Release|x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|x64.Deploy.0 = Release|x64 diff --git a/build/build.cake b/build/build.cake index 2c3dbd500..b3eaf377a 100644 --- a/build/build.cake +++ b/build/build.cake @@ -102,6 +102,19 @@ void RetrieveVersion() Information("\nBuild Version: " + Version); } +void UpdateToolsPath(MSBuildSettings buildSettings) +{ + // Workaround for https://github.com/cake-build/cake/issues/2128 + var vsInstallation = VSWhereLatest(new VSWhereLatestSettings { Requires = "Microsoft.Component.MSBuild", IncludePrerelease = true }); + + if (vsInstallation != null) + { + buildSettings.ToolPath = vsInstallation.CombineWithFilePath(@"MSBuild\Current\Bin\MSBuild.exe"); + if (!FileExists(buildSettings.ToolPath)) + buildSettings.ToolPath = vsInstallation.CombineWithFilePath(@"MSBuild\15.0\Bin\MSBuild.exe"); + } +} + ////////////////////////////////////////////////////////////////////// // DEFAULT TASK ////////////////////////////////////////////////////////////////////// @@ -161,15 +174,7 @@ Task("BuildProjects") .SetConfiguration("Release") .WithTarget("Restore"); - // Workaround for https://github.com/cake-build/cake/issues/2128 - var vsInstallation = VSWhereLatest(new VSWhereLatestSettings { Requires = "Microsoft.Component.MSBuild", IncludePrerelease = true }); - - if (vsInstallation != null) - { - buildSettings.ToolPath = vsInstallation.CombineWithFilePath(@"MSBuild\Current\Bin\MSBuild.exe"); - if (!FileExists(buildSettings.ToolPath)) - buildSettings.ToolPath = vsInstallation.CombineWithFilePath(@"MSBuild\15.0\Bin\MSBuild.exe"); - } + UpdateToolsPath(buildSettings); MSBuild(Solution, buildSettings); @@ -184,6 +189,8 @@ Task("BuildProjects") .WithTarget("Build") .WithProperty("GenerateLibraryLayout", "true"); + UpdateToolsPath(buildSettings); + MSBuild(Solution, buildSettings); }); @@ -234,6 +241,8 @@ Task("Package") .WithProperty("GenerateLibraryLayout", "true") .WithProperty("PackageOutputPath", nupkgDir); + UpdateToolsPath(buildSettings); + MSBuild(Solution, buildSettings); // Build and pack C++ packages @@ -243,6 +252,8 @@ Task("Package") } .SetConfiguration("Native"); + UpdateToolsPath(buildSettings); + // Ignored for now since WinUI3 alpha does not support ARM // buildSettings.SetPlatformTarget(PlatformTarget.ARM); // MSBuild(Solution, buildSettings); @@ -291,7 +302,7 @@ Task("Test") { var vswhere = VSWhereLatest(new VSWhereLatestSettings { - IncludePrerelease = false + IncludePrerelease = true }); var testSettings = new VSTestSettings