Skip to content

Commit 456db4d

Browse files
committed
Refactor remaining Project and Build files
- Simplify project files - Add and Update comments - Remove unnecessary lines - Rearrange and Order code blocks - Update Git Ignore to latest - Rename NuGet Icon to `Icon.png` - Normalize casing for `ReadMe.md` - Rename solution file to `CommunityToolkit.sln`
1 parent 16e21b6 commit 456db4d

File tree

21 files changed

+255
-215
lines changed

21 files changed

+255
-215
lines changed

.gitignore

+114-85
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
## files generated by popular Visual Studio add-ons.
33

44
# User-specific files
5+
*.rsuser
56
*.suo
67
*.user
78
*.userosscache
89
*.sln.docstates
9-
*.filters
10-
11-
# User-specific files (MonoDevelop/Xamarin Studio)
12-
*.userprefs
1310

1411
# Build results
1512
[Dd]ebug/
@@ -18,39 +15,63 @@
1815
[Rr]eleases/
1916
x64/
2017
x86/
21-
build/
18+
[Ww][Ii][Nn]32/
19+
[Aa][Rr][Mm]/
20+
[Aa][Rr][Mm]64/
2221
bld/
2322
[Bb]in/
2423
[Oo]bj/
24+
[Ee]xt/
25+
[Ll]og/
26+
[Ll]ogs/
2527

26-
# Visual Studio 2015 cache/options directory
28+
# Visual Studio 14+ cache/options directory
2729
.vs/
30+
# Uncomment if you have tasks that create the project's static files in wwwroot
31+
#wwwroot/
32+
33+
# Visual Studio 15+ auto generated files
34+
Generated\ Files/
2835

2936
# MSTest test Results
3037
[Tt]est[Rr]esult*/
3138
[Bb]uild[Ll]og.*
3239

33-
# NUNIT
40+
# NUnit
3441
*.VisualState.xml
3542
TestResult.xml
43+
nunit-*.xml
3644

3745
# Build Results of an ATL Project
3846
[Dd]ebugPS/
3947
[Rr]eleasePS/
4048
dlldata.c
4149

42-
# DNX
50+
# Benchmark Results
51+
BenchmarkDotNet.Artifacts/
52+
53+
# .NET Core
4354
project.lock.json
55+
project.fragment.lock.json
4456
artifacts/
4557

58+
# ASP.NET Scaffolding
59+
ScaffoldingReadMe.txt
60+
61+
# StyleCop
62+
StyleCopReport.xml
63+
64+
# Files built by Visual Studio
4665
*_i.c
4766
*_p.c
48-
*_i.h
67+
*_h.h
4968
*.ilk
5069
*.meta
5170
*.obj
71+
*.iobj
5272
*.pch
5373
*.pdb
74+
*.ipdb
5475
*.pgc
5576
*.pgd
5677
*.rsp
@@ -60,7 +81,9 @@ artifacts/
6081
*.tlh
6182
*.tmp
6283
*.tmp_proj
84+
*_wpftmp.csproj
6385
*.log
86+
*.tlog
6487
*.vspscc
6588
*.vssscc
6689
.builds
@@ -75,17 +98,21 @@ _Chutzpah*
7598
ipch/
7699
*.aps
77100
*.ncb
101+
*.opendb
78102
*.opensdf
79103
*.sdf
80104
*.cachefile
105+
*.VC.db
106+
*.VC.VC.opendb
81107

82108
# Visual Studio profiler
83109
*.psess
84110
*.vsp
85111
*.vspx
112+
*.sap
86113

87-
# TFS 2012 Local Workspace
88-
$tf/
114+
# Visual Studio Trace Files
115+
*.e2e
89116

90117
# Guidance Automation Toolkit
91118
*.gpState
@@ -95,84 +122,82 @@ _ReSharper*/
95122
*.[Rr]e[Ss]harper
96123
*.DotSettings.user
97124

98-
# JustCode is a .NET coding add-in
99-
.JustCode
100-
101125
# TeamCity is a build add-in
102126
_TeamCity*
103127

104128
# DotCover is a Code Coverage Tool
105129
*.dotCover
106130

107-
# NCrunch
108-
_NCrunch_*
109-
.*crunch*.local.xml
131+
# AxoCover is a Code Coverage Tool
132+
.axoCover/*
133+
!.axoCover/settings.json
110134

111-
# MightyMoose
112-
*.mm.*
113-
AutoTest.Net/
135+
# Coverlet is a free, cross platform Code Coverage Tool
136+
coverage*.json
137+
coverage*.xml
138+
coverage*.info
114139

115-
# Web workbench (sass)
116-
.sass-cache/
140+
# Visual Studio code coverage results
141+
*.coverage
142+
*.coveragexml
117143

118144
# Installshield output folder
119145
[Ee]xpress/
120146

121-
# DocProject is a documentation generator add-in
122-
DocProject/buildhelp/
123-
DocProject/Help/*.HxT
124-
DocProject/Help/*.HxC
125-
DocProject/Help/*.hhc
126-
DocProject/Help/*.hhk
127-
DocProject/Help/*.hhp
128-
DocProject/Help/Html2
129-
DocProject/Help/html
130-
131147
# Click-Once directory
132148
publish/
133149

134150
# Publish Web Output
135151
*.[Pp]ublish.xml
136152
*.azurePubxml
137-
## TODO: Comment the next line if you want to checkin your
138-
## web deploy settings but do note that will include unencrypted
139-
## passwords
140-
#*.pubxml
141-
153+
# Note: Comment the next line if you want to checkin your web deploy settings,
154+
# but database connection strings (with potential passwords) will be unencrypted
155+
*.pubxml
142156
*.publishproj
143157

158+
# Microsoft Azure Web App publish settings. Comment the next line if you want to
159+
# checkin your Azure Web App publish settings, but sensitive information contained
160+
# in these scripts will be unencrypted
161+
PublishScripts/
162+
144163
# NuGet Packages
145164
*.nupkg
165+
# NuGet Symbol Packages
166+
*.snupkg
146167
# The packages folder can be ignored because of Package Restore
147-
**/packages/*
168+
**/[Pp]ackages/*
148169
# except build/, which is used as an MSBuild target.
149-
!**/packages/build/
170+
!**/[Pp]ackages/build/
150171
# Uncomment if necessary however generally it will be regenerated when needed
151-
#!**/packages/repositories.config
152-
153-
# Windows Azure Build Output
154-
csx/
155-
*.build.csdef
172+
#!**/[Pp]ackages/repositories.config
173+
# NuGet v3's project.json files produces more ignorable files
174+
*.nuget.props
175+
*.nuget.targets
156176

157-
# Windows Store app package directory
177+
# Windows Store app package directories and files
158178
AppPackages/
179+
BundleArtifacts/
180+
Package.StoreAssociation.xml
181+
_pkginfo.txt
182+
*.appx
183+
*.appxbundle
184+
*.appxupload
159185

160186
# Visual Studio cache files
161187
# files ending in .cache can be ignored
162188
*.[Cc]ache
163189
# but keep track of directories ending in .cache
164-
!*.[Cc]ache/
190+
!?*.[Cc]ache/
165191

166192
# Others
167193
ClientBin/
168-
[Ss]tyle[Cc]op.*
169194
~$*
170195
*~
171196
*.dbmdl
172197
*.dbproj.schemaview
198+
*.jfm
173199
*.pfx
174200
*.publishsettings
175-
node_modules/
176201
orleans.codegen.cs
177202

178203
# RIA/Silverlight projects
@@ -185,50 +210,54 @@ _UpgradeReport_Files/
185210
Backup*/
186211
UpgradeLog*.XML
187212
UpgradeLog*.htm
188-
189-
# SQL Server files
190-
*.mdf
191-
*.ldf
192-
193-
# Business Intelligence projects
194-
*.rdl.data
195-
*.bim.layout
196-
*.bim_*.settings
213+
ServiceFabricBackup/
214+
*.rptproj.bak
197215

198216
# Microsoft Fakes
199217
FakesAssemblies/
200218

201-
# Node.js Tools for Visual Studio
202-
.ntvs_analysis.dat
219+
# CodeRush personal settings
220+
.cr/personal
203221

204-
# Visual Studio 6 build log
205-
*.plg
222+
# MSBuild Binary and Structured Log
223+
*.binlog
206224

