Skip to content

Commit b509fa9

Browse files
vgromfeldvgromfeld
committed
merge from master
2 parents 43c89ae + 5d03cac commit b509fa9

File tree

582 files changed

+36707
-3909
lines changed

Some content is hidden

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

582 files changed

+36707
-3909
lines changed

‎.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,11 @@ dotnet_naming_style.prefix_private_field_with_underscore.capitalization
237237
dotnet_naming_style.prefix_private_field_with_underscore.required_prefix = _
238238

239239
# Code files
240+
241+
# SA1009: Closing parenthesis should be spaced correctly
242+
# Needed for null forgiving operator after functions, "foo()!"
243+
dotnet_diagnostic.SA1009.severity = none
244+
240245
[*.{cs,vb}]
241246

242247
# Migrate back from old Toolkit.ruleset

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ Please check if your PR fulfills the following requirements:
3434
- [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/windows-toolkit/WindowsCommunityToolkit-design-assets)
3535
- [ ] Tests for the changes have been added (for bug fixes / features) (if applicable)
3636
- [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*)
37-
- [ ] If new feature, add to [Feature List](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/readme.md#-features)
3837
- [ ] Contains **NO** breaking changes
3938

4039
<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below.

‎Directory.Build.props

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,20 @@
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>
1414
<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
1515
<IsUwpProject Condition="'$(IsDesignProject)' != 'true'">$(MSBuildProjectName.Contains('Uwp'))</IsUwpProject>
1616
<IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
17-
<DefaultTargetPlatformVersion>17763</DefaultTargetPlatformVersion>
17+
<DefaultTargetPlatformVersion>18362</DefaultTargetPlatformVersion>
1818
<DefaultTargetPlatformMinVersion>16299</DefaultTargetPlatformMinVersion>
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>
@@ -41,7 +40,17 @@
4140
</Choose>
4241

4342
<Choose>
44-
<When Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true'">
43+
<When Condition="'$(Configuration)' == 'Debug' and '$(IsDesignProject)' != 'true'">
44+
<!-- Debug builds have this turned on by default, but it breaks our Xaml Islands Scenarios -->
45+
<PropertyGroup>
46+
<EnableTypeInfoReflection>false</EnableTypeInfoReflection>
47+
<EnableXBindDiagnostics>false</EnableXBindDiagnostics>
48+
</PropertyGroup>
49+
</When>
50+
</Choose>
51+
52+
<Choose>
53+
<When Condition="'$(SourceLinkEnabled)' != 'false' and '$(IsSampleProject)' != 'true'">
4554
<PropertyGroup>
4655
<!-- Optional: Declare that the Repository URL can be published to NuSpec -->
4756
<PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -51,8 +60,8 @@
5160
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
5261
</PropertyGroup>
5362
<ItemGroup>
54-
<PackageReference Include="Microsoft.SourceLink.Vsts.Git" Version="1.0.0-beta-62925-02" PrivateAssets="All"/>
55-
<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"/>
5665
</ItemGroup>
5766
</When>
5867
</Choose>
@@ -86,7 +95,7 @@
8695
</PropertyGroup>
8796

8897
<ItemGroup>
89-
<PackageReference Include="Nerdbank.GitVersioning" Version=" 2.1.65" PrivateAssets="all" />
98+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="all" />
9099
</ItemGroup>
91100

92101
<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 '$(IsSampleProject)' != '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>

‎GazeInputTest/GazeInputTest.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>GazeInputTest</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
@@ -86,7 +86,7 @@
8686
<UseVSHostingProcess>false</UseVSHostingProcess>
8787
<ErrorReport>prompt</ErrorReport>
8888
<Prefer32Bit>true</Prefer32Bit>
89-
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
89+
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
9090
</PropertyGroup>
9191
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
9292
<DebugSymbols>true</DebugSymbols>
@@ -150,7 +150,7 @@
150150
</ItemGroup>
151151
<ItemGroup>
152152
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
153-
<Version>6.2.9</Version>
153+
<Version>6.2.10</Version>
154154
</PackageReference>
155155
<PackageReference Include="StyleCop.Analyzers">
156156
<Version>1.0.2</Version>

‎Microsoft.Toolkit.HighPerformance/Attributes/NotNullWhenAttribute.cs

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
#if !NETSTANDARD2_1_OR_GREATER
6+
7+
namespace System.Diagnostics.CodeAnalysis
8+
{
9+
/// <summary>
10+
/// Specifies that when a method returns <see cref="ReturnValue"/>, the parameter
11+
/// will not be null even if the corresponding type allows it.
12+
/// </summary>
13+
/// <remarks>Internal copy of the .NET Standard 2.1 attribute.</remarks>
14+
[AttributeUsage(AttributeTargets.Parameter)]
15+
internal sealed class NotNullWhenAttribute : Attribute
16+
{
17+
/// <summary>
18+
/// Initializes a new instance of the <see cref="NotNullWhenAttribute"/> class.
19+
/// </summary>
20+
/// <param name="returnValue">
21+
/// The return value condition. If the method returns this value,
22+
/// the associated parameter will not be <see langword="null"/>.
23+
/// </param>
24+
public NotNullWhenAttribute(bool returnValue)
25+
{
26+
ReturnValue = returnValue;
27+
}
28+
29+
/// <summary>
30+
/// Gets a value indicating whether the return value should be <see langword="true"/>.
31+
/// </summary>
32+
public bool ReturnValue { get; }
33+
}
34+
}
35+
36+
#endif

0 commit comments

Comments
 (0)