Skip to content

Improve folders structure #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barjonp merged 1 commit into from
May 12, 2025
Merged

Improve folders structure #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions src/FastControls.TestApp/FastControls.TestApp.sln
View file
Open in desktop

This file was deleted.

0 src/FastControls/FastCheckBox.cs → ....ControlsKit.FastControls/FastCheckBox.cs
View file
Open in desktop
File renamed without changes.
0 ...penSilver.ControlsKit.FastControls.csproj → ...penSilver.ControlsKit.FastControls.csproj
View file
Open in desktop
File renamed without changes.
46 changes: 23 additions & 23 deletions src/OpenSilver.ControlsKit.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.4.33103.184
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSilver.ControlsKit.FastControls", "FastControls\OpenSilver.ControlsKit.FastControls.csproj", "{A8FAB0AB-A9EC-4FC6-B033-74ABBFE9DD9D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSilver.ControlsKit.FastControls", "OpenSilver.ControlsKit.FastControls\OpenSilver.ControlsKit.FastControls.csproj", "{A8FAB0AB-A9EC-4FC6-B033-74ABBFE9DD9D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenSilver.ControlsKit.FastControls.TestApp", "OpenSilver.ControlsKit.FastControls.TestApp", "{757990DC-A1AE-4E39-A086-A6C4FA59B250}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastControls.TestApp", "FastControls.TestApp\FastControls.TestApp\FastControls.TestApp.csproj", "{6EF229A1-0A2A-4452-8E57-88156D2650EC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastControls.TestApp.Browser", "FastControls.TestApp\FastControls.TestApp.Browser\FastControls.TestApp.Browser.csproj", "{569ABA81-F8A2-4A3E-9155-555A3EAB0F62}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastControls.TestApp.Simulator", "FastControls.TestApp\FastControls.TestApp.Simulator\FastControls.TestApp.Simulator.csproj", "{B28B4B1C-A738-4D9F-96A7-6DCC231A9928}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestApp", "TestApp", "{757990DC-A1AE-4E39-A086-A6C4FA59B250}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSilver.ControlsKit.Controls", "OpenSilver.ControlsKit.Controls\OpenSilver.ControlsKit.Controls.csproj", "{EFAC9728-C7A6-431F-8780-5AE3531B3764}"
EndProject
Expand All @@ -24,6 +18,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Nuget.Config = Nuget.Config
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "TestApp\TestApp\TestApp.csproj", "{89E16AC0-A76E-9D55-BC2A-B3AD76C0BD55}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp.Browser", "TestApp\TestApp.Browser\TestApp.Browser.csproj", "{ABE3304A-4482-B08F-A64D-F1722DD78C32}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp.Simulator", "TestApp\TestApp.Simulator\TestApp.Simulator.csproj", "{1A39DBC2-12F4-31B9-C4B5-4B50C053EA59}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -34,30 +34,30 @@ Global
{A8FAB0AB-A9EC-4FC6-B033-74ABBFE9DD9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A8FAB0AB-A9EC-4FC6-B033-74ABBFE9DD9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A8FAB0AB-A9EC-4FC6-B033-74ABBFE9DD9D}.Release|Any CPU.Build.0 = Release|Any CPU
{6EF229A1-0A2A-4452-8E57-88156D2650EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6EF229A1-0A2A-4452-8E57-88156D2650EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6EF229A1-0A2A-4452-8E57-88156D2650EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6EF229A1-0A2A-4452-8E57-88156D2650EC}.Release|Any CPU.Build.0 = Release|Any CPU
{569ABA81-F8A2-4A3E-9155-555A3EAB0F62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{569ABA81-F8A2-4A3E-9155-555A3EAB0F62}.Debug|Any CPU.Build.0 = Debug|Any CPU
{569ABA81-F8A2-4A3E-9155-555A3EAB0F62}.Release|Any CPU.ActiveCfg = Release|Any CPU
{569ABA81-F8A2-4A3E-9155-555A3EAB0F62}.Release|Any CPU.Build.0 = Release|Any CPU
{B28B4B1C-A738-4D9F-96A7-6DCC231A9928}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B28B4B1C-A738-4D9F-96A7-6DCC231A9928}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B28B4B1C-A738-4D9F-96A7-6DCC231A9928}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B28B4B1C-A738-4D9F-96A7-6DCC231A9928}.Release|Any CPU.Build.0 = Release|Any CPU
{EFAC9728-C7A6-431F-8780-5AE3531B3764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EFAC9728-C7A6-431F-8780-5AE3531B3764}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EFAC9728-C7A6-431F-8780-5AE3531B3764}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EFAC9728-C7A6-431F-8780-5AE3531B3764}.Release|Any CPU.Build.0 = Release|Any CPU
{89E16AC0-A76E-9D55-BC2A-B3AD76C0BD55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{89E16AC0-A76E-9D55-BC2A-B3AD76C0BD55}.Debug|Any CPU.Build.0 = Debug|Any CPU
{89E16AC0-A76E-9D55-BC2A-B3AD76C0BD55}.Release|Any CPU.ActiveCfg = Release|Any CPU
{89E16AC0-A76E-9D55-BC2A-B3AD76C0BD55}.Release|Any CPU.Build.0 = Release|Any CPU
{ABE3304A-4482-B08F-A64D-F1722DD78C32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ABE3304A-4482-B08F-A64D-F1722DD78C32}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ABE3304A-4482-B08F-A64D-F1722DD78C32}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ABE3304A-4482-B08F-A64D-F1722DD78C32}.Release|Any CPU.Build.0 = Release|Any CPU
{1A39DBC2-12F4-31B9-C4B5-4B50C053EA59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A39DBC2-12F4-31B9-C4B5-4B50C053EA59}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A39DBC2-12F4-31B9-C4B5-4B50C053EA59}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A39DBC2-12F4-31B9-C4B5-4B50C053EA59}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{6EF229A1-0A2A-4452-8E57-88156D2650EC} = {757990DC-A1AE-4E39-A086-A6C4FA59B250}
{569ABA81-F8A2-4A3E-9155-555A3EAB0F62} = {757990DC-A1AE-4E39-A086-A6C4FA59B250}
{B28B4B1C-A738-4D9F-96A7-6DCC231A9928} = {757990DC-A1AE-4E39-A086-A6C4FA59B250}
{89E16AC0-A76E-9D55-BC2A-B3AD76C0BD55} = {757990DC-A1AE-4E39-A086-A6C4FA59B250}
{ABE3304A-4482-B08F-A64D-F1722DD78C32} = {757990DC-A1AE-4E39-A086-A6C4FA59B250}
{1A39DBC2-12F4-31B9-C4B5-4B50C053EA59} = {757990DC-A1AE-4E39-A086-A6C4FA59B250}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3095C2CC-DAE8-4223-BF01-AFDDF80767AD}
Expand Down
0 ...stApp/FastControls.TestApp.Browser/App.cs → src/TestApp/TestApp.Browser/App.cs
View file
Open in desktop
File renamed without changes.
0 ...stControls.TestApp.Browser/Pages/Index.cs → src/TestApp/TestApp.Browser/Pages/Index.cs
View file
Open in desktop
File renamed without changes.
0 ...p/FastControls.TestApp.Browser/Program.cs → src/TestApp/TestApp.Browser/Program.cs
View file
Open in desktop
File renamed without changes.
0 ...pp.Browser/Properties/launchSettings.json → ...pp.Browser/Properties/launchSettings.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...owser/FastControls.TestApp.Browser.csproj → ...pp/TestApp.Browser/TestApp.Browser.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\FastControls.TestApp\FastControls.TestApp.csproj" />
<ProjectReference Include="..\TestApp\TestApp.csproj" />
</ItemGroup>

