Skip to content

Commit a8dba80

Browse files
azchohfiazchohfi
committed
Merge branch 'master' into dev/7.0.0
2 parents 2cfad9c + aec2ade commit a8dba80

File tree

133 files changed

+2136
-1400
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+2136
-1400
lines changed

‎Directory.Build.props‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageIconUrl>https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/build/nuget.png</PackageIconUrl>
88
<PackageProjectUrl>https://github.com/windows-toolkit/WindowsCommunityToolkit</PackageProjectUrl>
99
<PackageLicenseUrl>https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/license.md</PackageLicenseUrl>
10-
<PackageReleaseNotes>v3.0 release https://github.com/windows-toolkit/WindowsCommunityToolkit/releases</PackageReleaseNotes>
10+
<PackageReleaseNotes>https://github.com/windows-toolkit/WindowsCommunityToolkit/releases</PackageReleaseNotes>
1111
<Copyright>(c) .NET Foundation and Contributors. All rights reserved.</Copyright>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<IsDesignProject>$(MSBuildProjectName.Contains('.Design'))</IsDesignProject>
@@ -19,9 +19,8 @@
1919
<PackageOutputPath>$(MSBuildThisFileDirectory)bin\nupkg</PackageOutputPath>
2020
</PropertyGroup>
2121

22-
<PropertyGroup>
23-
<SignAssembly Condition="'$(SignAssembly)' == '' and '$(IsUwpProject)' != 'true' and '$(IsTestSampleProject)' != 'true'" >true</SignAssembly>
24-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)toolkit.snk</AssemblyOriginatorKeyFile>
22+
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
23+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
2524
</PropertyGroup>
2625

2726
<Choose>
@@ -51,7 +50,7 @@
5150
</Choose>
5251

5352
<Choose>
54-
<When Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true'">
53+
<When Condition="'$(SourceLinkEnabled)' != 'false' and '$(IsSampleProject)' != 'true'">
5554
<PropertyGroup>
5655
<!-- Optional: Declare that the Repository URL can be published to NuSpec -->
5756
<PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -61,8 +60,8 @@
6160
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
6261
</PropertyGroup>
6362
<ItemGroup>
64-
<PackageReference Include="Microsoft.SourceLink.Vsts.Git" Version="1.0.0-beta-62925-02" PrivateAssets="All"/>
65-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-62925-02" PrivateAssets="All"/>
63+
<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All"/>
64+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
6665
</ItemGroup>
6766
</When>
6867
</Choose>
@@ -96,7 +95,7 @@
9695
</PropertyGroup>
9796

9897
<ItemGroup>
99-
<PackageReference Include="Nerdbank.GitVersioning" Version=" 2.1.65" PrivateAssets="all" />
98+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="all" />
10099
</ItemGroup>
101100

102101
<ItemGroup>

‎Directory.Build.targets‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
<PropertyGroup>
66
<TargetPlatformVersion>10.0.$(DefaultTargetPlatformVersion).0</TargetPlatformVersion>
77
<TargetPlatformMinVersion>10.0.$(DefaultTargetPlatformMinVersion).0</TargetPlatformMinVersion>
8-
<DebugType>Full</DebugType>
8+
</PropertyGroup>
9+
10+
<PropertyGroup Condition="'$(DebugType)' == ''">
11+
<DebugType>Portable</DebugType>
912
</PropertyGroup>
1013

1114
<ItemGroup>
@@ -18,6 +21,15 @@
1821
</ItemGroup>
1922
</When>
2023
</Choose>
24+
25+
<Choose>
26+
<When Condition="$(TargetFramework.Contains('uap10.0')) == false and '$(TargetFramework)' != 'native' and '$(IsTestSampleProject)' != 'true'">
27+
<PropertyGroup>
28+
<SignAssembly>true</SignAssembly>
29+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)toolkit.snk</AssemblyOriginatorKeyFile>
30+
</PropertyGroup>
31+
</When>
32+
</Choose>
2133

2234
<Target Name="AddCommitHashToAssemblyAttributes" BeforeTargets="GetAssemblyAttributes">
2335
<ItemGroup>

‎Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
- NullableRef&lt;T&gt;: a stack-only struct similar to Ref&lt;T&gt;, which also supports nullable references.
2222
</Description>
2323
<PackageTags>UWP Toolkit Windows core standard unsafe span memory string array stream buffer extensions helpers parallel performance</PackageTags>
24-
25-
<!-- This is a temporary workaround for https://github.com/dotnet/sdk/issues/955 -->
26-
<DebugType>Full</DebugType>
2724
</PropertyGroup>
2825
<Choose>
2926
<When Condition=" '$(TargetFramework)' == 'netstandard1.4' ">

‎Microsoft.Toolkit.Parsers/Microsoft.Toolkit.Parsers.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212

