CommunityToolkit
/
Graph-Controls
зеркало из https://github.com/CommunityToolkit/Graph-Controls.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Updates to VS 2022 Build Process 

Update dependencies
Removes Cake call from azurepipeline.yml (after attempting to upgrade, will remove files in separate commit)
Uses dotnet/msbuild to build and run tests in Azure DevOps directly
Moves Stylecop to .editorconfig
Moves to .NET 6 for build and targets
Fixes build configuration for CI to only build required libraries and not samples
Renames Net5Windows example to NetWindows
This commit is contained in:
michael-hawker 2022-12-15 00:50:32 -08:00
Родитель a3dd5887ea
Коммит 4313ad7f69
35 изменённых файлов: 383 добавлений и 298 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

254
.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

10
CommunityToolkit.Authentication.Msal/CommunityToolkit.Authentication.Msal.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;uap10.0;net5.0-windows10.0.17763.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>netstandard2.0;uap10.0.17763;net6.0-windows10.0.17763.0;netcoreapp3.1</TargetFrameworks>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion>7</SupportedOSPlatformVersion>
@ -16,12 +16,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Graph.Core" Version="2.0.5" />
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.19.1" />
<PackageReference Include="Microsoft.Graph.Core" Version="2.0.14" />
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.25.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="Microsoft.Identity.Client.Desktop" Version="4.37.0" />
<PackageReference Include="Microsoft.Identity.Client.Desktop" Version="4.48.1" />
</ItemGroup>
<ItemGroup>

2
CommunityToolkit.Authentication.Msal/MsalProvider.cs
Просмотреть файл

@ -202,7 +202,7 @@ namespace CommunityToolkit.Authentication
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();

6
CommunityToolkit.Authentication.Uwp/CommunityToolkit.Authentication.Uwp.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFramework>uap10.0.17134</TargetFramework>
<TargetFramework>uap10.0.17763</TargetFramework>
<Title>Windows Community Toolkit Graph Uwp Authentication Provider</Title>
<Description>
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.
</Description>
<PackageTags>UWP Community Toolkit Provider Authentication Auth Windows</PackageTags>
<LangVersion>9.0</LangVersion>
<LangVersion>10.0</LangVersion>
</PropertyGroup>
<ItemGroup>

3
CommunityToolkit.Authentication/CommunityToolkit.Authentication.csproj
Просмотреть файл

@ -13,7 +13,4 @@
</Description>
<PackageTags>Community Toolkit Provider Authentication Auth</PackageTags>
</PropertyGroup>
<ItemGroup>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.4.231" />
</ItemGroup>
</Project>

8
CommunityToolkit.Graph.Uwp/CommunityToolkit.Graph.Uwp.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFramework>uap10.0.17763</TargetFramework>
@ -19,12 +19,12 @@
- ProviderStateTrigger: StateTrigger for reacting to changes in the global authentcation provider.
</Description>
<PackageTags>UWP Community Toolkit Windows Controls Microsoft Graph Login Person PeoplePicker Presenter</PackageTags>
<LangVersion>9.0</LangVersion>
<LangVersion>10.0</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Graph" Version="4.5.0" />
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Input" Version="7.1.0" />
<PackageReference Include="Microsoft.Graph" Version="4.48.0" />
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Input" Version="7.1.3" />
</ItemGroup>
<ItemGroup>

4
CommunityToolkit.Graph/CommunityToolkit.Graph.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
@ -16,7 +16,7 @@
- UserExtensionStorageHelper: A helper for interacting with open extensions on the Graph User to store data in key/value pairs.
</Description>
<PackageTags>Windows Community Toolkit Microsoft Graph Provider Extensions Helpers Roaming Settings</PackageTags>
<LangVersion>9.0</LangVersion>
<LangVersion>10.0</LangVersion>
</PropertyGroup>
<ItemGroup>

10
Directory.Build.props
Просмотреть файл

@ -37,11 +37,7 @@
</Choose>
<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" PrivateAssets="All" />
</ItemGroup>
<Choose>
@ -55,9 +51,9 @@
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>
</When>
</Choose>
</Project>
</Project>

4
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

