Skip to content

Commit 7e37935

Browse files
Nirmal4GNirmal4G
committed
Fix-up white-spaces across project files
Add/Remove leading and trailing white-space (only in comments, code blocks, xml strings)
1 parent 06362b2 commit 7e37935

File tree

15 files changed

+95
-96
lines changed

15 files changed

+95
-96
lines changed

‎Directory.Build.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,16 @@
6262
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
6363
</PropertyGroup>
6464
<ItemGroup>
65-
<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All"/>
66-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
65+
<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All" />
66+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
6767
</ItemGroup>
6868
</When>
6969
</Choose>
7070

7171
<Choose>
7272
<When Condition="'$(IsDesignProject)' != 'true'">
7373
<ItemGroup>
74-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"/>
74+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
7575
</ItemGroup>
7676
</When>
7777
</Choose>
@@ -103,10 +103,10 @@
103103
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json">
104104
<Link>stylecop.json</Link>
105105
</AdditionalFiles>
106-
<None Include="$(MSBuildThisFileDirectory)license.md" Pack="true" PackagePath="\"/>
107-
<None Include="$(MSBuildThisFileDirectory)build\nuget.png" Pack="true" PackagePath="images\"/>
106+
<None Include="$(MSBuildThisFileDirectory)license.md" Pack="true" PackagePath="\" />
107+
<None Include="$(MSBuildThisFileDirectory)build\nuget.png" Pack="true" PackagePath="images\" />
108108
</ItemGroup>
109109

110-
<Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.VisualStudio.Design.props" Condition="'$(IsDesignProject)' == 'true'"/>
110+
<Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.VisualStudio.Design.props" Condition="'$(IsDesignProject)' == 'true'" />
111111

112112
</Project>

‎Directory.Build.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<Choose>
8-
<!--We'll include signing the Notifications library since we need the DLL signature to match for interop from class libraries to main projects-->
8+
<!-- We'll include signing the Notifications library since we need the DLL signature to match for interop from class libraries to main projects -->
99
<When Condition="(!$(TargetFramework.Contains(`uap10.0`)) and '$(TargetFramework)' != 'native' and '$(IsSampleProject)' != 'true') or $(MSBuildProjectName) == 'Microsoft.Toolkit.Uwp.Notifications'">
1010
<PropertyGroup>
1111
<SignAssembly>true</SignAssembly>
@@ -15,11 +15,11 @@
1515
</Choose>
1616

1717
<!--Exclude Notifications project from this since it sets different min versions than what we want for notifications-->
18-
<Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.Uwp.Build.targets" Condition="'$(UseUWP)' == 'true' and $(MSBuildProjectName) != 'Microsoft.Toolkit.Uwp.Notifications'"/>
18+
<Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.Uwp.Build.targets" Condition="'$(UseUWP)' == 'true' and $(MSBuildProjectName) != 'Microsoft.Toolkit.Uwp.Notifications'" />
1919

2020
<Target Name="AddCommitHashToAssemblyAttributes" BeforeTargets="GetAssemblyAttributes">
2121
<ItemGroup>
22-
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition=" '$(SourceRevisionId)' != '' ">
22+
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(SourceRevisionId)' != ''">
2323
<_Parameter1>CommitHash</_Parameter1>
2424
<_Parameter2>$(SourceRevisionId)</_Parameter2>
2525
</AssemblyAttribute>

‎Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</PropertyGroup>
1616

1717
<Choose>
18-
<When Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
18+
<When Condition="'$(TargetFramework)' == 'netstandard1.4'">
1919
<ItemGroup>
2020
<!-- .NET Standard 1.4 doesn't have the Span<T> type, ValueTuple or the [Pure] attribute -->
2121
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
@@ -24,14 +24,14 @@
2424
</ItemGroup>
2525
</When>
2626

