diff --git a/.gitignore b/.gitignore index fa76b1f..cccd39e 100644 --- a/.gitignore +++ b/.gitignore @@ -300,8 +300,8 @@ __pycache__/ *.pyc # Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config +/build/tools/** +!/build/tools/packages.config # Tabs Studio *.tss diff --git a/Directory.Build.props b/Directory.Build.props index c9eb5d8..8cef025 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -13,16 +13,23 @@ en-US $(MSBuildProjectName.Contains('.Design')) $(MSBuildProjectName.Contains('Test')) - $(MSBuildProjectName.Contains('Uwp')) $(MSBuildProjectName.Contains('Sample')) $(MSBuildProjectName.Contains('Wpf')) - 19041 + 18362 17763 + 10.0.$(DefaultTargetPlatformVersion).0 + 10.0.$(DefaultTargetPlatformMinVersion).0 + $(TargetPlatformMinVersion) $(MSBuildThisFileDirectory)bin\nupkg + CS8002;CS8305 + + + + true - true + true $(MSBuildThisFileDirectory)toolkit.snk @@ -34,14 +41,6 @@ - - - - true - - - - @@ -64,10 +63,6 @@ - - - - true @@ -75,13 +70,6 @@ - - - - - $(NoWarn);8002 - - diff --git a/Directory.Build.targets b/Directory.Build.targets index cf384f9..7f000c8 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,24 +1,4 @@ - - - - - 10.0.$(DefaultTargetPlatformVersion).0 - 10.0.$(DefaultTargetPlatformMinVersion).0 - Full - - - - - Windows Desktop Extensions for the UWP - - - Windows Mobile Extensions for the UWP - - - - - diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/GraphPresenter.cs b/Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/GraphPresenter.cs index 91cb6a5..bcd2e70 100644 --- a/Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/GraphPresenter.cs +++ b/Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/GraphPresenter.cs @@ -7,11 +7,11 @@ using System.Linq; using System.Threading; using Microsoft.Graph; +using Microsoft.System; using Microsoft.Toolkit.Uwp.Extensions; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; using Newtonsoft.Json.Linq; -using Windows.System; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; namespace Microsoft.Toolkit.Graph.Controls { diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/QueryOption.cs b/Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/QueryOption.cs index 8af7159..2e3cde4 100644 --- a/Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/QueryOption.cs +++ b/Microsoft.Toolkit.Graph.Controls/Controls/GraphPresenter/QueryOption.cs @@ -2,13 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Windows.UI.Xaml; - namespace Microsoft.Toolkit.Graph.Controls { /// diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.Properties.cs b/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.Properties.cs index d7a5e66..7087346 100644 --- a/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.Properties.cs +++ b/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.Properties.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using Microsoft.Graph; -using Windows.UI.Xaml; +using Microsoft.UI.Xaml; namespace Microsoft.Toolkit.Graph.Controls { diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.cs b/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.cs index bb7c505..b0b159b 100644 --- a/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.cs +++ b/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.cs @@ -7,9 +7,9 @@ using System.Diagnostics; using System.Threading.Tasks; using Microsoft.Toolkit.Graph.Providers; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; namespace Microsoft.Toolkit.Graph.Controls { diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/PeoplePicker/PeoplePicker.cs b/Microsoft.Toolkit.Graph.Controls/Controls/PeoplePicker/PeoplePicker.cs index c5850e2..bd93292 100644 --- a/Microsoft.Toolkit.Graph.Controls/Controls/PeoplePicker/PeoplePicker.cs +++ b/Microsoft.Toolkit.Graph.Controls/Controls/PeoplePicker/PeoplePicker.cs @@ -7,12 +7,13 @@ using System.Collections.ObjectModel; using System.Linq; using Microsoft.Graph; +using Microsoft.System; using Microsoft.Toolkit.Graph.Extensions; using Microsoft.Toolkit.Graph.Providers; +using Microsoft.Toolkit.Uwp.Extensions; using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; namespace Microsoft.Toolkit.Graph.Controls { @@ -21,7 +22,7 @@ namespace Microsoft.Toolkit.Graph.Controls /// public partial class PeoplePicker : TokenizingTextBox { - private DispatcherTimer _typeTimer = new DispatcherTimer(); + private DispatcherQueueTimer _typeTimer = null; /// /// Initializes a new instance of the class. @@ -71,6 +72,11 @@ private void TokenBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChang if (list != null) { + if (_typeTimer == null) + { + _typeTimer = DispatcherQueue.CreateTimer(); + } + _typeTimer.Debounce( async () => { diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.Properties.cs b/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.Properties.cs index 84fdbed..6827544 100644 --- a/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.Properties.cs +++ b/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.Properties.cs @@ -8,8 +8,8 @@ using System.Text; using System.Threading.Tasks; using Microsoft.Graph; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Media.Imaging; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Media.Imaging; namespace Microsoft.Toolkit.Graph.Controls { diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.cs b/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.cs index f3bbdc5..7641c5e 100644 --- a/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.cs +++ b/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.cs @@ -9,9 +9,9 @@ using Microsoft.Graph; using Microsoft.Toolkit.Graph.Extensions; using Microsoft.Toolkit.Graph.Providers; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Media.Imaging; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Media.Imaging; namespace Microsoft.Toolkit.Graph.Controls { diff --git a/Microsoft.Toolkit.Graph.Controls/Converters/UserToPersonConverter.cs b/Microsoft.Toolkit.Graph.Controls/Converters/UserToPersonConverter.cs index 965c61b..976bcaa 100644 --- a/Microsoft.Toolkit.Graph.Controls/Converters/UserToPersonConverter.cs +++ b/Microsoft.Toolkit.Graph.Controls/Converters/UserToPersonConverter.cs @@ -5,7 +5,7 @@ using System; using Microsoft.Graph; using Microsoft.Toolkit.Graph.Extensions; -using Windows.UI.Xaml.Data; +using Microsoft.UI.Xaml.Data; namespace Microsoft.Toolkit.Graph.Converters { diff --git a/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj b/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj index bd63883..cbc8400 100644 --- a/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj +++ b/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj @@ -1,7 +1,7 @@ - + - uap10.0.17763 + net5.0-windows10.0.18362.0 Windows Community Toolkit Graph Controls Microsoft.Toolkit.Graph.Controls @@ -13,23 +13,19 @@ - PeoplePicker: The PeoplePicker Control is a simple control that allows for selection of one or more users. UWP Toolkit Windows Controls MSAL Microsoft Graph AadLogin ProfileCard Person PeoplePicker Login - false - true 8.0 - Debug;Release;CI - AnyCPU;ARM;ARM64;x64;x86 - - - - - + - - + + + + + 3.0.0-preview4.210210.4 + - + @@ -38,20 +34,14 @@ - + - - MSBuild:Compile - + + true + + + lib\net5.0-windows10.0.18362\$(AssemblyName)\Assets\person.png + - - - - - - - - - - + diff --git a/Microsoft.Toolkit.Graph.Controls/Providers/CommonProviderBehaviorBase.Properties.cs b/Microsoft.Toolkit.Graph.Controls/Providers/CommonProviderBehaviorBase.Properties.cs index e957366..aacf255 100644 --- a/Microsoft.Toolkit.Graph.Controls/Providers/CommonProviderBehaviorBase.Properties.cs +++ b/Microsoft.Toolkit.Graph.Controls/Providers/CommonProviderBehaviorBase.Properties.cs @@ -5,7 +5,7 @@ #if DOTNET using System.Windows; #else -using Windows.UI.Xaml; +using Microsoft.UI.Xaml; #endif #if DOTNET diff --git a/Microsoft.Toolkit.Graph.Controls/Providers/CommonProviderBehaviorBase.cs b/Microsoft.Toolkit.Graph.Controls/Providers/CommonProviderBehaviorBase.cs index bf8bd86..b694d06 100644 --- a/Microsoft.Toolkit.Graph.Controls/Providers/CommonProviderBehaviorBase.cs +++ b/Microsoft.Toolkit.Graph.Controls/Providers/CommonProviderBehaviorBase.cs @@ -7,7 +7,7 @@ using Microsoft.Toolkit.Wpf.UI.Behaviors; #else using Microsoft.Toolkit.Uwp.UI.Behaviors; -using Windows.UI.Xaml; +using Microsoft.UI.Xaml; #endif #if DOTNET diff --git a/Microsoft.Toolkit.Graph.Controls/Providers/InteractiveProviderBehavior.cs b/Microsoft.Toolkit.Graph.Controls/Providers/InteractiveProviderBehavior.cs index 99de148..1366871 100644 --- a/Microsoft.Toolkit.Graph.Controls/Providers/InteractiveProviderBehavior.cs +++ b/Microsoft.Toolkit.Graph.Controls/Providers/InteractiveProviderBehavior.cs @@ -9,7 +9,7 @@ using Microsoft.Toolkit.Graph.Providers; #else using System.Linq; -using Windows.System; +using Microsoft.System; #endif #if DOTNET diff --git a/Microsoft.Toolkit.Graph.Controls/Providers/MockProviderBehavior.cs b/Microsoft.Toolkit.Graph.Controls/Providers/MockProviderBehavior.cs index 03a7ba7..e698525 100644 --- a/Microsoft.Toolkit.Graph.Controls/Providers/MockProviderBehavior.cs +++ b/Microsoft.Toolkit.Graph.Controls/Providers/MockProviderBehavior.cs @@ -9,7 +9,7 @@ using Microsoft.Toolkit.Graph.Providers; #else using System.Linq; -using Windows.UI.Xaml; +using Microsoft.UI.Xaml; #endif #if DOTNET diff --git a/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj b/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj index b29ab1d..a7a58f1 100644 --- a/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj +++ b/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj @@ -1,7 +1,7 @@ - + - uap10.0.17763;netstandard2.0 + netstandard2.0 Windows Community Toolkit .NET Standard Graph Services This package includes .NET Standard code helpers such as: @@ -9,20 +9,12 @@ - GlobalProvider: A shared provider instance used by the Microsoft.Toolkit.Graph.Controls. UWP Graph Toolkit Windows Provider extensions helpers - - - Full - Debug;Release;CI - AnyCPU;ARM;ARM64;x64;x86 - - - - $(DefineConstants);WINRT - + + diff --git a/SampleTest/Assets/FileIcon.png b/SampleTest.Package/Images/FileIcon.png similarity index 100% rename from SampleTest/Assets/FileIcon.png rename to SampleTest.Package/Images/FileIcon.png diff --git a/SampleTest/Assets/LockScreenLogo.scale-200.png b/SampleTest.Package/Images/LockScreenLogo.scale-200.png similarity index 100% rename from SampleTest/Assets/LockScreenLogo.scale-200.png rename to SampleTest.Package/Images/LockScreenLogo.scale-200.png diff --git a/SampleTest/Assets/SplashScreen.scale-200.png b/SampleTest.Package/Images/SplashScreen.scale-200.png similarity index 100% rename from SampleTest/Assets/SplashScreen.scale-200.png rename to SampleTest.Package/Images/SplashScreen.scale-200.png diff --git a/SampleTest/Assets/Square150x150Logo.scale-200.png b/SampleTest.Package/Images/Square150x150Logo.scale-200.png similarity index 100% rename from SampleTest/Assets/Square150x150Logo.scale-200.png rename to SampleTest.Package/Images/Square150x150Logo.scale-200.png diff --git a/SampleTest/Assets/Square44x44Logo.scale-200.png b/SampleTest.Package/Images/Square44x44Logo.scale-200.png similarity index 100% rename from SampleTest/Assets/Square44x44Logo.scale-200.png rename to SampleTest.Package/Images/Square44x44Logo.scale-200.png diff --git a/SampleTest/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/SampleTest.Package/Images/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from SampleTest/Assets/Square44x44Logo.targetsize-24_altform-unplated.png rename to SampleTest.Package/Images/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/SampleTest/Assets/StoreLogo.png b/SampleTest.Package/Images/StoreLogo.png similarity index 100% rename from SampleTest/Assets/StoreLogo.png rename to SampleTest.Package/Images/StoreLogo.png diff --git a/SampleTest/Assets/Wide310x150Logo.scale-200.png b/SampleTest.Package/Images/Wide310x150Logo.scale-200.png similarity index 100% rename from SampleTest/Assets/Wide310x150Logo.scale-200.png rename to SampleTest.Package/Images/Wide310x150Logo.scale-200.png diff --git a/SampleTest/Package.appxmanifest b/SampleTest.Package/Package.appxmanifest similarity index 56% rename from SampleTest/Package.appxmanifest rename to SampleTest.Package/Package.appxmanifest index 5271618..890e1e4 100644 --- a/SampleTest/Package.appxmanifest +++ b/SampleTest.Package/Package.appxmanifest @@ -2,25 +2,24 @@ + xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" + IgnorableNamespaces="uap rescap"> - - SampleTest mhawker - Assets\StoreLogo.png + Images\StoreLogo.png + @@ -30,20 +29,21 @@ + EntryPoint="$targetentrypoint$"> - - + BackgroundColor="transparent" + Square150x150Logo="Images\Square150x150Logo.png" + Square44x44Logo="Images\Square44x44Logo.png"> + + + - \ No newline at end of file + diff --git a/SampleTest.Package/SampleTest.Package.wapproj b/SampleTest.Package/SampleTest.Package.wapproj new file mode 100644 index 0000000..cd4e232 --- /dev/null +++ b/SampleTest.Package/SampleTest.Package.wapproj @@ -0,0 +1,68 @@ + + + + 15.0 + + + + Debug + x86 + + + Release + x86 + + + Debug + x64 + + + Release + x64 + + + Debug + arm64 + + + Release + arm64 + + + + $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ + SampleTest\ + + + + d67eba45-b0cd-4bef-a2d9-6bada1b47d78 + 10.0.18362.0 + 10.0.17134.0 + en-US + false + $(MSBuildThisFileDirectory)build\ + ..\SampleTest\SampleTest.csproj + + + + Designer + + + + + + + + + + + + + + True + Properties\PublishProfiles\win10-$(Platform).pubxml + + + + + \ No newline at end of file diff --git a/SampleTest.Package/build/Microsoft.WinUI.AppX.targets b/SampleTest.Package/build/Microsoft.WinUI.AppX.targets new file mode 100644 index 0000000..b390f52 --- /dev/null +++ b/SampleTest.Package/build/Microsoft.WinUI.AppX.targets @@ -0,0 +1,251 @@ + + + + + + + + + + + + $(MSBuildThisFileDirectory) + + + $(WinUIClassRegistrationsDir.Substring(0,$(WinUIClassRegistrationsDir.IndexOf(';')))) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(MSBuildWarningsAsMessages); + + + APPX1707; + + + $(MSBuildWarningsAsMessages); + + + MSB3268; + + + + + + + + + Windows + 10.0 + en-US + + + + + + <_MuxRuntimeIdentifier Condition="'$(Platform)' == 'Win32'">win10-x86 + <_MuxRuntimeIdentifier Condition="'$(Platform)' != 'Win32'">win10-$(Platform) + + + + $([MSBuild]::MakeRelative($(MSBuildThisFileDirectory)..\runtimes\$(_MuxRuntimeIdentifier)\native\, %(RootDir)%(Directory))) + + + + + + + + + %(WapProjPackageFile.DestinationSubDirectory)%(TargetPath) + + + %(UploadWapProjPackageFile.DestinationSubDirectory)%(TargetPath) + + + + + + + + + + + + + + + + + true + + + + + + + + UAP + + + + + + + net5.0-windows$(TargetPlatformVersion) + + + + + + + + diff --git a/SampleTest/App.xaml b/SampleTest/App.xaml index ea9689d..b00e066 100644 --- a/SampleTest/App.xaml +++ b/SampleTest/App.xaml @@ -1,4 +1,13 @@ - + + + + + + + + + diff --git a/SampleTest/App.xaml.cs b/SampleTest/App.xaml.cs index cf46cb5..39ba513 100644 --- a/SampleTest/App.xaml.cs +++ b/SampleTest/App.xaml.cs @@ -2,103 +2,30 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; using Windows.ApplicationModel; -using Windows.ApplicationModel.Activation; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; +using Microsoft.UI.Xaml; +using System; namespace SampleTest { - /// - /// Provides application-specific behavior to supplement the default Application class. - /// - sealed partial class App : Application + sealed partial class App { - /// - /// Initializes the singleton application object. This is the first line of authored code - /// executed, and as such is the logical equivalent of main() or WinMain(). - /// + private MainWindow m_window; + public App() { this.InitializeComponent(); this.Suspending += OnSuspending; } - /// - /// Invoked when the application is launched normally by the end user. Other entry points - /// will be used such as when the application is launched to open a specific file. - /// - /// Details about the launch request and process. - protected override void OnLaunched(LaunchActivatedEventArgs e) - { - Frame rootFrame = Window.Current.Content as Frame; - - // Do not repeat app initialization when the Window already has content, - // just ensure that the window is active - if (rootFrame == null) - { - // Create a Frame to act as the navigation context and navigate to the first page - rootFrame = new Frame(); - - rootFrame.NavigationFailed += OnNavigationFailed; - - if (e.PreviousExecutionState == ApplicationExecutionState.Terminated) - { - //TODO: Load state from previously suspended application - } - - // Place the frame in the current Window - Window.Current.Content = rootFrame; - } - - if (e.PrelaunchActivated == false) - { - if (rootFrame.Content == null) - { - // When the navigation stack isn't restored navigate to the first page, - // configuring the new page by passing required information as a navigation - // parameter - rootFrame.Navigate(typeof(MainPage), e.Arguments); - } - // Ensure the current window is active - Window.Current.Activate(); - } - } - - /// - /// Invoked when Navigation to a certain page fails - /// - /// The Frame which failed navigation - /// Details about the navigation failure - void OnNavigationFailed(object sender, NavigationFailedEventArgs e) + protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) { - throw new Exception("Failed to load Page " + e.SourcePageType.FullName); + m_window = new MainWindow(); + m_window.Activate(); } - /// - /// Invoked when application execution is being suspended. Application state is saved - /// without knowing whether the application will be terminated or resumed with the contents - /// of memory still intact. - /// - /// The source of the suspend request. - /// Details about the suspend request. private void OnSuspending(object sender, SuspendingEventArgs e) { - var deferral = e.SuspendingOperation.GetDeferral(); - //TODO: Save application state and stop any background activity - deferral.Complete(); } } } diff --git a/SampleTest/MainPage.xaml.cs b/SampleTest/MainPage.xaml.cs index 428741f..ed4130c 100644 --- a/SampleTest/MainPage.xaml.cs +++ b/SampleTest/MainPage.xaml.cs @@ -7,7 +7,7 @@ using Microsoft.Toolkit.Graph.Providers; using System; using System.Text.RegularExpressions; -using Windows.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls; namespace SampleTest { diff --git a/SampleTest/MainWindow.xaml b/SampleTest/MainWindow.xaml new file mode 100644 index 0000000..6013244 --- /dev/null +++ b/SampleTest/MainWindow.xaml @@ -0,0 +1,9 @@ + + + diff --git a/SampleTest/MainWindow.xaml.cs b/SampleTest/MainWindow.xaml.cs new file mode 100644 index 0000000..9492b50 --- /dev/null +++ b/SampleTest/MainWindow.xaml.cs @@ -0,0 +1,16 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +namespace SampleTest +{ + public sealed partial class MainWindow + { + public MainWindow() + { + InitializeComponent(); + + rootFrame.Navigate(typeof(MainPage)); + } + } +} diff --git a/SampleTest/Properties/AssemblyInfo.cs b/SampleTest/Properties/AssemblyInfo.cs deleted file mode 100644 index 67a172e..0000000 --- a/SampleTest/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,31 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("SampleTest")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("SampleTest")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/SampleTest/Properties/Default.rd.xml b/SampleTest/Properties/Default.rd.xml deleted file mode 100644 index af00722..0000000 --- a/SampleTest/Properties/Default.rd.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/SampleTest/SampleTest.csproj b/SampleTest/SampleTest.csproj index d3d8e97..c3ccf83 100644 --- a/SampleTest/SampleTest.csproj +++ b/SampleTest/SampleTest.csproj @@ -1,160 +1,29 @@ - - - + - Debug - x86 - {26F5807A-25B5-4E09-8C72-1749C4C59591} - AppContainerExe - Properties + WinExe + net5.0-windows10.0.18362.0 + 10.0.17134.0 SampleTest - SampleTest - en-US - UAP - 10.0.19041.0 - 10.0.17763.0 - 14 - 512 - {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - true - false + + x86;x64;arm64 + win10-x86;win10-x64;win10-arm64 + + app.manifest - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x86 - false - prompt - true - - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x86 - false - prompt - true - true - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - true - - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - true - true - - - true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM64 - false - prompt - true - true - - - bin\ARM64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM64 - false - prompt - true - true - - - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x64 - false - prompt - true - - - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x64 - false - prompt - true - true - - - PackageReference - - - - App.xaml - - - MainPage.xaml - - - - - - Designer - - - - - - - - - - - + + - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - + + - - 6.2.12 + + 3.0.0-preview4.210210.4 + {42252ee8-7e68-428f-972b-6d2dd3aa12cc} @@ -165,71 +34,9 @@ Microsoft.Toolkit.Graph - - 14.0 - - - bin\x86\CI\ - TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS - true - ;2008 - true - pdbonly - x86 - false - 7.3 - prompt - C:\code\Graph-Controls\Toolkit.ruleset - true - - - bin\ARM\CI\ - TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS - true - ;2008 - true - pdbonly - ARM - false - 7.3 - prompt - C:\code\Graph-Controls\Toolkit.ruleset - true - - - bin\ARM64\CI\ - TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS - true - ;2008 - true - pdbonly - ARM64 - false - 7.3 - prompt - C:\code\Graph-Controls\Toolkit.ruleset - true - - - bin\x64\CI\ - TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS - true - ;2008 - true - pdbonly - x64 - false - 7.3 - prompt - C:\code\Graph-Controls\Toolkit.ruleset - true - - - + + + MSBuild:Compile + + \ No newline at end of file diff --git a/SampleTest/app.manifest b/SampleTest/app.manifest new file mode 100644 index 0000000..fdfb130 --- /dev/null +++ b/SampleTest/app.manifest @@ -0,0 +1,15 @@ + + + + + + + + true/PM + PerMonitorV2, PerMonitor + + + diff --git a/Samples/XAML Islands/UWP-XamlApplication/App.xaml.cs b/Samples/XAML Islands/UWP-XamlApplication/App.xaml.cs index b579caf..6e4786e 100644 --- a/Samples/XAML Islands/UWP-XamlApplication/App.xaml.cs +++ b/Samples/XAML Islands/UWP-XamlApplication/App.xaml.cs @@ -11,13 +11,13 @@ using Windows.ApplicationModel.Activation; using Windows.Foundation; using Windows.Foundation.Collections; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; namespace UWP_XamlApplication { diff --git a/Samples/XAML Islands/UWP-XamlApplication/SamplePage.xaml.cs b/Samples/XAML Islands/UWP-XamlApplication/SamplePage.xaml.cs index 955a32a..8cfb75e 100644 --- a/Samples/XAML Islands/UWP-XamlApplication/SamplePage.xaml.cs +++ b/Samples/XAML Islands/UWP-XamlApplication/SamplePage.xaml.cs @@ -9,13 +9,13 @@ using System.Runtime.InteropServices.WindowsRuntime; using Windows.Foundation; using Windows.Foundation.Collections; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; // The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409 diff --git a/Windows-Toolkit-Graph-Controls.sln b/Windows-Toolkit-Graph-Controls.sln index 3ee888b..02d2e2c 100644 --- a/Windows-Toolkit-Graph-Controls.sln +++ b/Windows-Toolkit-Graph-Controls.sln @@ -16,7 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Config", "Build Confi build\build.ps1 = build\build.ps1 Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets - global.json = global.json build\header.txt = build\header.txt nuget.config = nuget.config settings.xamlstyler = settings.xamlstyler @@ -24,7 +23,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Config", "Build Confi version.json = version.json EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleTest", "SampleTest\SampleTest.csproj", "{26F5807A-25B5-4E09-8C72-1749C4C59591}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleTest", "SampleTest\SampleTest.csproj", "{26F5807A-25B5-4E09-8C72-1749C4C59591}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{68158E5B-0290-4153-A9DE-5AAC2DC0948F}" EndProject @@ -38,6 +37,8 @@ Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "WPF-Packaged-App", "Samples EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Wpf.Graph.Providers", "Microsoft.Toolkit.Wpf.Graph.Providers\Microsoft.Toolkit.Wpf.Graph.Providers.csproj", "{8B9BFE42-F526-4961-A1FD-2D2B6AA0C305}" EndProject +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "SampleTest.Package", "SampleTest.Package\SampleTest.Package.wapproj", "{D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CI|Any CPU = CI|Any CPU @@ -62,16 +63,16 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|Any CPU.ActiveCfg = CI|Any CPU - {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|Any CPU.Build.0 = CI|Any CPU - {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|ARM.ActiveCfg = CI|ARM - {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|ARM.Build.0 = CI|ARM - {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|ARM64.ActiveCfg = CI|ARM64 - {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|ARM64.Build.0 = CI|ARM64 - {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|x64.ActiveCfg = CI|x64 - {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|x64.Build.0 = CI|x64 - {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|x86.ActiveCfg = CI|x86 - {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|x86.Build.0 = CI|x86 + {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|Any CPU.ActiveCfg = Release|Any CPU + {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|Any CPU.Build.0 = Release|Any CPU + {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|ARM.ActiveCfg = Release|Any CPU + {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|ARM.Build.0 = Release|Any CPU + {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|ARM64.ActiveCfg = Release|Any CPU + {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|ARM64.Build.0 = Release|Any CPU + {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|x64.ActiveCfg = Release|Any CPU + {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|x64.Build.0 = Release|Any CPU + {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|x86.ActiveCfg = Release|Any CPU + {B2246169-0CD8-473C-AFF6-172310E2C3F6}.CI|x86.Build.0 = Release|Any CPU {B2246169-0CD8-473C-AFF6-172310E2C3F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B2246169-0CD8-473C-AFF6-172310E2C3F6}.Debug|Any CPU.Build.0 = Debug|Any CPU {B2246169-0CD8-473C-AFF6-172310E2C3F6}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -102,16 +103,16 @@ Global {B2246169-0CD8-473C-AFF6-172310E2C3F6}.Release|x64.Build.0 = Release|Any CPU {B2246169-0CD8-473C-AFF6-172310E2C3F6}.Release|x86.ActiveCfg = Release|Any CPU {B2246169-0CD8-473C-AFF6-172310E2C3F6}.Release|x86.Build.0 = Release|Any CPU - {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|Any CPU.ActiveCfg = CI|Any CPU - {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|Any CPU.Build.0 = CI|Any CPU - {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|ARM.ActiveCfg = CI|ARM - {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|ARM.Build.0 = CI|ARM - {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|ARM64.ActiveCfg = CI|ARM64 - {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|ARM64.Build.0 = CI|ARM64 - {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|x64.ActiveCfg = CI|x64 - {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|x64.Build.0 = CI|x64 - {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|x86.ActiveCfg = CI|x86 - {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|x86.Build.0 = CI|x86 + {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|Any CPU.ActiveCfg = Release|Any CPU + {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|Any CPU.Build.0 = Release|Any CPU + {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|ARM.ActiveCfg = Release|Any CPU + {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|ARM.Build.0 = Release|Any CPU + {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|ARM64.ActiveCfg = Release|Any CPU + {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|ARM64.Build.0 = Release|Any CPU + {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|x64.ActiveCfg = Release|Any CPU + {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|x64.Build.0 = Release|Any CPU + {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|x86.ActiveCfg = Release|Any CPU + {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.CI|x86.Build.0 = Release|Any CPU {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.Debug|Any CPU.Build.0 = Debug|Any CPU {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -142,20 +143,16 @@ Global {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.Release|x64.Build.0 = Release|Any CPU {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.Release|x86.ActiveCfg = Release|Any CPU {42252EE8-7E68-428F-972B-6D2DD3AA12CC}.Release|x86.Build.0 = Release|Any CPU - {26F5807A-25B5-4E09-8C72-1749C4C59591}.CI|Any CPU.ActiveCfg = CI|x86 - {26F5807A-25B5-4E09-8C72-1749C4C59591}.CI|ARM.ActiveCfg = CI|ARM - {26F5807A-25B5-4E09-8C72-1749C4C59591}.CI|ARM64.ActiveCfg = CI|ARM64 - {26F5807A-25B5-4E09-8C72-1749C4C59591}.CI|x64.ActiveCfg = CI|x64 - {26F5807A-25B5-4E09-8C72-1749C4C59591}.CI|x86.ActiveCfg = CI|x86 + {26F5807A-25B5-4E09-8C72-1749C4C59591}.CI|Any CPU.ActiveCfg = Release|x86 + {26F5807A-25B5-4E09-8C72-1749C4C59591}.CI|ARM.ActiveCfg = Release|x86 + {26F5807A-25B5-4E09-8C72-1749C4C59591}.CI|ARM64.ActiveCfg = Release|x86 + {26F5807A-25B5-4E09-8C72-1749C4C59591}.CI|x64.ActiveCfg = Release|x64 + {26F5807A-25B5-4E09-8C72-1749C4C59591}.CI|x86.ActiveCfg = Release|x86 {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|Any CPU.ActiveCfg = Debug|x86 {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|Any CPU.Build.0 = Debug|x86 {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|Any CPU.Deploy.0 = Debug|x86 - {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|ARM.ActiveCfg = Debug|ARM - {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|ARM.Build.0 = Debug|ARM - {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|ARM.Deploy.0 = Debug|ARM - {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|ARM64.Build.0 = Debug|ARM64 - {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|ARM.ActiveCfg = Debug|x86 + {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|ARM64.ActiveCfg = Debug|x86 {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|x64.ActiveCfg = Debug|x64 {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|x64.Build.0 = Debug|x64 {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|x64.Deploy.0 = Debug|x64 @@ -163,17 +160,15 @@ Global {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|x86.Build.0 = Debug|x86 {26F5807A-25B5-4E09-8C72-1749C4C59591}.Debug|x86.Deploy.0 = Debug|x86 {26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|Any CPU.ActiveCfg = Release|x64 - {26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|ARM.ActiveCfg = Release|ARM - {26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|ARM64.ActiveCfg = Release|ARM64 + {26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|ARM.ActiveCfg = Release|x86 + {26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|ARM.Build.0 = Release|x86 + {26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|ARM64.ActiveCfg = Release|x86 + {26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|ARM64.Build.0 = Release|x86 {26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|x64.ActiveCfg = Release|x64 {26F5807A-25B5-4E09-8C72-1749C4C59591}.Native|x86.ActiveCfg = Release|x86 {26F5807A-25B5-4E09-8C72-1749C4C59591}.Release|Any CPU.ActiveCfg = Release|x86 - {26F5807A-25B5-4E09-8C72-1749C4C59591}.Release|ARM.ActiveCfg = Release|ARM - {26F5807A-25B5-4E09-8C72-1749C4C59591}.Release|ARM.Build.0 = Release|ARM - {26F5807A-25B5-4E09-8C72-1749C4C59591}.Release|ARM.Deploy.0 = Release|ARM - {26F5807A-25B5-4E09-8C72-1749C4C59591}.Release|ARM64.ActiveCfg = Release|ARM64 - {26F5807A-25B5-4E09-8C72-1749C4C59591}.Release|ARM64.Build.0 = Release|ARM64 - {26F5807A-25B5-4E09-8C72-1749C4C59591}.Release|ARM64.Deploy.0 = Release|ARM64 + {26F5807A-25B5-4E09-8C72-1749C4C59591}.Release|ARM.ActiveCfg = Release|x86 + {26F5807A-25B5-4E09-8C72-1749C4C59591}.Release|ARM64.ActiveCfg = Release|x86 {26F5807A-25B5-4E09-8C72-1749C4C59591}.Release|x64.ActiveCfg = Release|x64 {26F5807A-25B5-4E09-8C72-1749C4C59591}.Release|x64.Build.0 = Release|x64 {26F5807A-25B5-4E09-8C72-1749C4C59591}.Release|x64.Deploy.0 = Release|x64 @@ -351,6 +346,44 @@ Global {8B9BFE42-F526-4961-A1FD-2D2B6AA0C305}.Release|x64.Build.0 = Release|Any CPU {8B9BFE42-F526-4961-A1FD-2D2B6AA0C305}.Release|x86.ActiveCfg = Release|Any CPU {8B9BFE42-F526-4961-A1FD-2D2B6AA0C305}.Release|x86.Build.0 = Release|Any CPU + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.CI|Any CPU.ActiveCfg = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.CI|ARM.ActiveCfg = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.CI|ARM64.ActiveCfg = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.CI|x64.ActiveCfg = Release|x64 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.CI|x86.ActiveCfg = Release|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Debug|Any CPU.ActiveCfg = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Debug|ARM.ActiveCfg = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Debug|ARM64.ActiveCfg = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Debug|x64.ActiveCfg = Debug|x64 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Debug|x64.Build.0 = Debug|x64 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Debug|x64.Deploy.0 = Debug|x64 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Debug|x86.ActiveCfg = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Debug|x86.Build.0 = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Debug|x86.Deploy.0 = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Native|Any CPU.ActiveCfg = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Native|Any CPU.Build.0 = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Native|Any CPU.Deploy.0 = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Native|ARM.ActiveCfg = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Native|ARM.Build.0 = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Native|ARM.Deploy.0 = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Native|ARM64.ActiveCfg = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Native|ARM64.Build.0 = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Native|ARM64.Deploy.0 = Debug|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Native|x64.ActiveCfg = Release|x64 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Native|x64.Build.0 = Release|x64 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Native|x64.Deploy.0 = Release|x64 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Native|x86.ActiveCfg = Release|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Native|x86.Build.0 = Release|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Native|x86.Deploy.0 = Release|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Release|Any CPU.ActiveCfg = Release|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Release|ARM.ActiveCfg = Release|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Release|ARM64.ActiveCfg = Release|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Release|x64.ActiveCfg = Release|x64 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Release|x64.Build.0 = Release|x64 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Release|x64.Deploy.0 = Release|x64 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Release|x86.ActiveCfg = Release|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Release|x86.Build.0 = Release|x86 + {D67EBA45-B0CD-4BEF-A2D9-6BADA1B47D78}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4c3da40..c967098 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -26,9 +26,14 @@ steps: # Install Nuget Tool Installer - task: NuGetToolInstaller@0 - displayName: Use NuGet 5.0.0 + displayName: Use NuGet 5.8.1 inputs: - versionSpec: 5.0.0 + versionSpec: 5.8.1 + + - task: NuGetAuthenticate@0 + displayName: 'NuGet Authenticate' + inputs: + forceReinstallCredentialProvider: true # Install NBGV Tool - task: DotNetCoreCLI@2 @@ -43,8 +48,8 @@ steps: displayName: Set Version # Install Windows SDK 18362 (minimum compatible sdk) - - powershell: .\build\Install-WindowsSdkISO.ps1 18362 - displayName: Insider SDK + #- powershell: .\build\Install-WindowsSdkISO.ps1 18362 + # displayName: Insider SDK # Run cake build - powershell: .\build.ps1 -target=Package diff --git a/build/build.cake b/build/build.cake index 3662b3e..945f701 100644 --- a/build/build.cake +++ b/build/build.cake @@ -3,6 +3,8 @@ #addin nuget:?package=Cake.FileHelpers&version=3.3.0 #addin nuget:?package=Cake.Powershell&version=0.4.8 +#tool nuget:?package=vswhere&version=2.8.4 + using System; using System.Linq; using System.Text.RegularExpressions; @@ -53,7 +55,7 @@ void VerifyHeaders(bool Replace) Func exclude_objDir = fileSystemInfo => !fileSystemInfo.Path.Segments.Contains("obj"); - var files = GetFiles(baseDir + "/**/*.cs", exclude_objDir).Where(file => + var files = GetFiles(baseDir + "/**/*.cs", new GlobberSettings { Predicate = exclude_objDir }).Where(file => { var path = file.ToString(); return !(path.EndsWith(".g.cs") || path.EndsWith(".i.cs") || System.IO.Path.GetFileName(path).Contains("TemporaryGeneratedFile")); @@ -91,6 +93,19 @@ void VerifyHeaders(bool Replace) } } +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 ////////////////////////////////////////////////////////////////////// @@ -153,6 +168,8 @@ Task("Build") .SetConfiguration("CI") .WithTarget("Restore"); + UpdateToolsPath(buildSettings); + MSBuild(Solution, buildSettings); EnsureDirectoryExists(nupkgDir); @@ -163,8 +180,9 @@ Task("Build") MaxCpuCount = 0 } .SetConfiguration("CI") - .WithTarget("Build") - .WithProperty("GenerateLibraryLayout", "true"); + .WithTarget("Build"); + + UpdateToolsPath(buildSettings); MSBuild(Solution, buildSettings); }); @@ -209,9 +227,10 @@ Task("Package") } .SetConfiguration("CI") .WithTarget("Pack") - .WithProperty("GenerateLibraryLayout", "true") .WithProperty("PackageOutputPath", nupkgDir); + UpdateToolsPath(buildSettings); + MSBuild(Solution, buildSettings); }); @@ -246,7 +265,7 @@ Task("StyleXaml") Func exclude_objDir = fileSystemInfo => !fileSystemInfo.Path.Segments.Contains("obj"); - var files = GetFiles(baseDir + "/**/*.xaml", exclude_objDir); + var files = GetFiles(baseDir + "/**/*.xaml", new GlobberSettings { Predicate = exclude_objDir }); Information("\nChecking " + files.Count() + " file(s) for XAML Structure"); foreach(var file in files) { diff --git a/nuget.config b/nuget.config index 8698e94..c8dcc44 100644 --- a/nuget.config +++ b/nuget.config @@ -4,6 +4,7 @@ + diff --git a/version.json b/version.json index cfbc79b..756026a 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "7.0.0-build.{height}", + "version": "8.0.0-build.{height}", "publicReleaseRefSpec": [ "^refs/heads/main$", // we release out of main "^refs/heads/dev$", // we release out of dev