Skip to content

Commit d86dca8

Browse files
committed
Rename solution, readme and icon files
- Rename `build` folder to `eng`: - This is a standard build infra directory used in official dotnet projects. - Rename NuGet Icon to `Icon.png`: - This is no longer used as a public reference point for NuGet icon URL. - Also, Icon URL is deprecated. Hence, it's safe to change. - Normalize casing for `ReadMe.md`: - To match the file already in Windows toolkit repo. - Rename solution file to `CommunityToolkit.sln`: - The `dotnet` seems implied and also doesn't stand-out in the file list because of the lower casing and `d` char. - Spaces are a main issue when doing automation (_like using `*.sln` in build scripts and in URLs it adds `%20`_). - Move `toolkit.snk` file to `eng` sub-directory. - Remove un-needed and deleted files from solution. - Update Git Ignore entries to latest from upstream. - Indent text in `ThirdPartyNotices.txt` with spaces instead.
1 parent 40f7413 commit d86dca8

13 files changed

+25
-26
lines changed

.gitignore

+11-7
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,21 @@
2828
# Visual Studio 15+ auto generated files
2929
Generated\ Files/
3030

31+
# Backup folder for Package Reference Convert tool in Visual Studio 15+
32+
MigrationBackup/
33+
34+
# Live Unit Testing for Visual Studio
35+
.lutignore
36+
*.lutconfig
37+
3138
# Local History for Visual Studio
3239
.localhistory/
3340

3441
# Visual Studio History (VSHistory) files
3542
.vshistory/
3643

37-
# Backup folder for Package Reference Convert tool in Visual Studio 2017
38-
MigrationBackup/
44+
# Local History for Visual Studio Code
45+
.history/
3946

4047
# VS Code files for those working on multiple tools
4148
.vscode/*
@@ -45,9 +52,6 @@ MigrationBackup/
4552
!.vscode/extensions.json
4653
*.code-workspace
4754

48-
# Local History for Visual Studio Code
49-
.history/
50-
5155
# MSTest test Results
5256
[Tt]est[Rr]esult*/
5357
[Bb]uild[Ll]og.*
@@ -95,7 +99,7 @@ StyleCopReport.xml
9599
*.tlog
96100
*.vspscc
97101
*.vssscc
98-
.builds
102+
*.builds
99103
*.pidb
100104
*.svclog
101105
*.scc
@@ -177,7 +181,7 @@ _pkginfo.txt
177181

178182
# Others
179183
ClientBin/
180-
~$*
184+
~*
181185
*~
182186
*~.*
183187
*.dbmdl

dotnet Community Toolkit.sln renamed to CommunityToolkit.sln

