diff --git a/.editorconfig b/.editorconfig index 9225e97..67435fc 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,19 +1,87 @@ # Remove the line below if you want to inherit .editorconfig settings from higher directories root = true -# C# files -[*.cs] +# Generated code +[*{_AssemblyInfo.cs,.g.cs}] +generated_code = true + +# All files +[*] + +# .NET Foundation Header +file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.\nSee the LICENSE file in the project root for more information. #### Core EditorConfig Options #### +# Encoding +charset = utf-8 + # Indentation and spacing +tab_width = 4 indent_size = 4 indent_style = space -tab_width = 4 # New line preferences end_of_line = crlf -insert_final_newline = false +trim_trailing_whitespace = true +insert_final_newline = true +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_null_propagation = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion +dotnet_style_prefer_auto_properties = true:silent +dotnet_style_object_initializer = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_prefer_simplified_boolean_expressions = true:suggestion +dotnet_style_prefer_conditional_expression_over_assignment = true:silent +dotnet_style_prefer_conditional_expression_over_return = true:silent +dotnet_style_explicit_tuple_names = true:suggestion +dotnet_style_prefer_inferred_tuple_names = true:suggestion +dotnet_style_prefer_compound_assignment = true:suggestion +dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion +dotnet_style_namespace_match_folder = true:suggestion +dotnet_style_prefer_simplified_interpolation = true:suggestion +dotnet_style_readonly_field = true:suggestion +dotnet_style_predefined_type_for_locals_parameters_members = true:silent +dotnet_style_predefined_type_for_member_access = true:silent +dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent +dotnet_style_allow_multiple_blank_lines_experimental = true:silent +dotnet_style_allow_statement_immediately_after_block_experimental = true:silent +dotnet_code_quality_unused_parameters = all:suggestion +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent +dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent +dotnet_style_qualification_for_field = true:silent +dotnet_style_qualification_for_property = true:silent +dotnet_style_qualification_for_method = true:silent +dotnet_style_qualification_for_event = true:silent + +#### Build files #### + +# Solution files +[*.{sln,slnx}] +tab_width = 4 +indent_size = 4 +indent_style = tab + +# Configuration files +[*.{json,xml,yml,config,runsettings}] +indent_size = 2 + +# MSBuild files +[*.{slnf,props,targets,projitems,csproj,shproj}] +indent_size = 2 + +#### Source files #### + +# Markdown files +[*.md] +indent_size = 2 +insert_final_newline = true + +# C# files +[*.cs] #### .NET Coding Conventions #### @@ -103,8 +171,8 @@ csharp_new_line_between_query_expression_clauses = true csharp_indent_block_contents = true csharp_indent_braces = false csharp_indent_case_contents = true -csharp_indent_case_contents_when_block = true -csharp_indent_labels = one_less_than_current +csharp_indent_case_contents_when_block = false +csharp_indent_labels = no_change csharp_indent_switch_labels = true # Space preferences @@ -135,8 +203,8 @@ csharp_space_between_square_brackets = false csharp_preserve_single_line_blocks = true csharp_preserve_single_line_statements = true - # Naming Symbols + # constant_fields - Define constant fields dotnet_naming_symbols.constant_fields.applicable_kinds = field dotnet_naming_symbols.constant_fields.required_modifiers = const @@ -168,6 +236,7 @@ dotnet_naming_symbols.non_interface_types.applicable_kinds dotnet_naming_symbols.interface_types.applicable_kinds = interface # Naming Styles + # camel_case - Define the camelCase style dotnet_naming_style.camel_case.capitalization = camel_case # pascal_case - Define the Pascal_case style @@ -181,9 +250,9 @@ dotnet_naming_style.prefix_interface_interface_with_i.required_prefix # Naming Rules # Async -dotnet_naming_rule.async_methods_end_in_async.severity = silent +dotnet_naming_rule.async_methods_end_in_async.severity = silent dotnet_naming_rule.async_methods_end_in_async.symbols = any_async_methods -dotnet_naming_rule.async_methods_end_in_async.style = end_in_async +dotnet_naming_rule.async_methods_end_in_async.style = end_in_async dotnet_naming_symbols.any_async_methods.applicable_kinds = method dotnet_naming_symbols.any_async_methods.applicable_accessibilities = * @@ -193,46 +262,173 @@ dotnet_naming_style.end_in_async.required_suffix dotnet_naming_style.end_in_async.capitalization = pascal_case # Constant fields must be PascalCase -dotnet_naming_rule.constant_fields_must_be_pascal_case.severity = silent +dotnet_naming_rule.constant_fields_must_be_pascal_case.severity = silent dotnet_naming_rule.constant_fields_must_be_pascal_case.symbols = constant_fields -dotnet_naming_rule.constant_fields_must_be_pascal_case.style = pascal_case +dotnet_naming_rule.constant_fields_must_be_pascal_case.style = pascal_case # Public, internal and protected readonly fields must be PascalCase -dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.severity = silent +dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.severity = silent dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.symbols = non_private_readonly_fields -dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.style = pascal_case +dotnet_naming_rule.non_private_readonly_fields_must_be_pascal_case.style = pascal_case # Static readonly fields must be PascalCase -dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.severity = silent +dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.severity = silent dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.symbols = static_readonly_fields -dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.style = pascal_case +dotnet_naming_rule.static_readonly_fields_must_be_pascal_case.style = pascal_case # Private readonly fields must be camelCase -dotnet_naming_rule.private_readonly_fields_must_be_camel_case.severity = silent +dotnet_naming_rule.private_readonly_fields_must_be_camel_case.severity = silent dotnet_naming_rule.private_readonly_fields_must_be_camel_case.symbols = private_readonly_fields -dotnet_naming_rule.private_readonly_fields_must_be_camel_case.style = camel_case +dotnet_naming_rule.private_readonly_fields_must_be_camel_case.style = camel_case # Public and internal fields must be PascalCase -dotnet_naming_rule.public_internal_protected_fields_must_be_pascal_case.severity = silent +dotnet_naming_rule.public_internal_protected_fields_must_be_pascal_case.severity = silent dotnet_naming_rule.public_internal_protected_fields_must_be_pascal_case.symbols = public_internal_protected_fields -dotnet_naming_rule.public_internal_protected_fields_must_be_pascal_case.style = pascal_case +dotnet_naming_rule.public_internal_protected_fields_must_be_pascal_case.style = pascal_case # Private and protected fields must be camelCase -dotnet_naming_rule.private_fields_must_be_camel_case.severity = silent +dotnet_naming_rule.private_fields_must_be_camel_case.severity = silent dotnet_naming_rule.private_fields_must_be_camel_case.symbols = private_protected_fields -dotnet_naming_rule.private_fields_must_be_camel_case.style = prefix_private_field_with_underscore +dotnet_naming_rule.private_fields_must_be_camel_case.style = prefix_private_field_with_underscore # Public members must be capitalized -dotnet_naming_rule.public_members_must_be_capitalized.severity = silent +dotnet_naming_rule.public_members_must_be_capitalized.severity = silent dotnet_naming_rule.public_members_must_be_capitalized.symbols = public_symbols -dotnet_naming_rule.public_members_must_be_capitalized.style = first_upper +dotnet_naming_rule.public_members_must_be_capitalized.style = first_upper # Parameters must be camelCase -dotnet_naming_rule.parameters_must_be_camel_case.severity = silent +dotnet_naming_rule.parameters_must_be_camel_case.severity = silent dotnet_naming_rule.parameters_must_be_camel_case.symbols = parameters -dotnet_naming_rule.parameters_must_be_camel_case.style = camel_case +dotnet_naming_rule.parameters_must_be_camel_case.style = camel_case # Class, struct, enum and delegates must be PascalCase -dotnet_naming_rule.non_interface_types_must_be_pascal_case.severity = silent +dotnet_naming_rule.non_interface_types_must_be_pascal_case.severity = silent dotnet_naming_rule.non_interface_types_must_be_pascal_case.symbols = non_interface_types -dotnet_naming_rule.non_interface_types_must_be_pascal_case.style = pascal_case +dotnet_naming_rule.non_interface_types_must_be_pascal_case.style = pascal_case # Interfaces must be PascalCase and start with an 'I' -dotnet_naming_rule.interface_types_must_be_prefixed_with_i.severity = silent +dotnet_naming_rule.interface_types_must_be_prefixed_with_i.severity = silent dotnet_naming_rule.interface_types_must_be_prefixed_with_i.symbols = interface_types -dotnet_naming_rule.interface_types_must_be_prefixed_with_i.style = prefix_interface_interface_with_i +dotnet_naming_rule.interface_types_must_be_prefixed_with_i.style = prefix_interface_interface_with_i # prefix_private_field_with_underscore - Private fields must be prefixed with _ dotnet_naming_style.prefix_private_field_with_underscore.capitalization = camel_case dotnet_naming_style.prefix_private_field_with_underscore.required_prefix = _ +# .NET Code Analysis + +dotnet_diagnostic.CA1001.severity = warning +dotnet_diagnostic.CA1009.severity = warning +dotnet_diagnostic.CA1016.severity = warning +dotnet_diagnostic.CA1033.severity = warning +dotnet_diagnostic.CA1049.severity = warning +dotnet_diagnostic.CA1060.severity = warning +dotnet_diagnostic.CA1061.severity = warning +dotnet_diagnostic.CA1063.severity = warning +dotnet_diagnostic.CA1065.severity = warning +dotnet_diagnostic.CA1301.severity = warning +dotnet_diagnostic.CA1400.severity = warning +dotnet_diagnostic.CA1401.severity = warning +dotnet_diagnostic.CA1403.severity = warning +dotnet_diagnostic.CA1404.severity = warning +dotnet_diagnostic.CA1405.severity = warning +dotnet_diagnostic.CA1410.severity = warning +dotnet_diagnostic.CA1415.severity = warning +dotnet_diagnostic.CA1821.severity = warning +dotnet_diagnostic.CA1900.severity = warning +dotnet_diagnostic.CA1901.severity = warning +dotnet_diagnostic.CA2002.severity = warning +dotnet_diagnostic.CA2100.severity = warning +dotnet_diagnostic.CA2101.severity = warning +dotnet_diagnostic.CA2108.severity = warning +dotnet_diagnostic.CA2111.severity = warning +dotnet_diagnostic.CA2112.severity = warning +dotnet_diagnostic.CA2114.severity = warning +dotnet_diagnostic.CA2116.severity = warning +dotnet_diagnostic.CA2117.severity = warning +dotnet_diagnostic.CA2122.severity = warning +dotnet_diagnostic.CA2123.severity = warning +dotnet_diagnostic.CA2124.severity = warning +dotnet_diagnostic.CA2126.severity = warning +dotnet_diagnostic.CA2131.severity = warning +dotnet_diagnostic.CA2132.severity = warning +dotnet_diagnostic.CA2133.severity = warning +dotnet_diagnostic.CA2134.severity = warning +dotnet_diagnostic.CA2137.severity = warning +dotnet_diagnostic.CA2138.severity = warning +dotnet_diagnostic.CA2140.severity = warning +dotnet_diagnostic.CA2141.severity = warning +dotnet_diagnostic.CA2146.severity = warning +dotnet_diagnostic.CA2147.severity = warning +dotnet_diagnostic.CA2149.severity = warning +dotnet_diagnostic.CA2200.severity = warning +dotnet_diagnostic.CA2202.severity = warning +dotnet_diagnostic.CA2207.severity = warning +dotnet_diagnostic.CA2212.severity = warning +dotnet_diagnostic.CA2213.severity = warning +dotnet_diagnostic.CA2214.severity = warning +dotnet_diagnostic.CA2216.severity = warning +dotnet_diagnostic.CA2220.severity = warning +dotnet_diagnostic.CA2229.severity = warning +dotnet_diagnostic.CA2231.severity = warning +dotnet_diagnostic.CA2232.severity = warning +dotnet_diagnostic.CA2235.severity = warning +dotnet_diagnostic.CA2236.severity = warning +dotnet_diagnostic.CA2237.severity = warning +dotnet_diagnostic.CA2238.severity = warning +dotnet_diagnostic.CA2240.severity = warning +dotnet_diagnostic.CA2241.severity = warning +dotnet_diagnostic.CA2242.severity = warning + +# StyleCop Code Analysis + +# Closing parenthesis should be spaced correctly: "foo()!" +dotnet_diagnostic.SA1009.severity = none + +# Hide warnings when using the new() expression from C# 9. +dotnet_diagnostic.SA1000.severity = none + +dotnet_diagnostic.SA1011.severity = none +dotnet_diagnostic.SA1101.severity = none + +# Hide warnings when accessing properties without "this". +dotnet_diagnostic.SA1101.severity = none +dotnet_diagnostic.SA1118.severity = none +dotnet_diagnostic.SA1200.severity = none +dotnet_diagnostic.SA1201.severity = none +dotnet_diagnostic.SA1202.severity = none +dotnet_diagnostic.SA1309.severity = none +dotnet_diagnostic.SA1310.severity = none + +# Hide warnings for record parameters. +dotnet_diagnostic.SA1313.severity = none + +# TypeParameterNamesMustBeginWithT: We do have a few templates that don't start with T. We need to double check that changing this is not a breaking change. If not, we can re-enable this. +dotnet_diagnostic.SA1314.severity = none + +# UseTrailingCommasInMultiLineInitializers: This would also mean a lot of changes at the end of all multiline initializers. It's also debatable if we want this or not. +dotnet_diagnostic.SA1413.severity = none + +dotnet_diagnostic.SA1600.severity = none +dotnet_diagnostic.SA1602.severity = none +dotnet_diagnostic.SA1611.severity = none + +# DocumentationTextMustEndWithAPeriod: Let's enable this rule back when we shift to WinUI3 (v8.x). If we do it now, it would mean more than 400 file changes. +dotnet_diagnostic.SA1629.severity = none + +dotnet_diagnostic.SA1633.severity = none +dotnet_diagnostic.SA1634.severity = none +dotnet_diagnostic.SA1652.severity = none +csharp_using_directive_placement = outside_namespace:silent +csharp_prefer_simple_using_statement = true:suggestion +csharp_style_namespace_declarations = file_scoped:warning +csharp_style_expression_bodied_local_functions = false:silent +csharp_style_prefer_null_check_over_type_check = true:suggestion +csharp_style_prefer_local_over_anonymous_function = true:suggestion +csharp_style_prefer_index_operator = true:suggestion +csharp_style_prefer_range_operator = true:suggestion +csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion +csharp_style_prefer_tuple_swap = true:suggestion +csharp_style_unused_value_assignment_preference = discard_variable:suggestion +csharp_style_unused_value_expression_statement_preference = discard_variable:silent +csharp_prefer_static_local_function = true:suggestion +csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent +csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent +csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:silent +csharp_style_prefer_pattern_matching = true:silent +csharp_style_prefer_switch_expression = true:suggestion +csharp_style_prefer_not_pattern = true:suggestion +csharp_style_prefer_extended_property_pattern = true:suggestion + +# Require file header +dotnet_diagnostic.IDE0073.severity = warning diff --git a/CommunityToolkit.Authentication.Msal/CommunityToolkit.Authentication.Msal.csproj b/CommunityToolkit.Authentication.Msal/CommunityToolkit.Authentication.Msal.csproj index 501d753..caf51b9 100644 --- a/CommunityToolkit.Authentication.Msal/CommunityToolkit.Authentication.Msal.csproj +++ b/CommunityToolkit.Authentication.Msal/CommunityToolkit.Authentication.Msal.csproj @@ -1,7 +1,7 @@ - + - netstandard2.0;uap10.0;net5.0-windows10.0.17763.0;netcoreapp3.1 + netstandard2.0;uap10.0.17763;net6.0-windows10.0.17763.0;netcoreapp3.1 10.0.17763.0 7 @@ -16,12 +16,12 @@ - - + + - + diff --git a/CommunityToolkit.Authentication.Msal/MsalProvider.cs b/CommunityToolkit.Authentication.Msal/MsalProvider.cs index 3adf77a..d9a4134 100644 --- a/CommunityToolkit.Authentication.Msal/MsalProvider.cs +++ b/CommunityToolkit.Authentication.Msal/MsalProvider.cs @@ -202,7 +202,7 @@ protected IPublicClientApplication CreatePublicClientApplication(string clientId clientBuilder = clientBuilder.WithAuthority(AzureCloudInstance.AzurePublic, authority); } -#if WINDOWS_UWP || NET5_0_WINDOWS10_0_17763_0 +#if WINDOWS_UWP || NET6_0_WINDOWS10_0_17763_0 clientBuilder = clientBuilder.WithBroker(); #elif NETCOREAPP3_1 clientBuilder = clientBuilder.WithWindowsBroker(); diff --git a/CommunityToolkit.Authentication.Uwp/CommunityToolkit.Authentication.Uwp.csproj b/CommunityToolkit.Authentication.Uwp/CommunityToolkit.Authentication.Uwp.csproj index 5c68901..60c5a31 100644 --- a/CommunityToolkit.Authentication.Uwp/CommunityToolkit.Authentication.Uwp.csproj +++ b/CommunityToolkit.Authentication.Uwp/CommunityToolkit.Authentication.Uwp.csproj @@ -1,7 +1,7 @@ - + - uap10.0.17134 + uap10.0.17763 Windows Community Toolkit Graph Uwp Authentication Provider This library provides an authentication provider based on the native Windows dialogues. @@ -10,7 +10,7 @@ - WindowsProvider: An authentication provider based on the native AccountsSettingsPane in Windows. UWP Community Toolkit Provider Authentication Auth Windows - 9.0 + 10.0 diff --git a/CommunityToolkit.Authentication/CommunityToolkit.Authentication.csproj b/CommunityToolkit.Authentication/CommunityToolkit.Authentication.csproj index cd25959..1c8f624 100644 --- a/CommunityToolkit.Authentication/CommunityToolkit.Authentication.csproj +++ b/CommunityToolkit.Authentication/CommunityToolkit.Authentication.csproj @@ -13,7 +13,4 @@ Community Toolkit Provider Authentication Auth - - - diff --git a/CommunityToolkit.Graph.Uwp/CommunityToolkit.Graph.Uwp.csproj b/CommunityToolkit.Graph.Uwp/CommunityToolkit.Graph.Uwp.csproj index cf3fdfd..90016f9 100644 --- a/CommunityToolkit.Graph.Uwp/CommunityToolkit.Graph.Uwp.csproj +++ b/CommunityToolkit.Graph.Uwp/CommunityToolkit.Graph.Uwp.csproj @@ -1,4 +1,4 @@ - + uap10.0.17763 @@ -19,12 +19,12 @@ - ProviderStateTrigger: StateTrigger for reacting to changes in the global authentcation provider. UWP Community Toolkit Windows Controls Microsoft Graph Login Person PeoplePicker Presenter - 9.0 + 10.0 - - + + diff --git a/CommunityToolkit.Graph/CommunityToolkit.Graph.csproj b/CommunityToolkit.Graph/CommunityToolkit.Graph.csproj index 4eaf7b1..1feb066 100644 --- a/CommunityToolkit.Graph/CommunityToolkit.Graph.csproj +++ b/CommunityToolkit.Graph/CommunityToolkit.Graph.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -16,7 +16,7 @@ - UserExtensionStorageHelper: A helper for interacting with open extensions on the Graph User to store data in key/value pairs. Windows Community Toolkit Microsoft Graph Provider Extensions Helpers Roaming Settings - 9.0 + 10.0 diff --git a/Directory.Build.props b/Directory.Build.props index 08755e5..b5bad92 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -37,11 +37,7 @@ - - - - - + @@ -55,9 +51,9 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - + - \ No newline at end of file + diff --git a/README.md b/README.md index a8adcf4..10cd424 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you need similar controls for the Web, please use the [Microsoft Graph Toolki | Package | Min Supported | |--|--| | `CommunityToolkit.Authentication` | NetStandard 2.0 | -| `CommunityToolkit.Authentication.Msal` | NetStandard 2.0, UWP, .NET 5, .NET 5 Windows 10.0.17763.0, .NET Core 3.1 | +| `CommunityToolkit.Authentication.Msal` | NetStandard 2.0, UWP, .NET 6, .NET 6 Windows 10.0.17763.0, .NET Core 3.1 | | `CommunityToolkit.Authentication.Uwp` | UWP Windows 10.0.17134.0 | | `CommunityTookit.Graph` | NetStandard 2.0 | | `CommunityToolkit.Graph.Uwp` | UWP Windows 10.0.17763.0 | @@ -23,7 +23,7 @@ Check out our samples for getting started with authentication providers and maki - [UwpWindowsProviderSample](./Samples/UwpWindowsProviderSample) - [UwpMsalProviderSample](./Samples/UwpMsalProviderSample) - [WpfNetCoreMsalProviderSample](./Samples/WpfNetCoreMsalProviderSample) -- [WpfNetMsalProviderSample](./Samples/WpfNet5WindowsMsalProviderSample) +- [WpfNetMsalProviderSample](./Samples/WpfNetWindowsMsalProviderSample) - [ManualGraphRequestSample](./Samples/ManualGraphRequestSample) ### Contoso Notes Sample diff --git a/SampleTest/SampleTest.csproj b/SampleTest/SampleTest.csproj index 309669f..0d90b7c 100644 --- a/SampleTest/SampleTest.csproj +++ b/SampleTest/SampleTest.csproj @@ -1,4 +1,4 @@ - + @@ -11,9 +11,9 @@ SampleTest en-US UAP - 10.0.19041.0 + 10.0.22621.0 10.0.17763.0 - 14 + 17 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -208,16 +208,16 @@ - 4.5.0 + 4.48.0 - 6.2.12 + 6.2.13 - - 7.1.0 + + 8.0.0 - 7.1.0 + 7.1.3 @@ -242,8 +242,8 @@ CommunityToolkit.Graph.Uwp - - 14.0 + + 17.0 bin\x86\CI\ @@ -309,4 +309,4 @@ --> - \ No newline at end of file + diff --git a/SampleTest/Samples/GraphPresenter/OneDriveSample.xaml.cs b/SampleTest/Samples/GraphPresenter/OneDriveSample.xaml.cs index 35e56ce..c913633 100644 --- a/SampleTest/Samples/GraphPresenter/OneDriveSample.xaml.cs +++ b/SampleTest/Samples/GraphPresenter/OneDriveSample.xaml.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// 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. @@ -8,7 +8,7 @@ using CommunityToolkit.Graph.Extensions; using Microsoft.Graph; using Microsoft.Toolkit; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Data; diff --git a/Samples/ManualGraphRequestSample/ManualGraphRequestSample.csproj b/Samples/ManualGraphRequestSample/ManualGraphRequestSample.csproj index ab65af2..779b357 100644 --- a/Samples/ManualGraphRequestSample/ManualGraphRequestSample.csproj +++ b/Samples/ManualGraphRequestSample/ManualGraphRequestSample.csproj @@ -1,4 +1,4 @@ - + @@ -11,9 +11,9 @@ ManualGraphRequestSample en-US UAP - 10.0.19041.0 + 10.0.22621.0 10.0.17763.0 - 14 + 17 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -152,10 +152,10 @@ - 6.2.12 + 6.2.13 - 13.0.1 + 13.0.2 @@ -168,8 +168,8 @@ CommunityToolkit.Authentication - - 14.0 + + 17.0 - \ No newline at end of file + diff --git a/Samples/UwpMsalProviderSample/UwpMsalProviderSample.csproj b/Samples/UwpMsalProviderSample/UwpMsalProviderSample.csproj index f88ac03..88a5399 100644 --- a/Samples/UwpMsalProviderSample/UwpMsalProviderSample.csproj +++ b/Samples/UwpMsalProviderSample/UwpMsalProviderSample.csproj @@ -1,4 +1,4 @@ - + @@ -11,9 +11,9 @@ UwpMsalProviderSample en-US UAP - 10.0.19041.0 + 10.0.22621.0 10.0.17763.0 - 14 + 17 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -151,7 +151,7 @@ - 6.2.12 + 6.2.13 @@ -175,8 +175,8 @@ - - 14.0 + + 17.0 - \ No newline at end of file + diff --git a/Samples/UwpWindowsProviderSample/UwpWindowsProviderSample.csproj b/Samples/UwpWindowsProviderSample/UwpWindowsProviderSample.csproj index b29ef07..e9b9e1f 100644 --- a/Samples/UwpWindowsProviderSample/UwpWindowsProviderSample.csproj +++ b/Samples/UwpWindowsProviderSample/UwpWindowsProviderSample.csproj @@ -1,4 +1,4 @@ - + @@ -11,9 +11,9 @@ UwpAuthenticationSample en-US UAP - 10.0.19041.0 + 10.0.22621.0 10.0.17763.0 - 14 + 17 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -158,7 +158,7 @@ - 6.2.12 + 6.2.13 @@ -182,8 +182,8 @@ - - 14.0 + + 17.0 - \ No newline at end of file + diff --git a/Samples/WpfNet5WindowsMsalProviderSample/App.xaml b/Samples/WpfNetWindowsMsalProviderSample/App.xaml similarity index 66% rename from Samples/WpfNet5WindowsMsalProviderSample/App.xaml rename to Samples/WpfNetWindowsMsalProviderSample/App.xaml index 35cad72..041ec75 100644 --- a/Samples/WpfNet5WindowsMsalProviderSample/App.xaml +++ b/Samples/WpfNetWindowsMsalProviderSample/App.xaml @@ -1,7 +1,7 @@ - diff --git a/Samples/WpfNet5WindowsMsalProviderSample/App.xaml.cs b/Samples/WpfNetWindowsMsalProviderSample/App.xaml.cs similarity index 97% rename from Samples/WpfNet5WindowsMsalProviderSample/App.xaml.cs rename to Samples/WpfNetWindowsMsalProviderSample/App.xaml.cs index 928b0ec..c8050ce 100644 --- a/Samples/WpfNet5WindowsMsalProviderSample/App.xaml.cs +++ b/Samples/WpfNetWindowsMsalProviderSample/App.xaml.cs @@ -9,7 +9,7 @@ using CommunityToolkit.Authentication.Extensions; using Microsoft.Identity.Client.Extensions.Msal; -namespace WpfNet5WindowsMsalProviderSample +namespace WpfNetWindowsMsalProviderSample { public partial class App : Application { diff --git a/Samples/WpfNet5WindowsMsalProviderSample/AssemblyInfo.cs b/Samples/WpfNetWindowsMsalProviderSample/AssemblyInfo.cs similarity index 100% rename from Samples/WpfNet5WindowsMsalProviderSample/AssemblyInfo.cs rename to Samples/WpfNetWindowsMsalProviderSample/AssemblyInfo.cs diff --git a/Samples/WpfNet5WindowsMsalProviderSample/CacheConfig.cs b/Samples/WpfNetWindowsMsalProviderSample/CacheConfig.cs similarity index 96% rename from Samples/WpfNet5WindowsMsalProviderSample/CacheConfig.cs rename to Samples/WpfNetWindowsMsalProviderSample/CacheConfig.cs index 5986a84..8077ad4 100644 --- a/Samples/WpfNet5WindowsMsalProviderSample/CacheConfig.cs +++ b/Samples/WpfNetWindowsMsalProviderSample/CacheConfig.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Microsoft.Identity.Client.Extensions.Msal; -namespace WpfNet5WindowsMsalProviderSample +namespace WpfNetWindowsMsalProviderSample { /// /// https://github.com/AzureAD/microsoft-authentication-extensions-for-dotnet/wiki/Cross-platform-Token-Cache diff --git a/Samples/WpfNet5WindowsMsalProviderSample/LoginButton.xaml b/Samples/WpfNetWindowsMsalProviderSample/LoginButton.xaml similarity index 79% rename from Samples/WpfNet5WindowsMsalProviderSample/LoginButton.xaml rename to Samples/WpfNetWindowsMsalProviderSample/LoginButton.xaml index d6dfc4f..be55941 100644 --- a/Samples/WpfNet5WindowsMsalProviderSample/LoginButton.xaml +++ b/Samples/WpfNetWindowsMsalProviderSample/LoginButton.xaml @@ -1,9 +1,9 @@ - diff --git a/Samples/WpfNet5WindowsMsalProviderSample/LoginButton.xaml.cs b/Samples/WpfNetWindowsMsalProviderSample/LoginButton.xaml.cs similarity index 97% rename from Samples/WpfNet5WindowsMsalProviderSample/LoginButton.xaml.cs rename to Samples/WpfNetWindowsMsalProviderSample/LoginButton.xaml.cs index b312b95..f3f9e7f 100644 --- a/Samples/WpfNet5WindowsMsalProviderSample/LoginButton.xaml.cs +++ b/Samples/WpfNetWindowsMsalProviderSample/LoginButton.xaml.cs @@ -7,7 +7,7 @@ using System.Windows; using System.Windows.Controls; -namespace WpfNet5WindowsMsalProviderSample +namespace WpfNetWindowsMsalProviderSample { /// /// A simple button for triggering the globally configured IProvider to sign in and out. diff --git a/Samples/WpfNet5WindowsMsalProviderSample/MainWindow.xaml b/Samples/WpfNetWindowsMsalProviderSample/MainWindow.xaml similarity index 78% rename from Samples/WpfNet5WindowsMsalProviderSample/MainWindow.xaml rename to Samples/WpfNetWindowsMsalProviderSample/MainWindow.xaml index c29cbd3..16db65a 100644 --- a/Samples/WpfNet5WindowsMsalProviderSample/MainWindow.xaml +++ b/Samples/WpfNetWindowsMsalProviderSample/MainWindow.xaml @@ -1,9 +1,9 @@ - diff --git a/Samples/WpfNet5WindowsMsalProviderSample/MainWindow.xaml.cs b/Samples/WpfNetWindowsMsalProviderSample/MainWindow.xaml.cs similarity index 96% rename from Samples/WpfNet5WindowsMsalProviderSample/MainWindow.xaml.cs rename to Samples/WpfNetWindowsMsalProviderSample/MainWindow.xaml.cs index d42904a..43f36ed 100644 --- a/Samples/WpfNet5WindowsMsalProviderSample/MainWindow.xaml.cs +++ b/Samples/WpfNetWindowsMsalProviderSample/MainWindow.xaml.cs @@ -6,7 +6,7 @@ using CommunityToolkit.Graph.Extensions; using System.Windows; -namespace WpfNet5WindowsMsalProviderSample +namespace WpfNetWindowsMsalProviderSample { /// /// Interaction logic for MainWindow.xaml diff --git a/Samples/WpfNet5WindowsMsalProviderSample/README.md b/Samples/WpfNetWindowsMsalProviderSample/README.md similarity index 95% rename from Samples/WpfNet5WindowsMsalProviderSample/README.md rename to Samples/WpfNetWindowsMsalProviderSample/README.md index c57018b..a916958 100644 --- a/Samples/WpfNet5WindowsMsalProviderSample/README.md +++ b/Samples/WpfNetWindowsMsalProviderSample/README.md @@ -1,4 +1,4 @@ -# MsalProvider Authentication Sample for .NET 5.0 WPF apps +# MsalProvider Authentication Sample for .NET 6.0 WPF apps This sample demonstrates how to configure the MsalProvider to authenticate consumer MSA and organizational AAD accounts in your apps. diff --git a/Samples/WpfNet5WindowsMsalProviderSample/WpfNet5WindowsMsalProviderSample.csproj b/Samples/WpfNetWindowsMsalProviderSample/WpfNetWindowsMsalProviderSample.csproj similarity index 81% rename from Samples/WpfNet5WindowsMsalProviderSample/WpfNet5WindowsMsalProviderSample.csproj rename to Samples/WpfNetWindowsMsalProviderSample/WpfNetWindowsMsalProviderSample.csproj index 36360eb..de00203 100644 --- a/Samples/WpfNet5WindowsMsalProviderSample/WpfNet5WindowsMsalProviderSample.csproj +++ b/Samples/WpfNetWindowsMsalProviderSample/WpfNetWindowsMsalProviderSample.csproj @@ -1,13 +1,13 @@ - + WinExe - net5.0-windows10.0.17763.0 + net6.0-windows10.0.17763.0 true - + diff --git a/Toolkit.ruleset b/Toolkit.ruleset deleted file mode 100644 index 5f70b95..0000000 --- a/Toolkit.ruleset +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index 312a23c..ff7a9ac 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -1,4 +1,4 @@ - + @@ -11,14 +11,14 @@ UnitTests.UWP en-US UAP - 10.0.19041.0 + 10.0.22621.0 10.0.17763.0 - 14 + 17 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(VisualStudioVersion) false - 9.0 + 10.0 true @@ -154,28 +154,28 @@ - 5.0.2 + 7.0.0 - 6.1.0 + 6.8.0 - 4.5.0 + 4.48.0 - 6.2.12 + 6.2.13 - 7.1.0 + 7.1.3 - 2.2.7 + 2.2.10 - 2.2.7 + 2.2.10 - 5.0.2 + 7.0.1 4.3.0 @@ -195,8 +195,8 @@ CommunityToolkit.Graph - - 14.0 + + 17.0 - \ No newline at end of file + diff --git a/Windows-Toolkit-Graph-Controls.sln b/Windows-Toolkit-Graph-Controls.sln index 5ccb929..0afed84 100644 --- a/Windows-Toolkit-Graph-Controls.sln +++ b/Windows-Toolkit-Graph-Controls.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29230.61 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33103.184 MinimumVisualStudioVersion = 15.0.26124.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Graph", "CommunityToolkit.Graph\CommunityToolkit.Graph.csproj", "{B2246169-0CD8-473C-AFF6-172310E2C3F6}" EndProject @@ -19,7 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Config", "Build Confi build\header.txt = build\header.txt nuget.config = nuget.config settings.xamlstyler = settings.xamlstyler - stylecop.json = stylecop.json version.json = version.json build\Windows.Toolkit.Common.props = build\Windows.Toolkit.Common.props build\Windows.Toolkit.Common.targets = build\Windows.Toolkit.Common.targets @@ -43,13 +42,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{022B EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UwpMsalProviderSample", "Samples\UwpMsalProviderSample\UwpMsalProviderSample.csproj", "{D0F6A1EB-806E-424A-BDCA-9F749F12774F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfNet5WindowsMsalProviderSample", "Samples\WpfNet5WindowsMsalProviderSample\WpfNet5WindowsMsalProviderSample.csproj", "{EDAD72A8-498B-4645-AD1A-E5CDBDB610F7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfNetWindowsMsalProviderSample", "Samples\WpfNetWindowsMsalProviderSample\WpfNetWindowsMsalProviderSample.csproj", "{EDAD72A8-498B-4645-AD1A-E5CDBDB610F7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UwpWindowsProviderSample", "Samples\UwpWindowsProviderSample\UwpWindowsProviderSample.csproj", "{C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManualGraphRequestSample", "Samples\ManualGraphRequestSample\ManualGraphRequestSample.csproj", "{192CC7FD-408D-4B0B-9032-AD06C7BE46C6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfNetCoreMsalProviderSample", "Samples\WpfNetCoreMsalProviderSample\WpfNetCoreMsalProviderSample.csproj", "{86AD7D3C-F03F-4FD1-8D69-AB0520805A65}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfNetCoreMsalProviderSample", "Samples\WpfNetCoreMsalProviderSample\WpfNetCoreMsalProviderSample.csproj", "{86AD7D3C-F03F-4FD1-8D69-AB0520805A65}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -345,17 +344,9 @@ Global {6B33B26C-008B-4ADB-B317-EF996CD6755B}.Release|x86.Build.0 = Release|x86 {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.CI|Any CPU.ActiveCfg = Debug|x86 {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.CI|ARM.ActiveCfg = Debug|ARM - {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.CI|ARM.Build.0 = Debug|ARM - {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.CI|ARM.Deploy.0 = Debug|ARM {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.CI|ARM64.ActiveCfg = Debug|ARM64 - {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.CI|ARM64.Build.0 = Debug|ARM64 - {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.CI|ARM64.Deploy.0 = Debug|ARM64 {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.CI|x64.ActiveCfg = Debug|x64 - {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.CI|x64.Build.0 = Debug|x64 - {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.CI|x64.Deploy.0 = Debug|x64 {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.CI|x86.ActiveCfg = Debug|x86 - {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.CI|x86.Build.0 = Debug|x86 - {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.CI|x86.Deploy.0 = Debug|x86 {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.Debug|Any CPU.ActiveCfg = Debug|x86 {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.Debug|Any CPU.Build.0 = Debug|x86 {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.Debug|Any CPU.Deploy.0 = Debug|x86 @@ -399,13 +390,9 @@ Global {D0F6A1EB-806E-424A-BDCA-9F749F12774F}.Release|x86.Deploy.0 = Release|x86 {EDAD72A8-498B-4645-AD1A-E5CDBDB610F7}.CI|Any CPU.ActiveCfg = Debug|Any CPU {EDAD72A8-498B-4645-AD1A-E5CDBDB610F7}.CI|ARM.ActiveCfg = Debug|Any CPU - {EDAD72A8-498B-4645-AD1A-E5CDBDB610F7}.CI|ARM.Build.0 = Debug|Any CPU {EDAD72A8-498B-4645-AD1A-E5CDBDB610F7}.CI|ARM64.ActiveCfg = Debug|Any CPU - {EDAD72A8-498B-4645-AD1A-E5CDBDB610F7}.CI|ARM64.Build.0 = Debug|Any CPU {EDAD72A8-498B-4645-AD1A-E5CDBDB610F7}.CI|x64.ActiveCfg = Debug|Any CPU - {EDAD72A8-498B-4645-AD1A-E5CDBDB610F7}.CI|x64.Build.0 = Debug|Any CPU {EDAD72A8-498B-4645-AD1A-E5CDBDB610F7}.CI|x86.ActiveCfg = Debug|Any CPU - {EDAD72A8-498B-4645-AD1A-E5CDBDB610F7}.CI|x86.Build.0 = Debug|Any CPU {EDAD72A8-498B-4645-AD1A-E5CDBDB610F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EDAD72A8-498B-4645-AD1A-E5CDBDB610F7}.Debug|Any CPU.Build.0 = Debug|Any CPU {EDAD72A8-498B-4645-AD1A-E5CDBDB610F7}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -436,17 +423,9 @@ Global {EDAD72A8-498B-4645-AD1A-E5CDBDB610F7}.Release|x86.Build.0 = Release|Any CPU {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.CI|Any CPU.ActiveCfg = Debug|x86 {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.CI|ARM.ActiveCfg = Debug|ARM - {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.CI|ARM.Build.0 = Debug|ARM - {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.CI|ARM.Deploy.0 = Debug|ARM {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.CI|ARM64.ActiveCfg = Debug|ARM64 - {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.CI|ARM64.Build.0 = Debug|ARM64 - {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.CI|ARM64.Deploy.0 = Debug|ARM64 {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.CI|x64.ActiveCfg = Debug|x64 - {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.CI|x64.Build.0 = Debug|x64 - {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.CI|x64.Deploy.0 = Debug|x64 {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.CI|x86.ActiveCfg = Debug|x86 - {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.CI|x86.Build.0 = Debug|x86 - {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.CI|x86.Deploy.0 = Debug|x86 {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.Debug|Any CPU.ActiveCfg = Debug|x86 {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.Debug|Any CPU.Build.0 = Debug|x86 {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.Debug|Any CPU.Deploy.0 = Debug|x86 @@ -490,17 +469,9 @@ Global {C60C02DF-F44C-4449-A1D4-C2DC3A7959B9}.Release|x86.Deploy.0 = Release|x86 {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.CI|Any CPU.ActiveCfg = Debug|x86 {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.CI|ARM.ActiveCfg = Debug|ARM - {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.CI|ARM.Build.0 = Debug|ARM - {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.CI|ARM.Deploy.0 = Debug|ARM {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.CI|ARM64.ActiveCfg = Debug|ARM64 - {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.CI|ARM64.Build.0 = Debug|ARM64 - {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.CI|ARM64.Deploy.0 = Debug|ARM64 {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.CI|x64.ActiveCfg = Debug|x64 - {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.CI|x64.Build.0 = Debug|x64 - {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.CI|x64.Deploy.0 = Debug|x64 {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.CI|x86.ActiveCfg = Debug|x86 - {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.CI|x86.Build.0 = Debug|x86 - {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.CI|x86.Deploy.0 = Debug|x86 {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.Debug|Any CPU.ActiveCfg = Debug|x86 {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.Debug|Any CPU.Build.0 = Debug|x86 {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.Debug|Any CPU.Deploy.0 = Debug|x86 @@ -543,15 +514,10 @@ Global {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.Release|x86.Build.0 = Release|x86 {192CC7FD-408D-4B0B-9032-AD06C7BE46C6}.Release|x86.Deploy.0 = Release|x86 {86AD7D3C-F03F-4FD1-8D69-AB0520805A65}.CI|Any CPU.ActiveCfg = Debug|Any CPU - {86AD7D3C-F03F-4FD1-8D69-AB0520805A65}.CI|Any CPU.Build.0 = Debug|Any CPU {86AD7D3C-F03F-4FD1-8D69-AB0520805A65}.CI|ARM.ActiveCfg = Debug|Any CPU - {86AD7D3C-F03F-4FD1-8D69-AB0520805A65}.CI|ARM.Build.0 = Debug|Any CPU {86AD7D3C-F03F-4FD1-8D69-AB0520805A65}.CI|ARM64.ActiveCfg = Debug|Any CPU - {86AD7D3C-F03F-4FD1-8D69-AB0520805A65}.CI|ARM64.Build.0 = Debug|Any CPU {86AD7D3C-F03F-4FD1-8D69-AB0520805A65}.CI|x64.ActiveCfg = Debug|Any CPU - {86AD7D3C-F03F-4FD1-8D69-AB0520805A65}.CI|x64.Build.0 = Debug|Any CPU {86AD7D3C-F03F-4FD1-8D69-AB0520805A65}.CI|x86.ActiveCfg = Debug|Any CPU - {86AD7D3C-F03F-4FD1-8D69-AB0520805A65}.CI|x86.Build.0 = Debug|Any CPU {86AD7D3C-F03F-4FD1-8D69-AB0520805A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {86AD7D3C-F03F-4FD1-8D69-AB0520805A65}.Debug|Any CPU.Build.0 = Debug|Any CPU {86AD7D3C-F03F-4FD1-8D69-AB0520805A65}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1e0f608..0cc6593 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,18 +10,15 @@ pr: - dev/* - rel/* -# Microsoft-hosted agent pool for Visual Studio 2019 +# Microsoft-hosted agent pool for Visual Studio 2022 pool: - vmImage: windows-2019 - -variables: - BuildConfiguration: CI + vmImage: windows-2022 steps: # Setup Environment Variables - task: BatchScript@1 inputs: - filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\Tools\\VsDevCmd.bat" + filename: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\VsDevCmd.bat" arguments: -no_logo modifyEnvironment: true displayName: Setup Environment Variables @@ -45,13 +42,30 @@ steps: displayName: Set Version # Install Windows SDK 18362 (minimum compatible sdk) - - powershell: .\build\Install-WindowsSdkISO.ps1 18362 + - powershell: .\build\Install-WindowsSdkISO.ps1 22621 displayName: Insider SDK - # Run cake build - - powershell: .\build.ps1 -target=Package - displayName: Build - workingDirectory: .\build + # restore & build solution + - script: msbuild -r -target:Build -p:Configuration=CI -p:GenerateLibraryLayout=true + displayName: Restore & Build solution + + # run tests + ### Tests require logging in, so aren't achievable in CI with current setup. Should ask MSAL/Graph team how they mock in future. + ### Leaving this here as if UnitTests.Uwp area built, this should run them. + #- script: vstest.console.exe ./UnitTests/**/*.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=VsTestResultsUwp.trx" + # displayName: Unit Tests + + # publish results + #- task: PublishTestResults@2 + # inputs: + # testResultsFormat: 'VSTest' + # testResultsFiles: '**/VsTestResults*.trx' + # displayName: Publish Test Results + # condition: always() + + # pack solution + - script: msbuild -target:Pack -p:Configuration=CI -p:GenerateLibraryLayout=true -p:PackageOutputPath=..\bin\nupkg + displayName: Pack solution # Sign Nuget package - task: PowerShell@2 @@ -69,5 +83,4 @@ steps: displayName: Publish Package Artifacts inputs: pathToPublish: .\bin\nupkg - artifactType: container artifactName: Packages diff --git a/build/Build.bat b/build/Build.bat deleted file mode 100644 index bc1cd8c..0000000 --- a/build/Build.bat +++ /dev/null @@ -1,4 +0,0 @@ -@pushd %~dp0 -@PowerShell.exe -file "%~dp0build.ps1" %* -@popd -@PAUSE \ No newline at end of file diff --git a/build/Clean.bat b/build/Clean.bat deleted file mode 100644 index 0afbf41..0000000 --- a/build/Clean.bat +++ /dev/null @@ -1 +0,0 @@ -@call "%~dp0build.bat" -t:Clean %* diff --git a/build/StyleXaml.bat b/build/StyleXaml.bat deleted file mode 100644 index b03dcbd..0000000 --- a/build/StyleXaml.bat +++ /dev/null @@ -1,3 +0,0 @@ -@ECHO OFF -PowerShell.exe -file "%~dp0build.ps1" -target=StyleXaml -PAUSE \ No newline at end of file diff --git a/build/UpdateHeaders.bat b/build/UpdateHeaders.bat deleted file mode 100644 index 166ea21..0000000 --- a/build/UpdateHeaders.bat +++ /dev/null @@ -1,3 +0,0 @@ -@ECHO OFF -PowerShell.exe -file "%~dp0build.ps1" -target=UpdateHeaders -PAUSE \ No newline at end of file diff --git a/build/Windows.Toolkit.Common.props b/build/Windows.Toolkit.Common.props index 70a111d..28429bb 100644 --- a/build/Windows.Toolkit.Common.props +++ b/build/Windows.Toolkit.Common.props @@ -24,7 +24,7 @@ 10.0 - 19041 + 22621 17763 @@ -42,4 +42,4 @@ $(TF_BUILD) - \ No newline at end of file + diff --git a/build/build.cake b/build/build.cake deleted file mode 100644 index 4923cc4..0000000 --- a/build/build.cake +++ /dev/null @@ -1,266 +0,0 @@ -#module nuget:?package=Cake.LongPath.Module&version=0.7.0 - -#addin nuget:?package=Cake.FileHelpers&version=3.3.0 -#addin nuget:?package=Cake.Powershell&version=0.4.8 - -using System; -using System.Linq; -using System.Text.RegularExpressions; - -////////////////////////////////////////////////////////////////////// -// ARGUMENTS -////////////////////////////////////////////////////////////////////// - -var target = Argument("target", "Default"); - -////////////////////////////////////////////////////////////////////// -// VERSIONS -////////////////////////////////////////////////////////////////////// - -var gitVersioningVersion = "3.3.37"; -var inheritDocVersion = "2.5.2"; - -////////////////////////////////////////////////////////////////////// -// VARIABLES -////////////////////////////////////////////////////////////////////// - -var baseDir = MakeAbsolute(Directory("../")).ToString(); -var buildDir = baseDir + "/build"; -var Solution = baseDir + "/Windows-Toolkit-Graph-Controls.sln"; -var toolsDir = buildDir + "/tools"; - -var binDir = baseDir + "/bin"; -var nupkgDir = binDir + "/nupkg"; - -var styler = toolsDir + "/XamlStyler.Console/tools/xstyler.exe"; -var stylerFile = baseDir + "/settings.xamlstyler"; - -var versionClient = toolsDir + "/nerdbank.gitversioning/tools/Get-Version.ps1"; -string Version = null; - -var inheritDoc = toolsDir + "/InheritDoc/tools/InheritDoc.exe"; - -// Ignoring NerdBank until this is merged and we can use a new version of inheridoc: -// https://github.com/firesharkstudios/InheritDoc/pull/27 -var inheritDocExclude = "Nerdbank.GitVersioning.ManagedGit.GitRepository"; - -////////////////////////////////////////////////////////////////////// -// METHODS -////////////////////////////////////////////////////////////////////// - -void VerifyHeaders(bool Replace) -{ - var header = FileReadText("header.txt") + "\r\n"; - bool hasMissing = false; - - Func exclude_objDir = - fileSystemInfo => !fileSystemInfo.Path.Segments.Contains("obj"); - - var files = GetFiles(baseDir + "/**/*.cs", exclude_objDir).Where(file => - { - var path = file.ToString(); - return !(path.EndsWith(".g.cs") || path.EndsWith(".i.cs") || System.IO.Path.GetFileName(path).Contains("TemporaryGeneratedFile")); - }); - - Information("\nChecking " + files.Count() + " file header(s)"); - foreach(var file in files) - { - var oldContent = FileReadText(file); - if(oldContent.Contains("// ")) - { - continue; - } - var rgx = new Regex("^(//.*\r?\n)*\r?\n"); - var newContent = header + rgx.Replace(oldContent, ""); - - if(!newContent.Equals(oldContent, StringComparison.Ordinal)) - { - if(Replace) - { - Information("\nUpdating " + file + " header..."); - FileWriteText(file, newContent); - } - else - { - Error("\nWrong/missing header on " + file); - hasMissing = true; - } - } - } - - if(!Replace && hasMissing) - { - throw new Exception("Please run UpdateHeaders.bat or '.\\build.ps1 -target=UpdateHeaders' and commit the changes."); - } -} - -////////////////////////////////////////////////////////////////////// -// DEFAULT TASK -////////////////////////////////////////////////////////////////////// - -Task("Clean") - .Description("Clean the output folder") - .Does(() => -{ - if(DirectoryExists(binDir)) - { - Information("\nCleaning Working Directory"); - CleanDirectory(binDir); - } - else - { - CreateDirectory(binDir); - } -}); - -Task("Verify") - .Description("Run pre-build verifications") - .IsDependentOn("Clean") - .Does(() => -{ - VerifyHeaders(false); - - StartPowershellFile("./Find-WindowsSDKVersions.ps1"); -}); - -Task("Version") - .Description("Updates the version information in all Projects") - .IsDependentOn("Verify") - .Does(() => -{ - Information("\nDownloading NerdBank GitVersioning..."); - var installSettings = new NuGetInstallSettings { - ExcludeVersion = true, - Version = gitVersioningVersion, - OutputDirectory = toolsDir - }; - - NuGetInstall(new []{"nerdbank.gitversioning"}, installSettings); - - Information("\nRetrieving version..."); - var results = StartPowershellFile(versionClient); - Version = results[1].Properties["NuGetPackageVersion"].Value.ToString(); - Information("\nBuild Version: " + Version); -}); - -Task("Build") - .Description("Build all projects and get the assemblies") - .IsDependentOn("Version") - .Does(() => -{ - Information("\nBuilding Solution"); - var buildSettings = new MSBuildSettings - { - MaxCpuCount = 0 - } - .SetConfiguration("CI") - .WithTarget("Restore"); - - MSBuild(Solution, buildSettings); - - EnsureDirectoryExists(nupkgDir); - - // Build once with normal dependency ordering - buildSettings = new MSBuildSettings - { - MaxCpuCount = 0 - } - .SetConfiguration("CI") - .WithTarget("Build") - .WithProperty("GenerateLibraryLayout", "true"); - - MSBuild(Solution, buildSettings); -}); - -Task("InheritDoc") - .Description("Updates tags from base classes, interfaces, and similar methods") - .IsDependentOn("Build") - .Does(() => -{ - Information("\nDownloading InheritDoc..."); - var installSettings = new NuGetInstallSettings { - ExcludeVersion = true, - Version = inheritDocVersion, - OutputDirectory = toolsDir - }; - - NuGetInstall(new []{"InheritDoc"}, installSettings); - - var args = new ProcessArgumentBuilder() - .AppendSwitchQuoted("-b", baseDir) - .AppendSwitch("-o", "") - .AppendSwitchQuoted("-x", inheritDocExclude); - - var result = StartProcess(inheritDoc, new ProcessSettings { Arguments = args }); - - if (result != 0) - { - throw new InvalidOperationException("InheritDoc failed!"); - } - - Information("\nFinished generating documentation with InheritDoc"); -}); - -Task("Package") - .Description("Pack the NuPkg") - .IsDependentOn("InheritDoc") - .Does(() => -{ - // Invoke the pack target in the end - var buildSettings = new MSBuildSettings { - MaxCpuCount = 0 - } - .SetConfiguration("CI") - .WithTarget("Pack") - .WithProperty("GenerateLibraryLayout", "true") - .WithProperty("PackageOutputPath", nupkgDir); - - MSBuild(Solution, buildSettings); -}); - - - -////////////////////////////////////////////////////////////////////// -// TASK TARGETS -////////////////////////////////////////////////////////////////////// - -Task("Default") - .IsDependentOn("Package"); - -Task("UpdateHeaders") - .Description("Updates the headers in *.cs files") - .Does(() => -{ - VerifyHeaders(true); -}); - -Task("StyleXaml") - .Description("Ensures XAML Formatting is Clean") - .Does(() => -{ - Information("\nDownloading XamlStyler..."); - var installSettings = new NuGetInstallSettings { - ExcludeVersion = true, - OutputDirectory = toolsDir - }; - - NuGetInstall(new []{"xamlstyler.console"}, installSettings); - - Func exclude_objDir = - fileSystemInfo => !fileSystemInfo.Path.Segments.Contains("obj"); - - var files = GetFiles(baseDir + "/**/*.xaml", exclude_objDir); - Information("\nChecking " + files.Count() + " file(s) for XAML Structure"); - foreach(var file in files) - { - StartProcess(styler, "-f \"" + file + "\" -c \"" + stylerFile + "\""); - } -}); - - - -////////////////////////////////////////////////////////////////////// -// EXECUTION -////////////////////////////////////////////////////////////////////// - -RunTarget(target); diff --git a/build/build.ps1 b/build/build.ps1 deleted file mode 100644 index 7a24017..0000000 --- a/build/build.ps1 +++ /dev/null @@ -1,232 +0,0 @@ -########################################################################## -# This is the Cake bootstrapper script for PowerShell. -# This file was downloaded from https://github.com/cake-build/resources -# Feel free to change this file to fit your needs. -########################################################################## - -<# - -.SYNOPSIS -This is a Powershell script to bootstrap a Cake build. - -.DESCRIPTION -This Powershell script will download NuGet if missing, restore NuGet tools (including Cake) -and execute your Cake build script with the parameters you provide. - -.PARAMETER Target -The build script target to run. -.PARAMETER Configuration -The build configuration to use. -.PARAMETER Verbosity -Specifies the amount of information to be displayed. -.PARAMETER Experimental -Tells Cake to use the latest Roslyn release. -.PARAMETER WhatIf -Performs a dry run of the build script. -No tasks will be executed. -.PARAMETER Mono -Tells Cake to use the Mono scripting engine. -.PARAMETER SkipToolPackageRestore -Skips restoring of packages. -.PARAMETER ScriptArgs -Remaining arguments are added here. - -.LINK -https://cakebuild.net - -#> - -[CmdletBinding()] -Param( - [string]$Target = "Default", - [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")] - [string]$Verbosity = "Verbose", - [switch]$Experimental, - [Alias("DryRun","Noop")] - [switch]$WhatIf, - [switch]$Mono, - [switch]$SkipToolPackageRestore, - [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)] - [string[]]$ScriptArgs -) - -[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null -function MD5HashFile([string] $filePath) -{ - if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf)) - { - return $null - } - - [System.IO.Stream] $file = $null; - [System.Security.Cryptography.MD5] $md5 = $null; - try - { - $md5 = [System.Security.Cryptography.MD5]::Create() - $file = [System.IO.File]::OpenRead($filePath) - return [System.BitConverter]::ToString($md5.ComputeHash($file)) - } - finally - { - if ($file -ne $null) - { - $file.Dispose() - } - } -} - -Write-Host "Preparing to run build script..." - -if(!$PSScriptRoot){ - $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent -} - -$TOOLS_DIR = Join-Path $PSScriptRoot "tools" -$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" -$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe" -$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config" -$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum" -$MODULES_DIR = Join-Path $PSScriptRoot "tools/modules" -$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config" -$MODULES_PACKAGES_CONFIG_MD5 = Join-Path $MODULES_DIR "packages.config.md5sum" - -# Should we use mono? -$UseMono = ""; -if($Mono.IsPresent) { - Write-Verbose -Message "Using the Mono based scripting engine." - $UseMono = "-mono" -} - -# Should we use the new Roslyn? -$UseExperimental = ""; -if($Experimental.IsPresent -and !($Mono.IsPresent)) { - Write-Verbose -Message "Using experimental version of Roslyn." - $UseExperimental = "-experimental" -} - -# Is this a dry run? -$UseDryRun = ""; -if($WhatIf.IsPresent) { - $UseDryRun = "-dryrun" -} - -# Make sure tools folder exists -if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { - Write-Verbose -Message "Creating tools directory..." - New-Item -Path $TOOLS_DIR -Type directory | out-null -} - -# Fix to force PS to use TLS12 -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 - -# Make sure that packages.config exist. -if (!(Test-Path $PACKAGES_CONFIG)) { - Write-Verbose -Message "Downloading packages.config..." - try { (New-Object System.Net.WebClient).DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch { - Throw "Could not download packages.config." - } -} - -# Try find NuGet.exe in path if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Trying to find nuget.exe in PATH..." - $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) } - $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1 - if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) { - Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)." - $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName - } -} - -# Try download NuGet.exe if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Downloading NuGet.exe..." - try { - (New-Object System.Net.WebClient).DownloadFile($NUGET_URL, $NUGET_EXE) - } catch { - Throw "Could not download NuGet.exe." - } -} - -# Save nuget.exe path to environment to be available to child processed -$ENV:NUGET_EXE = $NUGET_EXE - -# Restore tools from NuGet? -if(-Not $SkipToolPackageRestore.IsPresent) { - Push-Location - Set-Location $TOOLS_DIR - - # Check for changes in packages.config and remove installed tools if true. - [string] $md5Hash = MD5HashFile($PACKAGES_CONFIG) - if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or - ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) { - Write-Verbose -Message "Missing or changed package.config hash..." - Remove-Item * -Recurse -Exclude packages.config,nuget.exe - } - - Write-Verbose -Message "Restoring tools from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occured while restoring NuGet tools." - } - else - { - $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII" - } - Write-Verbose -Message ($NuGetOutput | out-string) - Pop-Location -} - -# Make sure that Cake has been installed. -if (!(Test-Path $CAKE_EXE)) { - Throw "Could not find Cake.exe at $CAKE_EXE" -} - -# Make sure modules folder exists -if ((Test-Path $PSScriptRoot) -and !(Test-Path $MODULES_DIR)) { - Write-Verbose -Message "Creating tools/modules directory..." - New-Item -Path $MODULES_DIR -Type directory | out-null -} - -# Restore modules from NuGet? -if(-Not $SkipToolPackageRestore.IsPresent) { - Push-Location - Set-Location $MODULES_DIR - - # Check for changes in modules packages.config and remove installed tools if true. - [string] $md5Hash = MD5HashFile($MODULES_PACKAGES_CONFIG) - if((!(Test-Path $MODULES_PACKAGES_CONFIG_MD5)) -Or - ($md5Hash -ne (Get-Content $MODULES_PACKAGES_CONFIG_MD5 ))) { - Write-Verbose -Message "Missing or changed modules package.config hash..." - Remove-Item * -Recurse -Exclude packages.config,packages.config.md5sum,nuget.exe - } - - Write-Verbose -Message "Restoring modules from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occured while restoring NuGet modules." - } - else - { - $md5Hash | Out-File $MODULES_PACKAGES_CONFIG_MD5 -Encoding "ASCII" - } - Write-Verbose -Message ($NuGetOutput | out-string) - Pop-Location -} - -# Start Cake -$path = Split-Path -Parent $MyInvocation.MyCommand.Definition -$Script = "$path/build.cake" - -Write-Host "Bootstrapping Cake..." -Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" --bootstrap" -if ($LASTEXITCODE -ne 0) { - throw "An error occured while bootstrapping Cake." -} - -Write-Host "Running build script..." -Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs" -exit $LASTEXITCODE \ No newline at end of file diff --git a/build/header.txt b/build/header.txt deleted file mode 100644 index 45274ba..0000000 --- a/build/header.txt +++ /dev/null @@ -1,3 +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. diff --git a/build/tools/packages.config b/build/tools/packages.config deleted file mode 100644 index ba25a5e..0000000 --- a/build/tools/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/global.json b/global.json index fec540a..939f4aa 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,9 @@ { "msbuild-sdks": { - "MSBuild.Sdk.Extras": "3.0.23" + "MSBuild.Sdk.Extras": "3.0.44" + }, + "sdk": { + "version": "6.0.400", + "rollForward": "latestFeature" } -} \ No newline at end of file +} diff --git a/stylecop.json b/stylecop.json deleted file mode 100644 index d839cca..0000000 --- a/stylecop.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json", - "settings": { - "orderingRules": { - "usingDirectivesPlacement": "outsideNamespace" - } - } - } \ No newline at end of file diff --git a/version.json b/version.json index e986b91..ed10327 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "7.1.1-build.{height}", + "version": "7.1.3-build.{height}", "publicReleaseRefSpec": [ "^refs/heads/main$", // we release out of main "^refs/heads/dev$", // we release out of dev