From 048cc1c4bc84e22b5e3e950d5e625699fa3c0c1f Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 16 Feb 2023 14:12:39 -0600 Subject: [PATCH 1/9] Moved component Sample and Test files up one directory --- .../ToolkitDocumentationRenderer.xaml.cs | 11 ----------- .../Renderers/ToolkitSampleRenderer.xaml.cs | 4 ++-- common/GenerateAllSolution.ps1 | 2 +- .../GenerateAllProjectReferences.ps1 | 2 +- common/ProjectHeads/App.Head.props | 16 ++++++++-------- .../Uwp/ProjectTemplate.Uwp.csproj | 2 +- .../Wasm/ProjectTemplate.Wasm.csproj | 2 +- .../WinAppSdk/ProjectTemplate.WinAppSdk.csproj | 2 +- common/ToolkitComponent.SampleProject.props | 2 +- .../CanvasLayout.Samples.csproj | 0 .../{CanvasLayout.Samples => }/CanvasLayout.md | 0 .../CanvasLayoutSample.xaml | 0 .../CanvasLayoutSample.xaml.cs | 0 .../Dependencies.props | 0 .../CanvasLayout.Tests.projitems | 0 .../CanvasLayout.Tests.shproj | 0 .../ExampleCanvasLayoutTestClass.cs | 0 .../ExampleCanvasLayoutTestPage.xaml | 0 .../ExampleCanvasLayoutTestPage.xaml.cs | 0 .../CanvasView.Samples.csproj | 0 .../{CanvasView.Samples => }/CanvasView.md | 0 .../CanvasViewDragSample.xaml | 0 .../CanvasViewDragSample.xaml.cs | 0 .../{CanvasView.Samples => }/Dependencies.props | 0 .../CanvasView.Tests.projitems | 0 .../CanvasView.Tests.shproj | 0 .../ExampleCanvasViewTestClass.cs | 0 .../ExampleCanvasViewTestPage.xaml | 0 .../ExampleCanvasViewTestPage.xaml.cs | 0 .../{RivePlayer.Samples => }/Dependencies.props | 0 .../RivePlayer.Samples.csproj | 2 +- .../{RivePlayer.Samples => }/RivePlayer.md | 0 .../RivePlayerCustomSample.xaml | 0 .../RivePlayerCustomSample.xaml.cs | 0 .../animated-login-screen.riv | Bin .../ExampleRivePlayerTestClass.cs | 0 .../ExampleRivePlayerTestPage.xaml | 0 .../ExampleRivePlayerTestPage.xaml.cs | 0 .../RivePlayer.Tests.projitems | 0 .../RivePlayer.Tests.shproj | 0 .../ClickableSettingsCardSample.xaml | 0 .../ClickableSettingsCardSample.xaml.cs | 0 .../Dependencies.props | 0 .../SettingsCard.md | 0 .../SettingsCardSample.xaml | 0 .../SettingsCardSample.xaml.cs | 0 .../SettingsControls.Samples.csproj | 0 .../SettingsExpander.md | 0 .../SettingsExpanderItemsSourceSample.xaml | 0 .../SettingsExpanderItemsSourceSample.xaml.cs | 0 .../SettingsExpanderSample.xaml | 0 .../SettingsExpanderSample.xaml.cs | 0 .../SettingsPageExample.md | 0 .../SettingsPageExample.xaml | 0 .../SettingsPageExample.xaml.cs | 0 .../ExampleSettingsControlsTestClass.cs | 0 .../ExampleSettingsControlsTestPage.xaml | 0 .../ExampleSettingsControlsTestPage.xaml.cs | 0 .../SettingsControls.Tests.projitems | 0 .../SettingsControls.Tests.shproj | 0 .../{SizerBase.Samples => }/ContentSizer.md | 0 .../ContentSizerLeftShelfPage.xaml | 0 .../ContentSizerLeftShelfPage.xaml.cs | 0 .../ContentSizerTopShelfPage.xaml | 0 .../ContentSizerTopShelfPage.xaml.cs | 0 .../{SizerBase.Samples => }/Dependencies.props | 0 .../{SizerBase.Samples => }/GridSplitter.md | 0 .../GridSplitterPage.xaml | 0 .../GridSplitterPage.xaml.cs | 0 .../{SizerBase.Samples => }/PropertySizer.md | 0 .../PropertySizerNavigationViewPage.xaml | 0 .../PropertySizerNavigationViewPage.xaml.cs | 0 .../SizerBase.Samples.csproj | 0 .../{SizerBase.Samples => }/SizerControls.md | 0 .../SizerCursorPage.xaml | 0 .../SizerCursorPage.xaml.cs | 0 .../ExampleSizerBaseTestClass.cs | 0 .../PropertySizerTestInitialBinding.xaml | 0 .../PropertySizerTestInitialBinding.xaml.cs | 0 .../SizerBase.Tests.projitems | 0 .../SizerBase.Tests.shproj | 0 .../Dependencies.props | 0 .../StackedNotificationsBehavior.Samples.csproj | 0 .../StackedNotificationsBehavior.md | 0 ...tackedNotificationsBehaviorCustomSample.xaml | 0 ...kedNotificationsBehaviorCustomSample.xaml.cs | 0 ...mpleStackedNotificationsBehaviorTestClass.cs | 0 ...StackedNotificationsBehavior.Tests.projitems | 0 .../StackedNotificationsBehavior.Tests.shproj | 0 89 files changed, 17 insertions(+), 28 deletions(-) rename labs/CanvasLayout/samples/{CanvasLayout.Samples => }/CanvasLayout.Samples.csproj (100%) rename labs/CanvasLayout/samples/{CanvasLayout.Samples => }/CanvasLayout.md (100%) rename labs/CanvasLayout/samples/{CanvasLayout.Samples => }/CanvasLayoutSample.xaml (100%) rename labs/CanvasLayout/samples/{CanvasLayout.Samples => }/CanvasLayoutSample.xaml.cs (100%) rename labs/CanvasLayout/samples/{CanvasLayout.Samples => }/Dependencies.props (100%) rename labs/CanvasLayout/tests/{CanvasLayout.Tests => }/CanvasLayout.Tests.projitems (100%) rename labs/CanvasLayout/tests/{CanvasLayout.Tests => }/CanvasLayout.Tests.shproj (100%) rename labs/CanvasLayout/tests/{CanvasLayout.Tests => }/ExampleCanvasLayoutTestClass.cs (100%) rename labs/CanvasLayout/tests/{CanvasLayout.Tests => }/ExampleCanvasLayoutTestPage.xaml (100%) rename labs/CanvasLayout/tests/{CanvasLayout.Tests => }/ExampleCanvasLayoutTestPage.xaml.cs (100%) rename labs/CanvasView/samples/{CanvasView.Samples => }/CanvasView.Samples.csproj (100%) rename labs/CanvasView/samples/{CanvasView.Samples => }/CanvasView.md (100%) rename labs/CanvasView/samples/{CanvasView.Samples => }/CanvasViewDragSample.xaml (100%) rename labs/CanvasView/samples/{CanvasView.Samples => }/CanvasViewDragSample.xaml.cs (100%) rename labs/CanvasView/samples/{CanvasView.Samples => }/Dependencies.props (100%) rename labs/CanvasView/tests/{CanvasView.Tests => }/CanvasView.Tests.projitems (100%) rename labs/CanvasView/tests/{CanvasView.Tests => }/CanvasView.Tests.shproj (100%) rename labs/CanvasView/tests/{CanvasView.Tests => }/ExampleCanvasViewTestClass.cs (100%) rename labs/CanvasView/tests/{CanvasView.Tests => }/ExampleCanvasViewTestPage.xaml (100%) rename labs/CanvasView/tests/{CanvasView.Tests => }/ExampleCanvasViewTestPage.xaml.cs (100%) rename labs/RivePlayer/samples/{RivePlayer.Samples => }/Dependencies.props (100%) rename labs/RivePlayer/samples/{RivePlayer.Samples => }/RivePlayer.Samples.csproj (81%) rename labs/RivePlayer/samples/{RivePlayer.Samples => }/RivePlayer.md (100%) rename labs/RivePlayer/samples/{RivePlayer.Samples => }/RivePlayerCustomSample.xaml (100%) rename labs/RivePlayer/samples/{RivePlayer.Samples => }/RivePlayerCustomSample.xaml.cs (100%) rename labs/RivePlayer/samples/{RivePlayer.Samples => }/animated-login-screen.riv (100%) rename labs/RivePlayer/tests/{RivePlayer.Tests => }/ExampleRivePlayerTestClass.cs (100%) rename labs/RivePlayer/tests/{RivePlayer.Tests => }/ExampleRivePlayerTestPage.xaml (100%) rename labs/RivePlayer/tests/{RivePlayer.Tests => }/ExampleRivePlayerTestPage.xaml.cs (100%) rename labs/RivePlayer/tests/{RivePlayer.Tests => }/RivePlayer.Tests.projitems (100%) rename labs/RivePlayer/tests/{RivePlayer.Tests => }/RivePlayer.Tests.shproj (100%) rename labs/SettingsControls/samples/{SettingsControls.Samples => }/ClickableSettingsCardSample.xaml (100%) rename labs/SettingsControls/samples/{SettingsControls.Samples => }/ClickableSettingsCardSample.xaml.cs (100%) rename labs/SettingsControls/samples/{SettingsControls.Samples => }/Dependencies.props (100%) rename labs/SettingsControls/samples/{SettingsControls.Samples => }/SettingsCard.md (100%) rename labs/SettingsControls/samples/{SettingsControls.Samples => }/SettingsCardSample.xaml (100%) rename labs/SettingsControls/samples/{SettingsControls.Samples => }/SettingsCardSample.xaml.cs (100%) rename labs/SettingsControls/samples/{SettingsControls.Samples => }/SettingsControls.Samples.csproj (100%) rename labs/SettingsControls/samples/{SettingsControls.Samples => }/SettingsExpander.md (100%) rename labs/SettingsControls/samples/{SettingsControls.Samples => }/SettingsExpanderItemsSourceSample.xaml (100%) rename labs/SettingsControls/samples/{SettingsControls.Samples => }/SettingsExpanderItemsSourceSample.xaml.cs (100%) rename labs/SettingsControls/samples/{SettingsControls.Samples => }/SettingsExpanderSample.xaml (100%) rename labs/SettingsControls/samples/{SettingsControls.Samples => }/SettingsExpanderSample.xaml.cs (100%) rename labs/SettingsControls/samples/{SettingsControls.Samples => }/SettingsPageExample.md (100%) rename labs/SettingsControls/samples/{SettingsControls.Samples => }/SettingsPageExample.xaml (100%) rename labs/SettingsControls/samples/{SettingsControls.Samples => }/SettingsPageExample.xaml.cs (100%) rename labs/SettingsControls/tests/{SettingsControls.Tests => }/ExampleSettingsControlsTestClass.cs (100%) rename labs/SettingsControls/tests/{SettingsControls.Tests => }/ExampleSettingsControlsTestPage.xaml (100%) rename labs/SettingsControls/tests/{SettingsControls.Tests => }/ExampleSettingsControlsTestPage.xaml.cs (100%) rename labs/SettingsControls/tests/{SettingsControls.Tests => }/SettingsControls.Tests.projitems (100%) rename labs/SettingsControls/tests/{SettingsControls.Tests => }/SettingsControls.Tests.shproj (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/ContentSizer.md (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/ContentSizerLeftShelfPage.xaml (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/ContentSizerLeftShelfPage.xaml.cs (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/ContentSizerTopShelfPage.xaml (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/ContentSizerTopShelfPage.xaml.cs (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/Dependencies.props (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/GridSplitter.md (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/GridSplitterPage.xaml (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/GridSplitterPage.xaml.cs (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/PropertySizer.md (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/PropertySizerNavigationViewPage.xaml (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/PropertySizerNavigationViewPage.xaml.cs (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/SizerBase.Samples.csproj (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/SizerControls.md (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/SizerCursorPage.xaml (100%) rename labs/SizerBase/samples/{SizerBase.Samples => }/SizerCursorPage.xaml.cs (100%) rename labs/SizerBase/tests/{SizerBase.Tests => }/ExampleSizerBaseTestClass.cs (100%) rename labs/SizerBase/tests/{SizerBase.Tests => }/PropertySizerTestInitialBinding.xaml (100%) rename labs/SizerBase/tests/{SizerBase.Tests => }/PropertySizerTestInitialBinding.xaml.cs (100%) rename labs/SizerBase/tests/{SizerBase.Tests => }/SizerBase.Tests.projitems (100%) rename labs/SizerBase/tests/{SizerBase.Tests => }/SizerBase.Tests.shproj (100%) rename labs/StackedNotificationsBehavior/samples/{StackedNotificationsBehavior.Samples => }/Dependencies.props (100%) rename labs/StackedNotificationsBehavior/samples/{StackedNotificationsBehavior.Samples => }/StackedNotificationsBehavior.Samples.csproj (100%) rename labs/StackedNotificationsBehavior/samples/{StackedNotificationsBehavior.Samples => }/StackedNotificationsBehavior.md (100%) rename labs/StackedNotificationsBehavior/samples/{StackedNotificationsBehavior.Samples => }/StackedNotificationsBehaviorCustomSample.xaml (100%) rename labs/StackedNotificationsBehavior/samples/{StackedNotificationsBehavior.Samples => }/StackedNotificationsBehaviorCustomSample.xaml.cs (100%) rename labs/StackedNotificationsBehavior/tests/{StackedNotificationsBehavior.Tests => }/ExampleStackedNotificationsBehaviorTestClass.cs (100%) rename labs/StackedNotificationsBehavior/tests/{StackedNotificationsBehavior.Tests => }/StackedNotificationsBehavior.Tests.projitems (100%) rename labs/StackedNotificationsBehavior/tests/{StackedNotificationsBehavior.Tests => }/StackedNotificationsBehavior.Tests.shproj (100%) diff --git a/common/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs b/common/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs index 564ecfde6..90ca12943 100644 --- a/common/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs +++ b/common/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs @@ -168,17 +168,6 @@ private static async Task GetDocumentationFileContents(ToolkitFrontMatte var path = metadata.FilePath; - if (isSingleExperimentHead || isProjectTemplateHead) - { - var experimentName = assemblyName.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)[0]; - - // Our assembly has 'ProjectTemplateExperiment.Samples', but our folder is 'ProjectTemplate.Samples' - experimentName = experimentName.Replace("Experiment", ""); - - path = path.Split(new[] { $"\\{experimentName}.Samples" }, StringSplitOptions.RemoveEmptyEntries)[1]; - path = $"{experimentName}.Samples{path}"; - } - var fileUri = new Uri($"ms-appx:///SourceAssets/{path}"); try diff --git a/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs b/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs index fb0dba894..8cbca3cfc 100644 --- a/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs +++ b/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs @@ -247,7 +247,7 @@ private static string GetRelativePathToFileWithoutExtension(Type type) if (folderPath.Length != 0) folderPath += "/"; - // Component assembly names are formatted as 'ProjectTemplateComponent.Samples' + // Component assembly names are formatted as 'ProjectTemplateExperiment.Samples' // but the content folder is formatted as 'ProjectTemplate.Samples' simpleAssemblyName = simpleAssemblyName.Replace("Experiment", ""); @@ -259,7 +259,7 @@ private static string GetRelativePathToFileWithoutExtension(Type type) if (isAllExperimentHead) { var sampleName = simpleAssemblyName.Replace(".Samples", ""); - return $"SourceAssets/{sampleName}/samples/{simpleAssemblyName}/{folderPath}{type.Name}"; + return $"SourceAssets/{sampleName}/samples/{folderPath}{type.Name}"; } throw new InvalidOperationException("Unable to determine if running in a single or all experiment solution."); diff --git a/common/GenerateAllSolution.ps1 b/common/GenerateAllSolution.ps1 index 86400334c..4b4639fb7 100644 --- a/common/GenerateAllSolution.ps1 +++ b/common/GenerateAllSolution.ps1 @@ -65,7 +65,7 @@ if ($IncludeHeads -ne 'uwp') # Individual projects [void]$projects.Add(".\labs\**\src\*.csproj") -[void]$projects.Add(".\labs\**\samples\*.Samples\*.Samples.csproj") +[void]$projects.Add(".\labs\**\samples\*.Samples.csproj") [void]$projects.Add(".\labs\**\tests\*.Tests\*.shproj") if ($UseDiagnostics.IsPresent) diff --git a/common/MultiTarget/GenerateAllProjectReferences.ps1 b/common/MultiTarget/GenerateAllProjectReferences.ps1 index 5bb8fad65..1e09d2120 100644 --- a/common/MultiTarget/GenerateAllProjectReferences.ps1 +++ b/common/MultiTarget/GenerateAllProjectReferences.ps1 @@ -21,7 +21,7 @@ foreach ($projectPath in Get-ChildItem -Directory -Depth 0 -Path "$PSScriptRoot/ $srcPath = Resolve-Path "$($projectPath.FullName)\src"; $srcProjectPath = Get-ChildItem -File "$srcPath\*.csproj"; - $samplePath = Resolve-Path "$($projectPath.FullName)\samples\$projectName.Samples"; + $samplePath = Resolve-Path "$($projectPath.FullName)\samples"; $sampleProjectPath = Get-ChildItem -File "$samplePath\*.csproj"; if ($srcProjectPath.Length -eq 0) { diff --git a/common/ProjectHeads/App.Head.props b/common/ProjectHeads/App.Head.props index d8d972434..9f2509042 100644 --- a/common/ProjectHeads/App.Head.props +++ b/common/ProjectHeads/App.Head.props @@ -36,34 +36,34 @@ - + SourceAssets/%(RecursiveDir)%(FileName)%(Extension) - + SourceAssets/%(RecursiveDir)%(FileName)%(Extension) - + SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat - + - - + + - + - + diff --git a/common/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj b/common/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj index ca62bef9d..1a8728bf5 100644 --- a/common/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj +++ b/common/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj @@ -39,7 +39,7 @@ - + diff --git a/common/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj b/common/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj index 529095a48..f36af4556 100644 --- a/common/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj +++ b/common/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj @@ -28,6 +28,6 @@ - + diff --git a/common/ProjectHeads/SingleComponent/WinAppSdk/ProjectTemplate.WinAppSdk.csproj b/common/ProjectHeads/SingleComponent/WinAppSdk/ProjectTemplate.WinAppSdk.csproj index e1102b3c8..236da4274 100644 --- a/common/ProjectHeads/SingleComponent/WinAppSdk/ProjectTemplate.WinAppSdk.csproj +++ b/common/ProjectHeads/SingleComponent/WinAppSdk/ProjectTemplate.WinAppSdk.csproj @@ -25,7 +25,7 @@ - + diff --git a/common/ToolkitComponent.SampleProject.props b/common/ToolkitComponent.SampleProject.props index 9e3f877c5..eb629dd53 100644 --- a/common/ToolkitComponent.SampleProject.props +++ b/common/ToolkitComponent.SampleProject.props @@ -28,7 +28,7 @@ - + diff --git a/labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayout.Samples.csproj b/labs/CanvasLayout/samples/CanvasLayout.Samples.csproj similarity index 100% rename from labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayout.Samples.csproj rename to labs/CanvasLayout/samples/CanvasLayout.Samples.csproj diff --git a/labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayout.md b/labs/CanvasLayout/samples/CanvasLayout.md similarity index 100% rename from labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayout.md rename to labs/CanvasLayout/samples/CanvasLayout.md diff --git a/labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayoutSample.xaml b/labs/CanvasLayout/samples/CanvasLayoutSample.xaml similarity index 100% rename from labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayoutSample.xaml rename to labs/CanvasLayout/samples/CanvasLayoutSample.xaml diff --git a/labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayoutSample.xaml.cs b/labs/CanvasLayout/samples/CanvasLayoutSample.xaml.cs similarity index 100% rename from labs/CanvasLayout/samples/CanvasLayout.Samples/CanvasLayoutSample.xaml.cs rename to labs/CanvasLayout/samples/CanvasLayoutSample.xaml.cs diff --git a/labs/CanvasLayout/samples/CanvasLayout.Samples/Dependencies.props b/labs/CanvasLayout/samples/Dependencies.props similarity index 100% rename from labs/CanvasLayout/samples/CanvasLayout.Samples/Dependencies.props rename to labs/CanvasLayout/samples/Dependencies.props diff --git a/labs/CanvasLayout/tests/CanvasLayout.Tests/CanvasLayout.Tests.projitems b/labs/CanvasLayout/tests/CanvasLayout.Tests.projitems similarity index 100% rename from labs/CanvasLayout/tests/CanvasLayout.Tests/CanvasLayout.Tests.projitems rename to labs/CanvasLayout/tests/CanvasLayout.Tests.projitems diff --git a/labs/CanvasLayout/tests/CanvasLayout.Tests/CanvasLayout.Tests.shproj b/labs/CanvasLayout/tests/CanvasLayout.Tests.shproj similarity index 100% rename from labs/CanvasLayout/tests/CanvasLayout.Tests/CanvasLayout.Tests.shproj rename to labs/CanvasLayout/tests/CanvasLayout.Tests.shproj diff --git a/labs/CanvasLayout/tests/CanvasLayout.Tests/ExampleCanvasLayoutTestClass.cs b/labs/CanvasLayout/tests/ExampleCanvasLayoutTestClass.cs similarity index 100% rename from labs/CanvasLayout/tests/CanvasLayout.Tests/ExampleCanvasLayoutTestClass.cs rename to labs/CanvasLayout/tests/ExampleCanvasLayoutTestClass.cs diff --git a/labs/CanvasLayout/tests/CanvasLayout.Tests/ExampleCanvasLayoutTestPage.xaml b/labs/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml similarity index 100% rename from labs/CanvasLayout/tests/CanvasLayout.Tests/ExampleCanvasLayoutTestPage.xaml rename to labs/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml diff --git a/labs/CanvasLayout/tests/CanvasLayout.Tests/ExampleCanvasLayoutTestPage.xaml.cs b/labs/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml.cs similarity index 100% rename from labs/CanvasLayout/tests/CanvasLayout.Tests/ExampleCanvasLayoutTestPage.xaml.cs rename to labs/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml.cs diff --git a/labs/CanvasView/samples/CanvasView.Samples/CanvasView.Samples.csproj b/labs/CanvasView/samples/CanvasView.Samples.csproj similarity index 100% rename from labs/CanvasView/samples/CanvasView.Samples/CanvasView.Samples.csproj rename to labs/CanvasView/samples/CanvasView.Samples.csproj diff --git a/labs/CanvasView/samples/CanvasView.Samples/CanvasView.md b/labs/CanvasView/samples/CanvasView.md similarity index 100% rename from labs/CanvasView/samples/CanvasView.Samples/CanvasView.md rename to labs/CanvasView/samples/CanvasView.md diff --git a/labs/CanvasView/samples/CanvasView.Samples/CanvasViewDragSample.xaml b/labs/CanvasView/samples/CanvasViewDragSample.xaml similarity index 100% rename from labs/CanvasView/samples/CanvasView.Samples/CanvasViewDragSample.xaml rename to labs/CanvasView/samples/CanvasViewDragSample.xaml diff --git a/labs/CanvasView/samples/CanvasView.Samples/CanvasViewDragSample.xaml.cs b/labs/CanvasView/samples/CanvasViewDragSample.xaml.cs similarity index 100% rename from labs/CanvasView/samples/CanvasView.Samples/CanvasViewDragSample.xaml.cs rename to labs/CanvasView/samples/CanvasViewDragSample.xaml.cs diff --git a/labs/CanvasView/samples/CanvasView.Samples/Dependencies.props b/labs/CanvasView/samples/Dependencies.props similarity index 100% rename from labs/CanvasView/samples/CanvasView.Samples/Dependencies.props rename to labs/CanvasView/samples/Dependencies.props diff --git a/labs/CanvasView/tests/CanvasView.Tests/CanvasView.Tests.projitems b/labs/CanvasView/tests/CanvasView.Tests.projitems similarity index 100% rename from labs/CanvasView/tests/CanvasView.Tests/CanvasView.Tests.projitems rename to labs/CanvasView/tests/CanvasView.Tests.projitems diff --git a/labs/CanvasView/tests/CanvasView.Tests/CanvasView.Tests.shproj b/labs/CanvasView/tests/CanvasView.Tests.shproj similarity index 100% rename from labs/CanvasView/tests/CanvasView.Tests/CanvasView.Tests.shproj rename to labs/CanvasView/tests/CanvasView.Tests.shproj diff --git a/labs/CanvasView/tests/CanvasView.Tests/ExampleCanvasViewTestClass.cs b/labs/CanvasView/tests/ExampleCanvasViewTestClass.cs similarity index 100% rename from labs/CanvasView/tests/CanvasView.Tests/ExampleCanvasViewTestClass.cs rename to labs/CanvasView/tests/ExampleCanvasViewTestClass.cs diff --git a/labs/CanvasView/tests/CanvasView.Tests/ExampleCanvasViewTestPage.xaml b/labs/CanvasView/tests/ExampleCanvasViewTestPage.xaml similarity index 100% rename from labs/CanvasView/tests/CanvasView.Tests/ExampleCanvasViewTestPage.xaml rename to labs/CanvasView/tests/ExampleCanvasViewTestPage.xaml diff --git a/labs/CanvasView/tests/CanvasView.Tests/ExampleCanvasViewTestPage.xaml.cs b/labs/CanvasView/tests/ExampleCanvasViewTestPage.xaml.cs similarity index 100% rename from labs/CanvasView/tests/CanvasView.Tests/ExampleCanvasViewTestPage.xaml.cs rename to labs/CanvasView/tests/ExampleCanvasViewTestPage.xaml.cs diff --git a/labs/RivePlayer/samples/RivePlayer.Samples/Dependencies.props b/labs/RivePlayer/samples/Dependencies.props similarity index 100% rename from labs/RivePlayer/samples/RivePlayer.Samples/Dependencies.props rename to labs/RivePlayer/samples/Dependencies.props diff --git a/labs/RivePlayer/samples/RivePlayer.Samples/RivePlayer.Samples.csproj b/labs/RivePlayer/samples/RivePlayer.Samples.csproj similarity index 81% rename from labs/RivePlayer/samples/RivePlayer.Samples/RivePlayer.Samples.csproj rename to labs/RivePlayer/samples/RivePlayer.Samples.csproj index 39a83dbf8..89bf771d3 100644 --- a/labs/RivePlayer/samples/RivePlayer.Samples/RivePlayer.Samples.csproj +++ b/labs/RivePlayer/samples/RivePlayer.Samples.csproj @@ -5,7 +5,7 @@ - + Always diff --git a/labs/RivePlayer/samples/RivePlayer.Samples/RivePlayer.md b/labs/RivePlayer/samples/RivePlayer.md similarity index 100% rename from labs/RivePlayer/samples/RivePlayer.Samples/RivePlayer.md rename to labs/RivePlayer/samples/RivePlayer.md diff --git a/labs/RivePlayer/samples/RivePlayer.Samples/RivePlayerCustomSample.xaml b/labs/RivePlayer/samples/RivePlayerCustomSample.xaml similarity index 100% rename from labs/RivePlayer/samples/RivePlayer.Samples/RivePlayerCustomSample.xaml rename to labs/RivePlayer/samples/RivePlayerCustomSample.xaml diff --git a/labs/RivePlayer/samples/RivePlayer.Samples/RivePlayerCustomSample.xaml.cs b/labs/RivePlayer/samples/RivePlayerCustomSample.xaml.cs similarity index 100% rename from labs/RivePlayer/samples/RivePlayer.Samples/RivePlayerCustomSample.xaml.cs rename to labs/RivePlayer/samples/RivePlayerCustomSample.xaml.cs diff --git a/labs/RivePlayer/samples/RivePlayer.Samples/animated-login-screen.riv b/labs/RivePlayer/samples/animated-login-screen.riv similarity index 100% rename from labs/RivePlayer/samples/RivePlayer.Samples/animated-login-screen.riv rename to labs/RivePlayer/samples/animated-login-screen.riv diff --git a/labs/RivePlayer/tests/RivePlayer.Tests/ExampleRivePlayerTestClass.cs b/labs/RivePlayer/tests/ExampleRivePlayerTestClass.cs similarity index 100% rename from labs/RivePlayer/tests/RivePlayer.Tests/ExampleRivePlayerTestClass.cs rename to labs/RivePlayer/tests/ExampleRivePlayerTestClass.cs diff --git a/labs/RivePlayer/tests/RivePlayer.Tests/ExampleRivePlayerTestPage.xaml b/labs/RivePlayer/tests/ExampleRivePlayerTestPage.xaml similarity index 100% rename from labs/RivePlayer/tests/RivePlayer.Tests/ExampleRivePlayerTestPage.xaml rename to labs/RivePlayer/tests/ExampleRivePlayerTestPage.xaml diff --git a/labs/RivePlayer/tests/RivePlayer.Tests/ExampleRivePlayerTestPage.xaml.cs b/labs/RivePlayer/tests/ExampleRivePlayerTestPage.xaml.cs similarity index 100% rename from labs/RivePlayer/tests/RivePlayer.Tests/ExampleRivePlayerTestPage.xaml.cs rename to labs/RivePlayer/tests/ExampleRivePlayerTestPage.xaml.cs diff --git a/labs/RivePlayer/tests/RivePlayer.Tests/RivePlayer.Tests.projitems b/labs/RivePlayer/tests/RivePlayer.Tests.projitems similarity index 100% rename from labs/RivePlayer/tests/RivePlayer.Tests/RivePlayer.Tests.projitems rename to labs/RivePlayer/tests/RivePlayer.Tests.projitems diff --git a/labs/RivePlayer/tests/RivePlayer.Tests/RivePlayer.Tests.shproj b/labs/RivePlayer/tests/RivePlayer.Tests.shproj similarity index 100% rename from labs/RivePlayer/tests/RivePlayer.Tests/RivePlayer.Tests.shproj rename to labs/RivePlayer/tests/RivePlayer.Tests.shproj diff --git a/labs/SettingsControls/samples/SettingsControls.Samples/ClickableSettingsCardSample.xaml b/labs/SettingsControls/samples/ClickableSettingsCardSample.xaml similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples/ClickableSettingsCardSample.xaml rename to labs/SettingsControls/samples/ClickableSettingsCardSample.xaml diff --git a/labs/SettingsControls/samples/SettingsControls.Samples/ClickableSettingsCardSample.xaml.cs b/labs/SettingsControls/samples/ClickableSettingsCardSample.xaml.cs similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples/ClickableSettingsCardSample.xaml.cs rename to labs/SettingsControls/samples/ClickableSettingsCardSample.xaml.cs diff --git a/labs/SettingsControls/samples/SettingsControls.Samples/Dependencies.props b/labs/SettingsControls/samples/Dependencies.props similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples/Dependencies.props rename to labs/SettingsControls/samples/Dependencies.props diff --git a/labs/SettingsControls/samples/SettingsControls.Samples/SettingsCard.md b/labs/SettingsControls/samples/SettingsCard.md similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples/SettingsCard.md rename to labs/SettingsControls/samples/SettingsCard.md diff --git a/labs/SettingsControls/samples/SettingsControls.Samples/SettingsCardSample.xaml b/labs/SettingsControls/samples/SettingsCardSample.xaml similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples/SettingsCardSample.xaml rename to labs/SettingsControls/samples/SettingsCardSample.xaml diff --git a/labs/SettingsControls/samples/SettingsControls.Samples/SettingsCardSample.xaml.cs b/labs/SettingsControls/samples/SettingsCardSample.xaml.cs similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples/SettingsCardSample.xaml.cs rename to labs/SettingsControls/samples/SettingsCardSample.xaml.cs diff --git a/labs/SettingsControls/samples/SettingsControls.Samples/SettingsControls.Samples.csproj b/labs/SettingsControls/samples/SettingsControls.Samples.csproj similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples/SettingsControls.Samples.csproj rename to labs/SettingsControls/samples/SettingsControls.Samples.csproj diff --git a/labs/SettingsControls/samples/SettingsControls.Samples/SettingsExpander.md b/labs/SettingsControls/samples/SettingsExpander.md similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples/SettingsExpander.md rename to labs/SettingsControls/samples/SettingsExpander.md diff --git a/labs/SettingsControls/samples/SettingsControls.Samples/SettingsExpanderItemsSourceSample.xaml b/labs/SettingsControls/samples/SettingsExpanderItemsSourceSample.xaml similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples/SettingsExpanderItemsSourceSample.xaml rename to labs/SettingsControls/samples/SettingsExpanderItemsSourceSample.xaml diff --git a/labs/SettingsControls/samples/SettingsControls.Samples/SettingsExpanderItemsSourceSample.xaml.cs b/labs/SettingsControls/samples/SettingsExpanderItemsSourceSample.xaml.cs similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples/SettingsExpanderItemsSourceSample.xaml.cs rename to labs/SettingsControls/samples/SettingsExpanderItemsSourceSample.xaml.cs diff --git a/labs/SettingsControls/samples/SettingsControls.Samples/SettingsExpanderSample.xaml b/labs/SettingsControls/samples/SettingsExpanderSample.xaml similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples/SettingsExpanderSample.xaml rename to labs/SettingsControls/samples/SettingsExpanderSample.xaml diff --git a/labs/SettingsControls/samples/SettingsControls.Samples/SettingsExpanderSample.xaml.cs b/labs/SettingsControls/samples/SettingsExpanderSample.xaml.cs similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples/SettingsExpanderSample.xaml.cs rename to labs/SettingsControls/samples/SettingsExpanderSample.xaml.cs diff --git a/labs/SettingsControls/samples/SettingsControls.Samples/SettingsPageExample.md b/labs/SettingsControls/samples/SettingsPageExample.md similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples/SettingsPageExample.md rename to labs/SettingsControls/samples/SettingsPageExample.md diff --git a/labs/SettingsControls/samples/SettingsControls.Samples/SettingsPageExample.xaml b/labs/SettingsControls/samples/SettingsPageExample.xaml similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples/SettingsPageExample.xaml rename to labs/SettingsControls/samples/SettingsPageExample.xaml diff --git a/labs/SettingsControls/samples/SettingsControls.Samples/SettingsPageExample.xaml.cs b/labs/SettingsControls/samples/SettingsPageExample.xaml.cs similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples/SettingsPageExample.xaml.cs rename to labs/SettingsControls/samples/SettingsPageExample.xaml.cs diff --git a/labs/SettingsControls/tests/SettingsControls.Tests/ExampleSettingsControlsTestClass.cs b/labs/SettingsControls/tests/ExampleSettingsControlsTestClass.cs similarity index 100% rename from labs/SettingsControls/tests/SettingsControls.Tests/ExampleSettingsControlsTestClass.cs rename to labs/SettingsControls/tests/ExampleSettingsControlsTestClass.cs diff --git a/labs/SettingsControls/tests/SettingsControls.Tests/ExampleSettingsControlsTestPage.xaml b/labs/SettingsControls/tests/ExampleSettingsControlsTestPage.xaml similarity index 100% rename from labs/SettingsControls/tests/SettingsControls.Tests/ExampleSettingsControlsTestPage.xaml rename to labs/SettingsControls/tests/ExampleSettingsControlsTestPage.xaml diff --git a/labs/SettingsControls/tests/SettingsControls.Tests/ExampleSettingsControlsTestPage.xaml.cs b/labs/SettingsControls/tests/ExampleSettingsControlsTestPage.xaml.cs similarity index 100% rename from labs/SettingsControls/tests/SettingsControls.Tests/ExampleSettingsControlsTestPage.xaml.cs rename to labs/SettingsControls/tests/ExampleSettingsControlsTestPage.xaml.cs diff --git a/labs/SettingsControls/tests/SettingsControls.Tests/SettingsControls.Tests.projitems b/labs/SettingsControls/tests/SettingsControls.Tests.projitems similarity index 100% rename from labs/SettingsControls/tests/SettingsControls.Tests/SettingsControls.Tests.projitems rename to labs/SettingsControls/tests/SettingsControls.Tests.projitems diff --git a/labs/SettingsControls/tests/SettingsControls.Tests/SettingsControls.Tests.shproj b/labs/SettingsControls/tests/SettingsControls.Tests.shproj similarity index 100% rename from labs/SettingsControls/tests/SettingsControls.Tests/SettingsControls.Tests.shproj rename to labs/SettingsControls/tests/SettingsControls.Tests.shproj diff --git a/labs/SizerBase/samples/SizerBase.Samples/ContentSizer.md b/labs/SizerBase/samples/ContentSizer.md similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/ContentSizer.md rename to labs/SizerBase/samples/ContentSizer.md diff --git a/labs/SizerBase/samples/SizerBase.Samples/ContentSizerLeftShelfPage.xaml b/labs/SizerBase/samples/ContentSizerLeftShelfPage.xaml similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/ContentSizerLeftShelfPage.xaml rename to labs/SizerBase/samples/ContentSizerLeftShelfPage.xaml diff --git a/labs/SizerBase/samples/SizerBase.Samples/ContentSizerLeftShelfPage.xaml.cs b/labs/SizerBase/samples/ContentSizerLeftShelfPage.xaml.cs similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/ContentSizerLeftShelfPage.xaml.cs rename to labs/SizerBase/samples/ContentSizerLeftShelfPage.xaml.cs diff --git a/labs/SizerBase/samples/SizerBase.Samples/ContentSizerTopShelfPage.xaml b/labs/SizerBase/samples/ContentSizerTopShelfPage.xaml similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/ContentSizerTopShelfPage.xaml rename to labs/SizerBase/samples/ContentSizerTopShelfPage.xaml diff --git a/labs/SizerBase/samples/SizerBase.Samples/ContentSizerTopShelfPage.xaml.cs b/labs/SizerBase/samples/ContentSizerTopShelfPage.xaml.cs similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/ContentSizerTopShelfPage.xaml.cs rename to labs/SizerBase/samples/ContentSizerTopShelfPage.xaml.cs diff --git a/labs/SizerBase/samples/SizerBase.Samples/Dependencies.props b/labs/SizerBase/samples/Dependencies.props similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/Dependencies.props rename to labs/SizerBase/samples/Dependencies.props diff --git a/labs/SizerBase/samples/SizerBase.Samples/GridSplitter.md b/labs/SizerBase/samples/GridSplitter.md similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/GridSplitter.md rename to labs/SizerBase/samples/GridSplitter.md diff --git a/labs/SizerBase/samples/SizerBase.Samples/GridSplitterPage.xaml b/labs/SizerBase/samples/GridSplitterPage.xaml similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/GridSplitterPage.xaml rename to labs/SizerBase/samples/GridSplitterPage.xaml diff --git a/labs/SizerBase/samples/SizerBase.Samples/GridSplitterPage.xaml.cs b/labs/SizerBase/samples/GridSplitterPage.xaml.cs similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/GridSplitterPage.xaml.cs rename to labs/SizerBase/samples/GridSplitterPage.xaml.cs diff --git a/labs/SizerBase/samples/SizerBase.Samples/PropertySizer.md b/labs/SizerBase/samples/PropertySizer.md similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/PropertySizer.md rename to labs/SizerBase/samples/PropertySizer.md diff --git a/labs/SizerBase/samples/SizerBase.Samples/PropertySizerNavigationViewPage.xaml b/labs/SizerBase/samples/PropertySizerNavigationViewPage.xaml similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/PropertySizerNavigationViewPage.xaml rename to labs/SizerBase/samples/PropertySizerNavigationViewPage.xaml diff --git a/labs/SizerBase/samples/SizerBase.Samples/PropertySizerNavigationViewPage.xaml.cs b/labs/SizerBase/samples/PropertySizerNavigationViewPage.xaml.cs similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/PropertySizerNavigationViewPage.xaml.cs rename to labs/SizerBase/samples/PropertySizerNavigationViewPage.xaml.cs diff --git a/labs/SizerBase/samples/SizerBase.Samples/SizerBase.Samples.csproj b/labs/SizerBase/samples/SizerBase.Samples.csproj similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/SizerBase.Samples.csproj rename to labs/SizerBase/samples/SizerBase.Samples.csproj diff --git a/labs/SizerBase/samples/SizerBase.Samples/SizerControls.md b/labs/SizerBase/samples/SizerControls.md similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/SizerControls.md rename to labs/SizerBase/samples/SizerControls.md diff --git a/labs/SizerBase/samples/SizerBase.Samples/SizerCursorPage.xaml b/labs/SizerBase/samples/SizerCursorPage.xaml similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/SizerCursorPage.xaml rename to labs/SizerBase/samples/SizerCursorPage.xaml diff --git a/labs/SizerBase/samples/SizerBase.Samples/SizerCursorPage.xaml.cs b/labs/SizerBase/samples/SizerCursorPage.xaml.cs similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples/SizerCursorPage.xaml.cs rename to labs/SizerBase/samples/SizerCursorPage.xaml.cs diff --git a/labs/SizerBase/tests/SizerBase.Tests/ExampleSizerBaseTestClass.cs b/labs/SizerBase/tests/ExampleSizerBaseTestClass.cs similarity index 100% rename from labs/SizerBase/tests/SizerBase.Tests/ExampleSizerBaseTestClass.cs rename to labs/SizerBase/tests/ExampleSizerBaseTestClass.cs diff --git a/labs/SizerBase/tests/SizerBase.Tests/PropertySizerTestInitialBinding.xaml b/labs/SizerBase/tests/PropertySizerTestInitialBinding.xaml similarity index 100% rename from labs/SizerBase/tests/SizerBase.Tests/PropertySizerTestInitialBinding.xaml rename to labs/SizerBase/tests/PropertySizerTestInitialBinding.xaml diff --git a/labs/SizerBase/tests/SizerBase.Tests/PropertySizerTestInitialBinding.xaml.cs b/labs/SizerBase/tests/PropertySizerTestInitialBinding.xaml.cs similarity index 100% rename from labs/SizerBase/tests/SizerBase.Tests/PropertySizerTestInitialBinding.xaml.cs rename to labs/SizerBase/tests/PropertySizerTestInitialBinding.xaml.cs diff --git a/labs/SizerBase/tests/SizerBase.Tests/SizerBase.Tests.projitems b/labs/SizerBase/tests/SizerBase.Tests.projitems similarity index 100% rename from labs/SizerBase/tests/SizerBase.Tests/SizerBase.Tests.projitems rename to labs/SizerBase/tests/SizerBase.Tests.projitems diff --git a/labs/SizerBase/tests/SizerBase.Tests/SizerBase.Tests.shproj b/labs/SizerBase/tests/SizerBase.Tests.shproj similarity index 100% rename from labs/SizerBase/tests/SizerBase.Tests/SizerBase.Tests.shproj rename to labs/SizerBase/tests/SizerBase.Tests.shproj diff --git a/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples/Dependencies.props b/labs/StackedNotificationsBehavior/samples/Dependencies.props similarity index 100% rename from labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples/Dependencies.props rename to labs/StackedNotificationsBehavior/samples/Dependencies.props diff --git a/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples/StackedNotificationsBehavior.Samples.csproj b/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples.csproj similarity index 100% rename from labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples/StackedNotificationsBehavior.Samples.csproj rename to labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples.csproj diff --git a/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples/StackedNotificationsBehavior.md b/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.md similarity index 100% rename from labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples/StackedNotificationsBehavior.md rename to labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.md diff --git a/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples/StackedNotificationsBehaviorCustomSample.xaml b/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml similarity index 100% rename from labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples/StackedNotificationsBehaviorCustomSample.xaml rename to labs/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml diff --git a/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples/StackedNotificationsBehaviorCustomSample.xaml.cs b/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml.cs similarity index 100% rename from labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples/StackedNotificationsBehaviorCustomSample.xaml.cs rename to labs/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml.cs diff --git a/labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests/ExampleStackedNotificationsBehaviorTestClass.cs b/labs/StackedNotificationsBehavior/tests/ExampleStackedNotificationsBehaviorTestClass.cs similarity index 100% rename from labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests/ExampleStackedNotificationsBehaviorTestClass.cs rename to labs/StackedNotificationsBehavior/tests/ExampleStackedNotificationsBehaviorTestClass.cs diff --git a/labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests/StackedNotificationsBehavior.Tests.projitems b/labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.projitems similarity index 100% rename from labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests/StackedNotificationsBehavior.Tests.projitems rename to labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.projitems diff --git a/labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests/StackedNotificationsBehavior.Tests.shproj b/labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.shproj similarity index 100% rename from labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests/StackedNotificationsBehavior.Tests.shproj rename to labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.shproj From 41994a66d38708f3b24cd3e797a071ae8567c77a Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 16 Feb 2023 17:03:20 -0600 Subject: [PATCH 2/9] Renamed ./labs to ./components --- .github/workflows/build.yml | 8 ++++---- ReadMe.md | 4 ++-- .../ToolkitSampleMetadataTests.cs | 2 +- .../ToolkitSampleMetadataGenerator.Documentation.cs | 2 +- common/GenerateAllSolution.ps1 | 6 +++--- common/GenerateVSCodeLaunchConfig.ps1 | 4 ++-- common/MultiTarget/GenerateAllProjectReferences.ps1 | 2 +- .../AllComponents/Tests.Head.AllComponents.props | 2 +- common/ProjectHeads/App.Head.props | 8 ++++---- common/Scripts/PackEachExperiment.ps1 | 2 +- {labs => components}/.vsconfig | 0 {labs => components}/CanvasLayout/OpenSolution.bat | 0 .../samples/CanvasLayout.Samples.csproj | 0 .../CanvasLayout/samples/CanvasLayout.md | 0 .../CanvasLayout/samples/CanvasLayoutSample.xaml | 0 .../CanvasLayout/samples/CanvasLayoutSample.xaml.cs | 0 .../CanvasLayout/samples/Dependencies.props | 0 .../CanvasLayout/src/AdditionalAssemblyInfo.cs | 0 .../CanvasLayout/src/CanvasLayout.cs | 0 .../CommunityToolkit.Labs.WinUI.CanvasLayout.csproj | 0 .../CanvasLayout/src/Dependencies.props | 0 .../CanvasLayout/tests/CanvasLayout.Tests.projitems | 0 .../CanvasLayout/tests/CanvasLayout.Tests.shproj | 0 .../tests/ExampleCanvasLayoutTestClass.cs | 0 .../tests/ExampleCanvasLayoutTestPage.xaml | 0 .../tests/ExampleCanvasLayoutTestPage.xaml.cs | 0 {labs => components}/CanvasView/OpenSolution.bat | 0 .../CanvasView/samples/CanvasView.Samples.csproj | 0 .../CanvasView/samples/CanvasView.md | 0 .../CanvasView/samples/CanvasViewDragSample.xaml | 0 .../CanvasView/samples/CanvasViewDragSample.xaml.cs | 0 .../CanvasView/samples/Dependencies.props | 0 .../CanvasView/src/AdditionalAssemblyInfo.cs | 0 {labs => components}/CanvasView/src/CanvasView.cs | 0 .../CommunityToolkit.Labs.WinUI.CanvasView.csproj | 0 .../CanvasView/src/Dependencies.props | 0 .../CanvasView/src/FrameworkElementExtensions.cs | 0 .../CanvasView/tests/CanvasView.Tests.projitems | 0 .../CanvasView/tests/CanvasView.Tests.shproj | 0 .../CanvasView/tests/ExampleCanvasViewTestClass.cs | 0 .../CanvasView/tests/ExampleCanvasViewTestPage.xaml | 0 .../tests/ExampleCanvasViewTestPage.xaml.cs | 0 {labs => components}/RivePlayer/OpenSolution.bat | 0 .../RivePlayer/samples/Dependencies.props | 0 .../RivePlayer/samples/RivePlayer.Samples.csproj | 0 .../RivePlayer/samples/RivePlayer.md | 0 .../RivePlayer/samples/RivePlayerCustomSample.xaml | 0 .../samples/RivePlayerCustomSample.xaml.cs | 0 .../RivePlayer/samples/animated-login-screen.riv | Bin .../RivePlayer/src/AdditionalAssemblyInfo.cs | 0 ...mmunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj | 0 .../RivePlayer/src/Dependencies.props | 0 .../RivePlayer/src/MultiTarget.props | 0 .../RivePlayer/src/RivePlayer.Platform.cs | 0 .../RivePlayer/src/RivePlayer.Properties.cs | 0 {labs => components}/RivePlayer/src/RivePlayer.cs | 0 {labs => components}/RivePlayer/src/RivePlayer.xaml | 0 .../RivePlayer/src/StateMachineInput.cs | 0 .../RivePlayer/src/StateMachineInputCollection.cs | 0 .../RivePlayer/src/Themes/Generic.xaml | 0 .../RivePlayer/tests/ExampleRivePlayerTestClass.cs | 0 .../RivePlayer/tests/ExampleRivePlayerTestPage.xaml | 0 .../tests/ExampleRivePlayerTestPage.xaml.cs | 0 .../RivePlayer/tests/RivePlayer.Tests.projitems | 0 .../RivePlayer/tests/RivePlayer.Tests.shproj | 0 .../SettingsControls/OpenSolution.bat | 0 .../samples/ClickableSettingsCardSample.xaml | 0 .../samples/ClickableSettingsCardSample.xaml.cs | 0 .../SettingsControls/samples/Dependencies.props | 0 .../SettingsControls/samples/SettingsCard.md | 0 .../samples/SettingsCardSample.xaml | 0 .../samples/SettingsCardSample.xaml.cs | 0 .../samples/SettingsControls.Samples.csproj | 0 .../SettingsControls/samples/SettingsExpander.md | 0 .../samples/SettingsExpanderItemsSourceSample.xaml | 0 .../SettingsExpanderItemsSourceSample.xaml.cs | 0 .../samples/SettingsExpanderSample.xaml | 0 .../samples/SettingsExpanderSample.xaml.cs | 0 .../SettingsControls/samples/SettingsPageExample.md | 0 .../samples/SettingsPageExample.xaml | 0 .../samples/SettingsPageExample.xaml.cs | 0 .../SettingsControls/src/AdditionalAssemblyInfo.cs | 0 ...munityToolkit.Labs.WinUI.SettingsControls.csproj | 0 .../SettingsControls/src/Dependencies.props | 0 .../src/Helpers/ControlSizeTrigger.cs | 0 .../src/Helpers/IsEqualStateTrigger.cs | 0 .../src/Helpers/ResourceDictionaryExtensions.cs | 0 .../SettingsControls/src/Helpers/StyleExtensions.cs | 0 .../src/SettingsCard/SettingsCard.Properties.cs | 0 .../src/SettingsCard/SettingsCard.cs | 0 .../src/SettingsCard/SettingsCard.xaml | 0 .../src/SettingsCard/SettingsCardAutomationPeer.cs | 0 .../Internal/StyledContentPresenter.cs | 0 .../SettingsExpander.ItemsControl.cs | 0 .../SettingsExpander/SettingsExpander.Properties.cs | 0 .../src/SettingsExpander/SettingsExpander.cs | 0 .../src/SettingsExpander/SettingsExpander.xaml | 0 .../SettingsExpanderAutomationPeer.cs | 0 .../SettingsExpanderItemStyleSelector.cs | 0 .../SettingsControls/src/Themes/Generic.xaml | 0 .../tests/ExampleSettingsControlsTestClass.cs | 0 .../tests/ExampleSettingsControlsTestPage.xaml | 0 .../tests/ExampleSettingsControlsTestPage.xaml.cs | 0 .../tests/SettingsControls.Tests.projitems | 0 .../tests/SettingsControls.Tests.shproj | 0 {labs => components}/SizerBase/OpenSolution.bat | 0 .../SizerBase/samples/ContentSizer.md | 0 .../samples/ContentSizerLeftShelfPage.xaml | 0 .../samples/ContentSizerLeftShelfPage.xaml.cs | 0 .../SizerBase/samples/ContentSizerTopShelfPage.xaml | 0 .../samples/ContentSizerTopShelfPage.xaml.cs | 0 .../SizerBase/samples/Dependencies.props | 0 .../SizerBase/samples/GridSplitter.md | 0 .../SizerBase/samples/GridSplitterPage.xaml | 0 .../SizerBase/samples/GridSplitterPage.xaml.cs | 0 .../SizerBase/samples/PropertySizer.md | 0 .../samples/PropertySizerNavigationViewPage.xaml | 0 .../samples/PropertySizerNavigationViewPage.xaml.cs | 0 .../SizerBase/samples/SizerBase.Samples.csproj | 0 .../SizerBase/samples/SizerControls.md | 0 .../SizerBase/samples/SizerCursorPage.xaml | 0 .../SizerBase/samples/SizerCursorPage.xaml.cs | 0 .../SizerBase/src/AdditionalAssemblyInfo.cs | 0 .../CommunityToolkit.Labs.WinUI.SizerBase.csproj | 0 .../src/ContentSizer/ContentSizer.Events.cs | 0 .../src/ContentSizer/ContentSizer.Properties.cs | 0 .../SizerBase/src/ContentSizer/ContentSizer.cs | 0 .../SizerBase/src/Dependencies.props | 0 .../SizerBase/src/GridSplitter/GridSplitter.Data.cs | 0 .../src/GridSplitter/GridSplitter.Events.cs | 0 .../src/GridSplitter/GridSplitter.Helpers.cs | 0 .../src/GridSplitter/GridSplitter.Properties.cs | 0 .../SizerBase/src/GridSplitter/GridSplitter.cs | 0 .../src/PropertySizer/PropertySizer.Events.cs | 0 .../src/PropertySizer/PropertySizer.Properties.cs | 0 .../SizerBase/src/PropertySizer/PropertySizer.cs | 0 .../SizerBase/src/SizerAutomationPeer.cs | 0 .../SizerBase/src/SizerBase.Events.cs | 0 .../SizerBase/src/SizerBase.Helpers.cs | 0 .../SizerBase/src/SizerBase.Properties.cs | 0 {labs => components}/SizerBase/src/SizerBase.cs | 0 {labs => components}/SizerBase/src/SizerBase.xaml | 0 .../SizerBase/src/Strings/en-US/Resources.resw | 0 .../SizerBase/src/Themes/Generic.xaml | 0 .../SizerBase/src/Toolkit/ConverterTools.cs | 0 .../src/Toolkit/DependencyObjectExtensions.cs | 0 .../src/Toolkit/FrameworkElementExtensions.Mouse.cs | 0 .../src/Toolkit/OrientationToObjectConverter.cs | 0 .../SizerBase/src/Toolkit/TypeToObjectConverter.cs | 0 .../SizerBase/tests/ExampleSizerBaseTestClass.cs | 0 .../tests/PropertySizerTestInitialBinding.xaml | 0 .../tests/PropertySizerTestInitialBinding.xaml.cs | 0 .../SizerBase/tests/SizerBase.Tests.projitems | 0 .../SizerBase/tests/SizerBase.Tests.shproj | 0 .../StackedNotificationsBehavior/OpenSolution.bat | 0 .../samples/Dependencies.props | 0 .../StackedNotificationsBehavior.Samples.csproj | 0 .../samples/StackedNotificationsBehavior.md | 0 .../StackedNotificationsBehaviorCustomSample.xaml | 0 ...StackedNotificationsBehaviorCustomSample.xaml.cs | 0 .../src/AdditionalAssemblyInfo.cs | 0 ...t.Labs.WinUI.StackedNotificationsBehavior.csproj | 0 .../src/Dependencies.props | 0 .../src/MultiTarget.props | 0 .../src/Notification.cs | 0 .../src/StackedNotificationsBehavior.cs | 0 .../ExampleStackedNotificationsBehaviorTestClass.cs | 0 .../StackedNotificationsBehavior.Tests.projitems | 0 .../tests/StackedNotificationsBehavior.Tests.shproj | 0 template/README.md | 6 +++--- 170 files changed, 23 insertions(+), 23 deletions(-) rename {labs => components}/.vsconfig (100%) rename {labs => components}/CanvasLayout/OpenSolution.bat (100%) rename {labs => components}/CanvasLayout/samples/CanvasLayout.Samples.csproj (100%) rename {labs => components}/CanvasLayout/samples/CanvasLayout.md (100%) rename {labs => components}/CanvasLayout/samples/CanvasLayoutSample.xaml (100%) rename {labs => components}/CanvasLayout/samples/CanvasLayoutSample.xaml.cs (100%) rename {labs => components}/CanvasLayout/samples/Dependencies.props (100%) rename {labs => components}/CanvasLayout/src/AdditionalAssemblyInfo.cs (100%) rename {labs => components}/CanvasLayout/src/CanvasLayout.cs (100%) rename {labs => components}/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj (100%) rename {labs => components}/CanvasLayout/src/Dependencies.props (100%) rename {labs => components}/CanvasLayout/tests/CanvasLayout.Tests.projitems (100%) rename {labs => components}/CanvasLayout/tests/CanvasLayout.Tests.shproj (100%) rename {labs => components}/CanvasLayout/tests/ExampleCanvasLayoutTestClass.cs (100%) rename {labs => components}/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml (100%) rename {labs => components}/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml.cs (100%) rename {labs => components}/CanvasView/OpenSolution.bat (100%) rename {labs => components}/CanvasView/samples/CanvasView.Samples.csproj (100%) rename {labs => components}/CanvasView/samples/CanvasView.md (100%) rename {labs => components}/CanvasView/samples/CanvasViewDragSample.xaml (100%) rename {labs => components}/CanvasView/samples/CanvasViewDragSample.xaml.cs (100%) rename {labs => components}/CanvasView/samples/Dependencies.props (100%) rename {labs => components}/CanvasView/src/AdditionalAssemblyInfo.cs (100%) rename {labs => components}/CanvasView/src/CanvasView.cs (100%) rename {labs => components}/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj (100%) rename {labs => components}/CanvasView/src/Dependencies.props (100%) rename {labs => components}/CanvasView/src/FrameworkElementExtensions.cs (100%) rename {labs => components}/CanvasView/tests/CanvasView.Tests.projitems (100%) rename {labs => components}/CanvasView/tests/CanvasView.Tests.shproj (100%) rename {labs => components}/CanvasView/tests/ExampleCanvasViewTestClass.cs (100%) rename {labs => components}/CanvasView/tests/ExampleCanvasViewTestPage.xaml (100%) rename {labs => components}/CanvasView/tests/ExampleCanvasViewTestPage.xaml.cs (100%) rename {labs => components}/RivePlayer/OpenSolution.bat (100%) rename {labs => components}/RivePlayer/samples/Dependencies.props (100%) rename {labs => components}/RivePlayer/samples/RivePlayer.Samples.csproj (100%) rename {labs => components}/RivePlayer/samples/RivePlayer.md (100%) rename {labs => components}/RivePlayer/samples/RivePlayerCustomSample.xaml (100%) rename {labs => components}/RivePlayer/samples/RivePlayerCustomSample.xaml.cs (100%) rename {labs => components}/RivePlayer/samples/animated-login-screen.riv (100%) rename {labs => components}/RivePlayer/src/AdditionalAssemblyInfo.cs (100%) rename {labs => components}/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj (100%) rename {labs => components}/RivePlayer/src/Dependencies.props (100%) rename {labs => components}/RivePlayer/src/MultiTarget.props (100%) rename {labs => components}/RivePlayer/src/RivePlayer.Platform.cs (100%) rename {labs => components}/RivePlayer/src/RivePlayer.Properties.cs (100%) rename {labs => components}/RivePlayer/src/RivePlayer.cs (100%) rename {labs => components}/RivePlayer/src/RivePlayer.xaml (100%) rename {labs => components}/RivePlayer/src/StateMachineInput.cs (100%) rename {labs => components}/RivePlayer/src/StateMachineInputCollection.cs (100%) rename {labs => components}/RivePlayer/src/Themes/Generic.xaml (100%) rename {labs => components}/RivePlayer/tests/ExampleRivePlayerTestClass.cs (100%) rename {labs => components}/RivePlayer/tests/ExampleRivePlayerTestPage.xaml (100%) rename {labs => components}/RivePlayer/tests/ExampleRivePlayerTestPage.xaml.cs (100%) rename {labs => components}/RivePlayer/tests/RivePlayer.Tests.projitems (100%) rename {labs => components}/RivePlayer/tests/RivePlayer.Tests.shproj (100%) rename {labs => components}/SettingsControls/OpenSolution.bat (100%) rename {labs => components}/SettingsControls/samples/ClickableSettingsCardSample.xaml (100%) rename {labs => components}/SettingsControls/samples/ClickableSettingsCardSample.xaml.cs (100%) rename {labs => components}/SettingsControls/samples/Dependencies.props (100%) rename {labs => components}/SettingsControls/samples/SettingsCard.md (100%) rename {labs => components}/SettingsControls/samples/SettingsCardSample.xaml (100%) rename {labs => components}/SettingsControls/samples/SettingsCardSample.xaml.cs (100%) rename {labs => components}/SettingsControls/samples/SettingsControls.Samples.csproj (100%) rename {labs => components}/SettingsControls/samples/SettingsExpander.md (100%) rename {labs => components}/SettingsControls/samples/SettingsExpanderItemsSourceSample.xaml (100%) rename {labs => components}/SettingsControls/samples/SettingsExpanderItemsSourceSample.xaml.cs (100%) rename {labs => components}/SettingsControls/samples/SettingsExpanderSample.xaml (100%) rename {labs => components}/SettingsControls/samples/SettingsExpanderSample.xaml.cs (100%) rename {labs => components}/SettingsControls/samples/SettingsPageExample.md (100%) rename {labs => components}/SettingsControls/samples/SettingsPageExample.xaml (100%) rename {labs => components}/SettingsControls/samples/SettingsPageExample.xaml.cs (100%) rename {labs => components}/SettingsControls/src/AdditionalAssemblyInfo.cs (100%) rename {labs => components}/SettingsControls/src/CommunityToolkit.Labs.WinUI.SettingsControls.csproj (100%) rename {labs => components}/SettingsControls/src/Dependencies.props (100%) rename {labs => components}/SettingsControls/src/Helpers/ControlSizeTrigger.cs (100%) rename {labs => components}/SettingsControls/src/Helpers/IsEqualStateTrigger.cs (100%) rename {labs => components}/SettingsControls/src/Helpers/ResourceDictionaryExtensions.cs (100%) rename {labs => components}/SettingsControls/src/Helpers/StyleExtensions.cs (100%) rename {labs => components}/SettingsControls/src/SettingsCard/SettingsCard.Properties.cs (100%) rename {labs => components}/SettingsControls/src/SettingsCard/SettingsCard.cs (100%) rename {labs => components}/SettingsControls/src/SettingsCard/SettingsCard.xaml (100%) rename {labs => components}/SettingsControls/src/SettingsCard/SettingsCardAutomationPeer.cs (100%) rename {labs => components}/SettingsControls/src/SettingsExpander/Internal/StyledContentPresenter.cs (100%) rename {labs => components}/SettingsControls/src/SettingsExpander/SettingsExpander.ItemsControl.cs (100%) rename {labs => components}/SettingsControls/src/SettingsExpander/SettingsExpander.Properties.cs (100%) rename {labs => components}/SettingsControls/src/SettingsExpander/SettingsExpander.cs (100%) rename {labs => components}/SettingsControls/src/SettingsExpander/SettingsExpander.xaml (100%) rename {labs => components}/SettingsControls/src/SettingsExpander/SettingsExpanderAutomationPeer.cs (100%) rename {labs => components}/SettingsControls/src/SettingsExpander/SettingsExpanderItemStyleSelector.cs (100%) rename {labs => components}/SettingsControls/src/Themes/Generic.xaml (100%) rename {labs => components}/SettingsControls/tests/ExampleSettingsControlsTestClass.cs (100%) rename {labs => components}/SettingsControls/tests/ExampleSettingsControlsTestPage.xaml (100%) rename {labs => components}/SettingsControls/tests/ExampleSettingsControlsTestPage.xaml.cs (100%) rename {labs => components}/SettingsControls/tests/SettingsControls.Tests.projitems (100%) rename {labs => components}/SettingsControls/tests/SettingsControls.Tests.shproj (100%) rename {labs => components}/SizerBase/OpenSolution.bat (100%) rename {labs => components}/SizerBase/samples/ContentSizer.md (100%) rename {labs => components}/SizerBase/samples/ContentSizerLeftShelfPage.xaml (100%) rename {labs => components}/SizerBase/samples/ContentSizerLeftShelfPage.xaml.cs (100%) rename {labs => components}/SizerBase/samples/ContentSizerTopShelfPage.xaml (100%) rename {labs => components}/SizerBase/samples/ContentSizerTopShelfPage.xaml.cs (100%) rename {labs => components}/SizerBase/samples/Dependencies.props (100%) rename {labs => components}/SizerBase/samples/GridSplitter.md (100%) rename {labs => components}/SizerBase/samples/GridSplitterPage.xaml (100%) rename {labs => components}/SizerBase/samples/GridSplitterPage.xaml.cs (100%) rename {labs => components}/SizerBase/samples/PropertySizer.md (100%) rename {labs => components}/SizerBase/samples/PropertySizerNavigationViewPage.xaml (100%) rename {labs => components}/SizerBase/samples/PropertySizerNavigationViewPage.xaml.cs (100%) rename {labs => components}/SizerBase/samples/SizerBase.Samples.csproj (100%) rename {labs => components}/SizerBase/samples/SizerControls.md (100%) rename {labs => components}/SizerBase/samples/SizerCursorPage.xaml (100%) rename {labs => components}/SizerBase/samples/SizerCursorPage.xaml.cs (100%) rename {labs => components}/SizerBase/src/AdditionalAssemblyInfo.cs (100%) rename {labs => components}/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj (100%) rename {labs => components}/SizerBase/src/ContentSizer/ContentSizer.Events.cs (100%) rename {labs => components}/SizerBase/src/ContentSizer/ContentSizer.Properties.cs (100%) rename {labs => components}/SizerBase/src/ContentSizer/ContentSizer.cs (100%) rename {labs => components}/SizerBase/src/Dependencies.props (100%) rename {labs => components}/SizerBase/src/GridSplitter/GridSplitter.Data.cs (100%) rename {labs => components}/SizerBase/src/GridSplitter/GridSplitter.Events.cs (100%) rename {labs => components}/SizerBase/src/GridSplitter/GridSplitter.Helpers.cs (100%) rename {labs => components}/SizerBase/src/GridSplitter/GridSplitter.Properties.cs (100%) rename {labs => components}/SizerBase/src/GridSplitter/GridSplitter.cs (100%) rename {labs => components}/SizerBase/src/PropertySizer/PropertySizer.Events.cs (100%) rename {labs => components}/SizerBase/src/PropertySizer/PropertySizer.Properties.cs (100%) rename {labs => components}/SizerBase/src/PropertySizer/PropertySizer.cs (100%) rename {labs => components}/SizerBase/src/SizerAutomationPeer.cs (100%) rename {labs => components}/SizerBase/src/SizerBase.Events.cs (100%) rename {labs => components}/SizerBase/src/SizerBase.Helpers.cs (100%) rename {labs => components}/SizerBase/src/SizerBase.Properties.cs (100%) rename {labs => components}/SizerBase/src/SizerBase.cs (100%) rename {labs => components}/SizerBase/src/SizerBase.xaml (100%) rename {labs => components}/SizerBase/src/Strings/en-US/Resources.resw (100%) rename {labs => components}/SizerBase/src/Themes/Generic.xaml (100%) rename {labs => components}/SizerBase/src/Toolkit/ConverterTools.cs (100%) rename {labs => components}/SizerBase/src/Toolkit/DependencyObjectExtensions.cs (100%) rename {labs => components}/SizerBase/src/Toolkit/FrameworkElementExtensions.Mouse.cs (100%) rename {labs => components}/SizerBase/src/Toolkit/OrientationToObjectConverter.cs (100%) rename {labs => components}/SizerBase/src/Toolkit/TypeToObjectConverter.cs (100%) rename {labs => components}/SizerBase/tests/ExampleSizerBaseTestClass.cs (100%) rename {labs => components}/SizerBase/tests/PropertySizerTestInitialBinding.xaml (100%) rename {labs => components}/SizerBase/tests/PropertySizerTestInitialBinding.xaml.cs (100%) rename {labs => components}/SizerBase/tests/SizerBase.Tests.projitems (100%) rename {labs => components}/SizerBase/tests/SizerBase.Tests.shproj (100%) rename {labs => components}/StackedNotificationsBehavior/OpenSolution.bat (100%) rename {labs => components}/StackedNotificationsBehavior/samples/Dependencies.props (100%) rename {labs => components}/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples.csproj (100%) rename {labs => components}/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.md (100%) rename {labs => components}/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml (100%) rename {labs => components}/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml.cs (100%) rename {labs => components}/StackedNotificationsBehavior/src/AdditionalAssemblyInfo.cs (100%) rename {labs => components}/StackedNotificationsBehavior/src/CommunityToolkit.Labs.WinUI.StackedNotificationsBehavior.csproj (100%) rename {labs => components}/StackedNotificationsBehavior/src/Dependencies.props (100%) rename {labs => components}/StackedNotificationsBehavior/src/MultiTarget.props (100%) rename {labs => components}/StackedNotificationsBehavior/src/Notification.cs (100%) rename {labs => components}/StackedNotificationsBehavior/src/StackedNotificationsBehavior.cs (100%) rename {labs => components}/StackedNotificationsBehavior/tests/ExampleStackedNotificationsBehaviorTestClass.cs (100%) rename {labs => components}/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.projitems (100%) rename {labs => components}/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.shproj (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 48a3ae8ac..eaaa195f0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -152,7 +152,7 @@ jobs: env: PROJECT_DIRECTORY: template/ProjectTemplate TEST_PROJECT_NAME: CiTestExp - TEST_PROJECT_DIRECTORY: labs/CiTestExp + TEST_PROJECT_DIRECTORY: components/CiTestExp steps: - name: Install .NET SDK v${{ env.DOTNET_VERSION }} @@ -193,7 +193,7 @@ jobs: run: dotnet new --install ./ - name: Create new experiment - working-directory: ./labs + working-directory: ./components run: dotnet new labexp -n ${{ env.TEST_PROJECT_NAME }} - name: Add project heads to ${{ env.TEST_PROJECT_NAME }} @@ -215,11 +215,11 @@ jobs: - name: Run tests in the generated experiment against UWP id: test-uwp - run: vstest.console.exe ./labs/${{ env.TEST_PROJECT_NAME }}/**/${{ env.TEST_PROJECT_NAME }}.Tests.UWP.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PROJECT_NAME }}UWP.trx" + run: vstest.console.exe ./components/${{ env.TEST_PROJECT_NAME }}/**/${{ env.TEST_PROJECT_NAME }}.Tests.UWP.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PROJECT_NAME }}UWP.trx" - name: Run tests in the generated experiment against WinAppSDK id: test-winappsdk - run: vstest.console.exe ./labs/${{ env.TEST_PROJECT_NAME }}/**/${{ env.TEST_PROJECT_NAME }}.Tests.WinAppSdk.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PROJECT_NAME }}WinAppSdk.trx" + run: vstest.console.exe ./components/${{ env.TEST_PROJECT_NAME }}/**/${{ env.TEST_PROJECT_NAME }}.Tests.WinAppSdk.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PROJECT_NAME }}WinAppSdk.trx" - name: Create test reports run: | diff --git a/ReadMe.md b/ReadMe.md index 2b1fe8431..e827a2738 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -19,7 +19,7 @@ You can find the corresponding `CommunityToolkit.Labs` packages in our Azure Dev If you find an experiment useful, please up-vote 👍 its corresponding issue and comment with any feedback. Each experiment has an issue assigned to it with the `experiment` label for tracking. Please file any feedback or issues about that experiment on that singular issue. For any other questions or concerns, please [open a Discussion](https://github.com/CommunityToolkit/Labs-Windows/discussions). -Otherwise, you can clone the repo, open the `labs` directory, navigate within the folder for a particular experiment and open up it's solution file in Visual Studio. Run one of the project heads (_ExperimentName.Uwp/Wasm/WinAppSDK_) to see its samples. +Otherwise, you can clone the repo, open the `components` directory, navigate within the folder for a particular experiment and open up it's solution file in Visual Studio. Run one of the project heads (_ExperimentName.Uwp/Wasm/WinAppSDK_) to see its samples. ## Build Requirements @@ -41,7 +41,7 @@ Then you can fork the Labs repo, create a new branch, and start working on your ```ascii dotnet new --install .\template\ProjectTemplate\ -cd labs +cd components dotnet new labexp -n MyExperimentNameHere ``` diff --git a/common/CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleMetadataTests.cs b/common/CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleMetadataTests.cs index 8df2bdc5f..ca4b3b1e6 100644 --- a/common/CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleMetadataTests.cs +++ b/common/CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleMetadataTests.cs @@ -473,7 +473,7 @@ from assembly in AppDomain.CurrentDomain.GetAssemblies() if (!string.IsNullOrWhiteSpace(markdown)) { - var text = new InMemoryAdditionalText(@"C:\pathtorepo\labs\experiment\samples\experiment.Samples\documentation.md", markdown); + var text = new InMemoryAdditionalText(@"C:\pathtorepo\components\experiment\samples\experiment.Samples\documentation.md", markdown); driver = driver.AddAdditionalTexts(ImmutableArray.Create(text)); } diff --git a/common/CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs b/common/CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs index 95b90ff67..e0af62b1f 100644 --- a/common/CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs +++ b/common/CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs @@ -148,7 +148,7 @@ private ImmutableArray GatherDocumentFrontMatter(SourceProdu } // Get the filepath we need to be able to load the markdown file in sample app. - var filepath = file.Path.Split(new string[] { @"\labs\", "/labs/", @"\template\", "/template/" }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault(); + var filepath = file.Path.Split(new string[] { @"\components\", "/components/", @"\template\", "/template/" }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault(); // Look for sample id tags var matches = MarkdownRegexSampleTag.Matches(content); diff --git a/common/GenerateAllSolution.ps1 b/common/GenerateAllSolution.ps1 index 4b4639fb7..21c90c267 100644 --- a/common/GenerateAllSolution.ps1 +++ b/common/GenerateAllSolution.ps1 @@ -64,9 +64,9 @@ if ($IncludeHeads -ne 'uwp') [void]$projects.Add(".\common\ProjectHeads\AllComponents\**\*.Wasm.csproj") # Individual projects -[void]$projects.Add(".\labs\**\src\*.csproj") -[void]$projects.Add(".\labs\**\samples\*.Samples.csproj") -[void]$projects.Add(".\labs\**\tests\*.Tests\*.shproj") +[void]$projects.Add(".\components\**\src\*.csproj") +[void]$projects.Add(".\components\**\samples\*.Samples.csproj") +[void]$projects.Add(".\components\**\tests\*.Tests\*.shproj") if ($UseDiagnostics.IsPresent) { diff --git a/common/GenerateVSCodeLaunchConfig.ps1 b/common/GenerateVSCodeLaunchConfig.ps1 index 168481506..788e3c443 100644 --- a/common/GenerateVSCodeLaunchConfig.ps1 +++ b/common/GenerateVSCodeLaunchConfig.ps1 @@ -20,12 +20,12 @@ function CreateVsCodeLaunchConfigJson { `"/p:UnoSourceGeneratorUseGenerationHost=true`", `"/p:UnoSourceGeneratorUseGenerationController=false`", `"/p:UnoRemoteControlPort=443`", - `"--project=`$`{workspaceFolder`}/labs/$projectName/samples/$projectName.Wasm/$projectName.Wasm.csproj`" + `"--project=`$`{workspaceFolder`}/components/$projectName/samples/$projectName.Wasm/$projectName.Wasm.csproj`" ], `"presentation`": { `"group`": `"2`" }, - `"cwd`": `"`$`{workspaceFolder`}/labs/$projectName/samples/$projectName.Wasm`" + `"cwd`": `"`$`{workspaceFolder`}/components/$projectName/samples/$projectName.Wasm`" }"; } diff --git a/common/MultiTarget/GenerateAllProjectReferences.ps1 b/common/MultiTarget/GenerateAllProjectReferences.ps1 index 1e09d2120..04b6a78fc 100644 --- a/common/MultiTarget/GenerateAllProjectReferences.ps1 +++ b/common/MultiTarget/GenerateAllProjectReferences.ps1 @@ -11,7 +11,7 @@ Remove-Item -Path $projectPropsOutputDir -Recurse -Force -ErrorAction SilentlyCo New-Item -ItemType Directory -Force -Path $projectPropsOutputDir -ErrorAction SilentlyContinue | Out-Null; # Discover projects in provided paths -foreach ($projectPath in Get-ChildItem -Directory -Depth 0 -Path "$PSScriptRoot/../../labs/") { +foreach ($projectPath in Get-ChildItem -Directory -Depth 0 -Path "$PSScriptRoot/../../components/*") { # Normalize project path $projectName = $projectPath.Name; diff --git a/common/ProjectHeads/AllComponents/Tests.Head.AllComponents.props b/common/ProjectHeads/AllComponents/Tests.Head.AllComponents.props index d00d17b94..498547652 100644 --- a/common/ProjectHeads/AllComponents/Tests.Head.AllComponents.props +++ b/common/ProjectHeads/AllComponents/Tests.Head.AllComponents.props @@ -3,7 +3,7 @@ - + diff --git a/common/ProjectHeads/App.Head.props b/common/ProjectHeads/App.Head.props index 9f2509042..5820767c1 100644 --- a/common/ProjectHeads/App.Head.props +++ b/common/ProjectHeads/App.Head.props @@ -36,21 +36,21 @@ - + SourceAssets/%(RecursiveDir)%(FileName)%(Extension) - + SourceAssets/%(RecursiveDir)%(FileName)%(Extension) - + SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat - + diff --git a/common/Scripts/PackEachExperiment.ps1 b/common/Scripts/PackEachExperiment.ps1 index 49939aa48..22610a947 100644 --- a/common/Scripts/PackEachExperiment.ps1 +++ b/common/Scripts/PackEachExperiment.ps1 @@ -1,4 +1,4 @@ -foreach ($experimentProjPath in Get-ChildItem -Recurse -Path '../../labs/*/src/*.csproj') { +foreach ($experimentProjPath in Get-ChildItem -Recurse -Path '../../components/*/src/*.csproj') { & msbuild.exe -t:pack /p:Configuration=Release /p:DebugType=Portable $experimentProjPath } diff --git a/labs/.vsconfig b/components/.vsconfig similarity index 100% rename from labs/.vsconfig rename to components/.vsconfig diff --git a/labs/CanvasLayout/OpenSolution.bat b/components/CanvasLayout/OpenSolution.bat similarity index 100% rename from labs/CanvasLayout/OpenSolution.bat rename to components/CanvasLayout/OpenSolution.bat diff --git a/labs/CanvasLayout/samples/CanvasLayout.Samples.csproj b/components/CanvasLayout/samples/CanvasLayout.Samples.csproj similarity index 100% rename from labs/CanvasLayout/samples/CanvasLayout.Samples.csproj rename to components/CanvasLayout/samples/CanvasLayout.Samples.csproj diff --git a/labs/CanvasLayout/samples/CanvasLayout.md b/components/CanvasLayout/samples/CanvasLayout.md similarity index 100% rename from labs/CanvasLayout/samples/CanvasLayout.md rename to components/CanvasLayout/samples/CanvasLayout.md diff --git a/labs/CanvasLayout/samples/CanvasLayoutSample.xaml b/components/CanvasLayout/samples/CanvasLayoutSample.xaml similarity index 100% rename from labs/CanvasLayout/samples/CanvasLayoutSample.xaml rename to components/CanvasLayout/samples/CanvasLayoutSample.xaml diff --git a/labs/CanvasLayout/samples/CanvasLayoutSample.xaml.cs b/components/CanvasLayout/samples/CanvasLayoutSample.xaml.cs similarity index 100% rename from labs/CanvasLayout/samples/CanvasLayoutSample.xaml.cs rename to components/CanvasLayout/samples/CanvasLayoutSample.xaml.cs diff --git a/labs/CanvasLayout/samples/Dependencies.props b/components/CanvasLayout/samples/Dependencies.props similarity index 100% rename from labs/CanvasLayout/samples/Dependencies.props rename to components/CanvasLayout/samples/Dependencies.props diff --git a/labs/CanvasLayout/src/AdditionalAssemblyInfo.cs b/components/CanvasLayout/src/AdditionalAssemblyInfo.cs similarity index 100% rename from labs/CanvasLayout/src/AdditionalAssemblyInfo.cs rename to components/CanvasLayout/src/AdditionalAssemblyInfo.cs diff --git a/labs/CanvasLayout/src/CanvasLayout.cs b/components/CanvasLayout/src/CanvasLayout.cs similarity index 100% rename from labs/CanvasLayout/src/CanvasLayout.cs rename to components/CanvasLayout/src/CanvasLayout.cs diff --git a/labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj b/components/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj similarity index 100% rename from labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj rename to components/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj diff --git a/labs/CanvasLayout/src/Dependencies.props b/components/CanvasLayout/src/Dependencies.props similarity index 100% rename from labs/CanvasLayout/src/Dependencies.props rename to components/CanvasLayout/src/Dependencies.props diff --git a/labs/CanvasLayout/tests/CanvasLayout.Tests.projitems b/components/CanvasLayout/tests/CanvasLayout.Tests.projitems similarity index 100% rename from labs/CanvasLayout/tests/CanvasLayout.Tests.projitems rename to components/CanvasLayout/tests/CanvasLayout.Tests.projitems diff --git a/labs/CanvasLayout/tests/CanvasLayout.Tests.shproj b/components/CanvasLayout/tests/CanvasLayout.Tests.shproj similarity index 100% rename from labs/CanvasLayout/tests/CanvasLayout.Tests.shproj rename to components/CanvasLayout/tests/CanvasLayout.Tests.shproj diff --git a/labs/CanvasLayout/tests/ExampleCanvasLayoutTestClass.cs b/components/CanvasLayout/tests/ExampleCanvasLayoutTestClass.cs similarity index 100% rename from labs/CanvasLayout/tests/ExampleCanvasLayoutTestClass.cs rename to components/CanvasLayout/tests/ExampleCanvasLayoutTestClass.cs diff --git a/labs/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml b/components/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml similarity index 100% rename from labs/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml rename to components/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml diff --git a/labs/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml.cs b/components/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml.cs similarity index 100% rename from labs/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml.cs rename to components/CanvasLayout/tests/ExampleCanvasLayoutTestPage.xaml.cs diff --git a/labs/CanvasView/OpenSolution.bat b/components/CanvasView/OpenSolution.bat similarity index 100% rename from labs/CanvasView/OpenSolution.bat rename to components/CanvasView/OpenSolution.bat diff --git a/labs/CanvasView/samples/CanvasView.Samples.csproj b/components/CanvasView/samples/CanvasView.Samples.csproj similarity index 100% rename from labs/CanvasView/samples/CanvasView.Samples.csproj rename to components/CanvasView/samples/CanvasView.Samples.csproj diff --git a/labs/CanvasView/samples/CanvasView.md b/components/CanvasView/samples/CanvasView.md similarity index 100% rename from labs/CanvasView/samples/CanvasView.md rename to components/CanvasView/samples/CanvasView.md diff --git a/labs/CanvasView/samples/CanvasViewDragSample.xaml b/components/CanvasView/samples/CanvasViewDragSample.xaml similarity index 100% rename from labs/CanvasView/samples/CanvasViewDragSample.xaml rename to components/CanvasView/samples/CanvasViewDragSample.xaml diff --git a/labs/CanvasView/samples/CanvasViewDragSample.xaml.cs b/components/CanvasView/samples/CanvasViewDragSample.xaml.cs similarity index 100% rename from labs/CanvasView/samples/CanvasViewDragSample.xaml.cs rename to components/CanvasView/samples/CanvasViewDragSample.xaml.cs diff --git a/labs/CanvasView/samples/Dependencies.props b/components/CanvasView/samples/Dependencies.props similarity index 100% rename from labs/CanvasView/samples/Dependencies.props rename to components/CanvasView/samples/Dependencies.props diff --git a/labs/CanvasView/src/AdditionalAssemblyInfo.cs b/components/CanvasView/src/AdditionalAssemblyInfo.cs similarity index 100% rename from labs/CanvasView/src/AdditionalAssemblyInfo.cs rename to components/CanvasView/src/AdditionalAssemblyInfo.cs diff --git a/labs/CanvasView/src/CanvasView.cs b/components/CanvasView/src/CanvasView.cs similarity index 100% rename from labs/CanvasView/src/CanvasView.cs rename to components/CanvasView/src/CanvasView.cs diff --git a/labs/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj b/components/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj similarity index 100% rename from labs/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj rename to components/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj diff --git a/labs/CanvasView/src/Dependencies.props b/components/CanvasView/src/Dependencies.props similarity index 100% rename from labs/CanvasView/src/Dependencies.props rename to components/CanvasView/src/Dependencies.props diff --git a/labs/CanvasView/src/FrameworkElementExtensions.cs b/components/CanvasView/src/FrameworkElementExtensions.cs similarity index 100% rename from labs/CanvasView/src/FrameworkElementExtensions.cs rename to components/CanvasView/src/FrameworkElementExtensions.cs diff --git a/labs/CanvasView/tests/CanvasView.Tests.projitems b/components/CanvasView/tests/CanvasView.Tests.projitems similarity index 100% rename from labs/CanvasView/tests/CanvasView.Tests.projitems rename to components/CanvasView/tests/CanvasView.Tests.projitems diff --git a/labs/CanvasView/tests/CanvasView.Tests.shproj b/components/CanvasView/tests/CanvasView.Tests.shproj similarity index 100% rename from labs/CanvasView/tests/CanvasView.Tests.shproj rename to components/CanvasView/tests/CanvasView.Tests.shproj diff --git a/labs/CanvasView/tests/ExampleCanvasViewTestClass.cs b/components/CanvasView/tests/ExampleCanvasViewTestClass.cs similarity index 100% rename from labs/CanvasView/tests/ExampleCanvasViewTestClass.cs rename to components/CanvasView/tests/ExampleCanvasViewTestClass.cs diff --git a/labs/CanvasView/tests/ExampleCanvasViewTestPage.xaml b/components/CanvasView/tests/ExampleCanvasViewTestPage.xaml similarity index 100% rename from labs/CanvasView/tests/ExampleCanvasViewTestPage.xaml rename to components/CanvasView/tests/ExampleCanvasViewTestPage.xaml diff --git a/labs/CanvasView/tests/ExampleCanvasViewTestPage.xaml.cs b/components/CanvasView/tests/ExampleCanvasViewTestPage.xaml.cs similarity index 100% rename from labs/CanvasView/tests/ExampleCanvasViewTestPage.xaml.cs rename to components/CanvasView/tests/ExampleCanvasViewTestPage.xaml.cs diff --git a/labs/RivePlayer/OpenSolution.bat b/components/RivePlayer/OpenSolution.bat similarity index 100% rename from labs/RivePlayer/OpenSolution.bat rename to components/RivePlayer/OpenSolution.bat diff --git a/labs/RivePlayer/samples/Dependencies.props b/components/RivePlayer/samples/Dependencies.props similarity index 100% rename from labs/RivePlayer/samples/Dependencies.props rename to components/RivePlayer/samples/Dependencies.props diff --git a/labs/RivePlayer/samples/RivePlayer.Samples.csproj b/components/RivePlayer/samples/RivePlayer.Samples.csproj similarity index 100% rename from labs/RivePlayer/samples/RivePlayer.Samples.csproj rename to components/RivePlayer/samples/RivePlayer.Samples.csproj diff --git a/labs/RivePlayer/samples/RivePlayer.md b/components/RivePlayer/samples/RivePlayer.md similarity index 100% rename from labs/RivePlayer/samples/RivePlayer.md rename to components/RivePlayer/samples/RivePlayer.md diff --git a/labs/RivePlayer/samples/RivePlayerCustomSample.xaml b/components/RivePlayer/samples/RivePlayerCustomSample.xaml similarity index 100% rename from labs/RivePlayer/samples/RivePlayerCustomSample.xaml rename to components/RivePlayer/samples/RivePlayerCustomSample.xaml diff --git a/labs/RivePlayer/samples/RivePlayerCustomSample.xaml.cs b/components/RivePlayer/samples/RivePlayerCustomSample.xaml.cs similarity index 100% rename from labs/RivePlayer/samples/RivePlayerCustomSample.xaml.cs rename to components/RivePlayer/samples/RivePlayerCustomSample.xaml.cs diff --git a/labs/RivePlayer/samples/animated-login-screen.riv b/components/RivePlayer/samples/animated-login-screen.riv similarity index 100% rename from labs/RivePlayer/samples/animated-login-screen.riv rename to components/RivePlayer/samples/animated-login-screen.riv diff --git a/labs/RivePlayer/src/AdditionalAssemblyInfo.cs b/components/RivePlayer/src/AdditionalAssemblyInfo.cs similarity index 100% rename from labs/RivePlayer/src/AdditionalAssemblyInfo.cs rename to components/RivePlayer/src/AdditionalAssemblyInfo.cs diff --git a/labs/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj b/components/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj similarity index 100% rename from labs/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj rename to components/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj diff --git a/labs/RivePlayer/src/Dependencies.props b/components/RivePlayer/src/Dependencies.props similarity index 100% rename from labs/RivePlayer/src/Dependencies.props rename to components/RivePlayer/src/Dependencies.props diff --git a/labs/RivePlayer/src/MultiTarget.props b/components/RivePlayer/src/MultiTarget.props similarity index 100% rename from labs/RivePlayer/src/MultiTarget.props rename to components/RivePlayer/src/MultiTarget.props diff --git a/labs/RivePlayer/src/RivePlayer.Platform.cs b/components/RivePlayer/src/RivePlayer.Platform.cs similarity index 100% rename from labs/RivePlayer/src/RivePlayer.Platform.cs rename to components/RivePlayer/src/RivePlayer.Platform.cs diff --git a/labs/RivePlayer/src/RivePlayer.Properties.cs b/components/RivePlayer/src/RivePlayer.Properties.cs similarity index 100% rename from labs/RivePlayer/src/RivePlayer.Properties.cs rename to components/RivePlayer/src/RivePlayer.Properties.cs diff --git a/labs/RivePlayer/src/RivePlayer.cs b/components/RivePlayer/src/RivePlayer.cs similarity index 100% rename from labs/RivePlayer/src/RivePlayer.cs rename to components/RivePlayer/src/RivePlayer.cs diff --git a/labs/RivePlayer/src/RivePlayer.xaml b/components/RivePlayer/src/RivePlayer.xaml similarity index 100% rename from labs/RivePlayer/src/RivePlayer.xaml rename to components/RivePlayer/src/RivePlayer.xaml diff --git a/labs/RivePlayer/src/StateMachineInput.cs b/components/RivePlayer/src/StateMachineInput.cs similarity index 100% rename from labs/RivePlayer/src/StateMachineInput.cs rename to components/RivePlayer/src/StateMachineInput.cs diff --git a/labs/RivePlayer/src/StateMachineInputCollection.cs b/components/RivePlayer/src/StateMachineInputCollection.cs similarity index 100% rename from labs/RivePlayer/src/StateMachineInputCollection.cs rename to components/RivePlayer/src/StateMachineInputCollection.cs diff --git a/labs/RivePlayer/src/Themes/Generic.xaml b/components/RivePlayer/src/Themes/Generic.xaml similarity index 100% rename from labs/RivePlayer/src/Themes/Generic.xaml rename to components/RivePlayer/src/Themes/Generic.xaml diff --git a/labs/RivePlayer/tests/ExampleRivePlayerTestClass.cs b/components/RivePlayer/tests/ExampleRivePlayerTestClass.cs similarity index 100% rename from labs/RivePlayer/tests/ExampleRivePlayerTestClass.cs rename to components/RivePlayer/tests/ExampleRivePlayerTestClass.cs diff --git a/labs/RivePlayer/tests/ExampleRivePlayerTestPage.xaml b/components/RivePlayer/tests/ExampleRivePlayerTestPage.xaml similarity index 100% rename from labs/RivePlayer/tests/ExampleRivePlayerTestPage.xaml rename to components/RivePlayer/tests/ExampleRivePlayerTestPage.xaml diff --git a/labs/RivePlayer/tests/ExampleRivePlayerTestPage.xaml.cs b/components/RivePlayer/tests/ExampleRivePlayerTestPage.xaml.cs similarity index 100% rename from labs/RivePlayer/tests/ExampleRivePlayerTestPage.xaml.cs rename to components/RivePlayer/tests/ExampleRivePlayerTestPage.xaml.cs diff --git a/labs/RivePlayer/tests/RivePlayer.Tests.projitems b/components/RivePlayer/tests/RivePlayer.Tests.projitems similarity index 100% rename from labs/RivePlayer/tests/RivePlayer.Tests.projitems rename to components/RivePlayer/tests/RivePlayer.Tests.projitems diff --git a/labs/RivePlayer/tests/RivePlayer.Tests.shproj b/components/RivePlayer/tests/RivePlayer.Tests.shproj similarity index 100% rename from labs/RivePlayer/tests/RivePlayer.Tests.shproj rename to components/RivePlayer/tests/RivePlayer.Tests.shproj diff --git a/labs/SettingsControls/OpenSolution.bat b/components/SettingsControls/OpenSolution.bat similarity index 100% rename from labs/SettingsControls/OpenSolution.bat rename to components/SettingsControls/OpenSolution.bat diff --git a/labs/SettingsControls/samples/ClickableSettingsCardSample.xaml b/components/SettingsControls/samples/ClickableSettingsCardSample.xaml similarity index 100% rename from labs/SettingsControls/samples/ClickableSettingsCardSample.xaml rename to components/SettingsControls/samples/ClickableSettingsCardSample.xaml diff --git a/labs/SettingsControls/samples/ClickableSettingsCardSample.xaml.cs b/components/SettingsControls/samples/ClickableSettingsCardSample.xaml.cs similarity index 100% rename from labs/SettingsControls/samples/ClickableSettingsCardSample.xaml.cs rename to components/SettingsControls/samples/ClickableSettingsCardSample.xaml.cs diff --git a/labs/SettingsControls/samples/Dependencies.props b/components/SettingsControls/samples/Dependencies.props similarity index 100% rename from labs/SettingsControls/samples/Dependencies.props rename to components/SettingsControls/samples/Dependencies.props diff --git a/labs/SettingsControls/samples/SettingsCard.md b/components/SettingsControls/samples/SettingsCard.md similarity index 100% rename from labs/SettingsControls/samples/SettingsCard.md rename to components/SettingsControls/samples/SettingsCard.md diff --git a/labs/SettingsControls/samples/SettingsCardSample.xaml b/components/SettingsControls/samples/SettingsCardSample.xaml similarity index 100% rename from labs/SettingsControls/samples/SettingsCardSample.xaml rename to components/SettingsControls/samples/SettingsCardSample.xaml diff --git a/labs/SettingsControls/samples/SettingsCardSample.xaml.cs b/components/SettingsControls/samples/SettingsCardSample.xaml.cs similarity index 100% rename from labs/SettingsControls/samples/SettingsCardSample.xaml.cs rename to components/SettingsControls/samples/SettingsCardSample.xaml.cs diff --git a/labs/SettingsControls/samples/SettingsControls.Samples.csproj b/components/SettingsControls/samples/SettingsControls.Samples.csproj similarity index 100% rename from labs/SettingsControls/samples/SettingsControls.Samples.csproj rename to components/SettingsControls/samples/SettingsControls.Samples.csproj diff --git a/labs/SettingsControls/samples/SettingsExpander.md b/components/SettingsControls/samples/SettingsExpander.md similarity index 100% rename from labs/SettingsControls/samples/SettingsExpander.md rename to components/SettingsControls/samples/SettingsExpander.md diff --git a/labs/SettingsControls/samples/SettingsExpanderItemsSourceSample.xaml b/components/SettingsControls/samples/SettingsExpanderItemsSourceSample.xaml similarity index 100% rename from labs/SettingsControls/samples/SettingsExpanderItemsSourceSample.xaml rename to components/SettingsControls/samples/SettingsExpanderItemsSourceSample.xaml diff --git a/labs/SettingsControls/samples/SettingsExpanderItemsSourceSample.xaml.cs b/components/SettingsControls/samples/SettingsExpanderItemsSourceSample.xaml.cs similarity index 100% rename from labs/SettingsControls/samples/SettingsExpanderItemsSourceSample.xaml.cs rename to components/SettingsControls/samples/SettingsExpanderItemsSourceSample.xaml.cs diff --git a/labs/SettingsControls/samples/SettingsExpanderSample.xaml b/components/SettingsControls/samples/SettingsExpanderSample.xaml similarity index 100% rename from labs/SettingsControls/samples/SettingsExpanderSample.xaml rename to components/SettingsControls/samples/SettingsExpanderSample.xaml diff --git a/labs/SettingsControls/samples/SettingsExpanderSample.xaml.cs b/components/SettingsControls/samples/SettingsExpanderSample.xaml.cs similarity index 100% rename from labs/SettingsControls/samples/SettingsExpanderSample.xaml.cs rename to components/SettingsControls/samples/SettingsExpanderSample.xaml.cs diff --git a/labs/SettingsControls/samples/SettingsPageExample.md b/components/SettingsControls/samples/SettingsPageExample.md similarity index 100% rename from labs/SettingsControls/samples/SettingsPageExample.md rename to components/SettingsControls/samples/SettingsPageExample.md diff --git a/labs/SettingsControls/samples/SettingsPageExample.xaml b/components/SettingsControls/samples/SettingsPageExample.xaml similarity index 100% rename from labs/SettingsControls/samples/SettingsPageExample.xaml rename to components/SettingsControls/samples/SettingsPageExample.xaml diff --git a/labs/SettingsControls/samples/SettingsPageExample.xaml.cs b/components/SettingsControls/samples/SettingsPageExample.xaml.cs similarity index 100% rename from labs/SettingsControls/samples/SettingsPageExample.xaml.cs rename to components/SettingsControls/samples/SettingsPageExample.xaml.cs diff --git a/labs/SettingsControls/src/AdditionalAssemblyInfo.cs b/components/SettingsControls/src/AdditionalAssemblyInfo.cs similarity index 100% rename from labs/SettingsControls/src/AdditionalAssemblyInfo.cs rename to components/SettingsControls/src/AdditionalAssemblyInfo.cs diff --git a/labs/SettingsControls/src/CommunityToolkit.Labs.WinUI.SettingsControls.csproj b/components/SettingsControls/src/CommunityToolkit.Labs.WinUI.SettingsControls.csproj similarity index 100% rename from labs/SettingsControls/src/CommunityToolkit.Labs.WinUI.SettingsControls.csproj rename to components/SettingsControls/src/CommunityToolkit.Labs.WinUI.SettingsControls.csproj diff --git a/labs/SettingsControls/src/Dependencies.props b/components/SettingsControls/src/Dependencies.props similarity index 100% rename from labs/SettingsControls/src/Dependencies.props rename to components/SettingsControls/src/Dependencies.props diff --git a/labs/SettingsControls/src/Helpers/ControlSizeTrigger.cs b/components/SettingsControls/src/Helpers/ControlSizeTrigger.cs similarity index 100% rename from labs/SettingsControls/src/Helpers/ControlSizeTrigger.cs rename to components/SettingsControls/src/Helpers/ControlSizeTrigger.cs diff --git a/labs/SettingsControls/src/Helpers/IsEqualStateTrigger.cs b/components/SettingsControls/src/Helpers/IsEqualStateTrigger.cs similarity index 100% rename from labs/SettingsControls/src/Helpers/IsEqualStateTrigger.cs rename to components/SettingsControls/src/Helpers/IsEqualStateTrigger.cs diff --git a/labs/SettingsControls/src/Helpers/ResourceDictionaryExtensions.cs b/components/SettingsControls/src/Helpers/ResourceDictionaryExtensions.cs similarity index 100% rename from labs/SettingsControls/src/Helpers/ResourceDictionaryExtensions.cs rename to components/SettingsControls/src/Helpers/ResourceDictionaryExtensions.cs diff --git a/labs/SettingsControls/src/Helpers/StyleExtensions.cs b/components/SettingsControls/src/Helpers/StyleExtensions.cs similarity index 100% rename from labs/SettingsControls/src/Helpers/StyleExtensions.cs rename to components/SettingsControls/src/Helpers/StyleExtensions.cs diff --git a/labs/SettingsControls/src/SettingsCard/SettingsCard.Properties.cs b/components/SettingsControls/src/SettingsCard/SettingsCard.Properties.cs similarity index 100% rename from labs/SettingsControls/src/SettingsCard/SettingsCard.Properties.cs rename to components/SettingsControls/src/SettingsCard/SettingsCard.Properties.cs diff --git a/labs/SettingsControls/src/SettingsCard/SettingsCard.cs b/components/SettingsControls/src/SettingsCard/SettingsCard.cs similarity index 100% rename from labs/SettingsControls/src/SettingsCard/SettingsCard.cs rename to components/SettingsControls/src/SettingsCard/SettingsCard.cs diff --git a/labs/SettingsControls/src/SettingsCard/SettingsCard.xaml b/components/SettingsControls/src/SettingsCard/SettingsCard.xaml similarity index 100% rename from labs/SettingsControls/src/SettingsCard/SettingsCard.xaml rename to components/SettingsControls/src/SettingsCard/SettingsCard.xaml diff --git a/labs/SettingsControls/src/SettingsCard/SettingsCardAutomationPeer.cs b/components/SettingsControls/src/SettingsCard/SettingsCardAutomationPeer.cs similarity index 100% rename from labs/SettingsControls/src/SettingsCard/SettingsCardAutomationPeer.cs rename to components/SettingsControls/src/SettingsCard/SettingsCardAutomationPeer.cs diff --git a/labs/SettingsControls/src/SettingsExpander/Internal/StyledContentPresenter.cs b/components/SettingsControls/src/SettingsExpander/Internal/StyledContentPresenter.cs similarity index 100% rename from labs/SettingsControls/src/SettingsExpander/Internal/StyledContentPresenter.cs rename to components/SettingsControls/src/SettingsExpander/Internal/StyledContentPresenter.cs diff --git a/labs/SettingsControls/src/SettingsExpander/SettingsExpander.ItemsControl.cs b/components/SettingsControls/src/SettingsExpander/SettingsExpander.ItemsControl.cs similarity index 100% rename from labs/SettingsControls/src/SettingsExpander/SettingsExpander.ItemsControl.cs rename to components/SettingsControls/src/SettingsExpander/SettingsExpander.ItemsControl.cs diff --git a/labs/SettingsControls/src/SettingsExpander/SettingsExpander.Properties.cs b/components/SettingsControls/src/SettingsExpander/SettingsExpander.Properties.cs similarity index 100% rename from labs/SettingsControls/src/SettingsExpander/SettingsExpander.Properties.cs rename to components/SettingsControls/src/SettingsExpander/SettingsExpander.Properties.cs diff --git a/labs/SettingsControls/src/SettingsExpander/SettingsExpander.cs b/components/SettingsControls/src/SettingsExpander/SettingsExpander.cs similarity index 100% rename from labs/SettingsControls/src/SettingsExpander/SettingsExpander.cs rename to components/SettingsControls/src/SettingsExpander/SettingsExpander.cs diff --git a/labs/SettingsControls/src/SettingsExpander/SettingsExpander.xaml b/components/SettingsControls/src/SettingsExpander/SettingsExpander.xaml similarity index 100% rename from labs/SettingsControls/src/SettingsExpander/SettingsExpander.xaml rename to components/SettingsControls/src/SettingsExpander/SettingsExpander.xaml diff --git a/labs/SettingsControls/src/SettingsExpander/SettingsExpanderAutomationPeer.cs b/components/SettingsControls/src/SettingsExpander/SettingsExpanderAutomationPeer.cs similarity index 100% rename from labs/SettingsControls/src/SettingsExpander/SettingsExpanderAutomationPeer.cs rename to components/SettingsControls/src/SettingsExpander/SettingsExpanderAutomationPeer.cs diff --git a/labs/SettingsControls/src/SettingsExpander/SettingsExpanderItemStyleSelector.cs b/components/SettingsControls/src/SettingsExpander/SettingsExpanderItemStyleSelector.cs similarity index 100% rename from labs/SettingsControls/src/SettingsExpander/SettingsExpanderItemStyleSelector.cs rename to components/SettingsControls/src/SettingsExpander/SettingsExpanderItemStyleSelector.cs diff --git a/labs/SettingsControls/src/Themes/Generic.xaml b/components/SettingsControls/src/Themes/Generic.xaml similarity index 100% rename from labs/SettingsControls/src/Themes/Generic.xaml rename to components/SettingsControls/src/Themes/Generic.xaml diff --git a/labs/SettingsControls/tests/ExampleSettingsControlsTestClass.cs b/components/SettingsControls/tests/ExampleSettingsControlsTestClass.cs similarity index 100% rename from labs/SettingsControls/tests/ExampleSettingsControlsTestClass.cs rename to components/SettingsControls/tests/ExampleSettingsControlsTestClass.cs diff --git a/labs/SettingsControls/tests/ExampleSettingsControlsTestPage.xaml b/components/SettingsControls/tests/ExampleSettingsControlsTestPage.xaml similarity index 100% rename from labs/SettingsControls/tests/ExampleSettingsControlsTestPage.xaml rename to components/SettingsControls/tests/ExampleSettingsControlsTestPage.xaml diff --git a/labs/SettingsControls/tests/ExampleSettingsControlsTestPage.xaml.cs b/components/SettingsControls/tests/ExampleSettingsControlsTestPage.xaml.cs similarity index 100% rename from labs/SettingsControls/tests/ExampleSettingsControlsTestPage.xaml.cs rename to components/SettingsControls/tests/ExampleSettingsControlsTestPage.xaml.cs diff --git a/labs/SettingsControls/tests/SettingsControls.Tests.projitems b/components/SettingsControls/tests/SettingsControls.Tests.projitems similarity index 100% rename from labs/SettingsControls/tests/SettingsControls.Tests.projitems rename to components/SettingsControls/tests/SettingsControls.Tests.projitems diff --git a/labs/SettingsControls/tests/SettingsControls.Tests.shproj b/components/SettingsControls/tests/SettingsControls.Tests.shproj similarity index 100% rename from labs/SettingsControls/tests/SettingsControls.Tests.shproj rename to components/SettingsControls/tests/SettingsControls.Tests.shproj diff --git a/labs/SizerBase/OpenSolution.bat b/components/SizerBase/OpenSolution.bat similarity index 100% rename from labs/SizerBase/OpenSolution.bat rename to components/SizerBase/OpenSolution.bat diff --git a/labs/SizerBase/samples/ContentSizer.md b/components/SizerBase/samples/ContentSizer.md similarity index 100% rename from labs/SizerBase/samples/ContentSizer.md rename to components/SizerBase/samples/ContentSizer.md diff --git a/labs/SizerBase/samples/ContentSizerLeftShelfPage.xaml b/components/SizerBase/samples/ContentSizerLeftShelfPage.xaml similarity index 100% rename from labs/SizerBase/samples/ContentSizerLeftShelfPage.xaml rename to components/SizerBase/samples/ContentSizerLeftShelfPage.xaml diff --git a/labs/SizerBase/samples/ContentSizerLeftShelfPage.xaml.cs b/components/SizerBase/samples/ContentSizerLeftShelfPage.xaml.cs similarity index 100% rename from labs/SizerBase/samples/ContentSizerLeftShelfPage.xaml.cs rename to components/SizerBase/samples/ContentSizerLeftShelfPage.xaml.cs diff --git a/labs/SizerBase/samples/ContentSizerTopShelfPage.xaml b/components/SizerBase/samples/ContentSizerTopShelfPage.xaml similarity index 100% rename from labs/SizerBase/samples/ContentSizerTopShelfPage.xaml rename to components/SizerBase/samples/ContentSizerTopShelfPage.xaml diff --git a/labs/SizerBase/samples/ContentSizerTopShelfPage.xaml.cs b/components/SizerBase/samples/ContentSizerTopShelfPage.xaml.cs similarity index 100% rename from labs/SizerBase/samples/ContentSizerTopShelfPage.xaml.cs rename to components/SizerBase/samples/ContentSizerTopShelfPage.xaml.cs diff --git a/labs/SizerBase/samples/Dependencies.props b/components/SizerBase/samples/Dependencies.props similarity index 100% rename from labs/SizerBase/samples/Dependencies.props rename to components/SizerBase/samples/Dependencies.props diff --git a/labs/SizerBase/samples/GridSplitter.md b/components/SizerBase/samples/GridSplitter.md similarity index 100% rename from labs/SizerBase/samples/GridSplitter.md rename to components/SizerBase/samples/GridSplitter.md diff --git a/labs/SizerBase/samples/GridSplitterPage.xaml b/components/SizerBase/samples/GridSplitterPage.xaml similarity index 100% rename from labs/SizerBase/samples/GridSplitterPage.xaml rename to components/SizerBase/samples/GridSplitterPage.xaml diff --git a/labs/SizerBase/samples/GridSplitterPage.xaml.cs b/components/SizerBase/samples/GridSplitterPage.xaml.cs similarity index 100% rename from labs/SizerBase/samples/GridSplitterPage.xaml.cs rename to components/SizerBase/samples/GridSplitterPage.xaml.cs diff --git a/labs/SizerBase/samples/PropertySizer.md b/components/SizerBase/samples/PropertySizer.md similarity index 100% rename from labs/SizerBase/samples/PropertySizer.md rename to components/SizerBase/samples/PropertySizer.md diff --git a/labs/SizerBase/samples/PropertySizerNavigationViewPage.xaml b/components/SizerBase/samples/PropertySizerNavigationViewPage.xaml similarity index 100% rename from labs/SizerBase/samples/PropertySizerNavigationViewPage.xaml rename to components/SizerBase/samples/PropertySizerNavigationViewPage.xaml diff --git a/labs/SizerBase/samples/PropertySizerNavigationViewPage.xaml.cs b/components/SizerBase/samples/PropertySizerNavigationViewPage.xaml.cs similarity index 100% rename from labs/SizerBase/samples/PropertySizerNavigationViewPage.xaml.cs rename to components/SizerBase/samples/PropertySizerNavigationViewPage.xaml.cs diff --git a/labs/SizerBase/samples/SizerBase.Samples.csproj b/components/SizerBase/samples/SizerBase.Samples.csproj similarity index 100% rename from labs/SizerBase/samples/SizerBase.Samples.csproj rename to components/SizerBase/samples/SizerBase.Samples.csproj diff --git a/labs/SizerBase/samples/SizerControls.md b/components/SizerBase/samples/SizerControls.md similarity index 100% rename from labs/SizerBase/samples/SizerControls.md rename to components/SizerBase/samples/SizerControls.md diff --git a/labs/SizerBase/samples/SizerCursorPage.xaml b/components/SizerBase/samples/SizerCursorPage.xaml similarity index 100% rename from labs/SizerBase/samples/SizerCursorPage.xaml rename to components/SizerBase/samples/SizerCursorPage.xaml diff --git a/labs/SizerBase/samples/SizerCursorPage.xaml.cs b/components/SizerBase/samples/SizerCursorPage.xaml.cs similarity index 100% rename from labs/SizerBase/samples/SizerCursorPage.xaml.cs rename to components/SizerBase/samples/SizerCursorPage.xaml.cs diff --git a/labs/SizerBase/src/AdditionalAssemblyInfo.cs b/components/SizerBase/src/AdditionalAssemblyInfo.cs similarity index 100% rename from labs/SizerBase/src/AdditionalAssemblyInfo.cs rename to components/SizerBase/src/AdditionalAssemblyInfo.cs diff --git a/labs/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj b/components/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj similarity index 100% rename from labs/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj rename to components/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj diff --git a/labs/SizerBase/src/ContentSizer/ContentSizer.Events.cs b/components/SizerBase/src/ContentSizer/ContentSizer.Events.cs similarity index 100% rename from labs/SizerBase/src/ContentSizer/ContentSizer.Events.cs rename to components/SizerBase/src/ContentSizer/ContentSizer.Events.cs diff --git a/labs/SizerBase/src/ContentSizer/ContentSizer.Properties.cs b/components/SizerBase/src/ContentSizer/ContentSizer.Properties.cs similarity index 100% rename from labs/SizerBase/src/ContentSizer/ContentSizer.Properties.cs rename to components/SizerBase/src/ContentSizer/ContentSizer.Properties.cs diff --git a/labs/SizerBase/src/ContentSizer/ContentSizer.cs b/components/SizerBase/src/ContentSizer/ContentSizer.cs similarity index 100% rename from labs/SizerBase/src/ContentSizer/ContentSizer.cs rename to components/SizerBase/src/ContentSizer/ContentSizer.cs diff --git a/labs/SizerBase/src/Dependencies.props b/components/SizerBase/src/Dependencies.props similarity index 100% rename from labs/SizerBase/src/Dependencies.props rename to components/SizerBase/src/Dependencies.props diff --git a/labs/SizerBase/src/GridSplitter/GridSplitter.Data.cs b/components/SizerBase/src/GridSplitter/GridSplitter.Data.cs similarity index 100% rename from labs/SizerBase/src/GridSplitter/GridSplitter.Data.cs rename to components/SizerBase/src/GridSplitter/GridSplitter.Data.cs diff --git a/labs/SizerBase/src/GridSplitter/GridSplitter.Events.cs b/components/SizerBase/src/GridSplitter/GridSplitter.Events.cs similarity index 100% rename from labs/SizerBase/src/GridSplitter/GridSplitter.Events.cs rename to components/SizerBase/src/GridSplitter/GridSplitter.Events.cs diff --git a/labs/SizerBase/src/GridSplitter/GridSplitter.Helpers.cs b/components/SizerBase/src/GridSplitter/GridSplitter.Helpers.cs similarity index 100% rename from labs/SizerBase/src/GridSplitter/GridSplitter.Helpers.cs rename to components/SizerBase/src/GridSplitter/GridSplitter.Helpers.cs diff --git a/labs/SizerBase/src/GridSplitter/GridSplitter.Properties.cs b/components/SizerBase/src/GridSplitter/GridSplitter.Properties.cs similarity index 100% rename from labs/SizerBase/src/GridSplitter/GridSplitter.Properties.cs rename to components/SizerBase/src/GridSplitter/GridSplitter.Properties.cs diff --git a/labs/SizerBase/src/GridSplitter/GridSplitter.cs b/components/SizerBase/src/GridSplitter/GridSplitter.cs similarity index 100% rename from labs/SizerBase/src/GridSplitter/GridSplitter.cs rename to components/SizerBase/src/GridSplitter/GridSplitter.cs diff --git a/labs/SizerBase/src/PropertySizer/PropertySizer.Events.cs b/components/SizerBase/src/PropertySizer/PropertySizer.Events.cs similarity index 100% rename from labs/SizerBase/src/PropertySizer/PropertySizer.Events.cs rename to components/SizerBase/src/PropertySizer/PropertySizer.Events.cs diff --git a/labs/SizerBase/src/PropertySizer/PropertySizer.Properties.cs b/components/SizerBase/src/PropertySizer/PropertySizer.Properties.cs similarity index 100% rename from labs/SizerBase/src/PropertySizer/PropertySizer.Properties.cs rename to components/SizerBase/src/PropertySizer/PropertySizer.Properties.cs diff --git a/labs/SizerBase/src/PropertySizer/PropertySizer.cs b/components/SizerBase/src/PropertySizer/PropertySizer.cs similarity index 100% rename from labs/SizerBase/src/PropertySizer/PropertySizer.cs rename to components/SizerBase/src/PropertySizer/PropertySizer.cs diff --git a/labs/SizerBase/src/SizerAutomationPeer.cs b/components/SizerBase/src/SizerAutomationPeer.cs similarity index 100% rename from labs/SizerBase/src/SizerAutomationPeer.cs rename to components/SizerBase/src/SizerAutomationPeer.cs diff --git a/labs/SizerBase/src/SizerBase.Events.cs b/components/SizerBase/src/SizerBase.Events.cs similarity index 100% rename from labs/SizerBase/src/SizerBase.Events.cs rename to components/SizerBase/src/SizerBase.Events.cs diff --git a/labs/SizerBase/src/SizerBase.Helpers.cs b/components/SizerBase/src/SizerBase.Helpers.cs similarity index 100% rename from labs/SizerBase/src/SizerBase.Helpers.cs rename to components/SizerBase/src/SizerBase.Helpers.cs diff --git a/labs/SizerBase/src/SizerBase.Properties.cs b/components/SizerBase/src/SizerBase.Properties.cs similarity index 100% rename from labs/SizerBase/src/SizerBase.Properties.cs rename to components/SizerBase/src/SizerBase.Properties.cs diff --git a/labs/SizerBase/src/SizerBase.cs b/components/SizerBase/src/SizerBase.cs similarity index 100% rename from labs/SizerBase/src/SizerBase.cs rename to components/SizerBase/src/SizerBase.cs diff --git a/labs/SizerBase/src/SizerBase.xaml b/components/SizerBase/src/SizerBase.xaml similarity index 100% rename from labs/SizerBase/src/SizerBase.xaml rename to components/SizerBase/src/SizerBase.xaml diff --git a/labs/SizerBase/src/Strings/en-US/Resources.resw b/components/SizerBase/src/Strings/en-US/Resources.resw similarity index 100% rename from labs/SizerBase/src/Strings/en-US/Resources.resw rename to components/SizerBase/src/Strings/en-US/Resources.resw diff --git a/labs/SizerBase/src/Themes/Generic.xaml b/components/SizerBase/src/Themes/Generic.xaml similarity index 100% rename from labs/SizerBase/src/Themes/Generic.xaml rename to components/SizerBase/src/Themes/Generic.xaml diff --git a/labs/SizerBase/src/Toolkit/ConverterTools.cs b/components/SizerBase/src/Toolkit/ConverterTools.cs similarity index 100% rename from labs/SizerBase/src/Toolkit/ConverterTools.cs rename to components/SizerBase/src/Toolkit/ConverterTools.cs diff --git a/labs/SizerBase/src/Toolkit/DependencyObjectExtensions.cs b/components/SizerBase/src/Toolkit/DependencyObjectExtensions.cs similarity index 100% rename from labs/SizerBase/src/Toolkit/DependencyObjectExtensions.cs rename to components/SizerBase/src/Toolkit/DependencyObjectExtensions.cs diff --git a/labs/SizerBase/src/Toolkit/FrameworkElementExtensions.Mouse.cs b/components/SizerBase/src/Toolkit/FrameworkElementExtensions.Mouse.cs similarity index 100% rename from labs/SizerBase/src/Toolkit/FrameworkElementExtensions.Mouse.cs rename to components/SizerBase/src/Toolkit/FrameworkElementExtensions.Mouse.cs diff --git a/labs/SizerBase/src/Toolkit/OrientationToObjectConverter.cs b/components/SizerBase/src/Toolkit/OrientationToObjectConverter.cs similarity index 100% rename from labs/SizerBase/src/Toolkit/OrientationToObjectConverter.cs rename to components/SizerBase/src/Toolkit/OrientationToObjectConverter.cs diff --git a/labs/SizerBase/src/Toolkit/TypeToObjectConverter.cs b/components/SizerBase/src/Toolkit/TypeToObjectConverter.cs similarity index 100% rename from labs/SizerBase/src/Toolkit/TypeToObjectConverter.cs rename to components/SizerBase/src/Toolkit/TypeToObjectConverter.cs diff --git a/labs/SizerBase/tests/ExampleSizerBaseTestClass.cs b/components/SizerBase/tests/ExampleSizerBaseTestClass.cs similarity index 100% rename from labs/SizerBase/tests/ExampleSizerBaseTestClass.cs rename to components/SizerBase/tests/ExampleSizerBaseTestClass.cs diff --git a/labs/SizerBase/tests/PropertySizerTestInitialBinding.xaml b/components/SizerBase/tests/PropertySizerTestInitialBinding.xaml similarity index 100% rename from labs/SizerBase/tests/PropertySizerTestInitialBinding.xaml rename to components/SizerBase/tests/PropertySizerTestInitialBinding.xaml diff --git a/labs/SizerBase/tests/PropertySizerTestInitialBinding.xaml.cs b/components/SizerBase/tests/PropertySizerTestInitialBinding.xaml.cs similarity index 100% rename from labs/SizerBase/tests/PropertySizerTestInitialBinding.xaml.cs rename to components/SizerBase/tests/PropertySizerTestInitialBinding.xaml.cs diff --git a/labs/SizerBase/tests/SizerBase.Tests.projitems b/components/SizerBase/tests/SizerBase.Tests.projitems similarity index 100% rename from labs/SizerBase/tests/SizerBase.Tests.projitems rename to components/SizerBase/tests/SizerBase.Tests.projitems diff --git a/labs/SizerBase/tests/SizerBase.Tests.shproj b/components/SizerBase/tests/SizerBase.Tests.shproj similarity index 100% rename from labs/SizerBase/tests/SizerBase.Tests.shproj rename to components/SizerBase/tests/SizerBase.Tests.shproj diff --git a/labs/StackedNotificationsBehavior/OpenSolution.bat b/components/StackedNotificationsBehavior/OpenSolution.bat similarity index 100% rename from labs/StackedNotificationsBehavior/OpenSolution.bat rename to components/StackedNotificationsBehavior/OpenSolution.bat diff --git a/labs/StackedNotificationsBehavior/samples/Dependencies.props b/components/StackedNotificationsBehavior/samples/Dependencies.props similarity index 100% rename from labs/StackedNotificationsBehavior/samples/Dependencies.props rename to components/StackedNotificationsBehavior/samples/Dependencies.props diff --git a/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples.csproj b/components/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples.csproj similarity index 100% rename from labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples.csproj rename to components/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples.csproj diff --git a/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.md b/components/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.md similarity index 100% rename from labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.md rename to components/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.md diff --git a/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml b/components/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml similarity index 100% rename from labs/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml rename to components/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml diff --git a/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml.cs b/components/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml.cs similarity index 100% rename from labs/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml.cs rename to components/StackedNotificationsBehavior/samples/StackedNotificationsBehaviorCustomSample.xaml.cs diff --git a/labs/StackedNotificationsBehavior/src/AdditionalAssemblyInfo.cs b/components/StackedNotificationsBehavior/src/AdditionalAssemblyInfo.cs similarity index 100% rename from labs/StackedNotificationsBehavior/src/AdditionalAssemblyInfo.cs rename to components/StackedNotificationsBehavior/src/AdditionalAssemblyInfo.cs diff --git a/labs/StackedNotificationsBehavior/src/CommunityToolkit.Labs.WinUI.StackedNotificationsBehavior.csproj b/components/StackedNotificationsBehavior/src/CommunityToolkit.Labs.WinUI.StackedNotificationsBehavior.csproj similarity index 100% rename from labs/StackedNotificationsBehavior/src/CommunityToolkit.Labs.WinUI.StackedNotificationsBehavior.csproj rename to components/StackedNotificationsBehavior/src/CommunityToolkit.Labs.WinUI.StackedNotificationsBehavior.csproj diff --git a/labs/StackedNotificationsBehavior/src/Dependencies.props b/components/StackedNotificationsBehavior/src/Dependencies.props similarity index 100% rename from labs/StackedNotificationsBehavior/src/Dependencies.props rename to components/StackedNotificationsBehavior/src/Dependencies.props diff --git a/labs/StackedNotificationsBehavior/src/MultiTarget.props b/components/StackedNotificationsBehavior/src/MultiTarget.props similarity index 100% rename from labs/StackedNotificationsBehavior/src/MultiTarget.props rename to components/StackedNotificationsBehavior/src/MultiTarget.props diff --git a/labs/StackedNotificationsBehavior/src/Notification.cs b/components/StackedNotificationsBehavior/src/Notification.cs similarity index 100% rename from labs/StackedNotificationsBehavior/src/Notification.cs rename to components/StackedNotificationsBehavior/src/Notification.cs diff --git a/labs/StackedNotificationsBehavior/src/StackedNotificationsBehavior.cs b/components/StackedNotificationsBehavior/src/StackedNotificationsBehavior.cs similarity index 100% rename from labs/StackedNotificationsBehavior/src/StackedNotificationsBehavior.cs rename to components/StackedNotificationsBehavior/src/StackedNotificationsBehavior.cs diff --git a/labs/StackedNotificationsBehavior/tests/ExampleStackedNotificationsBehaviorTestClass.cs b/components/StackedNotificationsBehavior/tests/ExampleStackedNotificationsBehaviorTestClass.cs similarity index 100% rename from labs/StackedNotificationsBehavior/tests/ExampleStackedNotificationsBehaviorTestClass.cs rename to components/StackedNotificationsBehavior/tests/ExampleStackedNotificationsBehaviorTestClass.cs diff --git a/labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.projitems b/components/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.projitems similarity index 100% rename from labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.projitems rename to components/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.projitems diff --git a/labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.shproj b/components/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.shproj similarity index 100% rename from labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.shproj rename to components/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.shproj diff --git a/template/README.md b/template/README.md index 05ef4ad31..f32e0b93e 100644 --- a/template/README.md +++ b/template/README.md @@ -9,13 +9,13 @@ To use the template to create a new experiment, open a command prompt in the **r ```ascii dotnet new --install .\template\ProjectTemplate\ -cd labs +cd components dotnet new labexp -n MyExperimentNameHere ``` This creates a new experiment called "MyExperimentNameHere". -You can now open `./labs/MyExperimentNameHere/MyExperimentNameHere.sln` and start your experiment. +You can now open `./components/MyExperimentNameHere/MyExperimentNameHere.sln` and start your experiment. ### Inside the generated solution @@ -50,7 +50,7 @@ Visual Studio will prompt if any required components or workloads are missing. M #### Creating an experiment in the wrong place -The generated solution and some of the projects it contains rely on relative paths that assume the experiment is created in the `labs` directory. If the experiment is created elsewhere, the error message "One or more projects in the solution were not loaded correctly." will be shown when opening the solution. Deleting the incorrect solution and recreating in the correct location is the most reliable way to address this. +The generated solution and some of the projects it contains rely on relative paths that assume the experiment is created in the `components` directory. If the experiment is created elsewhere, the error message "One or more projects in the solution were not loaded correctly." will be shown when opening the solution. Deleting the incorrect solution and recreating in the correct location is the most reliable way to address this. #### Long Paths From 26d8d825cb0f1efc64b1d05bfee9461f4a7a7d10 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 21 Feb 2023 17:15:16 -0600 Subject: [PATCH 3/9] Fixed issue renaming head folder --- common/ProjectHeads/GenerateSingleSampleHeads.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/ProjectHeads/GenerateSingleSampleHeads.ps1 b/common/ProjectHeads/GenerateSingleSampleHeads.ps1 index 83f5c9178..0389b7904 100644 --- a/common/ProjectHeads/GenerateSingleSampleHeads.ps1 +++ b/common/ProjectHeads/GenerateSingleSampleHeads.ps1 @@ -48,6 +48,7 @@ Remove-Item -Recurse -Force "$componentPath/$headsFolderName/" -ErrorAction Sile # Intall our heads as a temporary template dotnet new --install "$PSScriptRoot/SingleComponent" --force +Write-Host $componentPath; # We need to copy files and run slngen from the target directory path Push-Location $componentPath @@ -55,7 +56,7 @@ Push-Location $componentPath dotnet new ct-tooling-heads -n $componentName # Rename folder from component name (dotnet tooling default) to 'heads' -Rename-Item -Path "$componentPath/$componentName" -NewName $headsFolderName -Force +Rename-Item -Path "$componentName" -NewName $headsFolderName -Force # Remove template, as just for script dotnet new --uninstall "$PSScriptRoot/SingleComponent" From 8143ffe7878117d9617fc8054e915539a0ae355f Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 21 Feb 2023 17:15:44 -0600 Subject: [PATCH 4/9] Reorganized project template files --- common/ProjectHeads/GenerateSingleSampleHeads.ps1 | 1 - .../samples/{ProjectTemplate.Samples => }/Dependencies.props | 0 .../{ProjectTemplate.Samples => }/ProjectTemplate.Samples.csproj | 0 .../samples/{ProjectTemplate.Samples => }/ProjectTemplate.md | 0 .../ProjectTemplateCustomSample.xaml | 0 .../ProjectTemplateCustomSample.xaml.cs | 0 .../ProjectTemplateTemplatedSample.xaml | 0 .../ProjectTemplateTemplatedSample.xaml.cs | 0 .../ProjectTemplateTemplatedStyleCustomSample.xaml | 0 .../ProjectTemplateTemplatedStyleCustomSample.xaml.cs | 0 .../ProjectTemplateXbindBackedSample.xaml | 0 .../ProjectTemplateXbindBackedSample.xaml.cs | 0 .../ProjectTemplateXbindBackedStyleCustomSample.xaml | 0 .../ProjectTemplateXbindBackedStyleCustomSample.xaml.cs | 0 .../ExampleProjectTemplateTestClass.cs | 0 .../ExampleProjectTemplateTestPage.xaml | 0 .../ExampleProjectTemplateTestPage.xaml.cs | 0 .../{ProjectTemplate.Tests => }/ProjectTemplate.Tests.projitems | 0 .../{ProjectTemplate.Tests => }/ProjectTemplate.Tests.shproj | 0 19 files changed, 1 deletion(-) rename template/ProjectTemplate/samples/{ProjectTemplate.Samples => }/Dependencies.props (100%) rename template/ProjectTemplate/samples/{ProjectTemplate.Samples => }/ProjectTemplate.Samples.csproj (100%) rename template/ProjectTemplate/samples/{ProjectTemplate.Samples => }/ProjectTemplate.md (100%) rename template/ProjectTemplate/samples/{ProjectTemplate.Samples => }/ProjectTemplateCustomSample.xaml (100%) rename template/ProjectTemplate/samples/{ProjectTemplate.Samples => }/ProjectTemplateCustomSample.xaml.cs (100%) rename template/ProjectTemplate/samples/{ProjectTemplate.Samples => }/ProjectTemplateTemplatedSample.xaml (100%) rename template/ProjectTemplate/samples/{ProjectTemplate.Samples => }/ProjectTemplateTemplatedSample.xaml.cs (100%) rename template/ProjectTemplate/samples/{ProjectTemplate.Samples => }/ProjectTemplateTemplatedStyleCustomSample.xaml (100%) rename template/ProjectTemplate/samples/{ProjectTemplate.Samples => }/ProjectTemplateTemplatedStyleCustomSample.xaml.cs (100%) rename template/ProjectTemplate/samples/{ProjectTemplate.Samples => }/ProjectTemplateXbindBackedSample.xaml (100%) rename template/ProjectTemplate/samples/{ProjectTemplate.Samples => }/ProjectTemplateXbindBackedSample.xaml.cs (100%) rename template/ProjectTemplate/samples/{ProjectTemplate.Samples => }/ProjectTemplateXbindBackedStyleCustomSample.xaml (100%) rename template/ProjectTemplate/samples/{ProjectTemplate.Samples => }/ProjectTemplateXbindBackedStyleCustomSample.xaml.cs (100%) rename template/ProjectTemplate/tests/{ProjectTemplate.Tests => }/ExampleProjectTemplateTestClass.cs (100%) rename template/ProjectTemplate/tests/{ProjectTemplate.Tests => }/ExampleProjectTemplateTestPage.xaml (100%) rename template/ProjectTemplate/tests/{ProjectTemplate.Tests => }/ExampleProjectTemplateTestPage.xaml.cs (100%) rename template/ProjectTemplate/tests/{ProjectTemplate.Tests => }/ProjectTemplate.Tests.projitems (100%) rename template/ProjectTemplate/tests/{ProjectTemplate.Tests => }/ProjectTemplate.Tests.shproj (100%) diff --git a/common/ProjectHeads/GenerateSingleSampleHeads.ps1 b/common/ProjectHeads/GenerateSingleSampleHeads.ps1 index 0389b7904..65bf1269b 100644 --- a/common/ProjectHeads/GenerateSingleSampleHeads.ps1 +++ b/common/ProjectHeads/GenerateSingleSampleHeads.ps1 @@ -48,7 +48,6 @@ Remove-Item -Recurse -Force "$componentPath/$headsFolderName/" -ErrorAction Sile # Intall our heads as a temporary template dotnet new --install "$PSScriptRoot/SingleComponent" --force -Write-Host $componentPath; # We need to copy files and run slngen from the target directory path Push-Location $componentPath diff --git a/template/ProjectTemplate/samples/ProjectTemplate.Samples/Dependencies.props b/template/ProjectTemplate/samples/Dependencies.props similarity index 100% rename from template/ProjectTemplate/samples/ProjectTemplate.Samples/Dependencies.props rename to template/ProjectTemplate/samples/Dependencies.props diff --git a/template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplate.Samples.csproj b/template/ProjectTemplate/samples/ProjectTemplate.Samples.csproj similarity index 100% rename from template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplate.Samples.csproj rename to template/ProjectTemplate/samples/ProjectTemplate.Samples.csproj diff --git a/template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplate.md b/template/ProjectTemplate/samples/ProjectTemplate.md similarity index 100% rename from template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplate.md rename to template/ProjectTemplate/samples/ProjectTemplate.md diff --git a/template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml similarity index 100% rename from template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateCustomSample.xaml rename to template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml diff --git a/template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateCustomSample.xaml.cs b/template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs similarity index 100% rename from template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateCustomSample.xaml.cs rename to template/ProjectTemplate/samples/ProjectTemplateCustomSample.xaml.cs diff --git a/template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateTemplatedSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml similarity index 100% rename from template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateTemplatedSample.xaml rename to template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml diff --git a/template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateTemplatedSample.xaml.cs b/template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml.cs similarity index 100% rename from template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateTemplatedSample.xaml.cs rename to template/ProjectTemplate/samples/ProjectTemplateTemplatedSample.xaml.cs diff --git a/template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateTemplatedStyleCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml similarity index 100% rename from template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateTemplatedStyleCustomSample.xaml rename to template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml diff --git a/template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateTemplatedStyleCustomSample.xaml.cs b/template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml.cs similarity index 100% rename from template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateTemplatedStyleCustomSample.xaml.cs rename to template/ProjectTemplate/samples/ProjectTemplateTemplatedStyleCustomSample.xaml.cs diff --git a/template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateXbindBackedSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml similarity index 100% rename from template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateXbindBackedSample.xaml rename to template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml diff --git a/template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateXbindBackedSample.xaml.cs b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml.cs similarity index 100% rename from template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateXbindBackedSample.xaml.cs rename to template/ProjectTemplate/samples/ProjectTemplateXbindBackedSample.xaml.cs diff --git a/template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateXbindBackedStyleCustomSample.xaml b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml similarity index 100% rename from template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateXbindBackedStyleCustomSample.xaml rename to template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml diff --git a/template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateXbindBackedStyleCustomSample.xaml.cs b/template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml.cs similarity index 100% rename from template/ProjectTemplate/samples/ProjectTemplate.Samples/ProjectTemplateXbindBackedStyleCustomSample.xaml.cs rename to template/ProjectTemplate/samples/ProjectTemplateXbindBackedStyleCustomSample.xaml.cs diff --git a/template/ProjectTemplate/tests/ProjectTemplate.Tests/ExampleProjectTemplateTestClass.cs b/template/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs similarity index 100% rename from template/ProjectTemplate/tests/ProjectTemplate.Tests/ExampleProjectTemplateTestClass.cs rename to template/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs diff --git a/template/ProjectTemplate/tests/ProjectTemplate.Tests/ExampleProjectTemplateTestPage.xaml b/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml similarity index 100% rename from template/ProjectTemplate/tests/ProjectTemplate.Tests/ExampleProjectTemplateTestPage.xaml rename to template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml diff --git a/template/ProjectTemplate/tests/ProjectTemplate.Tests/ExampleProjectTemplateTestPage.xaml.cs b/template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml.cs similarity index 100% rename from template/ProjectTemplate/tests/ProjectTemplate.Tests/ExampleProjectTemplateTestPage.xaml.cs rename to template/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml.cs diff --git a/template/ProjectTemplate/tests/ProjectTemplate.Tests/ProjectTemplate.Tests.projitems b/template/ProjectTemplate/tests/ProjectTemplate.Tests.projitems similarity index 100% rename from template/ProjectTemplate/tests/ProjectTemplate.Tests/ProjectTemplate.Tests.projitems rename to template/ProjectTemplate/tests/ProjectTemplate.Tests.projitems diff --git a/template/ProjectTemplate/tests/ProjectTemplate.Tests/ProjectTemplate.Tests.shproj b/template/ProjectTemplate/tests/ProjectTemplate.Tests.shproj similarity index 100% rename from template/ProjectTemplate/tests/ProjectTemplate.Tests/ProjectTemplate.Tests.shproj rename to template/ProjectTemplate/tests/ProjectTemplate.Tests.shproj From 930308db66189b689210584cf27f161cc65e9f70 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 21 Feb 2023 18:06:17 -0600 Subject: [PATCH 5/9] Fixed invalid paths --- .../SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj | 2 +- .../Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj b/common/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj index 58d4116c9..9f6539e48 100644 --- a/common/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj +++ b/common/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj @@ -42,7 +42,7 @@ - + diff --git a/common/ProjectHeads/SingleComponent/Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj b/common/ProjectHeads/SingleComponent/Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj index 9f45e1915..2236e4459 100644 --- a/common/ProjectHeads/SingleComponent/Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj +++ b/common/ProjectHeads/SingleComponent/Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj @@ -39,7 +39,7 @@ - + From 739410eadd8b3ab90bc3c3f4246bf84d17f32f56 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Wed, 22 Feb 2023 13:40:37 -0600 Subject: [PATCH 6/9] Fixed sample code not showing in "All" head --- .../Renderers/ToolkitSampleRenderer.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs b/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs index 8cbca3cfc..48188288f 100644 --- a/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs +++ b/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs @@ -226,7 +226,7 @@ private static string GetRelativePathToFileWithoutExtension(Type type) if (string.IsNullOrWhiteSpace(assemblyName)) throw new InvalidOperationException(); - var isAllExperimentHead = assemblyName.StartsWith("CommunityToolkit.Labs.", StringComparison.OrdinalIgnoreCase); + var isAllExperimentHead = assemblyName.StartsWith("CommunityToolkit.", StringComparison.OrdinalIgnoreCase); var isProjectTemplateHead = assemblyName.StartsWith("ProjectTemplate"); var isSingleExperimentHead = !isAllExperimentHead && !isProjectTemplateHead; From 457ddd5c25d5e5f93711d36173a3b9fc5834e368 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 23 Feb 2023 11:32:18 -0600 Subject: [PATCH 7/9] Fixed various path issues with sample and doc rendering --- .../Renderers/ToolkitDocumentationRenderer.xaml.cs | 5 +++-- .../Renderers/ToolkitSampleRenderer.xaml.cs | 4 +++- common/ProjectHeads/App.Head.props | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/common/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs b/common/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs index 90ca12943..97b2d1e06 100644 --- a/common/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs +++ b/common/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs @@ -162,13 +162,14 @@ private static async Task GetDocumentationFileContents(ToolkitFrontMatte var isAllExperimentHead = assemblyName.StartsWith("CommunityToolkit.", StringComparison.OrdinalIgnoreCase); var isProjectTemplateHead = assemblyName.StartsWith("ProjectTemplate"); var isSingleExperimentHead = !isAllExperimentHead && !isProjectTemplateHead; - + if (metadata.FilePath is null || string.IsNullOrWhiteSpace(metadata.FilePath)) throw new InvalidOperationException("Missing or malformed path to markdown file. Unable to continue;"); + // Normalize the path separators var path = metadata.FilePath; - var fileUri = new Uri($"ms-appx:///SourceAssets/{path}"); + var fileUri = new Uri($"ms-appx:///SourceAssets/{(isSingleExperimentHead ? Path.GetFileName(path.Replace('\\', '/')) : path)}"); try { diff --git a/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs b/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs index 48188288f..3533a089b 100644 --- a/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs +++ b/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs @@ -253,7 +253,9 @@ private static string GetRelativePathToFileWithoutExtension(Type type) if (isSingleExperimentHead || isProjectTemplateHead) { - return $"SourceAssets/{simpleAssemblyName}/{folderPath}{type.Name}"; + Console.WriteLine($"type.Name: {type.Name}, folderPath: {folderPath}, isAllExperimentHead: {isAllExperimentHead}, isProjectTemplateHead: {isProjectTemplateHead}, isSingleExperimentHead: {isSingleExperimentHead}"); + + return $"SourceAssets/{folderPath}{type.Name}"; } if (isAllExperimentHead) diff --git a/common/ProjectHeads/App.Head.props b/common/ProjectHeads/App.Head.props index 5820767c1..8054870db 100644 --- a/common/ProjectHeads/App.Head.props +++ b/common/ProjectHeads/App.Head.props @@ -60,10 +60,12 @@ - + + SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat + - + From e87ec5c43ad8d7967dd4e870aac92ee18a2986f4 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 23 Feb 2023 11:33:58 -0600 Subject: [PATCH 8/9] Cleaned up debug code --- .../Renderers/ToolkitSampleRenderer.xaml.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs b/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs index 3533a089b..a7f4bb1e7 100644 --- a/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs +++ b/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs @@ -253,8 +253,6 @@ private static string GetRelativePathToFileWithoutExtension(Type type) if (isSingleExperimentHead || isProjectTemplateHead) { - Console.WriteLine($"type.Name: {type.Name}, folderPath: {folderPath}, isAllExperimentHead: {isAllExperimentHead}, isProjectTemplateHead: {isProjectTemplateHead}, isSingleExperimentHead: {isSingleExperimentHead}"); - return $"SourceAssets/{folderPath}{type.Name}"; } From 84e89298a5da45a35105286496da850b73069021 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 23 Feb 2023 12:50:29 -0600 Subject: [PATCH 9/9] Fixed missing C# files on non-wasm platforms --- .../Renderers/ToolkitSampleRenderer.xaml.cs | 2 -- common/ProjectHeads/App.Head.props | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs b/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs index a7f4bb1e7..d5f635c08 100644 --- a/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs +++ b/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs @@ -190,13 +190,11 @@ private async Task LoadData() try { -#if __WASM__ // Workaround for https://github.com/unoplatform/uno/issues/8649 if (fileExtension.Contains(".cs")) { fileExtension = fileExtension.Replace(".cs", ".cs.dat"); } -#endif var finalPath = $"ms-appx:///{filePath}.{fileExtension.Trim('.')}"; diff --git a/common/ProjectHeads/App.Head.props b/common/ProjectHeads/App.Head.props index 8054870db..dc30dbde5 100644 --- a/common/ProjectHeads/App.Head.props +++ b/common/ProjectHeads/App.Head.props @@ -46,7 +46,7 @@ - SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat + SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat @@ -61,7 +61,7 @@ - SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat + SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat