Skip to content

Use PolySharp for polyfills, and centralize shared MSBuild properties #510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sergio0694 merged 5 commits into from
Nov 22, 2022
Merged

Use PolySharp for polyfills, and centralize shared MSBuild properties #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
261e7d3
Move [SkipLocalsInit] to shared .targets file
Sergio0694 Nov 22, 2022
6c462db
Use PolySharp to generate polyfills
Sergio0694 Nov 22, 2022
17fc0da
Move [InternalsVisibleTo] to .csproj files
Sergio0694 Nov 22, 2022
9d9de23
Move trimming properties to .targets file in src\
Sergio0694 Nov 22, 2022
765901a
Centralize NETSTANDARD2_1_OR_GREATER define in .targets
Sergio0694 Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build/Community.Toolkit.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<PropertyGroup>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(RepositoryDirectory)toolkit.snk</AssemblyOriginatorKeyFile>
<AssemblySignPublicKey>002400000480000094000000060200000024000052534131000400000100010041753AF735AE6140C9508567666C51C6AB929806ADB0D210694B30AB142A060237BC741F9682E7D8D4310364B4BBA4EE89CC9D3D5CE7E5583587E8EA44DCA09977996582875E71FB54FA7B170798D853D5D8010B07219633BDB761D01AC924DA44576D6180CDCEAE537973982BB461C541541D58417A3794E34F45E6F2D129E2</AssemblySignPublicKey>
</PropertyGroup>

<PropertyGroup>
Expand Down
6 changes: 0 additions & 6 deletions build/Community.Toolkit.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,4 @@
<None Include="$(RepositoryDirectory)ThirdPartyNotices.txt" Pack="true" PackagePath="\" Visible="False" />
</ItemGroup>

<!-- Configure trimming for core projects on .NET 6 and above -->
<PropertyGroup Condition="'$(IsCoreProject)' == 'true' AND ('$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0')">
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
<IsTrimmable>true</IsTrimmable>
</PropertyGroup>

</Project>
28 changes: 0 additions & 28 deletions src/CommunityToolkit.Common/Attributes/NotNullIfNotNullAttribute.cs
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/CommunityToolkit.Common/Attributes/NotNullWhenAttribute.cs
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions src/CommunityToolkit.Common/Attributes/SkipLocalsInitAttribute.cs
View file
Open in desktop

This file was deleted.

10 changes: 7 additions & 3 deletions src/CommunityToolkit.Common/CommunityToolkit.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@
<PackageTags>Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;Extensions;Helpers</PackageTags>
</PropertyGroup>

<!-- .NET Standard 2.1 and .NET 6 already have [NotNullIfNotNull] and [NotNullWhen] -->
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
<!-- Necessary polyfills -->
<PropertyGroup>
<PolySharpIncludeGeneratedTypes>
System.Diagnostics.CodeAnalysis.NotNullIfNotNullAttribute;
System.Diagnostics.CodeAnalysis.NotNullWhenAttribute;
System.Runtime.CompilerServices.SkipLocalsInitAttribute;
</PolySharpIncludeGeneratedTypes>
</PropertyGroup>

</Project>
8 changes: 0 additions & 8 deletions src/CommunityToolkit.Common/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions src/CommunityToolkit.Diagnostics/Attributes/CallerArgumentExpressionAttribute.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions src/CommunityToolkit.Diagnostics/Attributes/DoesNotReturnAttribute.cs
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions src/CommunityToolkit.Diagnostics/Attributes/DoesNotReturnIfAttribute.cs
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions src/CommunityToolkit.Diagnostics/Attributes/NotNullAttribute.cs
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions src/CommunityToolkit.Diagnostics/Attributes/SkipLocalsInitAttribute.cs
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions src/CommunityToolkit.Diagnostics/Attributes/StackTraceHiddenAttribute.cs
View file
Open in desktop

This file was deleted.

29 changes: 15 additions & 14 deletions src/CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,34 @@
</PropertyGroup>

<Choose>
<When Condition="'$(TargetFramework)' == 'netstandard2.0'">

<!-- .NET Standard 2.0 doesn't have the Span<T> type -->
<!-- .NET Standard 2.0 doesn't have the Span<T> type -->
<When Condition="'$(TargetFramework)' == 'netstandard2.0'">
<ItemGroup>
<PackageReference Include="System.Memory" Version="4.5.5" />
</ItemGroup>
</When>

<!-- .NET Standard 2.1 doesn't have the Unsafe type -->
<When Condition="'$(TargetFramework)' == 'netstandard2.1'">
<PropertyGroup>
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
</PropertyGroup>

<!-- .NET Standard 2.1 doesn't have the Unsafe type -->
<ItemGroup>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
</ItemGroup>
</When>

<!-- Enable trimming support on .NET 6 -->
<When Condition="'$(TargetFramework)' == 'net6.0'">
<PropertyGroup>
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
</PropertyGroup>
</When>
</Choose>

<!-- Necessary polyfills -->
<PropertyGroup>
<PolySharpIncludeGeneratedTypes>
System.Diagnostics.CodeAnalysis.DoesNotReturnAttribute;
System.Diagnostics.CodeAnalysis.DoesNotReturnIfAttribute;
System.Diagnostics.CodeAnalysis.NotNullAttribute;
System.Diagnostics.StackTraceHiddenAttribute;
System.Runtime.CompilerServices.CallerArgumentExpressionAttribute;
System.Runtime.CompilerServices.SkipLocalsInitAttribute;
</PolySharpIncludeGeneratedTypes>
</PropertyGroup>

<ItemGroup>
<None Update="Generated\Guard.Comparable.Numeric.tt">
<Generator>TextTemplatingFileGenerator</Generator>
Expand Down
8 changes: 0 additions & 8 deletions src/CommunityToolkit.Diagnostics/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions src/CommunityToolkit.HighPerformance/Attributes/NotNullAttribute.cs
View file
Open in desktop

This file was deleted.

Loading