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

Update Dependencies 

TODO:
See why organizational contacts aren't showing in People Picker when connected to tenant
XAML Islands not working?
This commit is contained in:
michael-hawker 2020-06-08 18:05:06 -07:00
Родитель 0195b3c01d
Коммит fa0cf54e9a
11 изменённых файлов: 26 добавлений и 23 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -53,7 +53,7 @@
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.Vsts.Git" Version="1.0.0-beta-62925-02" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
</ItemGroup>
</When>

5
Microsoft.Toolkit.Graph.Controls/Controls/PeoplePicker/PeoplePicker.xaml
Просмотреть файл

@ -2,7 +2,8 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Microsoft.Toolkit.Graph.Controls"
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions">
<Style TargetType="local:PeoplePicker">
<Setter Property="Template">
@ -14,7 +15,7 @@
BorderThickness="{TemplateBinding BorderThickness}">
<controls:TokenizingTextBox
x:Name="PART_TokenizingTextBox"
QueryIcon="Find"
QueryIcon="{ex:SymbolIconSource Symbol=Find}"
PlaceholderText="Start typing a name"
TextMemberPath="DisplayName"
TokenDelimiter=","

8
Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj
Просмотреть файл

@ -24,8 +24,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="6.1.0-build.97" />
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="6.1.0-build.97" />
<PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="6.1.0-rc1" />
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="6.1.0-rc1" />
<ProjectReference Include="..\Microsoft.Toolkit.Graph\Microsoft.Toolkit.Graph.csproj" />
</ItemGroup>
@ -34,8 +34,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Graph.Beta" Version="0.8.0-preview" />
<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.2" />
<PackageReference Include="Microsoft.Graph.Beta" Version="0.18.0-preview" />
<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.4" />
</ItemGroup>
<ItemGroup>

6
Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj
Просмотреть файл

@ -21,8 +21,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Graph.Beta" Version="0.8.0-preview" />
<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.2" />
<PackageReference Include="Microsoft.Toolkit" Version="6.1.0-build.97" />
<PackageReference Include="Microsoft.Graph.Beta" Version="0.18.0-preview" />
<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.4" />
<PackageReference Include="Microsoft.Toolkit" Version="6.1.0-rc1" />
</ItemGroup>
</Project>

10
Microsoft.Toolkit.Graph/Providers/ProviderManager.cs
Просмотреть файл

@ -3,9 +3,6 @@
// See the LICENSE file in the project root for more information.
using System;
using Microsoft.Graph;
using Microsoft.Identity.Client;
using Microsoft.Toolkit.Helpers;
namespace Microsoft.Toolkit.Graph.Providers
{
@ -27,7 +24,7 @@ namespace Microsoft.Toolkit.Graph.Providers
/// <summary>
/// Gets the instance of the GlobalProvider.
/// </summary>
public static ProviderManager Instance => Singleton<ProviderManager>.Instance;
public static ProviderManager Instance { get; } = new ProviderManager();
/// <summary>
/// Event called when the <see cref="IProvider"/> changes.
@ -64,6 +61,11 @@ namespace Microsoft.Toolkit.Graph.Providers
}
}
private ProviderManager()
{
// Use Instance
}
private void ProviderStateChanged(object sender, StateChangedEventArgs e)
{
ProviderUpdated?.Invoke(this, new ProviderUpdatedEventArgs(ProviderManagerChangedState.ProviderStateChanged));

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

@ -151,7 +151,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.9</Version>
<Version>6.2.10</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>

4
Samples/XAML Islands/UWP-XamlApplication/SamplePage.xaml
Просмотреть файл

@ -15,14 +15,14 @@
<StackPanel Margin="16,48">
<wgt:PeoplePicker x:Name="PeopleChooser"/>
<TextBlock Margin="0,8,0,0" FontWeight="Bold">Picked People:</TextBlock>
<ItemsControl ItemsSource="{x:Bind PeopleChooser.PickedPeople}"
<!--<ItemsControl ItemsSource="{x:Bind PeopleChooser.PickedPeople}"
Margin="8,0,0,0">
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="graph:Person">
<TextBlock Text="{x:Bind DisplayName}"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</ItemsControl>-->
</StackPanel>
</Grid>
</Page>

4
Samples/XAML Islands/UWP-XamlApplication/UWP-XamlApplication.csproj
Просмотреть файл

@ -151,10 +151,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.9</Version>
<Version>6.2.10</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
<Version>6.0.1</Version>
<Version>6.1.0-preview1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>

2
Samples/XAML Islands/WPF-Core-GraphApp/WPF-Core-GraphApp.csproj
Просмотреть файл

@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.0.1" />
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.1.0-preview1" />
</ItemGroup>
<ItemGroup>

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

@ -17,8 +17,8 @@ var target = Argument("target", "Default");
// VERSIONS
//////////////////////////////////////////////////////////////////////
var gitVersioningVersion = "2.1.65";
var inheritDocVersion = "1.1.1.1";
var gitVersioningVersion = "3.1.91";
var inheritDocVersion = "2.5.2";
//////////////////////////////////////////////////////////////////////
// VARIABLES

2
global.json
Просмотреть файл

@ -1,5 +1,5 @@
{
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "2.0.43"
"MSBuild.Sdk.Extras": "2.0.54"
}
}