22
SampleTest/SampleTest.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@ -11,9 +11,9 @@
<AssemblyName>SampleTest</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>17</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
@ -208,16 +208,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Graph">
<Version>4.5.0</Version>
<Version>4.48.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.12</Version>
<Version>6.2.13</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Mvvm">
<Version>7.1.0</Version>
<PackageReference Include="CommunityToolkit.Mvvm">
<Version>8.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
<Version>7.1.0</Version>
<Version>7.1.3</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@ -242,8 +242,8 @@
<Name>CommunityToolkit.Graph.Uwp</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0' ">
<VisualStudioVersion>17.0</VisualStudioVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CI|x86'">
<OutputPath>bin\x86\CI\</OutputPath>
@ -309,4 +309,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

4
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.Authentication;
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;

16
Samples/ManualGraphRequestSample/ManualGraphRequestSample.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@ -11,9 +11,9 @@
<AssemblyName>ManualGraphRequestSample</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>17</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
@ -152,10 +152,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.12</Version>
<Version>6.2.13</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>13.0.1</Version>
<Version>13.0.2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@ -168,8 +168,8 @@
<Name>CommunityToolkit.Authentication</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0' ">
<VisualStudioVersion>17.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@ -179,4 +179,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

14
Samples/UwpMsalProviderSample/UwpMsalProviderSample.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@ -11,9 +11,9 @@
<AssemblyName>UwpMsalProviderSample</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>17</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
@ -151,7 +151,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.12</Version>
<Version>6.2.13</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@ -175,8 +175,8 @@
<ItemGroup>
<None Include="README.md" />
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0' ">
<VisualStudioVersion>17.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@ -186,4 +186,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

14
Samples/UwpWindowsProviderSample/UwpWindowsProviderSample.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@ -11,9 +11,9 @@
<AssemblyName>UwpAuthenticationSample</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>17</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
@ -158,7 +158,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.12</Version>
<Version>6.2.13</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@ -182,8 +182,8 @@
<ItemGroup>
<None Include="README.md" />
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0' ">
<VisualStudioVersion>17.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@ -193,4 +193,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

4
Samples/WpfNet5WindowsMsalProviderSample/App.xaml → Samples/WpfNetWindowsMsalProviderSample/App.xaml
Просмотреть файл

@ -1,7 +1,7 @@
<Application x:Class="WpfNet5WindowsMsalProviderSample.App"
<Application x:Class="WpfNetWindowsMsalProviderSample.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:WpfNet5WindowsMsalProviderSample"
xmlns:local="clr-namespace:WpfNetWindowsMsalProviderSample"
StartupUri="MainWindow.xaml">
<Application.Resources>

2
Samples/WpfNet5WindowsMsalProviderSample/App.xaml.cs → Samples/WpfNetWindowsMsalProviderSample/App.xaml.cs
Просмотреть файл

