From 2eb009bc167446b4f6a83e5b6e719567d51d2a00 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sat, 31 Jul 2021 08:31:12 +0530 Subject: [PATCH] Refactor remaining Project and Build files - Simplify project files - Add and Update comments - Remove unnecessary lines - Rearrange and Order code blocks - Include build root folder - Rename NuGet Icon to `Icon.png` - Normalize casing for `ReadMe.md` - Rename solution file to `CommunityToolkit.sln` --- .gitignore | 1 - .../CommunityToolkit.Common.csproj | 7 ++- .../CommunityToolkit.Diagnostics.csproj | 19 +++++--- .../CommunityToolkit.HighPerformance.csproj | 33 +++++++++----- ...munityToolkit.Mvvm.SourceGenerators.csproj | 38 +++++----------- .../CommunityToolkit.Mvvm.csproj | 42 ++++++++++-------- .../CommunityToolkit.Mvvm.targets | 30 +++++++------ ...munity Toolkit.sln => CommunityToolkit.sln | 2 +- Directory.Build.props | 2 +- README.md => ReadMe.md | 0 build/Community.Toolkit.Common.props | 12 ++--- build/Community.Toolkit.Common.targets | 6 +-- build/{nuget.png => Icon.png} | Bin .../CommunityToolkit.Common.UnitTests.csproj | 10 ++--- ...munityToolkit.Diagnostics.UnitTests.csproj | 10 ++--- ...tyToolkit.HighPerformance.UnitTests.csproj | 2 +- ...leINotifyPropertyChanging.UnitTests.csproj | 12 ++--- ...munityToolkit.Mvvm.ExternalAssembly.csproj | 11 +++-- ...ityToolkit.Mvvm.Internals.UnitTests.csproj | 10 ++--- ...SourceGeneratorAttributes.UnitTests.csproj | 12 ++--- ...kit.Mvvm.SourceGenerators.UnitTests.csproj | 14 +++--- .../CommunityToolkit.Mvvm.UnitTests.csproj | 15 ++++--- 22 files changed, 151 insertions(+), 137 deletions(-) rename dotnet Community Toolkit.sln => CommunityToolkit.sln (99%) rename README.md => ReadMe.md (100%) rename build/{nuget.png => Icon.png} (100%) diff --git a/.gitignore b/.gitignore index e1269ff7f..c7eb234e3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ [Rr]eleases/ x64/ x86/ -build/ bld/ [Bb]in/ [Oo]bj/ diff --git a/CommunityToolkit.Common/CommunityToolkit.Common.csproj b/CommunityToolkit.Common/CommunityToolkit.Common.csproj index cb1d362d2..6c6dad2c1 100644 --- a/CommunityToolkit.Common/CommunityToolkit.Common.csproj +++ b/CommunityToolkit.Common/CommunityToolkit.Common.csproj @@ -14,8 +14,11 @@ Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;Extensions;Helpers - + NETSTANDARD2_1_OR_GREATER true diff --git a/CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj b/CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj index 839617cfb..a4de7c592 100644 --- a/CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj +++ b/CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj @@ -24,6 +24,8 @@ + + NETSTANDARD2_1_OR_GREATER @@ -34,7 +36,10 @@ - + NETSTANDARD2_1_OR_GREATER @@ -44,6 +49,12 @@ + + + + + + TextTemplatingFileGenerator @@ -63,11 +74,7 @@ - - - - - + True diff --git a/CommunityToolkit.HighPerformance/CommunityToolkit.HighPerformance.csproj b/CommunityToolkit.HighPerformance/CommunityToolkit.HighPerformance.csproj index d1cdb3f3b..64a7ea567 100644 --- a/CommunityToolkit.HighPerformance/CommunityToolkit.HighPerformance.csproj +++ b/CommunityToolkit.HighPerformance/CommunityToolkit.HighPerformance.csproj @@ -21,7 +21,7 @@ - Box<T>: a type mapping boxed value types and exposing some utility and high performance methods. - Ref<T>: a stack-only struct that can store a reference to a value of a specified type. - NullableRef<T>: a stack-only struct similar to Ref<T>, which also supports nullable references. - + Parallel;Performance;Unsafe;Span;Memory;String;StringPool;Array;Stream;Buffer;Extensions;Helpers @@ -39,33 +39,42 @@ + + + NETSTANDARD2_1_OR_GREATER + + - + - + NETSTANDARD2_1_OR_GREATER - true - true - - - - NETSTANDARD2_1_OR_GREATER - - + + + + + + NETSTANDARD2_1_OR_GREATER + true + true + + \ No newline at end of file diff --git a/CommunityToolkit.Mvvm.SourceGenerators/CommunityToolkit.Mvvm.SourceGenerators.csproj b/CommunityToolkit.Mvvm.SourceGenerators/CommunityToolkit.Mvvm.SourceGenerators.csproj index be288e6be..d42888765 100644 --- a/CommunityToolkit.Mvvm.SourceGenerators/CommunityToolkit.Mvvm.SourceGenerators.csproj +++ b/CommunityToolkit.Mvvm.SourceGenerators/CommunityToolkit.Mvvm.SourceGenerators.csproj @@ -1,43 +1,29 @@ - netstandard2.0 false + netstandard2.0 + - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + + PreserveNewest + - + + - - + - + \ No newline at end of file diff --git a/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj b/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj index 5af23ab85..205d703d1 100644 --- a/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj +++ b/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.csproj @@ -20,6 +20,21 @@ MVVM;Toolkit;MVVMToolkit;INotifyPropertyChanged;Observable;IOC;DI;Dependency Injection;Object Messaging;Extensions;Helpers + + + true + + false + + + + + + + + + + @@ -34,32 +49,21 @@ - - - true - - - false - - - + + - - - - - - - - + Pack="true" Visible="false" /> \ No newline at end of file diff --git a/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.targets b/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.targets index 7692c2385..94d30bb54 100644 --- a/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.targets +++ b/CommunityToolkit.Mvvm/CommunityToolkit.Mvvm.targets @@ -13,20 +13,20 @@ AfterTargets="ResolvePackageDependenciesForBuild;ResolveNuGetPackageAssets" DependsOnTargets="_MVVMToolkitGatherAnalyzers"> - - + + - @(CurrentCompilerAssemblyIdentity->'%(Version)') - - + true @@ -35,12 +35,14 @@ - - + + - + - + \ No newline at end of file diff --git a/dotnet Community Toolkit.sln b/CommunityToolkit.sln similarity index 99% rename from dotnet Community Toolkit.sln rename to CommunityToolkit.sln index ddb31f9ae..c8b143b1d 100644 --- a/dotnet Community Toolkit.sln +++ b/CommunityToolkit.sln @@ -30,7 +30,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{88C6FFBE-3 CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md Contributing.md = Contributing.md License.md = License.md - README.md = README.md + ReadMe.md = ReadMe.md ThirdPartyNotices.txt = ThirdPartyNotices.txt EndProjectSection EndProject diff --git a/Directory.Build.props b/Directory.Build.props index ff94022ed..27f11fbc5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -36,7 +36,7 @@ true - $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + .pdb diff --git a/README.md b/ReadMe.md similarity index 100% rename from README.md rename to ReadMe.md diff --git a/build/Community.Toolkit.Common.props b/build/Community.Toolkit.Common.props index 58ee9a527..d6e9c7517 100644 --- a/build/Community.Toolkit.Common.props +++ b/build/Community.Toolkit.Common.props @@ -4,24 +4,24 @@ .NET Foundation Microsoft.Toolkit .NET Community Toolkit - dotnet;Community;Toolkit + .NET;Community;Toolkit;dotnet MIT true (c) .NET Foundation and Contributors. All rights reserved. https://github.com/CommunityToolkit/dotnet https://github.com/CommunityToolkit/dotnet/releases Icon.png - https://raw.githubusercontent.com/CommunityToolkit/dotnet/main/build/nuget.png - true + Strict + Enable 10.0 - enable + true - $(MSBuildProjectName.Contains('Test')) + $(MSBuildProjectName.EndsWith('Tests')) False True @@ -32,4 +32,4 @@ $(TF_BUILD) - + \ No newline at end of file diff --git a/build/Community.Toolkit.Common.targets b/build/Community.Toolkit.Common.targets index f34ab2ab5..eb3acca83 100644 --- a/build/Community.Toolkit.Common.targets +++ b/build/Community.Toolkit.Common.targets @@ -12,9 +12,9 @@ - - - + + + \ No newline at end of file diff --git a/build/nuget.png b/build/Icon.png similarity index 100% rename from build/nuget.png rename to build/Icon.png diff --git a/tests/CommunityToolkit.Common.UnitTests/CommunityToolkit.Common.UnitTests.csproj b/tests/CommunityToolkit.Common.UnitTests/CommunityToolkit.Common.UnitTests.csproj index f38ef3bd1..ebbd7c709 100644 --- a/tests/CommunityToolkit.Common.UnitTests/CommunityToolkit.Common.UnitTests.csproj +++ b/tests/CommunityToolkit.Common.UnitTests/CommunityToolkit.Common.UnitTests.csproj @@ -5,13 +5,13 @@ - - - + - + + + - + \ No newline at end of file diff --git a/tests/CommunityToolkit.Diagnostics.UnitTests/CommunityToolkit.Diagnostics.UnitTests.csproj b/tests/CommunityToolkit.Diagnostics.UnitTests/CommunityToolkit.Diagnostics.UnitTests.csproj index 1889e20e0..68ba7de2a 100644 --- a/tests/CommunityToolkit.Diagnostics.UnitTests/CommunityToolkit.Diagnostics.UnitTests.csproj +++ b/tests/CommunityToolkit.Diagnostics.UnitTests/CommunityToolkit.Diagnostics.UnitTests.csproj @@ -5,13 +5,13 @@ - - - + - + + + - + \ No newline at end of file diff --git a/tests/CommunityToolkit.HighPerformance.UnitTests/CommunityToolkit.HighPerformance.UnitTests.csproj b/tests/CommunityToolkit.HighPerformance.UnitTests/CommunityToolkit.HighPerformance.UnitTests.csproj index e09447c38..ea20897b4 100644 --- a/tests/CommunityToolkit.HighPerformance.UnitTests/CommunityToolkit.HighPerformance.UnitTests.csproj +++ b/tests/CommunityToolkit.HighPerformance.UnitTests/CommunityToolkit.HighPerformance.UnitTests.csproj @@ -1,8 +1,8 @@ - net472;netcoreapp3.1;net6.0 true + net472;netcoreapp3.1;net6.0 diff --git a/tests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests.csproj index bc0d1eae6..549cf8a62 100644 --- a/tests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests.csproj +++ b/tests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests/CommunityToolkit.Mvvm.DisableINotifyPropertyChanging.UnitTests.csproj @@ -5,14 +5,14 @@ - - - + + - - + + + - + \ No newline at end of file diff --git a/tests/CommunityToolkit.Mvvm.ExternalAssembly/CommunityToolkit.Mvvm.ExternalAssembly.csproj b/tests/CommunityToolkit.Mvvm.ExternalAssembly/CommunityToolkit.Mvvm.ExternalAssembly.csproj index a1528a893..9a646cd63 100644 --- a/tests/CommunityToolkit.Mvvm.ExternalAssembly/CommunityToolkit.Mvvm.ExternalAssembly.csproj +++ b/tests/CommunityToolkit.Mvvm.ExternalAssembly/CommunityToolkit.Mvvm.ExternalAssembly.csproj @@ -4,8 +4,10 @@ netstandard2.0 - + false false @@ -14,7 +16,8 @@ - + - + \ No newline at end of file diff --git a/tests/CommunityToolkit.Mvvm.Internals.UnitTests/CommunityToolkit.Mvvm.Internals.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.Internals.UnitTests/CommunityToolkit.Mvvm.Internals.UnitTests.csproj index 4849bc656..358506227 100644 --- a/tests/CommunityToolkit.Mvvm.Internals.UnitTests/CommunityToolkit.Mvvm.Internals.UnitTests.csproj +++ b/tests/CommunityToolkit.Mvvm.Internals.UnitTests/CommunityToolkit.Mvvm.Internals.UnitTests.csproj @@ -5,13 +5,13 @@ - - - + - + + + - + \ No newline at end of file diff --git a/tests/CommunityToolkit.Mvvm.KeepSourceGeneratorAttributes.UnitTests/CommunityToolkit.Mvvm.KeepSourceGeneratorAttributes.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.KeepSourceGeneratorAttributes.UnitTests/CommunityToolkit.Mvvm.KeepSourceGeneratorAttributes.UnitTests.csproj index c467526af..cc37d22b5 100644 --- a/tests/CommunityToolkit.Mvvm.KeepSourceGeneratorAttributes.UnitTests/CommunityToolkit.Mvvm.KeepSourceGeneratorAttributes.UnitTests.csproj +++ b/tests/CommunityToolkit.Mvvm.KeepSourceGeneratorAttributes.UnitTests/CommunityToolkit.Mvvm.KeepSourceGeneratorAttributes.UnitTests.csproj @@ -2,17 +2,17 @@ net472;netcoreapp3.1;net6.0 - $(DefineConstants);MVVMTOOLKIT_KEEP_SOURCE_GENERATOR_ATTRIBUTES + MVVMTOOLKIT_KEEP_SOURCE_GENERATOR_ATTRIBUTES - - - + - + + + - + \ No newline at end of file diff --git a/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests.csproj index ae3978399..4b4b4c259 100644 --- a/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests.csproj +++ b/tests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests/CommunityToolkit.Mvvm.SourceGenerators.UnitTests.csproj @@ -5,15 +5,15 @@ - - - - + + - - + + + + - + \ No newline at end of file diff --git a/tests/CommunityToolkit.Mvvm.UnitTests/CommunityToolkit.Mvvm.UnitTests.csproj b/tests/CommunityToolkit.Mvvm.UnitTests/CommunityToolkit.Mvvm.UnitTests.csproj index 6e494cb70..38788553e 100644 --- a/tests/CommunityToolkit.Mvvm.UnitTests/CommunityToolkit.Mvvm.UnitTests.csproj +++ b/tests/CommunityToolkit.Mvvm.UnitTests/CommunityToolkit.Mvvm.UnitTests.csproj @@ -5,15 +5,16 @@ - - - + + + - - - + + + - + \ No newline at end of file