Skip to content
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

Reorganise solution [#73] #76

Merged
merged 10 commits into from
Nov 15, 2019
Merged

Reorganise solution [#73] #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c011657
Move projects to src / tests subfolders
fernandreu Nov 14, 2019
1402d4f
Fix references
fernandreu Nov 14, 2019
589b909
Merge branch 'master' into feature/restructuring
fernandreu Nov 15, 2019
d2c1979
Split test project into unit, integration and functional projects
fernandreu Nov 15, 2019
d5cc5df
Add callback generation tests [#75]
fernandreu Nov 15, 2019
7f8647b
Add docs subfolder to solution
fernandreu Nov 15, 2019
531e454
Restructure folders in main project
fernandreu Nov 15, 2019
569b6d2
Suppress NU1701 warning
fernandreu Nov 15, 2019
5b217d9
Update SharedAssemblyInfo.cs path in PreBuild.ps1
fernandreu Nov 15, 2019
a4fb82f
Update gitignore to match new ScintillaNET location
fernandreu Nov 15, 2019
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
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ bld/
[Bb]in/
[Oo]bj/
[Ll]og/
!/ScintillaNET/x86/
!/ScintillaNET/x64/
!/src/ScintillaNET/x86/
!/src/ScintillaNET/x64/

# Visual Studio 2015 cache/options directory
.vs/
Expand Down
74 changes: 58 additions & 16 deletions OfficeRibbonXEditor.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,43 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29318.209
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OfficeRibbonXEditor", "OfficeRibbonXEditor\OfficeRibbonXEditor.csproj", "{87EFED6B-45A1-425F-B63B-5894E4FC0C03}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OfficeRibbonXEditorTests", "OfficeRibbonXEditorTests\OfficeRibbonXEditorTests.csproj", "{D4F06196-AE8D-4DF5-BE6B-49490919A67B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OfficeRibbonXEditor", "src\OfficeRibbonXEditor\OfficeRibbonXEditor.csproj", "{87EFED6B-45A1-425F-B63B-5894E4FC0C03}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{62BC0A54-36D3-47DD-8A1B-44AE03DDB305}"
ProjectSection(SolutionItems) = preProject
azure-pipelines.yml = azure-pipelines.yml
CONTRIBUTING.md = CONTRIBUTING.md
LICENSE = LICENSE
PreBuild.ps1 = PreBuild.ps1
README.md = README.md
Screenshot.png = Screenshot.png
THIRD-PARTY-NOTICES = THIRD-PARTY-NOTICES
EndProjectSection
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{414E2267-764A-4E61-AA5E-F25F407DFAFD}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{017FBD33-4473-4DD2-ADEA-CAA00B695055}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "src\Installer\Installer.wixproj", "{414E2267-764A-4E61-AA5E-F25F407DFAFD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScintillaNET", "ScintillaNET\ScintillaNET.csproj", "{22AE2386-60F1-476E-9303-61CDB0AAC4CF}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScintillaNET", "src\ScintillaNET\ScintillaNET.csproj", "{22AE2386-60F1-476E-9303-61CDB0AAC4CF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScintillaNET.WPF", "ScintillaNET.WPF\ScintillaNET.WPF.csproj", "{BD57B012-822B-4C74-95B8-8254B320CAF3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScintillaNET.WPF", "src\ScintillaNET.WPF\ScintillaNET.WPF.csproj", "{BD57B012-822B-4C74-95B8-8254B320CAF3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{D8B42177-9C73-48C9-971E-1D435353FF17}"
ProjectSection(SolutionItems) = preProject
build\PreBuild.ps1 = build\PreBuild.ps1
build\SharedAssemblyInfo.cs = build\SharedAssemblyInfo.cs
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{46AC6013-D81B-4D5F-ADE8-79F429782266}"
ProjectSection(SolutionItems) = preProject
docs\Screenshot.png = docs\Screenshot.png
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5FB6177B-63FD-4817-A7ED-D1FA2D6EBEAF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "tests\UnitTests\UnitTests.csproj", "{92E4D5A6-E84D-4EBD-867B-C5A2994855E5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests", "tests\IntegrationTests\IntegrationTests.csproj", "{0F75E691-6B9B-4092-B551-05D49EF445F4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests", "tests\FunctionalTests\FunctionalTests.csproj", "{ACF85006-A9D7-4B30-97C8-C964EA6494E4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -40,14 +57,6 @@ Global
{87EFED6B-45A1-425F-B63B-5894E4FC0C03}.Release|Any CPU.Build.0 = Release|Any CPU
{87EFED6B-45A1-425F-B63B-5894E4FC0C03}.Release|x86.ActiveCfg = Release|Any CPU
{87EFED6B-45A1-425F-B63B-5894E4FC0C03}.Release|x86.Build.0 = Release|Any CPU
{D4F06196-AE8D-4DF5-BE6B-49490919A67B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D4F06196-AE8D-4DF5-BE6B-49490919A67B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D4F06196-AE8D-4DF5-BE6B-49490919A67B}.Debug|x86.ActiveCfg = Debug|Any CPU
{D4F06196-AE8D-4DF5-BE6B-49490919A67B}.Debug|x86.Build.0 = Debug|Any CPU
{D4F06196-AE8D-4DF5-BE6B-49490919A67B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D4F06196-AE8D-4DF5-BE6B-49490919A67B}.Release|Any CPU.Build.0 = Release|Any CPU
{D4F06196-AE8D-4DF5-BE6B-49490919A67B}.Release|x86.ActiveCfg = Release|Any CPU
{D4F06196-AE8D-4DF5-BE6B-49490919A67B}.Release|x86.Build.0 = Release|Any CPU
{414E2267-764A-4E61-AA5E-F25F407DFAFD}.Debug|Any CPU.ActiveCfg = Debug|x86
{414E2267-764A-4E61-AA5E-F25F407DFAFD}.Debug|x86.ActiveCfg = Debug|x86
{414E2267-764A-4E61-AA5E-F25F407DFAFD}.Debug|x86.Build.0 = Debug|x86
Expand All @@ -71,10 +80,43 @@ Global
{BD57B012-822B-4C74-95B8-8254B320CAF3}.Release|Any CPU.Build.0 = Release|Any CPU
{BD57B012-822B-4C74-95B8-8254B320CAF3}.Release|x86.ActiveCfg = Release|Any CPU
{BD57B012-822B-4C74-95B8-8254B320CAF3}.Release|x86.Build.0 = Release|Any CPU
{92E4D5A6-E84D-4EBD-867B-C5A2994855E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{92E4D5A6-E84D-4EBD-867B-C5A2994855E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{92E4D5A6-E84D-4EBD-867B-C5A2994855E5}.Debug|x86.ActiveCfg = Debug|Any CPU
{92E4D5A6-E84D-4EBD-867B-C5A2994855E5}.Debug|x86.Build.0 = Debug|Any CPU
{92E4D5A6-E84D-4EBD-867B-C5A2994855E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{92E4D5A6-E84D-4EBD-867B-C5A2994855E5}.Release|Any CPU.Build.0 = Release|Any CPU
{92E4D5A6-E84D-4EBD-867B-C5A2994855E5}.Release|x86.ActiveCfg = Release|Any CPU
{92E4D5A6-E84D-4EBD-867B-C5A2994855E5}.Release|x86.Build.0 = Release|Any CPU
{0F75E691-6B9B-4092-B551-05D49EF445F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0F75E691-6B9B-4092-B551-05D49EF445F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0F75E691-6B9B-4092-B551-05D49EF445F4}.Debug|x86.ActiveCfg = Debug|Any CPU
{0F75E691-6B9B-4092-B551-05D49EF445F4}.Debug|x86.Build.0 = Debug|Any CPU
{0F75E691-6B9B-4092-B551-05D49EF445F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0F75E691-6B9B-4092-B551-05D49EF445F4}.Release|Any CPU.Build.0 = Release|Any CPU
{0F75E691-6B9B-4092-B551-05D49EF445F4}.Release|x86.ActiveCfg = Release|Any CPU
{0F75E691-6B9B-4092-B551-05D49EF445F4}.Release|x86.Build.0 = Release|Any CPU
{ACF85006-A9D7-4B30-97C8-C964EA6494E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ACF85006-A9D7-4B30-97C8-C964EA6494E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ACF85006-A9D7-4B30-97C8-C964EA6494E4}.Debug|x86.ActiveCfg = Debug|Any CPU
{ACF85006-A9D7-4B30-97C8-C964EA6494E4}.Debug|x86.Build.0 = Debug|Any CPU
{ACF85006-A9D7-4B30-97C8-C964EA6494E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ACF85006-A9D7-4B30-97C8-C964EA6494E4}.Release|Any CPU.Build.0 = Release|Any CPU
{ACF85006-A9D7-4B30-97C8-C964EA6494E4}.Release|x86.ActiveCfg = Release|Any CPU
{ACF85006-A9D7-4B30-97C8-C964EA6494E4}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{87EFED6B-45A1-425F-B63B-5894E4FC0C03} = {017FBD33-4473-4DD2-ADEA-CAA00B695055}
{414E2267-764A-4E61-AA5E-F25F407DFAFD} = {017FBD33-4473-4DD2-ADEA-CAA00B695055}
{22AE2386-60F1-476E-9303-61CDB0AAC4CF} = {017FBD33-4473-4DD2-ADEA-CAA00B695055}
{BD57B012-822B-4C74-95B8-8254B320CAF3} = {017FBD33-4473-4DD2-ADEA-CAA00B695055}
{92E4D5A6-E84D-4EBD-867B-C5A2994855E5} = {5FB6177B-63FD-4817-A7ED-D1FA2D6EBEAF}
{0F75E691-6B9B-4092-B551-05D49EF445F4} = {5FB6177B-63FD-4817-A7ED-D1FA2D6EBEAF}
{ACF85006-A9D7-4B30-97C8-C964EA6494E4} = {5FB6177B-63FD-4817-A7ED-D1FA2D6EBEAF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8E5E4631-F9D6-43A1-B677-FD1B0C599606}
EndGlobalSection
Expand Down
4 changes: 0 additions & 4 deletions OfficeRibbonXEditorTests/FodyWeavers.xml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions OfficeRibbonXEditorTests/Models/OfficePartTests.cs
View file
Open in desktop

This file was deleted.

73 changes: 0 additions & 73 deletions OfficeRibbonXEditorTests/OfficeRibbonXEditorTests.csproj
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions OfficeRibbonXEditorTests/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

73 changes: 0 additions & 73 deletions OfficeRibbonXEditorTests/Properties/Resources.Designer.cs
View file
Open in desktop

This file was deleted.

Loading