Skip to content

Commit c39a832

Browse files
michael-hawkermichael-hawker
authored
Merge branch 'master' into dev/jackil/mtbFix
2 parents 892e488 + 45cdd25 commit c39a832

File tree

45 files changed

+670
-1634
lines changed

Some content is hidden

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

45 files changed

+670
-1634
lines changed

‎Directory.Build.props

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,16 @@
5858
</Choose>
5959

6060
<Choose>
61-
<When Condition="'$(IsTestProject)' != 'true' and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true'">
61+
<When Condition="'$(IsDesignProject)' != 'true'">
6262
<ItemGroup>
63-
<!--<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="15.3.83" PrivateAssets="all" />-->
64-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
63+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"/>
64+
</ItemGroup>
65+
</When>
66+
</Choose>
6567

68+
<Choose>
69+
<When Condition="'$(IsTestProject)' != 'true' and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true'">
70+
<ItemGroup>
6671
<EmbeddedResource Include="**\*.rd.xml" />
6772
<Page Include="**\*.xaml" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
6873
<Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />

‎Microsoft.Toolkit.Uwp.PlatformDifferencesGen/DifferencesGen.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
<DefineConstants>TRACE</DefineConstants>
3131
<ErrorReport>prompt</ErrorReport>
3232
<WarningLevel>4</WarningLevel>
33+
<DocumentationFile>bin\Release\DifferencesGen.xml</DocumentationFile>
34+
<NoWarn>1591</NoWarn>
3335
</PropertyGroup>
3436
<ItemGroup>
3537
<Reference Include="System" />

‎Microsoft.Toolkit.Uwp.SampleApp/.editorconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[*.{cs,vb}]
2+
3+
# SA1601: Partial elements should be documented
4+
dotnet_diagnostic.SA1601.severity = none
5+
dotnet_diagnostic.CS1573.severity = none
6+
dotnet_diagnostic.CS1591.severity = none
7+
dotnet_diagnostic.CS1712.severity = none

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

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232
<UseVSHostingProcess>false</UseVSHostingProcess>
3333
<ErrorReport>prompt</ErrorReport>
3434
<Prefer32Bit>true</Prefer32Bit>
35-
<DocumentationFile>
36-
</DocumentationFile>
37-
<CodeAnalysisRuleSet>microsoft.toolkit.uwp.sampleapp.ruleset</CodeAnalysisRuleSet>
35+
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
3836
</PropertyGroup>
3937
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
4038
<OutputPath>bin\x86\Release\</OutputPath>
@@ -49,9 +47,7 @@
4947
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
5048
<RunCodeAnalysis>false</RunCodeAnalysis>
5149
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
52-
<DocumentationFile>
53-
</DocumentationFile>
54-
<CodeAnalysisRuleSet>microsoft.toolkit.uwp.sampleapp.ruleset</CodeAnalysisRuleSet>
50+
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
5551
</PropertyGroup>
5652
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
5753
<DebugSymbols>true</DebugSymbols>
@@ -63,7 +59,6 @@
6359
<UseVSHostingProcess>false</UseVSHostingProcess>
6460
<ErrorReport>prompt</ErrorReport>
6561
<Prefer32Bit>true</Prefer32Bit>
66-
<CodeAnalysisRuleSet>microsoft.toolkit.uwp.sampleapp.ruleset</CodeAnalysisRuleSet>
6762
</PropertyGroup>
6863
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
6964
<OutputPath>bin\ARM\Release\</OutputPath>
@@ -78,9 +73,7 @@
7873
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
7974
<RunCodeAnalysis>false</RunCodeAnalysis>
8075
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
81-
<DocumentationFile>
82-
</DocumentationFile>
83-
<CodeAnalysisRuleSet>microsoft.toolkit.uwp.sampleapp.ruleset</CodeAnalysisRuleSet>
76+
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
8477
</PropertyGroup>
8578
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
8679
<DebugSymbols>true</DebugSymbols>
@@ -92,7 +85,6 @@
9285
<UseVSHostingProcess>false</UseVSHostingProcess>
9386
<ErrorReport>prompt</ErrorReport>
9487
<Prefer32Bit>true</Prefer32Bit>
95-
<CodeAnalysisRuleSet>microsoft.toolkit.uwp.sampleapp.ruleset</CodeAnalysisRuleSet>
9688
</PropertyGroup>
9789
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
9890
<OutputPath>bin\x64\Release\</OutputPath>
@@ -107,9 +99,7 @@
10799
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
108100
<RunCodeAnalysis>false</RunCodeAnalysis>
109101
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
110-
<DocumentationFile>
111-
</DocumentationFile>
112-
<CodeAnalysisRuleSet>microsoft.toolkit.uwp.sampleapp.ruleset</CodeAnalysisRuleSet>
102+
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
113103
</PropertyGroup>
114104
<PropertyGroup>
115105
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
@@ -130,9 +120,6 @@
130120
<PackageReference Include="Monaco.Editor">
131121
<Version>0.7.0-alpha</Version>
132122
</PackageReference>
133-
<PackageReference Include="StyleCop.Analyzers">
134-
<Version>1.0.2</Version>
135-
</PackageReference>
136123
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
137124
<Version>1.1.0</Version>
138125
</PackageReference>
@@ -385,7 +372,7 @@
385372
<Content Include="Assets\mtns.csv">
386373
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
387374
</Content>
388-
<None Include="Microsoft.Toolkit.Uwp.SampleApp.ruleset" />
375+
<None Include=".editorconfig" />
389376
<Content Include="SamplePages\WeatherLiveTileAndToast\WeatherLiveTileAndToast.png" />
390377
<Content Include="SamplePages\WeatherLiveTileAndToast\WeatherLiveTileAndToastCode.bind" />
391378
<Content Include="SamplePages\ImageEx\ImageExCode.bind" />
@@ -1449,7 +1436,6 @@
14491436
<PlatformTarget>ARM64</PlatformTarget>
14501437
<UseVSHostingProcess>false</UseVSHostingProcess>
14511438
<ErrorReport>prompt</ErrorReport>
1452-
<CodeAnalysisRuleSet>microsoft.toolkit.uwp.sampleapp.ruleset</CodeAnalysisRuleSet>
14531439
<Prefer32Bit>true</Prefer32Bit>
14541440
</PropertyGroup>
14551441
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
@@ -1463,7 +1449,6 @@
14631449
<PlatformTarget>ARM64</PlatformTarget>
14641450
<UseVSHostingProcess>false</UseVSHostingProcess>
14651451
<ErrorReport>prompt</ErrorReport>
1466-
<CodeAnalysisRuleSet>microsoft.toolkit.uwp.sampleapp.ruleset</CodeAnalysisRuleSet>
14671452
<Prefer32Bit>true</Prefer32Bit>
14681453
</PropertyGroup>
14691454
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />

