Skip to content

Commit 759a047

Browse files
michael-hawkermichael-hawker
committed
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 build Unit Tests Renames Net5Windows example to NetWindows
1 parent a3dd588 commit 759a047

35 files changed

+383
-298
lines changed

‎.editorconfig‎

Lines changed: 225 additions & 29 deletions
Large diffs are not rendered by default.

‎CommunityToolkit.Authentication.Msal/CommunityToolkit.Authentication.Msal.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="MSBuild.Sdk.Extras">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;uap10.0;net5.0-windows10.0.17763.0;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;uap10.0.17763;net6.0-windows10.0.17763.0;netcoreapp3.1</TargetFrameworks>
55
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
66
<SupportedOSPlatformVersion>7</SupportedOSPlatformVersion>
77

@@ -16,12 +16,12 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.Graph.Core" Version="2.0.5" />
20-
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.19.1" />
19+
<PackageReference Include="Microsoft.Graph.Core" Version="2.0.14" />
20+
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.25.0" />
2121
</ItemGroup>
2222

2323
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
24-
<PackageReference Include="Microsoft.Identity.Client.Desktop" Version="4.37.0" />
24+
<PackageReference Include="Microsoft.Identity.Client.Desktop" Version="4.48.1" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

‎CommunityToolkit.Authentication.Msal/MsalProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ protected IPublicClientApplication CreatePublicClientApplication(string clientId
202202
clientBuilder = clientBuilder.WithAuthority(AzureCloudInstance.AzurePublic, authority);
203203
}
204204

205-
#if WINDOWS_UWP || NET5_0_WINDOWS10_0_17763_0
205+
#if WINDOWS_UWP || NET6_0_WINDOWS10_0_17763_0
206206
clientBuilder = clientBuilder.WithBroker();
207207
#elif NETCOREAPP3_1
208208
clientBuilder = clientBuilder.WithWindowsBroker();

‎CommunityToolkit.Authentication.Uwp/CommunityToolkit.Authentication.Uwp.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="MSBuild.Sdk.Extras">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFramework>uap10.0.17134</TargetFramework>
4+
<TargetFramework>uap10.0.17763</TargetFramework>
55
<Title>Windows Community Toolkit Graph Uwp Authentication Provider</Title>
66
<Description>
77
This library provides an authentication provider based on the native Windows dialogues.
@@ -10,7 +10,7 @@
1010
- WindowsProvider: An authentication provider based on the native AccountsSettingsPane in Windows.
1111
</Description>
1212
<PackageTags>UWP Community Toolkit Provider Authentication Auth Windows</PackageTags>
13-
<LangVersion>9.0</LangVersion>
13+
<LangVersion>10.0</LangVersion>
1414
</PropertyGroup>
1515

1616
<ItemGroup>

‎CommunityToolkit.Authentication/CommunityToolkit.Authentication.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,4 @@
1313
</Description>
1414
<PackageTags>Community Toolkit Provider Authentication Auth</PackageTags>
1515
</PropertyGroup>
16-
<ItemGroup>
17-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.4.231" />
18-
</ItemGroup>
1916
</Project>

‎CommunityToolkit.Graph.Uwp/CommunityToolkit.Graph.Uwp.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="MSBuild.Sdk.Extras">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
44
<TargetFramework>uap10.0.17763</TargetFramework>
@@ -19,12 +19,12 @@
1919
- ProviderStateTrigger: StateTrigger for reacting to changes in the global authentcation provider.
2020
</Description>
2121
<PackageTags>UWP Community Toolkit Windows Controls Microsoft Graph Login Person PeoplePicker Presenter</PackageTags>
22-
<LangVersion>9.0</LangVersion>
22+
<LangVersion>10.0</LangVersion>
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Microsoft.Graph" Version="4.5.0" />
27-
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Input" Version="7.1.0" />
26+
<PackageReference Include="Microsoft.Graph" Version="4.48.0" />
27+
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Input" Version="7.1.3" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎CommunityToolkit.Graph/CommunityToolkit.Graph.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
@@ -16,7 +16,7 @@
1616
- UserExtensionStorageHelper: A helper for interacting with open extensions on the Graph User to store data in key/value pairs.
1717
</Description>
1818
<PackageTags>Windows Community Toolkit Microsoft Graph Provider Extensions Helpers Roaming Settings</PackageTags>
19-
<LangVersion>9.0</LangVersion>
19+
<LangVersion>10.0</LangVersion>
2020
</PropertyGroup>
2121