1313
</Description>
1414
<PackageTags>UWP Toolkit Windows Parsers Parsing Markdown RSS</PackageTags>
15-
16-
<!-- This is a temporary workaround for https://github.com/dotnet/sdk/issues/955 -->
17-
<DebugType>Full</DebugType>
1815
</PropertyGroup>
1916

2017
<ItemGroup>

‎Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
</Description>
1212
<PackageTags>UWP Community Toolkit Windows Microsoft Graph OneDrive Twitter Translator LinkedIn service login OAuth</PackageTags>
1313

14-
<!-- This is a temporary workaround for https://github.com/dotnet/sdk/issues/955 -->
15-
<DebugType>Full</DebugType>
1614
<NoWarn>CS8002;CS0618</NoWarn>
15+
<DeterministicSourcePaths Condition="'$(EnableSourceLink)' == ''">false</DeterministicSourcePaths>
1716
</PropertyGroup>
1817

1918
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">
@@ -27,7 +26,7 @@
2726

2827
<ItemGroup>
2928
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
30-
<PackageReference Include="System.Net.Http" Version="4.3.3" />
29+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
3130
</ItemGroup>
3231

3332
<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.16299'">

‎Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
-Themes : Provides the source path of the resource dictionaries for the FocusTracker.
1111
</Description>
1212
<PackageTags>UWP Toolkit Windows Controls XAML Developer Tools Accessibility AlignmentGrid</PackageTags>
13-
<UseUwpMetaPackage>true</UseUwpMetaPackage>
13+
<!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
14+
<EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
1415
</PropertyGroup>
1516

1617
<ItemGroup>

‎Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,12 @@
5353
</ItemGroup>
5454

5555
<ItemGroup>
56-
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
56+
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
5757
</ItemGroup>
5858

5959
<PropertyGroup Condition="'$(TargetFramework)' == 'native'">
6060
<OutputType>winmdobj</OutputType>
61+
<DebugType>Full</DebugType>
6162
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
6263
<!-- Workaround for issue NuGet/Home#8388; change behavior during NuGet restore time vs. final build to avoid NuGet conflict in VS 2019 -->
6364
<NugetTargetMoniker Condition="'$(DesignTimeBuild)' == 'true'">native</NugetTargetMoniker>

‎Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer/Microsoft.Toolkit.Uwp.PlatformSpecificAnalyzer.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
<PackageTags>UWP Toolkit Windows Platform Specific Analyzer</PackageTags>
88

99
<IncludeBuildOutput>false</IncludeBuildOutput>
10-
11-
<!-- This is a temporary workaround for https://github.com/dotnet/sdk/issues/955 -->
12-
<DebugType>Full</DebugType>
1310
</PropertyGroup>
1411

1512
<ItemGroup>

‎Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using Microsoft.Toolkit.Uwp.SampleApp.Styles;
1010
using Windows.ApplicationModel;
1111
using Windows.ApplicationModel.Activation;
12+
using Windows.ApplicationModel.DataTransfer;
1213
using Windows.System.Profile;
1314
using Windows.UI.ViewManagement;
1415
using Windows.UI.Xaml;
@@ -167,7 +168,18 @@ private void OnSuspending(object sender, SuspendingEventArgs e)
167168
var deferral = e.SuspendingOperation.GetDeferral();
168169

169170
// TODO: Save application state and stop any background activity
171+
try
172+
{
173+
// Here we flush the Clipboard to make sure content in clipboard to remain available
174+
// after the application shuts down.
175+
Clipboard.Flush();
176+
}
177+
catch (Exception)
178+
{
179+
// ignore
180+
}
181+
170182
deferral.Complete();
171183
}
172184
}
173-
}
185+
}

