diff --git a/.gitignore b/.gitignore
index 45cc92d1..84ce9d61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,14 +28,21 @@
# Visual Studio 15+ auto generated files
Generated\ Files/
+# Backup folder for Package Reference Convert tool in Visual Studio 15+
+MigrationBackup/
+
+# Live Unit Testing for Visual Studio
+.lutignore
+*.lutconfig
+
# Local History for Visual Studio
.localhistory/
# Visual Studio History (VSHistory) files
.vshistory/
-# Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
+# Local History for Visual Studio Code
+.history/
# VS Code files for those working on multiple tools
.vscode/*
@@ -45,9 +52,6 @@ MigrationBackup/
!.vscode/extensions.json
*.code-workspace
-# Local History for Visual Studio Code
-.history/
-
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
@@ -95,7 +99,7 @@ StyleCopReport.xml
*.tlog
*.vspscc
*.vssscc
-.builds
+*.builds
*.pidb
*.svclog
*.scc
@@ -177,7 +181,7 @@ _pkginfo.txt
# Others
ClientBin/
-~$*
+~*
*~
*~.*
*.dbmdl
diff --git a/dotnet Community Toolkit.sln b/CommunityToolkit.sln
similarity index 98%
rename from dotnet Community Toolkit.sln
rename to CommunityToolkit.sln
index 8e1b6174..c327e93e 100644
--- a/dotnet Community Toolkit.sln
+++ b/CommunityToolkit.sln
@@ -15,7 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
azure-pipelines.yml = azure-pipelines.yml
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
- toolkit.snk = toolkit.snk
version.json = version.json
EndProjectSection
EndProject
@@ -30,7 +29,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
@@ -44,13 +43,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Common.Uni
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{CD16E790-7B7B-411E-9CE7-768E759CC22D}"
ProjectSection(SolutionItems) = preProject
- build\Community.Toolkit.Common.props = build\Community.Toolkit.Common.props
- build\Community.Toolkit.Common.targets = build\Community.Toolkit.Common.targets
- build\header.txt = build\header.txt
- build\nuget.png = build\nuget.png
- build\Sign-Package.ps1 = build\Sign-Package.ps1
- build\SignClientSettings.json = build\SignClientSettings.json
- build\Update-Headers.ps1 = build\Update-Headers.ps1
+ eng\Toolkit.Common.props = eng\Toolkit.Common.props
+ eng\Toolkit.Common.targets = eng\Toolkit.Common.targets
+ eng\Sign-Package.ps1 = eng\Sign-Package.ps1
+ eng\SignClientSettings.json = eng\SignClientSettings.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Configuration", "Configuration", "{6640D447-C28D-4DBB-91F4-3ADCE0CA64AD}"
diff --git a/Directory.Build.props b/Directory.Build.props
index 37e8c342..022a4a7a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,10 +2,10 @@
$(MSBuildThisFileDirectory)
- $(RepositoryDirectory)build\
+ $(RepositoryDirectory)eng\
-
+
diff --git a/Directory.Build.targets b/Directory.Build.targets
index c51d83ac..df33e0f2 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,6 +1,6 @@
-
+
diff --git a/README.md b/ReadMe.md
similarity index 100%
rename from README.md
rename to ReadMe.md
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index ea8b9da1..1010bb50 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -5,9 +5,9 @@ Do Not Translate or Localize
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.
-1. PedroLamas/DeferredEvents version 1.0.4 (https://github.com/PedroLamas/DeferredEvents), included in CommunityToolkit.Common/Deferred.
-2. MichaeIDietrich/UwpNotificationNetCoreTest commit 5c1a4a3 (https://github.com/MichaeIDietrich/UwpNotificationNetCoreTest), used in DesktopNotificationManagerCompat.cs to support .NET Core 3.0.
-3. lbugnion/mvvmlight commit 4cbf77c (https://github.com/lbugnion/mvvmlight), from which some APIs from the `CommunityToolkit.Mvvm` package take inspiration from.
+1. PedroLamas/DeferredEvents version 1.0.4 (https://github.com/PedroLamas/DeferredEvents), included in CommunityToolkit.Common/Deferred.
+2. MichaeIDietrich/UwpNotificationNetCoreTest commit 5c1a4a3 (https://github.com/MichaeIDietrich/UwpNotificationNetCoreTest), used in DesktopNotificationManagerCompat.cs to support .NET Core 3.0.
+3. lbugnion/mvvmlight commit 4cbf77c (https://github.com/lbugnion/mvvmlight), from which some APIs from the `CommunityToolkit.Mvvm` package take inspiration from.
4. PrivateObject/PrivateType (https://github.com/microsoft/testfx/tree/664ac7c2ac9dbfbee9d2a0ef560cfd72449dfe34/src/TestFramework/Extension.Desktop), included in UnitTests.
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.
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.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4738052b..28e2b003 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -78,7 +78,7 @@ jobs:
displayName: Pack solution
# Sign packages
- - pwsh: build/Sign-Package.ps1
+ - pwsh: eng/Sign-Package.ps1
displayName: Authenticode sign packages
env:
SignClientUser: $(SignClientUser)
diff --git a/build/nuget.png b/eng/Icon.png
similarity index 100%
rename from build/nuget.png
rename to eng/Icon.png
diff --git a/build/Sign-Package.ps1 b/eng/Sign-Package.ps1
similarity index 100%
rename from build/Sign-Package.ps1
rename to eng/Sign-Package.ps1
diff --git a/build/SignClientSettings.json b/eng/SignClientSettings.json
similarity index 100%
rename from build/SignClientSettings.json
rename to eng/SignClientSettings.json
diff --git a/build/Community.Toolkit.Common.props b/eng/Toolkit.Common.props
similarity index 90%
rename from build/Community.Toolkit.Common.props
rename to eng/Toolkit.Common.props
index a43ae645..6456ab2d 100644
--- a/build/Community.Toolkit.Common.props
+++ b/eng/Toolkit.Common.props
@@ -11,7 +11,6 @@
https://github.com/CommunityToolkit/dotnet
https://github.com/CommunityToolkit/dotnet/releases
Icon.png
- https://raw.githubusercontent.com/CommunityToolkit/dotnet/main/build/nuget.png
@@ -33,7 +32,7 @@
true
- $(RepositoryDirectory)toolkit.snk
+ $(MSBuildThisFileDirectory)toolkit.snk
002400000480000094000000060200000024000052534131000400000100010041753AF735AE6140C9508567666C51C6AB929806ADB0D210694B30AB142A060237BC741F9682E7D8D4310364B4BBA4EE89CC9D3D5CE7E5583587E8EA44DCA09977996582875E71FB54FA7B170798D853D5D8010B07219633BDB761D01AC924DA44576D6180CDCEAE537973982BB461C541541D58417A3794E34F45E6F2D129E2
diff --git a/build/Community.Toolkit.Common.targets b/eng/Toolkit.Common.targets
similarity index 86%
rename from build/Community.Toolkit.Common.targets
rename to eng/Toolkit.Common.targets
index f34ab2ab..0de2ec95 100644
--- a/build/Community.Toolkit.Common.targets
+++ b/eng/Toolkit.Common.targets
@@ -12,7 +12,7 @@
-
+
diff --git a/toolkit.snk b/eng/toolkit.snk
similarity index 100%
rename from toolkit.snk
rename to eng/toolkit.snk