27-
<When Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
27+
<When Condition="'$(TargetFramework)' == 'netstandard2.0'">
2828
<ItemGroup>
2929
<!-- .NET Standard 2.0 doesn't have the Span<T> type -->
3030
<PackageReference Include="System.Memory" Version="4.5.4" />
3131
</ItemGroup>
3232
</When>
3333

34-
<When Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
34+
<When Condition="'$(TargetFramework)' == 'netstandard2.1'">
3535
<PropertyGroup>
3636
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
3737
</PropertyGroup>
@@ -41,7 +41,7 @@
4141
</ItemGroup>
4242
</When>
4343

44-
<When Condition=" '$(TargetFramework)' == 'net5.0' ">
44+
<When Condition="'$(TargetFramework)' == 'net5.0'">
4545
<PropertyGroup>
4646
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
4747
</PropertyGroup>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</PropertyGroup>
2727

2828
<Choose>
29-
<When Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
29+
<When Condition="'$(TargetFramework)' == 'netstandard1.4'">
3030
<ItemGroup>
3131
<!-- .NET Standard 1.4 lacks the [Pure] attribute, the Rectangle primitive,
3232
the Span<T> and Memory<T> types, the Vector<T> primitive and related APIs,
@@ -45,7 +45,7 @@
4545
</ItemGroup>
4646
</When>
4747

48-
<When Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
48+
<When Condition="'$(TargetFramework)' == 'netstandard2.0'">
4949
<ItemGroup>
5050
<!-- .NET Standard 2.0 doesn't have the Span<T>, HashCode and ValueTask types -->
5151
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.0" />
@@ -55,7 +55,7 @@
5555
</ItemGroup>
5656
</When>
5757

58-
<When Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
58+
<When Condition="'$(TargetFramework)' == 'netstandard2.1'">
5959
<ItemGroup>
6060
<!-- .NET Standard 2.1 doesn't have the Unsafe type -->
6161
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
@@ -75,13 +75,13 @@
7575
</PropertyGroup>
7676
</When>
7777

78-
<When Condition=" '$(TargetFramework)' == 'net5.0' ">
78+
<When Condition="'$(TargetFramework)' == 'net5.0'">
7979
<PropertyGroup>
8080
<DefineConstants>NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT</DefineConstants>
8181
</PropertyGroup>
8282
</When>
8383

84-
<When Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
84+
<When Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
8585
<ItemGroup>
8686
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
8787
</ItemGroup>
@@ -97,7 +97,7 @@
9797
</PropertyGroup>
9898
</When>
9999

100-
<When Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
100+
<When Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
101101
<ItemGroup>
102102
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
103103
</ItemGroup>

‎Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
</PropertyGroup>
2222

2323
<!-- .NET Standard 2.0 doesn't have the Span<T> and IAsyncEnumerable<T> types -->
24-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
24+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
2525
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
2626
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
2727
<PackageReference Include="System.Memory" Version="4.5.4" />
2828
</ItemGroup>
2929

3030
<!-- .NET Standard 2.1 doesn't have the Unsafe type -->
31-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
31+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
3232
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
3333
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
3434
</ItemGroup>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
<PropertyGroup>
44
<TargetFrameworks>netstandard1.4;uap10.0.19041;net461;netcoreapp3.1;net5.0;net5.0-windows10.0.17763.0;native</TargetFrameworks>
55
<DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>
6-
<ExtrasImplicitPlatformPackageIsPrivate Condition=" '$(TargetFramework)' == 'native' ">true</ExtrasImplicitPlatformPackageIsPrivate>
6+
<ExtrasImplicitPlatformPackageIsPrivate Condition="'$(TargetFramework)' == 'native'">true</ExtrasImplicitPlatformPackageIsPrivate>
77
<NuspecFile>Microsoft.Toolkit.Uwp.Notifications.nuspec</NuspecFile>
88
</PropertyGroup>
99

1010
<Choose>
1111
<!--Desktop Win32 apps-->
12-
<When Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='netcoreapp3.1'">
12+
<When Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'netcoreapp3.1'">
1313
<ItemGroup>
1414
<!--Reference Windows SDK NuGet of correct target platform version-->
1515
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
1616
</ItemGroup>
1717
</When>
1818
</Choose>
1919