</Project>
0 ...ntrols.TestApp.Browser/wwwroot/.gitignore → ...estApp/TestApp.Browser/wwwroot/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...s.TestApp.Browser/wwwroot/BlazorLoader.js → ...p/TestApp.Browser/wwwroot/BlazorLoader.js
View file
Open in desktop
File renamed without changes.
0 ...trols.TestApp.Browser/wwwroot/favicon.ico → ...stApp/TestApp.Browser/wwwroot/favicon.ico
View file
Open in desktop
File renamed without changes.
0 ...ntrols.TestApp.Browser/wwwroot/index.html → ...estApp/TestApp.Browser/wwwroot/index.html
View file
Open in desktop
File renamed without changes.
0 ...App.Browser/wwwroot/loading-indicator.css → ...App.Browser/wwwroot/loading-indicator.css
View file
Open in desktop
File renamed without changes.
0 ...tApp.Browser/wwwroot/loading-indicator.js → ...tApp.Browser/wwwroot/loading-indicator.js
View file
Open in desktop
File renamed without changes.
0 ...FastControls.TestApp.Simulator/Startup.cs → src/TestApp/TestApp.Simulator/Startup.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tor/FastControls.TestApp.Simulator.csproj → ...estApp.Simulator/TestApp.Simulator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\FastControls.TestApp\FastControls.TestApp.csproj" />
<ProjectReference Include="..\TestApp\TestApp.csproj" />
</ItemGroup>