+5-9
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1515
azure-pipelines.yml = azure-pipelines.yml
1616
Directory.Build.props = Directory.Build.props
1717
Directory.Build.targets = Directory.Build.targets
18-
toolkit.snk = toolkit.snk
1918
version.json = version.json
2019
EndProjectSection
2120
EndProject
@@ -30,7 +29,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{88C6FFBE-3
3029
CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
3130
Contributing.md = Contributing.md
3231
License.md = License.md
33-
README.md = README.md
32+
ReadMe.md = ReadMe.md
3433
ThirdPartyNotices.txt = ThirdPartyNotices.txt
3534
EndProjectSection
3635
EndProject
@@ -44,13 +43,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Common.Uni
4443
EndProject
4544
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{CD16E790-7B7B-411E-9CE7-768E759CC22D}"
4645
ProjectSection(SolutionItems) = preProject
47-
build\Community.Toolkit.Common.props = build\Community.Toolkit.Common.props
48-
build\Community.Toolkit.Common.targets = build\Community.Toolkit.Common.targets
49-
build\header.txt = build\header.txt
50-
build\nuget.png = build\nuget.png
51-
build\Sign-Package.ps1 = build\Sign-Package.ps1
52-
build\SignClientSettings.json = build\SignClientSettings.json
53-
build\Update-Headers.ps1 = build\Update-Headers.ps1
46+
eng\Toolkit.Common.props = eng\Toolkit.Common.props
47+
eng\Toolkit.Common.targets = eng\Toolkit.Common.targets
48+
eng\Sign-Package.ps1 = eng\Sign-Package.ps1
49+
eng\SignClientSettings.json = eng\SignClientSettings.json
5450
EndProjectSection
5551
EndProject
5652
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Configuration", "Configuration", "{6640D447-C28D-4DBB-91F4-3ADCE0CA64AD}"

Directory.Build.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
<PropertyGroup>
44
<RepositoryDirectory>$(MSBuildThisFileDirectory)</RepositoryDirectory>
5-
<BuildToolsDirectory>$(RepositoryDirectory)build\</BuildToolsDirectory>
5+
<BuildToolsDirectory>$(RepositoryDirectory)eng\</BuildToolsDirectory>
66
</PropertyGroup>
77

8-
<Import Project="$(BuildToolsDirectory)Community.Toolkit.Common.props" />
8+
<Import Project="$(BuildToolsDirectory)Toolkit.Common.props" />
99

1010
<Choose>
1111
<When Condition="$(IsCoreProject)">

Directory.Build.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22

3-
<Import Project="$(BuildToolsDirectory)Community.Toolkit.Common.targets" />
3+
<Import Project="$(BuildToolsDirectory)Toolkit.Common.targets" />
44

55
<Target Name="AddCommitHashToAssemblyAttributes" BeforeTargets="GetAssemblyAttributes">
66
<ItemGroup>

README.md renamed to ReadMe.md

File renamed without changes.

ThirdPartyNotices.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Do Not Translate or Localize
55

66
This project incorporates components from the projects listed below. The original copyright notices and the licenses under which the .NET Foundation received such components are set forth below. The .NET Foundation reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise.
77

8-
1. PedroLamas/DeferredEvents version 1.0.4 (https://github.com/PedroLamas/DeferredEvents), included in CommunityToolkit.Common/Deferred.
9-
2. MichaeIDietrich/UwpNotificationNetCoreTest commit 5c1a4a3 (https://github.com/MichaeIDietrich/UwpNotificationNetCoreTest), used in DesktopNotificationManagerCompat.cs to support .NET Core 3.0.
10-
3. lbugnion/mvvmlight commit 4cbf77c (https://github.com/lbugnion/mvvmlight), from which some APIs from the `CommunityToolkit.Mvvm` package take inspiration from.
8+
1. PedroLamas/DeferredEvents version 1.0.4 (https://github.com/PedroLamas/DeferredEvents), included in CommunityToolkit.Common/Deferred.
9+
2. MichaeIDietrich/UwpNotificationNetCoreTest commit 5c1a4a3 (https://github.com/MichaeIDietrich/UwpNotificationNetCoreTest), used in DesktopNotificationManagerCompat.cs to support .NET Core 3.0.
10+
3. lbugnion/mvvmlight commit 4cbf77c (https://github.com/lbugnion/mvvmlight), from which some APIs from the `CommunityToolkit.Mvvm` package take inspiration from.
1111
4. PrivateObject/PrivateType (https://github.com/microsoft/testfx/tree/664ac7c2ac9dbfbee9d2a0ef560cfd72449dfe34/src/TestFramework/Extension.Desktop), included in UnitTests.
1212
5. QuinnDamerell/UniversalMarkdown (https://github.com/QuinnDamerell/UniversalMarkdown) contributed by Quinn Damerell and Paul Bartrum for the MarkdownTextBlock control, relicensed to this .NET Foundation project under the MIT license upon contribution in https://github.com/CommunityToolkit/WindowsCommunityToolkit/pull/772.
1313
6. qmatteoq/DesktopBridgeHelpers commit e278153 (https://github.com/qmatteoq/DesktopBridgeHelpers), contributed by Matteo Pagani to identify if running with identity in DesktopNotificationManagerCompat.cs and DesktopBridgeHelpers.cs, relicensed to this .NET Foundation project under the MIT license upon contribution in https://github.com/CommunityToolkit/WindowsCommunityToolkit/pull/3457.

azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
displayName: Pack solution
7979

8080
# Sign packages
81-
- pwsh: build/Sign-Package.ps1
81+
- pwsh: eng/Sign-Package.ps1
8282
displayName: Authenticode sign packages
8383
env:
8484
SignClientUser: $(SignClientUser)
File renamed without changes.
File renamed without changes.
File renamed without changes.

build/Community.Toolkit.Common.props renamed to eng/Toolkit.Common.props

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<PackageProjectUrl>https://github.com/CommunityToolkit/dotnet</PackageProjectUrl>
1212
<PackageReleaseNotes>https://github.com/CommunityToolkit/dotnet/releases</PackageReleaseNotes>
1313
<PackageIcon>Icon.png</PackageIcon>
14-
<PackageIconUrl>https://raw.githubusercontent.com/CommunityToolkit/dotnet/main/build/nuget.png</PackageIconUrl>
1514
</PropertyGroup>
1615

1716
<PropertyGroup>
@@ -33,7 +32,7 @@
3332

3433
<PropertyGroup>
3534
<SignAssembly>true</SignAssembly>
36-
<AssemblyOriginatorKeyFile>$(RepositoryDirectory)toolkit.snk</AssemblyOriginatorKeyFile>
35+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)toolkit.snk</AssemblyOriginatorKeyFile>
3736
<AssemblySignPublicKey>002400000480000094000000060200000024000052534131000400000100010041753AF735AE6140C9508567666C51C6AB929806ADB0D210694B30AB142A060237BC741F9682E7D8D4310364B4BBA4EE89CC9D3D5CE7E5583587E8EA44DCA09977996582875E71FB54FA7B170798D853D5D8010B07219633BDB761D01AC924DA44576D6180CDCEAE537973982BB461C541541D58417A3794E34F45E6F2D129E2</AssemblySignPublicKey>
3837
</PropertyGroup>
3938

build/Community.Toolkit.Common.targets renamed to eng/Toolkit.Common.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup Condition="$(IsPackable)">
15-
<None Include="$(BuildToolsDirectory)nuget.png" Pack="true" PackagePath="\Icon.png" Visible="False" />
15+
<None Include="$(BuildToolsDirectory)Icon.png" Pack="true" PackagePath="\" Visible="False" />
1616
<None Include="$(RepositoryDirectory)License.md" Pack="true" PackagePath="\" Visible="False" />
1717
<None Include="$(RepositoryDirectory)ThirdPartyNotices.txt" Pack="true" PackagePath="\" Visible="False" />
1818
</ItemGroup>
File renamed without changes.

0 commit comments

Comments
 (0)