20-
<PropertyGroup Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='netcoreapp3.1' or '$(TargetFramework)'=='net5.0-windows10.0.17763.0'">
20+
<PropertyGroup Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0-windows10.0.17763.0'">
2121
<!--Define the WINDOWS_UWP conditional symbol, since the Windows.Data.Xml and the Windows.UI.Notification namespaces are available-->
2222
<DefineConstants>$(DefineConstants);WINDOWS_UWP;WIN32</DefineConstants>
2323
</PropertyGroup>
2424

2525
<!--NET Core desktop apps also need the Registry NuGet package and System.Reflection.Emit for generating COM class dynamically-->
26-
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1' or '$(TargetFramework)'=='net5.0-windows10.0.17763.0'">
26+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0-windows10.0.17763.0'">
2727
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
2828
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
2929
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />

‎Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj

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

3-
<PropertyGroup>
4-
<TargetFrameworks>uap10.0.17763</TargetFrameworks>
5-
<Title>Windows Community Toolkit Primitive Controls</Title>
6-
<Description>
7-
This library provides controls for use in XAML which don't provide their own style. It is part of the Windows Community Toolkit.
8-
9-
Controls:
10-
- AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space.
11-
- DockPanel: Define areas where you can arrange child elements either horizontally or vertically, relative to each other.
12-
- StaggeredLayout: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
13-
- StaggeredPanel: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
14-
- SwitchPresenter: A presenter which can act as a switch statement for layout providing alternate layouts based on a value.
15-
- UniformGrid: Presents items in an evenly-spaced set of rows or columns to fill the total available display space.
16-
- WrapLayout: Positions child elements in sequential position from left to right and breaks content to the next line.
17-
- WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line.
18-
</Description>
19-
<PackageTags>
20-
Windows;Community;Toolkit;WCT;UWP;Controls;XAML;
21-
Adaptive;Grid;View;AdaptiveGridView;GridView ;AdaptiveGrid ;
22-
Dock;Panel ;DockPanel ;
23-
Staggered;Layout ;StaggeredLayout ;
24-
Staggered;Panel ;StaggeredPanel ;
25-
Switch;Presenter ;SwitchPresenter ;
26-
Uniform;Grid ;UniformGrid ;
27-
Wrap;Layout ;WrapLayout ;
28-
Wrap;Panel ;WrapPanel ;
29-
</PackageTags>
30-
<!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
31-
<EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
32-
<LangVersion>8.0</LangVersion>
33-
</PropertyGroup>
34-
35-
<ItemGroup>
36-
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
37-
</ItemGroup>
38-
39-
<ItemGroup>
40-
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
41-
</ItemGroup>
42-
43-
<ItemGroup>
44-
<None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
45-
<None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
46-
</ItemGroup>
47-
48-
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
49-
50-
<!-- https://weblogs.asp.net/rweigelt/disable-warnings-in-generated-c-files-of-uwp-app -->
51-
<Target Name="PragmaWarningDisablePrefixer" AfterTargets="MarkupCompilePass2">
52-
<ItemGroup>
53-
<GeneratedCSFiles Include="**\*.g.cs;**\*.g.i.cs" />
54-
</ItemGroup>
55-
<Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
56-
<Exec Command="for %%f in (@(GeneratedCSFiles->'&quot;%(Identity)&quot;')) do echo #pragma warning disable &gt; %%f.temp &amp;&amp; type %%f &gt;&gt; %%f.temp &amp;&amp; move /y %%f.temp %%f &gt; NUL" />
57-
</Target>
3+
<PropertyGroup>
4+
<TargetFrameworks>uap10.0.17763</TargetFrameworks>
5+
<Title>Windows Community Toolkit Primitive Controls</Title>
6+
<Description>
7+
This library provides controls for use in XAML which don't provide their own style. It is part of the Windows Community Toolkit.
8+
9+
Controls:
10+
- AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space.
11+
- DockPanel: Define areas where you can arrange child elements either horizontally or vertically, relative to each other.
12+
- StaggeredLayout: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
13+
- StaggeredPanel: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
14+
- SwitchPresenter: A presenter which can act as a switch statement for layout providing alternate layouts based on a value.
15+
- UniformGrid: Presents items in an evenly-spaced set of rows or columns to fill the total available display space.
16+
- WrapLayout: Positions child elements in sequential position from left to right and breaks content to the next line.
17+
- WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line.
18+
</Description>
19+
<PackageTags>
20+
Windows;Community;Toolkit;WCT;UWP;Controls;XAML;
21+
Adaptive;Grid;View;AdaptiveGridView;GridView ;AdaptiveGrid ;
22+
Dock;Panel ;DockPanel ;
23+
Staggered;Layout ;StaggeredLayout ;
24+
Staggered;Panel ;StaggeredPanel ;
25+
Switch;Presenter ;SwitchPresenter ;
26+
Uniform;Grid ;UniformGrid ;
27+
Wrap;Layout ;WrapLayout ;
28+
Wrap;Panel ;WrapPanel ;
29+
</PackageTags>
30+
<LangVersion>8.0</LangVersion>
31+
</PropertyGroup>
32+
33+
<ItemGroup>
34+
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
35+
</ItemGroup>
36+
37+
<ItemGroup>
38+
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
39+
</ItemGroup>
40+
41+
<ItemGroup>
42+
<None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
43+
<None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
44+
</ItemGroup>
45+
46+
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
47+
48+
<!-- https://weblogs.asp.net/rweigelt/disable-warnings-in-generated-c-files-of-uwp-app -->
49+
<Target Name="PragmaWarningDisablePrefixer" AfterTargets="MarkupCompilePass2">
50+
<ItemGroup>
51+
<GeneratedCSFiles Include="**\*.g.cs;**\*.g.i.cs" />
52+
</ItemGroup>
53+
<Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
54+
<Exec Command="for %%f in (@(GeneratedCSFiles->'&quot;%(Identity)&quot;')) do echo #pragma warning disable &gt; %%f.temp &amp;&amp; type %%f &gt;&gt; %%f.temp &amp;&amp; move /y %%f.temp %%f &gt; NUL" />
55+
</Target>
56+
5857
</Project>