‎Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1919
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
2020
<AppxBundle>Always</AppxBundle>
21-
<AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
21+
<AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>
2222
<Win32Resource>MiddleClickScrolling-CursorType.res</Win32Resource>
2323
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
2424
</PropertyGroup>
@@ -115,7 +115,7 @@
115115
<Version>6.1.0-build.6</Version>
116116
</PackageReference>
117117
<PackageReference Include="Microsoft.UI.Xaml">
118-
<Version>2.3.200213001</Version>
118+
<Version>2.4.2</Version>
119119
</PackageReference>
120120
<PackageReference Include="Monaco.Editor">
121121
<Version>0.7.0-alpha</Version>
@@ -130,7 +130,7 @@
130130
<Version>1.0.5</Version>
131131
</PackageReference>
132132
<PackageReference Include="System.ValueTuple">
133-
<Version>4.4.0</Version>
133+
<Version>4.5.0</Version>
134134
</PackageReference>
135135
</ItemGroup>
136136
<ItemGroup>
@@ -605,6 +605,7 @@
605605
<Content Include="SamplePages\IconExtensions\IconExtensionsXaml.bind" />
606606
<Content Include="SamplePages\WrapLayout\WrapLayout.bind" />
607607
<Content Include="SamplePages\ObservableGroup\ObservableGroup.bind" />
608+
<Content Include="SamplePages\ScrollViewerExtensions\ScrollViewerExtensionsXaml.bind" />
608609
<Content Include="SamplePages\Triggers\CompareStateTrigger.bind" />
609610
<Content Include="SamplePages\Triggers\IsEqualStateTrigger.bind" />
610611
<Content Include="SamplePages\Triggers\FullScreenModeStateTrigger.bind" />
@@ -614,6 +615,7 @@
614615
<Content Include="SamplePages\Triggers\RegexStateTrigger.bind" />
615616
<Content Include="SamplePages\Triggers\UserHandPreferenceStateTrigger.bind" />
616617
<Content Include="SamplePages\Triggers\UserInteractionModeStateTrigger.bind" />
618+
<Content Include="SamplePages\StaggeredLayout\StaggeredLayout.bind" />
617619
</ItemGroup>
618620
<ItemGroup>
619621
<Compile Include="App.xaml.cs">
@@ -807,7 +809,6 @@
807809
<Compile Include="SamplePages\Expander\ExpanderPage.xaml.cs">
808810
<DependentUpon>ExpanderPage.xaml</DependentUpon>
809811
</Compile>
810-
<Compile Include="SamplePages\Facebook Service\FacebookPhotoTemplateSelector.cs" />
811812
<Compile Include="Controls\CodeRenderer.cs" />
812813
<Compile Include="Controls\PropertyControl.xaml.cs">
813814
<DependentUpon>PropertyControl.xaml</DependentUpon>
@@ -913,9 +914,6 @@
913914
<Compile Include="SamplePages\Fade\FadeBehaviorPage.xaml.cs">
914915
<DependentUpon>FadeBehaviorPage.xaml</DependentUpon>
915916
</Compile>
916-
<Compile Include="SamplePages\Facebook Service\FacebookPage.xaml.cs">
917-
<DependentUpon>FacebookPage.xaml</DependentUpon>
918-
</Compile>
919917
<Compile Include="SamplePages\HeaderedTextBlock\HeaderedTextBlockPage.xaml.cs">
920918
<DependentUpon>HeaderedTextBlockPage.xaml</DependentUpon>
921919
</Compile>
@@ -1415,10 +1413,6 @@
14151413
<Generator>MSBuild:Compile</Generator>
14161414
<SubType>Designer</SubType>
14171415
</Page>
1418-
<Page Include="SamplePages\Facebook Service\FacebookPage.xaml">
1419-
<Generator>MSBuild:Compile</Generator>
1420-
<SubType>Designer</SubType>
1421-
</Page>
14221416
<Page Include="SamplePages\HeaderedTextBlock\HeaderedTextBlockPage.xaml">
14231417
<SubType>Designer</SubType>
14241418
<Generator>MSBuild:Compile</Generator>
@@ -1528,10 +1522,6 @@
15281522
<Project>{1ae2cb5c-58a0-4f12-8e6f-2cd4aaadb34c}</Project>
15291523
<Name>Microsoft.Toolkit.Uwp.Samples.BackgroundTasks</Name>
15301524
</ProjectReference>
1531-
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.Services\Microsoft.Toolkit.Uwp.Services.csproj">
1532-
<Project>{7189a42d-6f1a-4fa3-8e00-e2c14fdf167a}</Project>
1533-
<Name>Microsoft.Toolkit.Uwp.Services</Name>
1534-
</ProjectReference>
15351525
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj">
15361526
<Project>{daeb9cec-c817-33b2-74b2-bc379380db72}</Project>
15371527
<Name>Microsoft.Toolkit.Uwp.UI.Controls.DataGrid</Name>
@@ -1587,6 +1577,8 @@
15871577
<UseVSHostingProcess>false</UseVSHostingProcess>
15881578
<ErrorReport>prompt</ErrorReport>
15891579
<Prefer32Bit>true</Prefer32Bit>
1580+
<!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
1581+
<EnableTypeInfoReflection>false</EnableTypeInfoReflection>
15901582
</PropertyGroup>
15911583
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
15921584
<OutputPath>bin\ARM64\Release\</OutputPath>
@@ -1642,4 +1634,4 @@
16421634
<Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
16431635
<Exec Command="for %%f in (@(GeneratedCSFiles->'&quot;%(Identity)&quot;')) do echo #pragma warning disable &gt; %%f.temp &amp;&amp; type %%f | findstr /v /b &quot;#pragma&quot; &gt;&gt; %%f.temp &amp;&amp; move /y %%f.temp %%f &gt; NUL" />
16441636
</Target>
1645-
</Project>
1637+
</Project>

0 commit comments

Comments
 (0)