@ -9,7 +9,7 @@ using CommunityToolkit.Authentication;
using CommunityToolkit.Authentication.Extensions;
using Microsoft.Identity.Client.Extensions.Msal;
namespace WpfNet5WindowsMsalProviderSample
namespace WpfNetWindowsMsalProviderSample
{
public partial class App : Application
{

0
Samples/WpfNet5WindowsMsalProviderSample/AssemblyInfo.cs → Samples/WpfNetWindowsMsalProviderSample/AssemblyInfo.cs
Просмотреть файл

2
Samples/WpfNet5WindowsMsalProviderSample/CacheConfig.cs → Samples/WpfNetWindowsMsalProviderSample/CacheConfig.cs
Просмотреть файл

@ -5,7 +5,7 @@
using System.Collections.Generic;
using Microsoft.Identity.Client.Extensions.Msal;
namespace WpfNet5WindowsMsalProviderSample
namespace WpfNetWindowsMsalProviderSample
{
/// <summary>
/// https://github.com/AzureAD/microsoft-authentication-extensions-for-dotnet/wiki/Cross-platform-Token-Cache

4
Samples/WpfNet5WindowsMsalProviderSample/LoginButton.xaml → Samples/WpfNetWindowsMsalProviderSample/LoginButton.xaml
Просмотреть файл

@ -1,9 +1,9 @@
<UserControl x:Class="WpfNet5WindowsMsalProviderSample.LoginButton"
<UserControl x:Class="WpfNetWindowsMsalProviderSample.LoginButton"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:WpfNet5WindowsMsalProviderSample"
xmlns:local="clr-namespace:WpfNetWindowsMsalProviderSample"
mc:Ignorable="d"
DataContext="{Binding RelativeSource={RelativeSource Self}}">
<Grid>

2
Samples/WpfNet5WindowsMsalProviderSample/LoginButton.xaml.cs → Samples/WpfNetWindowsMsalProviderSample/LoginButton.xaml.cs
Просмотреть файл

@ -7,7 +7,7 @@ using System;
using System.Windows;
using System.Windows.Controls;
namespace WpfNet5WindowsMsalProviderSample
namespace WpfNetWindowsMsalProviderSample
{
/// <summary>
/// A simple button for triggering the globally configured IProvider to sign in and out.

4
Samples/WpfNet5WindowsMsalProviderSample/MainWindow.xaml → Samples/WpfNetWindowsMsalProviderSample/MainWindow.xaml
Просмотреть файл

@ -1,9 +1,9 @@
<Window x:Class="WpfNet5WindowsMsalProviderSample.MainWindow"
<Window x:Class="WpfNetWindowsMsalProviderSample.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:WpfNet5WindowsMsalProviderSample"
xmlns:local="clr-namespace:WpfNetWindowsMsalProviderSample"
mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800">
<StackPanel>

2
Samples/WpfNet5WindowsMsalProviderSample/MainWindow.xaml.cs → Samples/WpfNetWindowsMsalProviderSample/MainWindow.xaml.cs
Просмотреть файл

@ -6,7 +6,7 @@ using CommunityToolkit.Authentication;
using CommunityToolkit.Graph.Extensions;
using System.Windows;
namespace WpfNet5WindowsMsalProviderSample
namespace WpfNetWindowsMsalProviderSample
{
/// <summary>
/// Interaction logic for MainWindow.xaml

2
Samples/WpfNet5WindowsMsalProviderSample/README.md → 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.

6
Samples/WpfNet5WindowsMsalProviderSample/WpfNet5WindowsMsalProviderSample.csproj → Samples/WpfNetWindowsMsalProviderSample/WpfNetWindowsMsalProviderSample.csproj
Просмотреть файл

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
<UseWPF>true</UseWPF>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.19.2" />
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.25.0" />
</ItemGroup>
<ItemGroup>

87
Toolkit.ruleset
Просмотреть файл

@ -1,87 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RuleSet Name="Microsoft Managed Recommended Rules" Description="These rules focus on the most critical problems in your code, including potential security holes, application crashes, and other important logic and design errors. It is recommended to include this rule set in any custom rule set you create for your projects." ToolsVersion="15.0">
<Localization ResourceAssembly="Microsoft.VisualStudio.CodeAnalysis.RuleSets.Strings.dll" ResourceBaseName="Microsoft.VisualStudio.CodeAnalysis.RuleSets.Strings.Localized">
<Name Resource="MinimumRecommendedRules_Name" />
<Description Resource="MinimumRecommendedRules_Description" />
</Localization>
<Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
<Rule Id="CA1001" Action="Warning" />
<Rule Id="CA1009" Action="Warning" />
<Rule Id="CA1016" Action="Warning" />
<Rule Id="CA1033" Action="Warning" />
<Rule Id="CA1049" Action="Warning" />
<Rule Id="CA1060" Action="Warning" />
<Rule Id="CA1061" Action="Warning" />
<Rule Id="CA1063" Action="Warning" />
<Rule Id="CA1065" Action="Warning" />
<Rule Id="CA1301" Action="Warning" />
<Rule Id="CA1400" Action="Warning" />
<Rule Id="CA1401" Action="Warning" />
<Rule Id="CA1403" Action="Warning" />
<Rule Id="CA1404" Action="Warning" />
<Rule Id="CA1405" Action="Warning" />
<Rule Id="CA1410" Action="Warning" />
<Rule Id="CA1415" Action="Warning" />
<Rule Id="CA1821" Action="Warning" />
<Rule Id="CA1900" Action="Warning" />
<Rule Id="CA1901" Action="Warning" />
<Rule Id="CA2002" Action="Warning" />
<Rule Id="CA2100" Action="Warning" />
<Rule Id="CA2101" Action="Warning" />
<Rule Id="CA2108" Action="Warning" />
<Rule Id="CA2111" Action="Warning" />
<Rule Id="CA2112" Action="Warning" />
<Rule Id="CA2114" Action="Warning" />
<Rule Id="CA2116" Action="Warning" />
<Rule Id="CA2117" Action="Warning" />
<Rule Id="CA2122" Action="Warning" />
<Rule Id="CA2123" Action="Warning" />
<Rule Id="CA2124" Action="Warning" />
<Rule Id="CA2126" Action="Warning" />
<Rule Id="CA2131" Action="Warning" />
<Rule Id="CA2132" Action="Warning" />
<Rule Id="CA2133" Action="Warning" />
<Rule Id="CA2134" Action="Warning" />
<Rule Id="CA2137" Action="Warning" />
<Rule Id="CA2138" Action="Warning" />
<Rule Id="CA2140" Action="Warning" />
<Rule Id="CA2141" Action="Warning" />
<Rule Id="CA2146" Action="Warning" />
<Rule Id="CA2147" Action="Warning" />
<Rule Id="CA2149" Action="Warning" />
<Rule Id="CA2200" Action="Warning" />
<Rule Id="CA2202" Action="Warning" />
<Rule Id="CA2207" Action="Warning" />
<Rule Id="CA2212" Action="Warning" />
<Rule Id="CA2213" Action="Warning" />
<Rule Id="CA2214" Action="Warning" />
<Rule Id="CA2216" Action="Warning" />
<Rule Id="CA2220" Action="Warning" />
<Rule Id="CA2229" Action="Warning" />
<Rule Id="CA2231" Action="Warning" />
<Rule Id="CA2232" Action="Warning" />
<Rule Id="CA2235" Action="Warning" />
<Rule Id="CA2236" Action="Warning" />
<Rule Id="CA2237" Action="Warning" />
<Rule Id="CA2238" Action="Warning" />
<Rule Id="CA2240" Action="Warning" />
<Rule Id="CA2241" Action="Warning" />
<Rule Id="CA2242" Action="Warning" />
</Rules>
<Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
<Rule Id="SA1011" Action="None" />
<Rule Id="SA1101" Action="None" />
<Rule Id="SA1118" Action="None" />
<Rule Id="SA1200" Action="None" />
<Rule Id="SA1201" Action="None" />
<Rule Id="SA1202" Action="None" />
<Rule Id="SA1309" Action="None" />
<Rule Id="SA1310" Action="None" />
<Rule Id="SA1600" Action="None" />
<Rule Id="SA1602" Action="None" />
<Rule Id="SA1611" Action="None" />
<Rule Id="SA1633" Action="None" />
<Rule Id="SA1634" Action="None" />
<Rule Id="SA1652" Action="None" />
</Rules>
</RuleSet>

30
UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@ -11,14 +11,14 @@
<AssemblyName>UnitTests.UWP</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>17</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
<LangVersion>9.0</LangVersion>
<LangVersion>10.0</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
@ -154,28 +154,28 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection">
<Version>5.0.2</Version>
<Version>7.0.0</Version>
</PackageReference>
<PackageReference Include="FluentAssertions">
<Version>6.1.0</Version>
<Version>6.8.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Graph">
<Version>4.5.0</Version>
<Version>4.48.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.12</Version>
<Version>6.2.13</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Uwp.UI">
<Version>7.1.0</Version>
<Version>7.1.3</Version>
</PackageReference>
<PackageReference Include="MSTest.TestAdapter">
<Version>2.2.7</Version>
<Version>2.2.10</Version>
</PackageReference>
<PackageReference Include="MSTest.TestFramework">
<Version>2.2.7</Version>
<Version>2.2.10</Version>
</PackageReference>
<PackageReference Include="System.Text.Json">
<Version>5.0.2</Version>
<Version>7.0.1</Version>
</PackageReference>
<PackageReference Include="System.Xml.XPath.XmlDocument">
<Version>4.3.0</Version>
@ -195,8 +195,8 @@
<Name>CommunityToolkit.Graph</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0' ">
<VisualStudioVersion>17.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@ -206,4 +206,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

42
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

37
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

4
build/Windows.Toolkit.Common.props
Просмотреть файл

@ -24,7 +24,7 @@
<PropertyGroup>
<TargetPlatformBaseVersion>10.0</TargetPlatformBaseVersion>
<TargetPlatformRevision>19041</TargetPlatformRevision>
<TargetPlatformRevision>22621</TargetPlatformRevision>
<TargetPlatformMinRevision>17763</TargetPlatformMinRevision>
</PropertyGroup>
@ -42,4 +42,4 @@
<ContinuousIntegrationBuild>$(TF_BUILD)</ContinuousIntegrationBuild>
</PropertyGroup>
</Project>
</Project>

54
build/build.cake
Просмотреть файл

@ -1,7 +1,9 @@
#module nuget:?package=Cake.LongPath.Module&version=0.7.0
#module nuget:?package=Cake.LongPath.Module&version=1.0.1
#addin nuget:?package=Cake.FileHelpers&version=3.3.0
#addin nuget:?package=Cake.Powershell&version=0.4.8
#addin nuget:?package=Cake.FileHelpers&version=4.0.1
#addin nuget:?package=Cake.Powershell&version=1.0.1
#load nuget:?package=System.Buffers&version=4.0.0
#addin nuget:?package=Cake.GitVersioning&version=3.5.119
using System;
using System.Linq;
@ -17,7 +19,6 @@ var target = Argument("target", "Default");
// VERSIONS
//////////////////////////////////////////////////////////////////////
var gitVersioningVersion = "3.3.37";
var inheritDocVersion = "2.5.2";
//////////////////////////////////////////////////////////////////////
@ -35,7 +36,6 @@ 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";
@ -56,7 +56,12 @@ void VerifyHeaders(bool Replace)
Func<IFileSystemInfo, bool> exclude_objDir =
fileSystemInfo => !fileSystemInfo.Path.Segments.Contains("obj");
var files = GetFiles(baseDir + "/**/*.cs", exclude_objDir).Where(file =>
var globberSettings = new GlobberSettings
{
Predicate = exclude_objDir
};
var files = GetFiles(baseDir + "/**/*.cs", globberSettings).Where(file =>
{
var path = file.ToString();
return !(path.EndsWith(".g.cs") || path.EndsWith(".i.cs") || System.IO.Path.GetFileName(path).Contains("TemporaryGeneratedFile"));
@ -94,6 +99,13 @@ void VerifyHeaders(bool Replace)
}
}
void RetrieveVersion()
{
Information("\nRetrieving version...");
Version = GitVersioningGetVersion().NuGetPackageVersion;
Information("\nBuild Version: " + Version);
}
//////////////////////////////////////////////////////////////////////
// DEFAULT TASK
//////////////////////////////////////////////////////////////////////
@ -128,19 +140,7 @@ Task("Version")
.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);
RetrieveVersion();
});
Task("Build")
@ -151,7 +151,8 @@ Task("Build")
Information("\nBuilding Solution");
var buildSettings = new MSBuildSettings
{
MaxCpuCount = 0
MaxCpuCount = 0,
ToolVersion = MSBuildToolVersion.VS2022
}
.SetConfiguration("CI")
.WithTarget("Restore");
@ -163,7 +164,8 @@ Task("Build")
// Build once with normal dependency ordering
buildSettings = new MSBuildSettings
{
MaxCpuCount = 0
MaxCpuCount = 0,
ToolVersion = MSBuildToolVersion.VS2022
}
.SetConfiguration("CI")
.WithTarget("Build")
@ -208,7 +210,8 @@ Task("Package")
{
// Invoke the pack target in the end
var buildSettings = new MSBuildSettings {
MaxCpuCount = 0
MaxCpuCount = 0,
ToolVersion = MSBuildToolVersion.VS2022
}
.SetConfiguration("CI")
.WithTarget("Pack")
@ -249,7 +252,12 @@ Task("StyleXaml")
Func<IFileSystemInfo, bool> exclude_objDir =
fileSystemInfo => !fileSystemInfo.Path.Segments.Contains("obj");
var files = GetFiles(baseDir + "/**/*.xaml", exclude_objDir);
var globberSettings = new GlobberSettings
{
Predicate = exclude_objDir
};
var files = GetFiles(baseDir + "/**/*.xaml", globberSettings);
Information("\nChecking " + files.Count() + " file(s) for XAML Structure");
foreach(var file in files)
{

8
build/build.ps1
Просмотреть файл

@ -95,20 +95,20 @@ $MODULES_PACKAGES_CONFIG_MD5 = Join-Path $MODULES_DIR "packages.config.md5sum"
$UseMono = "";
if($Mono.IsPresent) {
Write-Verbose -Message "Using the Mono based scripting engine."
$UseMono = "-mono"
$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"
$UseExperimental = "--experimental"
}
# Is this a dry run?
$UseDryRun = "";
if($WhatIf.IsPresent) {
$UseDryRun = "-dryrun"
$UseDryRun = "--dryrun"
}
# Make sure tools folder exists
@ -228,5 +228,5 @@ if ($LASTEXITCODE -ne 0) {
}
Write-Host "Running build script..."
Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" --verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
exit $LASTEXITCODE

2
build/tools/packages.config
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake" version="0.38.5" />
<package id="Cake" version="1.3.0" />
</packages>

8
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"
}
}
}

8
stylecop.json
Просмотреть файл

@ -1,8 +0,0 @@
{
"$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
"settings": {
"orderingRules": {
"usingDirectivesPlacement": "outsideNamespace"
}
}
}

2
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