</Project>
0 ...ols.TestApp/FastControls.TestApp/App.xaml → src/TestApp/TestApp/App.xaml
View file
Open in desktop
File renamed without changes.
0 ....TestApp/FastControls.TestApp/App.xaml.cs → src/TestApp/TestApp/App.xaml.cs
View file
Open in desktop
File renamed without changes.
0 ...estApp/FastControls.TestApp/MainPage.xaml → src/TestApp/TestApp/MainPage.xaml
View file
Open in desktop
File renamed without changes.
0 ...App/FastControls.TestApp/MainPage.xaml.cs → src/TestApp/TestApp/MainPage.xaml.cs
View file
Open in desktop
File renamed without changes.
0 ...tControls.TestApp/Pages/FastCheckBox.xaml → src/TestApp/TestApp/Pages/FastCheckBox.xaml
View file
Open in desktop
File renamed without changes.
0 ...ntrols.TestApp/Pages/FastCheckBox.xaml.cs → ...estApp/TestApp/Pages/FastCheckBox.xaml.cs
View file
Open in desktop
File renamed without changes.
0 ...ols.TestApp/Pages/TestStaggeredPanel.xaml → ...App/TestApp/Pages/TestStaggeredPanel.xaml
View file
Open in desktop
File renamed without changes.
0 ....TestApp/Pages/TestStaggeredPanel.xaml.cs → .../TestApp/Pages/TestStaggeredPanel.xaml.cs
View file
Open in desktop
File renamed without changes.
0 ...ls.TestApp/Properties/launchSettings.json → ...pp/TestApp/Properties/launchSettings.json
View file
Open in desktop
File renamed without changes.
0 ...Controls.TestApp/Registry/TestRegistry.cs → src/TestApp/TestApp/Registry/TestRegistry.cs
View file
Open in desktop
File renamed without changes.
0 ...FastControls.TestApp/Registry/TreeItem.cs → src/TestApp/TestApp/Registry/TreeItem.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...trols.TestApp/FastControls.TestApp.csproj → src/TestApp/TestApp/TestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\FastControls\OpenSilver.ControlsKit.FastControls.csproj" />
<ProjectReference Include="..\..\OpenSilver.ControlsKit.FastControls\OpenSilver.ControlsKit.FastControls.csproj" />
<ProjectReference Include="..\..\OpenSilver.ControlsKit.Controls\OpenSilver.ControlsKit.Controls.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/build/build-nuget-package.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ IF "%~1" == "" (
ECHO.
ECHO %ESC%[95mBuilding %ESC%[0mFastControl %CFG% %ESC%[95mconfiguration%ESC%[0m
ECHO.
msbuild "%BUILD_DIR%..\FastControls\OpenSilver.ControlsKit.FastControls.csproj" -p:Configuration=%CFG%;OpenSilverVersion=%OpenSilverPkgVersion% -verbosity:minimal -restore
msbuild "%BUILD_DIR%..\OpenSilver.ControlsKit.FastControls\OpenSilver.ControlsKit.FastControls.csproj" -p:Configuration=%CFG%;OpenSilverVersion=%OpenSilverPkgVersion% -verbosity:minimal -restore

ECHO.
ECHO %ESC%[95mBuilding %ESC%[0mControlsKit %CFG% %ESC%[95mconfiguration%ESC%[0m
Expand Down
4 changes: 2 additions & 2 deletions src/build/nuspec/ControlsKit.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<file src="../../OpenSilver.ControlsKit.Controls/bin/$Configuration$/netstandard2.0/OpenSilver.ControlsKit.Controls.xml" target="lib/netstandard2.0/OpenSilver.ControlsKit.Controls.xml" />

<!-- ControlsKit.FastControls -->
<file src="../../FastControls/bin/$Configuration$/netstandard2.0/OpenSilver.ControlsKit.FastControls.dll" target="lib/netstandard2.0/OpenSilver.ControlsKit.FastControls.dll" />
<file src="../../FastControls/bin/$Configuration$/netstandard2.0/OpenSilver.ControlsKit.FastControls.xml" target="lib/netstandard2.0/OpenSilver.ControlsKit.FastControls.xml" />
<file src="../../OpenSilver.ControlsKit.FastControls/bin/$Configuration$/netstandard2.0/OpenSilver.ControlsKit.FastControls.dll" target="lib/netstandard2.0/OpenSilver.ControlsKit.FastControls.dll" />
<file src="../../OpenSilver.ControlsKit.FastControls/bin/$Configuration$/netstandard2.0/OpenSilver.ControlsKit.FastControls.xml" target="lib/netstandard2.0/OpenSilver.ControlsKit.FastControls.xml" />


<!-- OpenSilver icon -->
Expand Down