‎Microsoft.Toolkit.Uwp/IncrementalLoadingCollection/IncrementalLoadingCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ protected virtual async Task<IEnumerable<IType>> LoadDataAsync(CancellationToken
232232
.ContinueWith(
233233
t =>
234234
{
235-
if(t.IsFaulted)
235+
if (t.IsFaulted)
236236
{
237237
throw t.Exception;
238238
}

‎Microsoft.Toolkit/Microsoft.Toolkit.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</ItemGroup>
2121

2222
<!-- .NET Standard 2.1 and .NET 5 already have [NotNullIfNotNull] and [NotNullWhen] -->
23-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'net5.0' ">
23+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'net5.0'">
2424
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
2525
</PropertyGroup>
2626

‎SmokeTests/SmokeTests.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
<MSBuild Projects="SmokeTest.csproj"
5151
Targets="restore;build"
52-
Properties="CurrentProject=%(ProjectsToBuild.Identity);Configuration=%(ProjectsToBuild.Configuration);Platform=%(ProjectsToBuild.Platform);NuGetPackageVersion=$(NuGetPackageVersion)"/>
52+
Properties="CurrentProject=%(ProjectsToBuild.Identity);Configuration=%(ProjectsToBuild.Configuration);Platform=%(ProjectsToBuild.Platform);NuGetPackageVersion=$(NuGetPackageVersion)" />
5353
</Target>
5454

5555
<Target Name="ChooseProjectsToBuild" DependsOnTargets="CheckNugets">

0 commit comments

Comments
 (0)