‎Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.ruleset

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/CameraHelper/CameraHelperPage.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ private async Task CleanUpAsync()
141141
{
142142
_cameraHelper.FrameArrived -= CameraHelper_FrameArrived;
143143
await _cameraHelper.CleanUpAsync();
144-
_cameraHelper = null;
144+
_cameraHelper = null;
145145
}
146146
}
147147
}

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Incremental Loading Collection/IncrementalLoadingCollectionPage.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
88
{
99
/// <summary>
10-
/// A sample XAML page that shows how to use <see cref="IIncrementalSource{TSource}"/> and <see cref="IncrementalLoadingCollection{TSource, IType}"/> classes.
10+
/// A sample XAML page that shows how to use <see cref="Collections.IIncrementalSource{TSource}"/> and <see cref="IncrementalLoadingCollection{TSource, IType}"/> classes.
1111
/// </summary>
1212
public sealed partial class IncrementalLoadingCollectionPage
1313
{

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Incremental Loading Collection/PeopleSource.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
1212
{
1313
/// <summary>
14-
/// A sample implementation of the <see cref="IIncrementalSource{TSource}"/> interface.
14+
/// A sample implementation of the <see cref="Collections.IIncrementalSource{TSource}"/> interface.
1515
/// </summary>
16-
/// <seealso cref="IIncrementalSource{TSource}"/>
16+
/// <seealso cref="Collections.IIncrementalSource{TSource}"/>
1717
public class PeopleSource : Collections.IIncrementalSource<Person>
1818
{
1919
private readonly List<Person> _people;

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Incremental Loading Collection/Person.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
66
{
77
/// <summary>
8-
/// A sample class used to show how to use the <see cref="IIncrementalSource{TSource}"/> interface.
8+
/// A sample class used to show how to use the <see cref="Collections.IIncrementalSource{TSource}"/> interface.
99
/// </summary>
1010
public class Person
1111
{

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/SampleDataType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
88
{
99
/// <summary>
10-
/// Sample of strongly-typed data for <see cref="TokenizingTextBox"/>.
10+
/// Sample of strongly-typed data for <see cref="Microsoft.Toolkit.Uwp.UI.Controls.TokenizingTextBox"/>.
1111
/// </summary>
1212
public class SampleDataType
1313
{

0 commit comments

Comments
 (0)