207-
# Visual Studio 6 workspace options file
208-
*.opt
225+
# MFractors (Xamarin productivity tool) working folder
226+
.mfractor/
209227

210-
# LightSwitch generated files
211-
GeneratedArtifacts/
212-
_Pvt_Extensions/
213-
ModelManifest.xml
214-
BundleArtifacts
215-
!/build
216-
/build/tools/GitVersion.CommandLine
217-
AppPackages
228+
# Local History for Visual Studio
229+
.localhistory/
218230

219-
# NuGet V3 artifacts
220-
*-packages.config
221-
*.nuget.props
222-
*.nuget.targets
223-
project.lock.json
224-
msbuild.binlog
225-
*.project.lock.json
226-
/build/tools/**
227-
!/build/tools/packages.config
231+
# Visual Studio History (VSHistory) files
232+
.vshistory/
228233

229-
# Generated file from .ttinclude
230-
**/Generated/TypeInfo.g.cs
234+
# Backup folder for Package Reference Convert tool in Visual Studio 2017
235+
MigrationBackup/
231236

232-
# TAEF Log output
233-
WexLogFileOutput
234-
*.wtl
237+
# VS Code files for those working on multiple tools
238+
.vscode/*
239+
!.vscode/settings.json
240+
!.vscode/tasks.json
241+
!.vscode/launch.json
242+
!.vscode/extensions.json
243+
*.code-workspace
244+
245+
# Local History for Visual Studio Code
246+
.history/
247+
248+
# Windows Installer files from build outputs
249+
*.cab
250+
*.msi
251+
*.msix
252+
*.msm
253+
*.msp
254+
255+
# JetBrains Rider
256+
*.sln.iml
257+
258+
# MSBuild response files
259+
!MSBuild.rsp
260+
!Directory.Build.rsp
261+
262+
# Generated file from .ttinclude
263+
**/Generated/*.g.cs

CommunityToolkit.Common/CommunityToolkit.Common.csproj

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
<PackageTags>Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;Extensions;Helpers</PackageTags>
1515
</PropertyGroup>
1616

17-
<!-- .NET Standard 2.1 and .NET 6 already have [NotNullIfNotNull] and [NotNullWhen].
18-
Additionally, also enable trimming support on .NET 6. -->
17+
<!--
18+
Use `NETSTANDARD2_1_OR_GREATER` define to include .NET Standard 2.1 and .NET 6 shared APIs.
19+
They already have `[NotNullIfNotNull]` and `[NotNullWhen]` attributes built-in.
20+
Additionally, enable assembly trimming on .NET 6+
21+
-->
1922
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
2023
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
2124
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>

CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj

+11-9
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
</When>
2525

2626
<When Condition="'$(TargetFramework)' == 'netstandard2.1'">
27-
<PropertyGroup>
28-
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
29-
</PropertyGroup>
3027

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

37-
<!-- Enable trimming support on .NET 6 -->
34+
<!--
35+
Use `NETSTANDARD2_1_OR_GREATER` define to include .NET Standard 2.1 and .NET 6 shared APIs.
36+
Additionally, enable assembly trimming on .NET 6+
37+
-->
3838
<When Condition="'$(TargetFramework)' == 'net6.0'">
3939
<PropertyGroup>
4040
<DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
@@ -44,6 +44,12 @@
4444
</When>
4545
</Choose>
4646

47+
<!-- T4 service used by the Guard APIs -->
48+
<ItemGroup>
49+
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
50+
</ItemGroup>
51+
52+
<!-- Text Templates to generate sources -->
4753
<ItemGroup>
4854
<None Update="Generated\Guard.Comparable.Numeric.tt">
4955
<Generator>TextTemplatingFileGenerator</Generator>
@@ -63,11 +69,7 @@
6369
</None>
6470
</ItemGroup>
6571

66-
<!-- T4 service used by the Guard APIs -->
67-
<ItemGroup>
68-
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
69-
</ItemGroup>
70-
72+
<!-- Sources generated based on the above text templates -->
7173
<ItemGroup>
7274
<Compile Update="Generated\Guard.Comparable.Numeric.g.cs">
7375
<DesignTime>True</DesignTime>

0 commit comments

Comments
 (0)