Skip to content

Commit 06362b2

Browse files
committed
Fix-up new-lines across project files
Add/Remove new-lines (only in project files, xml files and some source files)
1 parent c6d9fe4 commit 06362b2

File tree

26 files changed

+25
-55
lines changed

26 files changed

+25
-55
lines changed

GazeInputTest/Properties/Default.rd.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,13 @@
1414
Using the Namespace directive to apply reflection policy to all the types in a particular namespace
1515
<Namespace Name="DataClasses.ViewModels" Serialize="All" />
1616
-->
17-
1817
<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
1918
<Application>
2019
<!--
2120
An Assembly element with Name="*Application*" applies to all assemblies in
2221
the application package. The asterisks are not wildcards.
2322
-->
2423
<Assembly Name="*Application*" Dynamic="Required All" />
25-
26-
2724
<!-- Add your application specific runtime directives here. -->
28-
29-
3025
</Application>
3126
</Directives>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,34 @@
1313
</Description>
1414
<PackageTags>Windows;Community;Toolkit;WCT;UWP;Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;extensions;helpers</PackageTags>
1515
</PropertyGroup>
16+
1617
<Choose>
1718
<When Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
1819
<ItemGroup>
19-
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" />
2222
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
2323
<PackageReference Include="System.Memory" Version="4.5.4" />
2424
</ItemGroup>
2525
</When>
26+
2627
<When Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
2728
<ItemGroup>
28-
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>
33+
3334
<When Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
3435
<PropertyGroup>
3536
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
3637
</PropertyGroup>
3738
<ItemGroup>
38-
3939
<!-- .NET Standard 2.1 doesn't have the Unsafe type -->
4040
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
4141
</ItemGroup>
4242
</When>
43+
4344
<When Condition=" '$(TargetFramework)' == 'net5.0' ">
4445
<PropertyGroup>
4546
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
</Description>
2525
<PackageTags>Windows;Community;Toolkit;WCT;UWP;core;standard;unsafe;span;memory;string;array;stream;buffer;extensions;helpers;parallel;performance</PackageTags>
2626
</PropertyGroup>
27+
2728
<Choose>
2829
<When Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
2930
<ItemGroup>
30-
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,
3333
ValueTask and ValueTask<T>, the Parallel class and the Unsafe class.
@@ -44,24 +44,23 @@
4444
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
4545
</ItemGroup>
4646
</When>
47+
4748
<When Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
4849
<ItemGroup>
49-
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" />
5252
<PackageReference Include="System.Memory" Version="4.5.4" />
5353
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
5454
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
5555
</ItemGroup>
5656
</When>
57+
5758
<When Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
5859
<ItemGroup>
59-
6060
<!-- .NET Standard 2.1 doesn't have the Unsafe type -->
6161
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
6262
</ItemGroup>
6363
<PropertyGroup>
64-
6564
<!-- NETSTANDARD2_1_OR_GREATER: includes both .NET Standard 2.1 and .NET Core 3.1.
6665
This is needed because .NET Core 3.1 will be a separate package than .NET Standard 2.1. -->
6766

@@ -75,17 +74,18 @@
7574
<DefineConstants>NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT</DefineConstants>
7675
</PropertyGroup>
7776
</When>
77+
7878
<When Condition=" '$(TargetFramework)' == 'net5.0' ">
7979
<PropertyGroup>
8080
<DefineConstants>NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT</DefineConstants>
8181
</PropertyGroup>
8282
</When>
83+
8384
<When Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
8485
<ItemGroup>
8586
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
8687
</ItemGroup>
8788
<PropertyGroup>
88-
8989
<!-- NETCORE_RUNTIME: to avoid issues with APIs that assume a specific memory layout, we define a
9090
.NET Core runtime constant to indicate either .NET Core 2.1 or .NET Core 3.1. These are
9191
runtimes with the same overall memory layout for objects (in particular: strings, SZ arrays,
@@ -96,6 +96,7 @@
9696
<DefineConstants>NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT;NETCORE_RUNTIME</DefineConstants>
9797
</PropertyGroup>
9898
</When>
99+
99100
<When Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
100101
<ItemGroup>
101102
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />

Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
1211
<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
13-
1412
</ItemGroup>
1513

1614
</Project>

Microsoft.Toolkit.Uwp.Connectivity/Properties/Microsoft.Toolkit.Uwp.Connectivity.rd.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
-->
2626
<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
2727
<Library Name="Microsoft.Toolkit.Uwp.Connectivity">
28-
29-
<!-- add directives for your library here -->
30-
28+
<!-- add directives for your library here -->
3129
</Library>
3230
</Directives>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@
2626
<Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
2727
<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" />
2828
</Target>
29+
2930
</Project>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@
88
</PropertyGroup>
99

1010
<Choose>
11-
1211
<!--Desktop Win32 apps-->
1312
<When Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='netcoreapp3.1'">
1413
<ItemGroup>
1514
<!--Reference Windows SDK NuGet of correct target platform version-->
1615
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
1716
</ItemGroup>
1817
</When>
19-
2018
</Choose>
2119

2220
<PropertyGroup Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='netcoreapp3.1' or '$(TargetFramework)'=='net5.0-windows10.0.17763.0'">

Microsoft.Toolkit.Uwp.Notifications/Properties/Microsoft.Toolkit.Uwp.Notifications.rd.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
enabling the library to work in .NET Native even if developers modified their default rd.xml.
44
See issue https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/3093 for more details.
55
-->
6-
76
<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
87
<Library Name="Microsoft.Toolkit.Uwp.Notifications">
98
<!-- TODO: We can potentially minimize the metadata needed, but further

Microsoft.Toolkit.Uwp.SampleApp/Properties/Default.rd.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,16 @@
1414
Using the Namespace directive to apply reflection policy to all the types in a particular namespace
1515
<Namespace Name="DataClasses.ViewModels" Serialize="All" />
1616
-->
17-
1817
<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
1918
<Application>
2019
<!--
2120
An Assembly element with Name="*Application*" applies to all assemblies in
2221
the application package. The asterisks are not wildcards.
2322
-->
2423
<Assembly Name="*Application*" Dynamic="Required All" />
25-
26-
2724
<!-- Add your application specific runtime directives here. -->
2825
<Type Name="Windows.UI.Xaml.Controls.Border" Dynamic="Required Public" />
29-
3026
<!-- Fix for https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/3883 -->
3127
<Type Name="Windows.UI.Xaml.Controls.TextBlock" Dynamic="Required Public" />
32-
3328
</Application>
3429
</Directives>

Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@
2828
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Animations\Microsoft.Toolkit.Uwp.UI.Animations.csproj" />
2929
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
3030
</ItemGroup>
31+
3132
</Project>

0 commit comments

Comments
 (0)