2222
<ItemGroup>

‎Directory.Build.props‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@
3737
</Choose>
3838

3939
<ItemGroup>
40-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
41-
</ItemGroup>
42-
43-
<ItemGroup>
44-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
40+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" PrivateAssets="All" />
4541
</ItemGroup>
4642

4743
<Choose>
@@ -55,9 +51,9 @@
5551
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
5652
</PropertyGroup>
5753
<ItemGroup>
58-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
54+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
5955
</ItemGroup>
6056
</When>
6157
</Choose>
6258

63-
</Project>
59+
</Project>

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ If you need similar controls for the Web, please use the [Microsoft Graph Toolki
1111
| Package | Min Supported |
1212
|--|--|
1313
| `CommunityToolkit.Authentication` | NetStandard 2.0 |
14-
| `CommunityToolkit.Authentication.Msal` | NetStandard 2.0, UWP, .NET 5, .NET 5 Windows 10.0.17763.0, .NET Core 3.1 |
14+
| `CommunityToolkit.Authentication.Msal` | NetStandard 2.0, UWP, .NET 6, .NET 6 Windows 10.0.17763.0, .NET Core 3.1 |
1515
| `CommunityToolkit.Authentication.Uwp` | UWP Windows 10.0.17134.0 |
1616
| `CommunityTookit.Graph` | NetStandard 2.0 |
1717
| `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
2323
- [UwpWindowsProviderSample](./Samples/UwpWindowsProviderSample)
2424
- [UwpMsalProviderSample](./Samples/UwpMsalProviderSample)
2525
- [WpfNetCoreMsalProviderSample](./Samples/WpfNetCoreMsalProviderSample)
26-
- [WpfNetMsalProviderSample](./Samples/WpfNet5WindowsMsalProviderSample)
26+
- [WpfNetMsalProviderSample](./Samples/WpfNetWindowsMsalProviderSample)
2727
- [ManualGraphRequestSample](./Samples/ManualGraphRequestSample)
2828

2929
### Contoso Notes Sample

‎SampleTest/SampleTest.csproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -11,9 +11,9 @@
1111
<AssemblyName>SampleTest</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
16-
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
16+
<MinimumVisualStudioVersion>17</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1919
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
@@ -208,16 +208,16 @@
208208
</ItemGroup>
209209
<ItemGroup>
210210
<PackageReference Include="Microsoft.Graph">
211-
<Version>4.5.0</Version>
211+
<Version>4.48.0</Version>
212212
</PackageReference>
213213
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
214-
<Version>6.2.12</Version>
214+
<Version>6.2.13</Version>
215215
</PackageReference>
216-
<PackageReference Include="Microsoft.Toolkit.Mvvm">
217-
<Version>7.1.0</Version>
216+
<PackageReference Include="CommunityToolkit.Mvvm">
217+
<Version>8.0.0</Version>
218218
</PackageReference>
219219
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
220-
<Version>7.1.0</Version>
220+
<Version>7.1.3</Version>
221221
</PackageReference>
222222
</ItemGroup>
223223
<ItemGroup>
@@ -242,8 +242,8 @@
242242
<Name>CommunityToolkit.Graph.Uwp</Name>
243243
</ProjectReference>
244244
</ItemGroup>
245-
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
246-
<VisualStudioVersion>14.0</VisualStudioVersion>
245+
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0' ">
246+
<VisualStudioVersion>17.0</VisualStudioVersion>
247247
</PropertyGroup>
248248
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CI|x86'">
249249
<OutputPath>bin\x86\CI\</OutputPath>
@@ -309,4 +309,4 @@
309309
<Target Name="AfterBuild">
310310
</Target>
311311
-->
312-
</Project>
312+
</Project>

0 commit comments

Comments
 (0)