diff --git a/Squidex.sln b/Squidex.sln index 133daf848..d75d2e1af 100644 --- a/Squidex.sln +++ b/Squidex.sln @@ -1,101 +1,167 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26020.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4B5539DB-F68E-4DBA-B22A-72B9FE7FE2D8}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - EndProjectSection -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex", "src\Squidex\Squidex.xproj", "{61F6BBCE-A080-4400-B194-70E2F5D2096E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex", "src\Squidex\Squidex.csproj", "{61F6BBCE-A080-4400-B194-70E2F5D2096E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "squidex_infrastructure", "squidex_infrastructure", "{8CF53B92-5EB1-461D-98F8-70DA9B603FBF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "squidex_domain", "squidex_domain", "{4C6B06C2-6D77-4E0E-AE32-D7050236433A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Core", "src\Squidex.Core\Squidex.Core.xproj", "{47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Core", "src\Squidex.Core\Squidex.Core.csproj", "{47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Infrastructure", "src\Squidex.Infrastructure\Squidex.Infrastructure.csproj", "{BD1C30A8-8FFA-4A92-A9BD-B67B1CDDD84C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Events", "src\Squidex.Events\Squidex.Events.csproj", "{25F66C64-058A-4D44-BC0C-F12A054F9A91}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Infrastructure", "src\Squidex.Infrastructure\Squidex.Infrastructure.xproj", "{BD1C30A8-8FFA-4A92-A9BD-B67B1CDDD84C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Write", "src\Squidex.Write\Squidex.Write.csproj", "{A85201C6-6AF8-4B63-8365-08F741050438}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Events", "src\Squidex.Events\Squidex.Events.xproj", "{25F66C64-058A-4D44-BC0C-F12A054F9A91}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Read", "src\Squidex.Read\Squidex.Read.csproj", "{A92B4734-2587-4F6F-97A3-741BE48709A5}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Write", "src\Squidex.Write\Squidex.Write.xproj", "{A85201C6-6AF8-4B63-8365-08F741050438}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Read.MongoDb", "src\Squidex.Read.MongoDb\Squidex.Read.MongoDb.csproj", "{28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Read", "src\Squidex.Read\Squidex.Read.xproj", "{A92B4734-2587-4F6F-97A3-741BE48709A5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Write.Tests", "tests\Squidex.Write.Tests\Squidex.Write.Tests.csproj", "{9A3DEA7E-1681-4D48-AC5C-1F0DE421A203}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Read.MongoDb", "src\Squidex.Read.MongoDb\Squidex.Read.MongoDb.xproj", "{28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Infrastructure.Tests", "tests\Squidex.Infrastructure.Tests\Squidex.Infrastructure.Tests.csproj", "{7FD0A92B-7862-4BB1-932B-B52A9CACB56B}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Write.Tests", "tests\Squidex.Write.Tests\Squidex.Write.Tests.xproj", "{9A3DEA7E-1681-4D48-AC5C-1F0DE421A203}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Core.Tests", "tests\Squidex.Core.Tests\Squidex.Core.Tests.csproj", "{FD0AFD44-7A93-4F9E-B5ED-72582392E435}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Infrastructure.Tests", "tests\Squidex.Infrastructure.Tests\Squidex.Infrastructure.Tests.xproj", "{7FD0A92B-7862-4BB1-932B-B52A9CACB56B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Infrastructure.MongoDb", "src\Squidex.Infrastructure.MongoDb\Squidex.Infrastructure.MongoDb.csproj", "{6A811927-3C37-430A-90F4-503E37123956}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Core.Tests", "tests\Squidex.Core.Tests\Squidex.Core.Tests.xproj", "{FD0AFD44-7A93-4F9E-B5ED-72582392E435}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Read.Tests", "tests\Squidex.Read.Tests\Squidex.Read.Tests.csproj", "{8B074219-F69A-4E41-83C6-12EE1E647779}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Infrastructure.MongoDb", "src\Squidex.Infrastructure.MongoDb\Squidex.Infrastructure.MongoDb.xproj", "{6A811927-3C37-430A-90F4-503E37123956}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Infrastructure.Redis", "src\Squidex.Infrastructure.Redis\Squidex.Infrastructure.Redis.csproj", "{D7166C56-178A-4457-B56A-C615C7450DEE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Read.Tests", "tests\Squidex.Read.Tests\Squidex.Read.Tests.xproj", "{8B074219-F69A-4E41-83C6-12EE1E647779}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{1667F3B4-31E6-45B2-90FB-97B1ECFE9874}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Squidex.Infrastructure.Redis", "src\Squidex.Infrastructure.Redis\Squidex.Infrastructure.Redis.xproj", "{D7166C56-178A-4457-B56A-C615C7450DEE}" +Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "GenerateLanguages", "tools\GenerateLanguages\GenerateLanguages.csproj", "{927E1F1C-95F0-4991-B33F-603977204B02}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {61F6BBCE-A080-4400-B194-70E2F5D2096E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {61F6BBCE-A080-4400-B194-70E2F5D2096E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {61F6BBCE-A080-4400-B194-70E2F5D2096E}.Debug|x64.ActiveCfg = Debug|Any CPU + {61F6BBCE-A080-4400-B194-70E2F5D2096E}.Debug|x86.ActiveCfg = Debug|Any CPU {61F6BBCE-A080-4400-B194-70E2F5D2096E}.Release|Any CPU.ActiveCfg = Release|Any CPU {61F6BBCE-A080-4400-B194-70E2F5D2096E}.Release|Any CPU.Build.0 = Release|Any CPU + {61F6BBCE-A080-4400-B194-70E2F5D2096E}.Release|x64.ActiveCfg = Release|Any CPU + {61F6BBCE-A080-4400-B194-70E2F5D2096E}.Release|x86.ActiveCfg = Release|Any CPU {47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0}.Debug|x64.ActiveCfg = Debug|Any CPU + {47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0}.Debug|x86.ActiveCfg = Debug|Any CPU {47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0}.Release|Any CPU.ActiveCfg = Release|Any CPU {47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0}.Release|Any CPU.Build.0 = Release|Any CPU + {47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0}.Release|x64.ActiveCfg = Release|Any CPU + {47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0}.Release|x86.ActiveCfg = Release|Any CPU {BD1C30A8-8FFA-4A92-A9BD-B67B1CDDD84C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BD1C30A8-8FFA-4A92-A9BD-B67B1CDDD84C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BD1C30A8-8FFA-4A92-A9BD-B67B1CDDD84C}.Debug|x64.ActiveCfg = Debug|Any CPU + {BD1C30A8-8FFA-4A92-A9BD-B67B1CDDD84C}.Debug|x86.ActiveCfg = Debug|Any CPU {BD1C30A8-8FFA-4A92-A9BD-B67B1CDDD84C}.Release|Any CPU.ActiveCfg = Release|Any CPU {BD1C30A8-8FFA-4A92-A9BD-B67B1CDDD84C}.Release|Any CPU.Build.0 = Release|Any CPU + {BD1C30A8-8FFA-4A92-A9BD-B67B1CDDD84C}.Release|x64.ActiveCfg = Release|Any CPU + {BD1C30A8-8FFA-4A92-A9BD-B67B1CDDD84C}.Release|x86.ActiveCfg = Release|Any CPU {25F66C64-058A-4D44-BC0C-F12A054F9A91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {25F66C64-058A-4D44-BC0C-F12A054F9A91}.Debug|Any CPU.Build.0 = Debug|Any CPU + {25F66C64-058A-4D44-BC0C-F12A054F9A91}.Debug|x64.ActiveCfg = Debug|Any CPU + {25F66C64-058A-4D44-BC0C-F12A054F9A91}.Debug|x86.ActiveCfg = Debug|Any CPU {25F66C64-058A-4D44-BC0C-F12A054F9A91}.Release|Any CPU.ActiveCfg = Release|Any CPU {25F66C64-058A-4D44-BC0C-F12A054F9A91}.Release|Any CPU.Build.0 = Release|Any CPU + {25F66C64-058A-4D44-BC0C-F12A054F9A91}.Release|x64.ActiveCfg = Release|Any CPU + {25F66C64-058A-4D44-BC0C-F12A054F9A91}.Release|x86.ActiveCfg = Release|Any CPU {A85201C6-6AF8-4B63-8365-08F741050438}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A85201C6-6AF8-4B63-8365-08F741050438}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A85201C6-6AF8-4B63-8365-08F741050438}.Debug|x64.ActiveCfg = Debug|Any CPU + {A85201C6-6AF8-4B63-8365-08F741050438}.Debug|x86.ActiveCfg = Debug|Any CPU {A85201C6-6AF8-4B63-8365-08F741050438}.Release|Any CPU.ActiveCfg = Release|Any CPU {A85201C6-6AF8-4B63-8365-08F741050438}.Release|Any CPU.Build.0 = Release|Any CPU + {A85201C6-6AF8-4B63-8365-08F741050438}.Release|x64.ActiveCfg = Release|Any CPU + {A85201C6-6AF8-4B63-8365-08F741050438}.Release|x86.ActiveCfg = Release|Any CPU {A92B4734-2587-4F6F-97A3-741BE48709A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A92B4734-2587-4F6F-97A3-741BE48709A5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A92B4734-2587-4F6F-97A3-741BE48709A5}.Debug|x64.ActiveCfg = Debug|Any CPU + {A92B4734-2587-4F6F-97A3-741BE48709A5}.Debug|x86.ActiveCfg = Debug|Any CPU {A92B4734-2587-4F6F-97A3-741BE48709A5}.Release|Any CPU.ActiveCfg = Release|Any CPU {A92B4734-2587-4F6F-97A3-741BE48709A5}.Release|Any CPU.Build.0 = Release|Any CPU + {A92B4734-2587-4F6F-97A3-741BE48709A5}.Release|x64.ActiveCfg = Release|Any CPU + {A92B4734-2587-4F6F-97A3-741BE48709A5}.Release|x86.ActiveCfg = Release|Any CPU {28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}.Debug|x64.ActiveCfg = Debug|Any CPU + {28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}.Debug|x86.ActiveCfg = Debug|Any CPU {28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}.Release|Any CPU.ActiveCfg = Release|Any CPU {28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}.Release|Any CPU.Build.0 = Release|Any CPU + {28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}.Release|x64.ActiveCfg = Release|Any CPU + {28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}.Release|x86.ActiveCfg = Release|Any CPU {9A3DEA7E-1681-4D48-AC5C-1F0DE421A203}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9A3DEA7E-1681-4D48-AC5C-1F0DE421A203}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9A3DEA7E-1681-4D48-AC5C-1F0DE421A203}.Debug|x64.ActiveCfg = Debug|Any CPU + {9A3DEA7E-1681-4D48-AC5C-1F0DE421A203}.Debug|x86.ActiveCfg = Debug|Any CPU {9A3DEA7E-1681-4D48-AC5C-1F0DE421A203}.Release|Any CPU.ActiveCfg = Release|Any CPU {9A3DEA7E-1681-4D48-AC5C-1F0DE421A203}.Release|Any CPU.Build.0 = Release|Any CPU + {9A3DEA7E-1681-4D48-AC5C-1F0DE421A203}.Release|x64.ActiveCfg = Release|Any CPU + {9A3DEA7E-1681-4D48-AC5C-1F0DE421A203}.Release|x86.ActiveCfg = Release|Any CPU {7FD0A92B-7862-4BB1-932B-B52A9CACB56B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7FD0A92B-7862-4BB1-932B-B52A9CACB56B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7FD0A92B-7862-4BB1-932B-B52A9CACB56B}.Debug|x64.ActiveCfg = Debug|Any CPU + {7FD0A92B-7862-4BB1-932B-B52A9CACB56B}.Debug|x86.ActiveCfg = Debug|Any CPU {7FD0A92B-7862-4BB1-932B-B52A9CACB56B}.Release|Any CPU.ActiveCfg = Release|Any CPU {7FD0A92B-7862-4BB1-932B-B52A9CACB56B}.Release|Any CPU.Build.0 = Release|Any CPU + {7FD0A92B-7862-4BB1-932B-B52A9CACB56B}.Release|x64.ActiveCfg = Release|Any CPU + {7FD0A92B-7862-4BB1-932B-B52A9CACB56B}.Release|x86.ActiveCfg = Release|Any CPU {FD0AFD44-7A93-4F9E-B5ED-72582392E435}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FD0AFD44-7A93-4F9E-B5ED-72582392E435}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FD0AFD44-7A93-4F9E-B5ED-72582392E435}.Debug|x64.ActiveCfg = Debug|Any CPU + {FD0AFD44-7A93-4F9E-B5ED-72582392E435}.Debug|x86.ActiveCfg = Debug|Any CPU {FD0AFD44-7A93-4F9E-B5ED-72582392E435}.Release|Any CPU.ActiveCfg = Release|Any CPU {FD0AFD44-7A93-4F9E-B5ED-72582392E435}.Release|Any CPU.Build.0 = Release|Any CPU + {FD0AFD44-7A93-4F9E-B5ED-72582392E435}.Release|x64.ActiveCfg = Release|Any CPU + {FD0AFD44-7A93-4F9E-B5ED-72582392E435}.Release|x86.ActiveCfg = Release|Any CPU {6A811927-3C37-430A-90F4-503E37123956}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6A811927-3C37-430A-90F4-503E37123956}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A811927-3C37-430A-90F4-503E37123956}.Debug|x64.ActiveCfg = Debug|Any CPU + {6A811927-3C37-430A-90F4-503E37123956}.Debug|x86.ActiveCfg = Debug|Any CPU {6A811927-3C37-430A-90F4-503E37123956}.Release|Any CPU.ActiveCfg = Release|Any CPU {6A811927-3C37-430A-90F4-503E37123956}.Release|Any CPU.Build.0 = Release|Any CPU + {6A811927-3C37-430A-90F4-503E37123956}.Release|x64.ActiveCfg = Release|Any CPU + {6A811927-3C37-430A-90F4-503E37123956}.Release|x86.ActiveCfg = Release|Any CPU {8B074219-F69A-4E41-83C6-12EE1E647779}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8B074219-F69A-4E41-83C6-12EE1E647779}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8B074219-F69A-4E41-83C6-12EE1E647779}.Debug|x64.ActiveCfg = Debug|Any CPU + {8B074219-F69A-4E41-83C6-12EE1E647779}.Debug|x86.ActiveCfg = Debug|Any CPU {8B074219-F69A-4E41-83C6-12EE1E647779}.Release|Any CPU.ActiveCfg = Release|Any CPU {8B074219-F69A-4E41-83C6-12EE1E647779}.Release|Any CPU.Build.0 = Release|Any CPU + {8B074219-F69A-4E41-83C6-12EE1E647779}.Release|x64.ActiveCfg = Release|Any CPU + {8B074219-F69A-4E41-83C6-12EE1E647779}.Release|x86.ActiveCfg = Release|Any CPU {D7166C56-178A-4457-B56A-C615C7450DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D7166C56-178A-4457-B56A-C615C7450DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D7166C56-178A-4457-B56A-C615C7450DEE}.Debug|x64.ActiveCfg = Debug|Any CPU + {D7166C56-178A-4457-B56A-C615C7450DEE}.Debug|x86.ActiveCfg = Debug|Any CPU {D7166C56-178A-4457-B56A-C615C7450DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU {D7166C56-178A-4457-B56A-C615C7450DEE}.Release|Any CPU.Build.0 = Release|Any CPU + {D7166C56-178A-4457-B56A-C615C7450DEE}.Release|x64.ActiveCfg = Release|Any CPU + {D7166C56-178A-4457-B56A-C615C7450DEE}.Release|x86.ActiveCfg = Release|Any CPU + {927E1F1C-95F0-4991-B33F-603977204B02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {927E1F1C-95F0-4991-B33F-603977204B02}.Debug|Any CPU.Build.0 = Debug|Any CPU + {927E1F1C-95F0-4991-B33F-603977204B02}.Debug|x64.ActiveCfg = Debug|x64 + {927E1F1C-95F0-4991-B33F-603977204B02}.Debug|x64.Build.0 = Debug|x64 + {927E1F1C-95F0-4991-B33F-603977204B02}.Debug|x86.ActiveCfg = Debug|x86 + {927E1F1C-95F0-4991-B33F-603977204B02}.Debug|x86.Build.0 = Debug|x86 + {927E1F1C-95F0-4991-B33F-603977204B02}.Release|Any CPU.ActiveCfg = Release|Any CPU + {927E1F1C-95F0-4991-B33F-603977204B02}.Release|Any CPU.Build.0 = Release|Any CPU + {927E1F1C-95F0-4991-B33F-603977204B02}.Release|x64.ActiveCfg = Release|x64 + {927E1F1C-95F0-4991-B33F-603977204B02}.Release|x64.Build.0 = Release|x64 + {927E1F1C-95F0-4991-B33F-603977204B02}.Release|x86.ActiveCfg = Release|x86 + {927E1F1C-95F0-4991-B33F-603977204B02}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -113,5 +179,6 @@ Global {6A811927-3C37-430A-90F4-503E37123956} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} {8B074219-F69A-4E41-83C6-12EE1E647779} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} {D7166C56-178A-4457-B56A-C615C7450DEE} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} + {927E1F1C-95F0-4991-B33F-603977204B02} = {1667F3B4-31E6-45B2-90FB-97B1ECFE9874} EndGlobalSection EndGlobal diff --git a/global.json b/global.json deleted file mode 100644 index 62fed04ac..000000000 --- a/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "projects": [ "src", "tests", "." ], - "sdk": { - "version": "1.0.0-preview2-1-003177" - } -} diff --git a/src/Squidex.Core/Squidex.Core.csproj b/src/Squidex.Core/Squidex.Core.csproj new file mode 100644 index 000000000..def4259e5 --- /dev/null +++ b/src/Squidex.Core/Squidex.Core.csproj @@ -0,0 +1,18 @@ + + + netstandard1.6 + $(PackageTargetFallback);dnxcore50 + + + + + + + + + + + + + + diff --git a/src/Squidex.Core/Squidex.Core.xproj b/src/Squidex.Core/Squidex.Core.xproj deleted file mode 100644 index 361383acb..000000000 --- a/src/Squidex.Core/Squidex.Core.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 47f3c27e-698b-4edf-a7e8-d7f4232afbb0 - Squidex.Core - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/Squidex.Core/project.json b/src/Squidex.Core/project.json deleted file mode 100644 index 55267b47f..000000000 --- a/src/Squidex.Core/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "dependencies": { - "Squidex.Infrastructure": "1.0.0-*", - "protobuf-net": "2.1.0", - "System.Collections.Immutable": "1.3.1", - "NodaTime": "2.0.0-beta20170123", - "NJsonSchema": "7.10.6235.25398" - }, - "frameworks": { - "netstandard1.6": { - "dependencies": { - "NETStandard.Library": "1.6.1", - "Microsoft.OData.Core": "6.15.0" - }, - "imports": "dnxcore50" - } - }, - "tooling": { - "defaultNamespace": "Squidex.Core" - }, - "version": "1.0.0-*" -} diff --git a/src/Squidex.Events/Squidex.Events.csproj b/src/Squidex.Events/Squidex.Events.csproj new file mode 100644 index 000000000..e7319ec16 --- /dev/null +++ b/src/Squidex.Events/Squidex.Events.csproj @@ -0,0 +1,13 @@ + + + netstandard1.6 + $(PackageTargetFallback);dnxcore50 + + + + + + + + + diff --git a/src/Squidex.Events/Squidex.Events.xproj b/src/Squidex.Events/Squidex.Events.xproj deleted file mode 100644 index 871e27c63..000000000 --- a/src/Squidex.Events/Squidex.Events.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 25f66c64-058a-4d44-bc0c-f12a054f9a91 - Squidex.Events - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/Squidex.Events/project.json b/src/Squidex.Events/project.json deleted file mode 100644 index a1f5e9c08..000000000 --- a/src/Squidex.Events/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "dependencies": { - "NodaTime": "2.0.0-beta20170123", - "Squidex.Core": "1.0.0-*", - "Squidex.Infrastructure": "1.0.0-*" - }, - "frameworks": { - "netstandard1.6": { - "dependencies": { - "NETStandard.Library": "1.6.1" - }, - "imports": "dnxcore50" - } - }, - "tooling": { - "defaultNamespace": "Squidex.Events" - }, - "version": "1.0.0-*" -} diff --git a/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj b/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj new file mode 100644 index 000000000..1f4fc04e4 --- /dev/null +++ b/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj @@ -0,0 +1,11 @@ + + + netstandard1.6 + + + + + + + + diff --git a/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.xproj b/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.xproj deleted file mode 100644 index 5fed50e5f..000000000 --- a/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.xproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 6a811927-3c37-430a-90f4-503e37123956 - Squidex.Infrastructure.MongoDb - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - - - \ No newline at end of file diff --git a/src/Squidex.Infrastructure.MongoDb/project.json b/src/Squidex.Infrastructure.MongoDb/project.json deleted file mode 100644 index 6ea6cebd0..000000000 --- a/src/Squidex.Infrastructure.MongoDb/project.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Autofac": "4.3.0", - "Microsoft.Extensions.Logging": "1.1.0", - "MongoDB.Driver": "2.4.1", - "Newtonsoft.Json": "9.0.2-beta2", - "NodaTime": "2.0.0-beta20170123", - "Squidex.Infrastructure": "1.0.0-*", - "System.Linq": "4.3.0", - "System.Reactive": "3.1.1", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Security.Claims": "4.3.0" - }, - "frameworks": { - "netstandard1.6": { - "dependencies": { - "NETStandard.Library": "1.6.1" - }, - "imports": "dnxcore50" - } - }, - "buildOptions": { - "embed": [ - "*.csv" - ] - }, - "tooling": { - "defaultNamespace": "Squidex.Infrastructure.MongoDb" - } -} \ No newline at end of file diff --git a/src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.csproj b/src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.csproj new file mode 100644 index 000000000..aeb6f358d --- /dev/null +++ b/src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.csproj @@ -0,0 +1,12 @@ + + + netstandard1.6 + + + + + + + + + diff --git a/src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.xproj b/src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.xproj deleted file mode 100644 index 27ec46604..000000000 --- a/src/Squidex.Infrastructure.Redis/Squidex.Infrastructure.Redis.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - d7166c56-178a-4457-b56a-c615c7450dee - Squidex.Infrastructure.Redis - .\obj - .\bin\ - v4.6.1 - - - - 2.0 - - - diff --git a/src/Squidex.Infrastructure.Redis/project.json b/src/Squidex.Infrastructure.Redis/project.json deleted file mode 100644 index db6d74855..000000000 --- a/src/Squidex.Infrastructure.Redis/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Squidex.Infrastructure": "1.0.0-*", - "StackExchange.Redis.StrongName": "1.2.0", - "System.Linq": "4.3.0", - "System.Reactive": "3.1.1", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Security.Claims": "4.3.0" - }, - "frameworks": { - "netstandard1.6": { - "dependencies": { - "NETStandard.Library": "1.6.1" - }, - "imports": "dnxcore50" - } - }, - "tooling": { - "defaultNamespace": "Squidex.Infrastructure.Redis" - } -} \ No newline at end of file diff --git a/src/Squidex.Infrastructure/Reflection/PropertyAccessor.cs b/src/Squidex.Infrastructure/Reflection/PropertyAccessor.cs index 355dd088d..1bdeccfe0 100644 --- a/src/Squidex.Infrastructure/Reflection/PropertyAccessor.cs +++ b/src/Squidex.Infrastructure/Reflection/PropertyAccessor.cs @@ -26,7 +26,7 @@ namespace Squidex.Infrastructure.Reflection } else { - getMethod = x => { throw new NotSupportedException(); }; + getMethod = x => throw new NotSupportedException(); } if (propertyInfo.CanWrite) @@ -35,7 +35,7 @@ namespace Squidex.Infrastructure.Reflection } else { - setMethod = (x, y) => { throw new NotSupportedException(); }; + setMethod = (x, y) => throw new NotSupportedException(); } } diff --git a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj new file mode 100644 index 000000000..d7ce08816 --- /dev/null +++ b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj @@ -0,0 +1,15 @@ + + + netstandard1.6 + + + + + + + + + + + + diff --git a/src/Squidex.Infrastructure/Squidex.Infrastructure.xproj b/src/Squidex.Infrastructure/Squidex.Infrastructure.xproj deleted file mode 100644 index 4c50bfdd2..000000000 --- a/src/Squidex.Infrastructure/Squidex.Infrastructure.xproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - bd1c30a8-8ffa-4a92-a9bd-b67b1cddd84c - Squidex.Infrastructure - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - - - - - - \ No newline at end of file diff --git a/src/Squidex.Infrastructure/project.json b/src/Squidex.Infrastructure/project.json deleted file mode 100644 index 74f895db2..000000000 --- a/src/Squidex.Infrastructure/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Newtonsoft.Json": "9.0.2-beta2", - "NodaTime": "2.0.0-beta20170123", - "protobuf-net": "2.1.0", - "System.Linq": "4.3.0", - "System.Reactive": "3.1.1", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Security.Claims": "4.3.0" - }, - "frameworks": { - "netstandard1.6": { - "dependencies": { - "NETStandard.Library": "1.6.1" - }, - "imports": "dnxcore50" - } - }, - "tooling": { - "defaultNamespace": "Squidex.Infrastructure" - } -} \ No newline at end of file diff --git a/src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.csproj b/src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.csproj new file mode 100644 index 000000000..a5c3703d7 --- /dev/null +++ b/src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.csproj @@ -0,0 +1,22 @@ + + + netstandard1.6 + $(PackageTargetFallback);dnxcore50 + + + + + + + + + + + + + + + + + + diff --git a/src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.xproj b/src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.xproj deleted file mode 100644 index 1e77a04d6..000000000 --- a/src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 28f8e9e2-fe24-41f7-a888-9fc244a9e2dd - Squidex.Read.MongoDb - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Squidex.Read.MongoDb/project.json b/src/Squidex.Read.MongoDb/project.json deleted file mode 100644 index 6721a0e25..000000000 --- a/src/Squidex.Read.MongoDb/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "dependencies": { - "IdentityServer4": "1.0.2", - "Microsoft.AspNetCore.Identity": "1.1.0", - "Microsoft.AspNetCore.Identity.MongoDB": "1.0.2", - "MongoDB.Driver": "2.4.1", - "Squidex.Core": "1.0.0-*", - "Squidex.Events": "1.0.0-*", - "Squidex.Infrastructure": "1.0.0-*", - "Squidex.Infrastructure.MongoDb": "1.0.0-*", - "Squidex.Read": "1.0.0-*" - }, - "frameworks": { - "netstandard1.6": { - "dependencies": { - "NETStandard.Library": "1.6.1", - "Microsoft.OData.Core": "6.15.0" - }, - "imports": "dnxcore50" - } - }, - "version": "1.0.0-*" -} diff --git a/src/Squidex.Read/Squidex.Read.csproj b/src/Squidex.Read/Squidex.Read.csproj new file mode 100644 index 000000000..700fa1891 --- /dev/null +++ b/src/Squidex.Read/Squidex.Read.csproj @@ -0,0 +1,15 @@ + + + netstandard1.6 + $(PackageTargetFallback);dnxcore50 + + + + + + + + + + + diff --git a/src/Squidex.Read/Squidex.Read.xproj b/src/Squidex.Read/Squidex.Read.xproj deleted file mode 100644 index 08556906a..000000000 --- a/src/Squidex.Read/Squidex.Read.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a92b4734-2587-4f6f-97a3-741be48709a5 - Squidex.Read - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/Squidex.Read/project.json b/src/Squidex.Read/project.json deleted file mode 100644 index 72f883379..000000000 --- a/src/Squidex.Read/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "dependencies": { - "Microsoft.Extensions.Caching.Memory": "1.1.0", - "MongoDB.Driver": "2.4.1", - "NodaTime": "2.0.0-beta20170123", - "Squidex.Core": "1.0.0-*", - "Squidex.Events": "1.0.0-*", - "Squidex.Infrastructure": "1.0.0-*" - }, - "frameworks": { - "netstandard1.6": { - "dependencies": { - "NETStandard.Library": "1.6.1" - }, - "imports": "dnxcore50" - } - }, - "tooling": { - "defaultNamespace": "Squidex.Read" - }, - "version": "1.0.0-*" -} diff --git a/src/Squidex.Write/.gitignore b/src/Squidex.Write/.gitignore deleted file mode 100644 index 0ca27f04e..000000000 --- a/src/Squidex.Write/.gitignore +++ /dev/null @@ -1,234 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -build/ -bld/ -[Bb]in/ -[Oo]bj/ - -# Visual Studio 2015 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# DNX -project.lock.json -artifacts/ - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Microsoft Azure ApplicationInsights config file -ApplicationInsights.config - -# Windows Store app package directory -AppPackages/ -BundleArtifacts/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.pfx -*.publishsettings -node_modules/ -orleans.codegen.cs - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe - -# FAKE - F# Make -.fake/ diff --git a/src/Squidex.Write/Apps/AppClients.cs b/src/Squidex.Write/Apps/AppClients.cs index 078569123..2bf58d626 100644 --- a/src/Squidex.Write/Apps/AppClients.cs +++ b/src/Squidex.Write/Apps/AppClients.cs @@ -25,19 +25,15 @@ namespace Squidex.Write.Apps public void Add(string id, string secret, DateTime expires) { - Func message = () => "Cannot add client"; - - ThrowIfFound(id, message); + ThrowIfFound(id, () => "Cannot rename client"); clients[id] = new AppClient(id, secret, expires); } public void Rename(string clientId, string name) { - Func message = () => "Cannot rename client"; - ThrowIfNotFound(clientId); - ThrowIfSameName(clientId, name, message); + ThrowIfSameName(clientId, name, () => "Cannot rename client"); clients[clientId] = clients[clientId].Rename(name); } diff --git a/src/Squidex.Write/Apps/AppContributors.cs b/src/Squidex.Write/Apps/AppContributors.cs index 0c6922abb..b7627bc5f 100644 --- a/src/Squidex.Write/Apps/AppContributors.cs +++ b/src/Squidex.Write/Apps/AppContributors.cs @@ -22,20 +22,20 @@ namespace Squidex.Write.Apps public void Assign(string contributorId, PermissionLevel permission) { - Func message = () => "Cannot assign contributor"; + string Message() => "Cannot assign contributor"; - ThrowIfFound(contributorId, permission, message); - ThrowIfNoOwner(c => c[contributorId] = permission, message); + ThrowIfFound(contributorId, permission, Message); + ThrowIfNoOwner(c => c[contributorId] = permission, Message); contributors[contributorId] = permission; } public void Remove(string contributorId) { - Func message = () => "Cannot remove contributor"; + string Message() => "Cannot remove contributor"; ThrowIfNotFound(contributorId); - ThrowIfNoOwner(c => c.Remove(contributorId), message); + ThrowIfNoOwner(c => c.Remove(contributorId), Message); contributors.Remove(contributorId); } diff --git a/src/Squidex.Write/Apps/AppLanguages.cs b/src/Squidex.Write/Apps/AppLanguages.cs index 92c042001..1d3261e6e 100644 --- a/src/Squidex.Write/Apps/AppLanguages.cs +++ b/src/Squidex.Write/Apps/AppLanguages.cs @@ -21,29 +21,23 @@ namespace Squidex.Write.Apps public void Add(Language language) { - Func message = () => "Cannot add language"; - - ThrowIfFound(language, message); + ThrowIfFound(language, () => "Cannot add language"); languages.Add(language); } public void Remove(Language language) { - Func message = () => "Cannot remove language"; - ThrowIfNotFound(language); - ThrowIfMasterLanguage(language, message); + ThrowIfMasterLanguage(language, () => "Cannot remove language"); languages.Remove(language); } public void SetMasterLanguage(Language language) { - Func message = () => "Cannot set master language"; - ThrowIfNotFound(language); - ThrowIfMasterLanguage(language, message); + ThrowIfMasterLanguage(language, () => "Cannot set master language"); masterLanguage = language; } diff --git a/src/Squidex.Write/Squidex.Write.csproj b/src/Squidex.Write/Squidex.Write.csproj new file mode 100644 index 000000000..afc5ca9a8 --- /dev/null +++ b/src/Squidex.Write/Squidex.Write.csproj @@ -0,0 +1,15 @@ + + + netstandard1.6 + $(PackageTargetFallback);dnxcore50 + + + + + + + + + + + diff --git a/src/Squidex.Write/Squidex.Write.xproj b/src/Squidex.Write/Squidex.Write.xproj deleted file mode 100644 index 7e7e98f21..000000000 --- a/src/Squidex.Write/Squidex.Write.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a85201c6-6af8-4b63-8365-08f741050438 - Squidex.Write - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/Squidex.Write/project.json b/src/Squidex.Write/project.json deleted file mode 100644 index e198fa93f..000000000 --- a/src/Squidex.Write/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "dependencies": { - "Microsoft.AspNetCore.Identity": "1.1.0", - "NodaTime": "2.0.0-beta20170123", - "Squidex.Core": "1.0.0-*", - "Squidex.Events": "1.0.0-*", - "Squidex.Infrastructure": "1.0.0-*", - "Squidex.Read": "1.0.0-*", - "System.Linq": "4.3.0" - }, - "frameworks": { - "netstandard1.6": { - "dependencies": { - "NETStandard.Library": "1.6.1" - }, - "imports": "dnxcore50" - } - }, - "tooling": { - "defaultNamespace": "Squidex.Write" - }, - "version": "1.0.0-*" -} diff --git a/src/Squidex/Config/Swagger/SwaggerServices.cs b/src/Squidex/Config/Swagger/SwaggerServices.cs index ffab71b41..accb8e24c 100644 --- a/src/Squidex/Config/Swagger/SwaggerServices.cs +++ b/src/Squidex/Config/Swagger/SwaggerServices.cs @@ -12,7 +12,7 @@ using Microsoft.Extensions.Options; using NJsonSchema; using NJsonSchema.Generation.TypeMappers; using NSwag.AspNetCore; -using NSwag.CodeGeneration.SwaggerGenerators.WebApi.Processors.Security; +using NSwag.SwaggerGeneration.WebApi.Processors.Security; using Squidex.Controllers.ContentApi.Generator; using Squidex.Infrastructure; using Squidex.Pipeline.Swagger; diff --git a/src/Squidex/Config/Swagger/XmlResponseTypesProcessor.cs b/src/Squidex/Config/Swagger/XmlResponseTypesProcessor.cs index ade9e59fc..7a9cd9865 100644 --- a/src/Squidex/Config/Swagger/XmlResponseTypesProcessor.cs +++ b/src/Squidex/Config/Swagger/XmlResponseTypesProcessor.cs @@ -13,8 +13,8 @@ using NJsonSchema; using NJsonSchema.Generation; using NJsonSchema.Infrastructure; using NSwag; -using NSwag.CodeGeneration.SwaggerGenerators.WebApi.Processors; -using NSwag.CodeGeneration.SwaggerGenerators.WebApi.Processors.Contexts; +using NSwag.SwaggerGeneration.Processors; +using NSwag.SwaggerGeneration.Processors.Contexts; using Squidex.Controllers.Api; // ReSharper disable UseObjectOrCollectionInitializer diff --git a/src/Squidex/Config/Swagger/XmlTagProcessor.cs b/src/Squidex/Config/Swagger/XmlTagProcessor.cs index ebabe5353..4841f848c 100644 --- a/src/Squidex/Config/Swagger/XmlTagProcessor.cs +++ b/src/Squidex/Config/Swagger/XmlTagProcessor.cs @@ -10,8 +10,8 @@ using System.Reflection; using System.Threading.Tasks; using NJsonSchema.Infrastructure; using NSwag.Annotations; -using NSwag.CodeGeneration.SwaggerGenerators.WebApi.Processors; -using NSwag.CodeGeneration.SwaggerGenerators.WebApi.Processors.Contexts; +using NSwag.SwaggerGeneration.Processors; +using NSwag.SwaggerGeneration.Processors.Contexts; // ReSharper disable InvertIf diff --git a/src/Squidex/Controllers/Api/Schemas/SchemaFieldsController.cs b/src/Squidex/Controllers/Api/Schemas/SchemaFieldsController.cs index dd0196da9..af47a12c7 100644 --- a/src/Squidex/Controllers/Api/Schemas/SchemaFieldsController.cs +++ b/src/Squidex/Controllers/Api/Schemas/SchemaFieldsController.cs @@ -63,6 +63,7 @@ namespace Squidex.Controllers.Api.Schemas /// /// The name of the app. /// The name of the schema. + /// The id of the field to update. /// The field object that needs to be added to the schema. /// /// 204 => Schema field created. diff --git a/src/Squidex/Controllers/ContentApi/Generator/SchemasSwaggerGenerator.cs b/src/Squidex/Controllers/ContentApi/Generator/SchemasSwaggerGenerator.cs index c4f138f1b..4e5cdc7e5 100644 --- a/src/Squidex/Controllers/ContentApi/Generator/SchemasSwaggerGenerator.cs +++ b/src/Squidex/Controllers/ContentApi/Generator/SchemasSwaggerGenerator.cs @@ -16,7 +16,7 @@ using NJsonSchema; using NJsonSchema.Generation; using NSwag; using NSwag.AspNetCore; -using NSwag.CodeGeneration.SwaggerGenerators; +using NSwag.SwaggerGeneration; using Squidex.Config; using Squidex.Controllers.Api; using Squidex.Core.Schemas; diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj new file mode 100644 index 000000000..5c1d938d0 --- /dev/null +++ b/src/Squidex/Squidex.csproj @@ -0,0 +1,70 @@ + + + + netcoreapp1.1 + $(NoWarn);CS1591;1591;1573;1572 + true + true + Squidex + Exe + Squidex + $(PackageTargetFallback);dnxcore50 + 1.1.0 + + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Squidex/Squidex.xproj b/src/Squidex/Squidex.xproj deleted file mode 100644 index 36b67c180..000000000 --- a/src/Squidex/Squidex.xproj +++ /dev/null @@ -1,35 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 61f6bbce-a080-4400-b194-70e2f5d2096e - Squidex - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - True - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Squidex/app/theme/icomoon/selection.json b/src/Squidex/app/theme/icomoon/selection.json deleted file mode 100644 index 71d7acd50..000000000 --- a/src/Squidex/app/theme/icomoon/selection.json +++ /dev/null @@ -1,1551 +0,0 @@ -{ - "IcoMoonType": "selection", - "icons": [ - { - "icon": { - "paths": [ - "M512 92.774l429.102 855.226h-858.206l429.104-855.226zM512 0c-22.070 0-44.14 14.882-60.884 44.648l-437.074 871.112c-33.486 59.532-5 108.24 63.304 108.24h869.308c68.3 0 96.792-48.708 63.3-108.24h0.002l-437.074-871.112c-16.742-29.766-38.812-44.648-60.882-44.648v0z", - "M576 832c0 35.346-28.654 64-64 64s-64-28.654-64-64c0-35.346 28.654-64 64-64s64 28.654 64 64z", - "M512 704c-35.346 0-64-28.654-64-64v-192c0-35.346 28.654-64 64-64s64 28.654 64 64v192c0 35.346-28.654 64-64 64z" - ], - "attrs": [], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "warning", - "sign" - ], - "defaultCode": 59911, - "grid": 16 - }, - "attrs": [], - "properties": { - "ligatures": "warning, sign", - "name": "warning", - "id": 263, - "order": 52, - "prevSize": 32, - "code": 59911 - }, - "setIdx": 0, - "setId": 3, - "iconIdx": 263 - }, - { - "icon": { - "paths": [ - "M512 96c-111.118 0-215.584 43.272-294.156 121.844s-121.844 183.038-121.844 294.156c0 111.118 43.272 215.584 121.844 294.156s183.038 121.844 294.156 121.844c111.118 0 215.584-43.272 294.156-121.844s121.844-183.038 121.844-294.156c0-111.118-43.272-215.584-121.844-294.156s-183.038-121.844-294.156-121.844zM512 0v0c282.77 0 512 229.23 512 512s-229.23 512-512 512c-282.77 0-512-229.23-512-512s229.23-512 512-512zM448 704h128v128h-128zM448 192h128v384h-128z" - ], - "attrs": [], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "notification", - "warning", - "notice", - "note", - "exclamation" - ], - "defaultCode": 59912, - "grid": 16 - }, - "attrs": [], - "properties": { - "ligatures": "notification, warning2", - "name": "notification", - "id": 264, - "order": 50, - "prevSize": 32, - "code": 59912 - }, - "setIdx": 0, - "setId": 3, - "iconIdx": 264 - }, - { - "icon": { - "paths": [ - "M889.68 166.32c-93.608-102.216-228.154-166.32-377.68-166.32-282.77 0-512 229.23-512 512h96c0-229.75 186.25-416 416-416 123.020 0 233.542 53.418 309.696 138.306l-149.696 149.694h352v-352l-134.32 134.32z", - "M928 512c0 229.75-186.25 416-416 416-123.020 0-233.542-53.418-309.694-138.306l149.694-149.694h-352v352l134.32-134.32c93.608 102.216 228.154 166.32 377.68 166.32 282.77 0 512-229.23 512-512h-96z" - ], - "attrs": [ - {}, - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "loop", - "repeat", - "player", - "reload", - "refresh", - "update", - "synchronize", - "arrows" - ], - "grid": 16 - }, - "attrs": [ - {}, - {} - ], - "properties": { - "order": 49, - "id": 2, - "prevSize": 32, - "code": 59694, - "name": "reset" - }, - "setIdx": 1, - "setId": 2, - "iconIdx": 0 - }, - { - "icon": { - "paths": [ - "M128 128h320v768h-320zM576 128h320v768h-320z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "pause", - "player" - ], - "grid": 16 - }, - "attrs": [ - {} - ], - "properties": { - "order": 2, - "id": 1, - "prevSize": 32, - "code": 59695, - "name": "pause" - }, - "setIdx": 1, - "setId": 2, - "iconIdx": 1 - }, - { - "icon": { - "paths": [ - "M192 128l640 384-640 384z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "play", - "player" - ], - "grid": 16 - }, - "attrs": [ - {} - ], - "properties": { - "order": 3, - "id": 0, - "prevSize": 32, - "code": 59696, - "name": "play" - }, - "setIdx": 1, - "setId": 2, - "iconIdx": 2 - }, - { - "icon": { - "paths": [ - "M933.79 610.25c-53.726-93.054-21.416-212.304 72.152-266.488l-100.626-174.292c-28.75 16.854-62.176 26.518-97.846 26.518-107.536 0-194.708-87.746-194.708-195.99h-201.258c0.266 33.41-8.074 67.282-25.958 98.252-53.724 93.056-173.156 124.702-266.862 70.758l-100.624 174.292c28.97 16.472 54.050 40.588 71.886 71.478 53.638 92.908 21.512 211.92-71.708 266.224l100.626 174.292c28.65-16.696 61.916-26.254 97.4-26.254 107.196 0 194.144 87.192 194.7 194.958h201.254c-0.086-33.074 8.272-66.57 25.966-97.218 53.636-92.906 172.776-124.594 266.414-71.012l100.626-174.29c-28.78-16.466-53.692-40.498-71.434-71.228zM512 719.332c-114.508 0-207.336-92.824-207.336-207.334 0-114.508 92.826-207.334 207.336-207.334 114.508 0 207.332 92.826 207.332 207.334-0.002 114.51-92.824 207.334-207.332 207.334z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "cog", - "gear", - "preferences", - "settings", - "generate", - "control", - "options" - ], - "grid": 16 - }, - "attrs": [ - {} - ], - "properties": { - "order": 1, - "id": 1, - "prevSize": 32, - "code": 59693, - "name": "settings2" - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 0 - }, - { - "icon": { - "paths": [ - "M128 320v640c0 35.2 28.8 64 64 64h576c35.2 0 64-28.8 64-64v-640h-704zM320 896h-64v-448h64v448zM448 896h-64v-448h64v448zM576 896h-64v-448h64v448zM704 896h-64v-448h64v448z", - "M848 128h-208v-80c0-26.4-21.6-48-48-48h-224c-26.4 0-48 21.6-48 48v80h-208c-26.4 0-48 21.6-48 48v80h832v-80c0-26.4-21.6-48-48-48zM576 128h-192v-63.198h192v63.198z" - ], - "attrs": [ - {}, - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "bin", - "trashcan", - "remove", - "delete", - "recycle", - "dispose" - ], - "grid": 16 - }, - "attrs": [ - {}, - {} - ], - "properties": { - "order": 1, - "id": 0, - "name": "bin2", - "prevSize": 32, - "code": 59650 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 1 - }, - { - "icon": { - "paths": [ - "M512 102.4c-200.4 0-366.954 144.072-402.4 334.2-0.031 0.165-0.069 0.335-0.1 0.5-2.974 16.061-4.76 32.441-5.8 49.1-0.017 0.271-0.084 0.529-0.1 0.8 0.019 0.004 0.080-0.004 0.1 0-0.503 8.31-1.3 16.564-1.3 25 0 226.202 183.398 409.6 409.6 409.6 208.165 0 379.707-155.44 405.8-356.5 0.004-0.033-0.004-0.067 0-0.1 1.94-14.978 3.124-30.16 3.4-45.6 0.044-2.487 0.4-4.903 0.4-7.4 0-226.202-183.398-409.6-409.6-409.6zM512 153.6c185.461 0 337.902 140.924 356.4 321.5-35.181-21.812-84.232-39.9-151.6-39.9-85.35 0-140.891 41.606-194.6 81.9-49.152 36.864-95.55 71.7-163.8 71.7-86.067 0-135.862-54.67-175.9-98.6-9.001-9.901-17.11-17.483-25.4-25.3 23.131-175.603 172.981-311.3 354.9-311.3zM716.8 486.4c77.828 0 125.173 28.221 152.2 52.8-13.96 185.173-168.254 331.2-357 331.2-190.097 0-345.175-148.14-357.2-335.2 41.826 45.372 102.577 104.8 203.6 104.8 85.35 0 140.891-41.606 194.6-81.9 49.152-36.915 95.55-71.7 163.8-71.7z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "activity" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 12, - "id": 36, - "name": "activity, history, time", - "prevSize": 32, - "code": 59652 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 2 - }, - { - "icon": { - "paths": [ - "M512 0c-35.392 0-64 28.608-64 64v384h-384c-35.392 0-64 28.608-64 64s28.608 64 64 64h384v384c0 35.392 28.608 64 64 64s64-28.608 64-64v-384h384c35.392 0 64-28.608 64-64s-28.608-64-64-64h-384v-384c0-35.392-28.608-64-64-64z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "add" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 13, - "id": 35, - "name": "add, plus", - "prevSize": 32, - "code": 59653 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 3 - }, - { - "icon": { - "paths": [ - "M512 102.4c-226.202 0-409.6 183.398-409.6 409.6s183.398 409.6 409.6 409.6c226.202 0 409.6-183.398 409.6-409.6s-183.398-409.6-409.6-409.6zM512 153.6c197.632 0 358.4 160.819 358.4 358.4s-160.768 358.4-358.4 358.4c-197.632 0-358.4-160.819-358.4-358.4s160.768-358.4 358.4-358.4zM691.9 333c-12.893 0.002-25.782 4.882-35.5 14.6l-222.2 221.9-67.7-67.5c-19.19-19.294-51.085-19.215-70.3 0-19.15 19.15-19.15 51.050 0 70.2 0.198 0.2 26.198 26.681 52 53 12.95 13.209 25.761 26.372 35.2 36 4.719 4.814 8.607 8.755 11.2 11.4 1.296 1.322 2.293 2.281 2.9 2.9 0.279 0.282 0.488 0.486 0.6 0.6 0.001 0.001 7.591-7.429 14.6-14.3l-14.5 14.4 0.2 0.2v0.1c19.43 19.327 51.57 19.327 71 0v-0.1l258.1-257.6c19.546-19.447 19.521-51.885-0.1-71.3-9.731-9.679-22.607-14.502-35.5-14.5z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "check-circle" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 14, - "id": 34, - "name": "check-circle", - "prevSize": 32, - "code": 59654 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 4 - }, - { - "icon": { - "paths": [ - "M512 1024c-282.778 0-512-229.222-512-512s229.222-512 512-512 512 229.222 512 512-229.222 512-512 512zM855.808 270.592c-19.2-19.2-50.278-19.2-69.478 0l-376.73 376.73-171.878-171.93c-19.2-19.2-50.278-19.2-69.478 0s-19.2 50.278 0 69.478c0 0 201.523 205.261 204.8 208.486 9.984 10.138 23.347 14.643 36.557 14.080 13.21 0.563 26.573-3.942 36.608-14.029 3.277-3.226 409.6-413.286 409.6-413.286 19.2-19.2 19.2-50.33 0-69.53z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "check-circle-filled" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 27, - "id": 33, - "name": "check-circle-filled", - "prevSize": 32, - "code": 59655 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 5 - }, - { - "icon": { - "paths": [ - "M601.024 512l276.736 276.736c24.512 24.576 24.512 64.384 0 89.024-24.64 24.576-64.384 24.576-89.024 0l-276.736-276.736-276.736 276.736c-24.512 24.576-64.384 24.576-89.024 0-24.512-24.64-24.512-64.448 0-89.024l276.736-276.736-276.736-276.736c-24.512-24.576-24.512-64.384 0-89.024 24.64-24.576 64.512-24.576 89.024 0l276.736 276.736 276.736-276.736c24.64-24.576 64.384-24.576 89.024 0 24.512 24.64 24.512 64.448 0 89.024l-276.736 276.736z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "close" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 28, - "id": 32, - "name": "close", - "prevSize": 32, - "code": 59656 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 6 - }, - { - "icon": { - "paths": [ - "M409.6 435.2h-153.6v51.2h153.6v-51.2zM409.6 332.8h-153.6v51.2h153.6v-51.2zM256 691.2h409.6v-51.2h-409.6v51.2zM409.6 230.4h-153.6v51.2h153.6v-51.2zM870.4 179.2h-51.2v-51.2c0-28.262-22.938-51.2-51.2-51.2h-614.4c-28.262 0-51.2 22.938-51.2 51.2v665.6c0 28.262 22.938 51.2 51.2 51.2h51.2v51.2c0 28.262 22.938 51.2 51.2 51.2h614.4c28.262 0 51.2-22.938 51.2-51.2v-665.6c0-28.262-22.938-51.2-51.2-51.2zM179.2 793.6c-14.157 0-25.6-11.443-25.6-25.6v-614.4c0-14.131 11.443-25.6 25.6-25.6h563.2c14.157 0 25.6 11.469 25.6 25.6v614.4c0 14.157-11.443 25.6-25.6 25.6h-563.2zM870.4 870.4c0 14.157-11.443 25.6-25.6 25.6h-563.2c-14.157 0-25.6-11.443-25.6-25.6v-25.6h512c28.262 0 51.2-22.938 51.2-51.2v-563.2h25.6c14.157 0 25.6 11.469 25.6 25.6v614.4zM614.4 230.4h-102.4c-28.262 0-51.2 22.938-51.2 51.2v153.6c0 28.262 22.938 51.2 51.2 51.2h102.4c28.262 0 51.2-22.938 51.2-51.2v-153.6c0-28.262-22.938-51.2-51.2-51.2zM614.4 435.2h-102.4v-153.6h102.4v153.6zM256 588.8h409.6v-51.2h-409.6v51.2z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "content" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 37, - "id": 31, - "name": "content", - "prevSize": 32, - "code": 59657 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 7 - }, - { - "icon": { - "paths": [ - "M793.6 844.8c0 14.157-11.443 25.6-25.6 25.6h-665.6c-14.131 0-25.6-11.443-25.6-25.6v-665.6c0-14.157 11.469-25.6 25.6-25.6h665.6c14.157 0 25.6 11.443 25.6 25.6v102.4h51.2v-128c0-28.262-22.938-51.2-51.2-51.2h-716.8c-28.262 0-51.2 22.938-51.2 51.2v716.8c0 28.262 22.938 51.2 51.2 51.2h716.8c28.262 0 51.2-22.938 51.2-51.2v-281.6h-51.2v256zM991.078 237.747c-9.958-9.958-26.035-9.958-35.968 0l-391.91 391.91-238.31-238.31c-9.958-9.958-26.061-9.958-35.942 0-9.958 9.907-9.958 26.010 0 35.942l254.874 254.874c0.461 0.538 0.614 1.203 1.126 1.69 5.043 5.018 11.674 7.475 18.278 7.373 6.605 0.102 13.235-2.355 18.278-7.373 0.512-0.512 0.666-1.178 1.126-1.69l408.448-408.474c9.933-9.933 9.933-26.035 0-35.942z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "control-checkbox" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 38, - "id": 30, - "name": "control-checkbox", - "prevSize": 32, - "code": 59658 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 8 - }, - { - "icon": { - "paths": [ - "M51.2 0c-28.262 0-51.2 22.938-51.2 51.2v281.6c0 28.262 22.938 51.2 51.2 51.2h921.6c28.262 0 51.2-22.938 51.2-51.2v-281.6c0-28.262-22.938-51.2-51.2-51.2h-921.6zM76.8 51.2h512v281.6h-512c-14.157 0-25.6-11.443-25.6-25.6v-230.4c0-14.157 11.443-25.6 25.6-25.6zM640 51.2h307.2c14.157 0 25.6 11.443 25.6 25.6v230.4c0 14.157-11.443 25.6-25.6 25.6h-307.2v-281.6zM716.8 153.6c-0.41 0.358 89.139 102.938 89.6 102.4 0.512 0 89.6-95.36 89.6-102.4 0 0.384-172.16 0-179.2 0zM128 435.2c-42.394 0-76.8 34.406-76.8 76.8s34.406 76.8 76.8 76.8c42.394 0 76.8-34.406 76.8-76.8s-34.406-76.8-76.8-76.8zM128 486.4c14.157 0 25.6 11.443 25.6 25.6s-11.443 25.6-25.6 25.6c-14.157 0-25.6-11.443-25.6-25.6s11.443-25.6 25.6-25.6zM307.2 486.4c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h640c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-640zM128 640c-42.394 0-76.8 34.381-76.8 76.8s34.406 76.8 76.8 76.8c42.394 0 76.8-34.381 76.8-76.8s-34.406-76.8-76.8-76.8zM128 691.2c14.157 0 25.6 11.443 25.6 25.6s-11.443 25.6-25.6 25.6c-14.157 0-25.6-11.443-25.6-25.6s11.443-25.6 25.6-25.6zM307.2 691.2c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h640c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-640zM128 844.8c-42.394 0-76.8 34.381-76.8 76.8s34.406 76.8 76.8 76.8c42.394 0 76.8-34.381 76.8-76.8s-34.406-76.8-76.8-76.8zM128 896c14.157 0 25.6 11.443 25.6 25.6s-11.443 25.6-25.6 25.6c-14.157 0-25.6-11.443-25.6-25.6s11.443-25.6 25.6-25.6zM307.2 896c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h640c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-640z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "control-dropdown" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 39, - "id": 29, - "name": "control-dropdown", - "prevSize": 32, - "code": 59659 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 9 - }, - { - "icon": { - "paths": [ - "M512 0c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h128v870.4h-128c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h307.2c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-128v-870.4h128c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-307.2zM51.2 204.8c-28.262 0-51.2 22.938-51.2 51.2v460.8c0 28.262 22.938 51.2 51.2 51.2h537.6v-51.2h-512c-14.131 0-25.6-11.443-25.6-25.6v-409.6c0-14.157 11.469-25.6 25.6-25.6h512v-51.2h-537.6zM742.4 204.8v51.2h204.8c14.157 0 25.6 11.443 25.6 25.6v409.6c0 14.157-11.443 25.6-25.6 25.6h-204.8v51.2h230.4c28.262 0 51.2-22.938 51.2-51.2v-460.8c0-28.262-22.938-51.2-51.2-51.2h-230.4zM285.9 307c-0.589 0.051-1.161 0.048-1.75 0.15-8.243 0.051-16.396 4.474-20.85 13.050l-132.55 306.25c-6.656 12.749-2.866 28.981 8.5 36.2 11.341 7.219 25.97 2.749 32.6-10l27.65-63.85h170.5c0.512 0 0.914-0.224 1.4-0.25l27.45 64.050c6.63 12.749 21.136 17.269 32.4 10.050s15.005-23.451 8.4-36.2l-131.3-306.25c-4.454-8.576-12.432-12.973-20.65-13.050-0.614-0.102-1.211-0.099-1.8-0.15zM285.9 389.15l63.65 148.45h-127.9l64.25-148.45z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "control-input" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 41, - "id": 28, - "name": "control-input", - "prevSize": 32, - "code": 59660 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 10 - }, - { - "icon": { - "paths": [ - "M153.6 716.8c-84.787 0-153.6 68.813-153.6 153.6s68.813 153.6 153.6 153.6c84.787 0 153.6-68.813 153.6-153.6s-68.813-153.6-153.6-153.6zM153.6 972.8c-56.55 0-102.4-45.85-102.4-102.4s45.85-102.4 102.4-102.4c56.55 0 102.4 45.85 102.4 102.4s-45.85 102.4-102.4 102.4zM384 179.2h614.4c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-614.4c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6zM998.4 486.4h-614.4c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6h614.4c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6zM153.6 0c-84.787 0-153.6 68.787-153.6 153.6s68.813 153.6 153.6 153.6c84.787 0 153.6-68.787 153.6-153.6s-68.813-153.6-153.6-153.6zM153.6 256c-56.55 0-102.4-45.85-102.4-102.4s45.85-102.4 102.4-102.4c56.55 0 102.4 45.85 102.4 102.4s-45.85 102.4-102.4 102.4zM153.6 358.4c-84.787 0-153.6 68.787-153.6 153.6 0 84.787 68.813 153.6 153.6 153.6s153.6-68.813 153.6-153.6c0-84.813-68.813-153.6-153.6-153.6zM153.6 614.4c-56.55 0-102.4-45.85-102.4-102.4s45.85-102.4 102.4-102.4c56.55 0 102.4 45.85 102.4 102.4s-45.85 102.4-102.4 102.4zM153.6 102.4c-28.262 0-51.2 22.938-51.2 51.2s22.938 51.2 51.2 51.2c28.262 0 51.2-22.938 51.2-51.2s-22.938-51.2-51.2-51.2zM998.4 844.8h-614.4c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6h614.4c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "control-radio" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 42, - "id": 27, - "name": "control-radio", - "prevSize": 32, - "code": 59661 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 11 - }, - { - "icon": { - "paths": [ - "M0 0v204.8h76.8v76.8h51.2v-76.8h76.8v-204.8h-204.8zM819.2 0v204.8h204.8v-204.8h-204.8zM51.2 51.2h102.4v102.4h-102.4v-102.4zM870.4 51.2h102.4v102.4h-102.4v-102.4zM281.6 76.8v51.2h102.4v-51.2h-102.4zM486.4 76.8v51.2h102.4v-51.2h-102.4zM691.2 76.8v51.2h102.4v-51.2h-102.4zM333.25 204.8c-7.091-0.307-14.348 2.097-19.75 7.55l-74.75 74.75c-10.317 10.291-10.317 27.083 0 37.4s27.059 10.317 37.35 0l68.45-68.5h141.85v486.4h-50.7c-7.117-0.307-14.348 2.097-19.75 7.55l-23.6 23.55c-10.317 10.317-10.317 27.083 0 37.4 10.291 10.317 27.109 10.317 37.4 0l17.25-17.3h129.75l18.050 18c10.394 10.368 27.181 10.368 37.6 0 10.368-10.394 10.368-27.181 0-37.6l-24-24c-5.478-5.478-12.682-7.907-19.85-7.6h-50.95v-486.4h141.55l69.25 69.2c10.394 10.368 27.155 10.368 37.6 0 10.368-10.368 10.368-27.181 0-37.6l-75.2-75.2c-5.478-5.478-12.706-7.907-19.9-7.6h-357.65zM896 281.6v102.4h51.2v-102.4h-51.2zM76.8 384v102.4h51.2v-102.4h-51.2zM896 486.4v102.4h51.2v-102.4h-51.2zM76.8 588.8v102.4h51.2v-102.4h-51.2zM896 691.2v102.4h51.2v-102.4h-51.2zM76.8 793.6v25.6h-76.8v204.8h204.8v-76.8h76.8v-51.2h-76.8v-76.8h-76.8v-25.6h-51.2zM819.2 819.2v76.8h-25.6v51.2h25.6v76.8h204.8v-204.8h-204.8zM51.2 870.4h102.4v102.4h-102.4v-102.4zM870.4 870.4h102.4v102.4h-102.4v-102.4zM384 896v51.2h102.4v-51.2h-102.4zM588.8 896v51.2h102.4v-51.2h-102.4z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "control-textarea" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 17, - "id": 26, - "name": "control-textarea", - "prevSize": 32, - "code": 59662 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 12 - }, - { - "icon": { - "paths": [ - "M332.8 25.6c-127.258 0-230.4 103.142-230.4 230.4s103.142 230.4 230.4 230.4h358.4c127.258 0 230.4-103.142 230.4-230.4s-103.142-230.4-230.4-230.4h-358.4zM332.8 76.8h358.4c98.97 0 179.2 80.23 179.2 179.2s-80.23 179.2-179.2 179.2h-358.4c-98.97 0-179.2-80.23-179.2-179.2s80.23-179.2 179.2-179.2zM332.8 128c-70.707 0-128 57.293-128 128s57.293 128 128 128c70.707 0 128-57.293 128-128s-57.293-128-128-128zM332.8 179.2c42.419 0 76.8 34.381 76.8 76.8s-34.381 76.8-76.8 76.8c-42.419 0-76.8-34.381-76.8-76.8s34.381-76.8 76.8-76.8zM332.8 537.6c-127.258 0-230.4 103.142-230.4 230.4s103.142 230.4 230.4 230.4h358.4c127.258 0 230.4-103.142 230.4-230.4s-103.142-230.4-230.4-230.4h-358.4zM332.8 588.8h358.4c98.97 0 179.2 80.23 179.2 179.2s-80.23 179.2-179.2 179.2h-358.4c-98.97 0-179.2-80.23-179.2-179.2s80.23-179.2 179.2-179.2zM691.2 640c-70.707 0-128 57.293-128 128s57.293 128 128 128c70.707 0 128-57.293 128-128s-57.293-128-128-128zM691.2 691.2c42.419 0 76.8 34.381 76.8 76.8s-34.381 76.8-76.8 76.8c-42.419 0-76.8-34.381-76.8-76.8s34.381-76.8 76.8-76.8z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "control-toggle" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 16, - "id": 25, - "name": "control-toggle", - "prevSize": 32, - "code": 59663 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 13 - }, - { - "icon": { - "paths": [ - "M204.8 51.2c-56.525 0-102.4 45.875-102.4 102.4v512c0 56.525 45.875 102.4 102.4 102.4h409.6c56.525 0 102.4-45.875 102.4-102.4v-512c0-56.525-45.875-102.4-102.4-102.4h-409.6zM204.8 102.4h409.6c28.262 0 51.2 22.886 51.2 51.2v512c0 28.314-22.938 51.2-51.2 51.2h-409.6c-28.262 0-51.2-22.886-51.2-51.2v-512c0-28.314 22.938-51.2 51.2-51.2zM768 204.8v51.2c28.262 0 51.2 22.886 51.2 51.2v512c0 28.314-22.938 51.2-51.2 51.2h-409.6c-28.262 0-51.2-22.886-51.2-51.2h-51.2c0 56.525 45.875 102.4 102.4 102.4h409.6c56.525 0 102.4-45.875 102.4-102.4v-512c0-56.525-45.875-102.4-102.4-102.4z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "copy" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 15, - "id": 24, - "name": "copy", - "prevSize": 32, - "code": 59664 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 14 - }, - { - "icon": { - "paths": [ - "M882.534 870.4h-792.243c-56.653-79.514-90.291-176.538-90.291-281.6 0-268.621 217.779-486.4 486.4-486.4s486.4 217.779 486.4 486.4c0 105.062-33.638 202.086-90.266 281.6zM512 154.854v49.946h-51.2v-49.946c-219.827 12.826-395.494 188.493-408.32 408.346h49.92v51.2h-50.278c4.429 75.008 27.981 144.742 65.664 204.8h737.203c37.709-60.058 61.261-129.792 65.664-204.8h-50.253v-51.2h49.894c-12.826-219.853-188.467-395.52-408.294-408.346zM486.4 716.8c-42.419 0-76.8-34.381-76.8-76.8s34.381-332.8 76.8-332.8c42.419 0 76.8 290.381 76.8 332.8s-34.381 76.8-76.8 76.8zM486.4 512c-14.131 0-25.6 113.843-25.6 128s11.469 25.6 25.6 25.6c14.157 0 25.6-11.443 25.6-25.6s-11.443-128-25.6-128z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "dashboard" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 26, - "id": 23, - "name": "dashboard", - "prevSize": 32, - "code": 59665 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 15 - }, - { - "icon": { - "paths": [ - "M597.35 819.2c14.131 0 25.6-11.469 25.6-25.6v-307.2c0-14.080-11.469-25.6-25.6-25.6s-25.6 11.52-25.6 25.6v307.2c0 14.131 11.418 25.6 25.6 25.6zM776.55 204.8h-153.6v-51.2c0-28.314-22.886-51.2-51.2-51.2h-102.4c-28.262 0-51.2 22.886-51.2 51.2v51.2h-153.6c-28.262 0-51.2 22.886-51.2 51.2v102.4c0 28.314 22.938 51.2 51.2 51.2v460.8c0 28.314 22.938 51.2 51.2 51.2h409.6c28.314 0 51.2-22.886 51.2-51.2v-460.8c28.314 0 51.2-22.886 51.2-51.2v-102.4c0-28.314-22.938-51.2-51.2-51.2zM469.35 153.6h102.4v51.2h-102.4v-51.2zM725.35 870.4h-409.6v-460.8h409.6v460.8zM776.55 358.4h-512v-102.4h512v102.4zM443.75 819.2c14.131 0 25.6-11.469 25.6-25.6v-307.2c0-14.080-11.469-25.6-25.6-25.6s-25.6 11.52-25.6 25.6v307.2c0 14.131 11.469 25.6 25.6 25.6z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "delete" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 29, - "id": 22, - "name": "delete, bin", - "prevSize": 32, - "code": 59666 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 16 - }, - { - "icon": { - "paths": [ - "M832 128h-192v-64c0-35.392-28.608-64-64-64h-128c-35.328 0-64 28.608-64 64v64h-192c-35.328 0-64 28.608-64 64v128c0 35.392 28.672 64 64 64v512c0 35.392 28.672 64 64 64h512c35.392 0 64-28.608 64-64v-512c35.392 0 64-28.608 64-64v-128c0-35.392-28.608-64-64-64zM448 64h128v64h-128v-64zM448 800c0 17.664-14.336 32-32 32s-32-14.336-32-32v-320c0-17.6 14.336-32 32-32s32 14.4 32 32v320zM640 800c0 17.664-14.336 32-32 32s-32-14.336-32-32v-320c0-17.6 14.336-32 32-32s32 14.4 32 32v320zM832 320h-640v-128h640v128z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "delete-filled" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 36, - "id": 21, - "name": "delete-filled", - "prevSize": 32, - "code": 59667 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 17 - }, - { - "icon": { - "paths": [ - "M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-358.4v51.2h358.4c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-343.4zM716.8 189.8l117.4 117.4h-117.4v-117.4zM332.8 460.8c-127.232 0-230.4 103.168-230.4 230.4s103.168 230.4 230.4 230.4c127.232 0 230.4-103.168 230.4-230.4s-103.168-230.4-230.4-230.4zM332.8 512c98.816 0 179.2 80.384 179.2 179.2s-80.384 179.2-179.2 179.2c-98.816 0-179.2-80.384-179.2-179.2s80.384-179.2 179.2-179.2zM227.2 665.6c-12.39 0-22.4 10.061-22.4 22.4v6.4c0 12.39 10.010 22.4 22.4 22.4h211.2c12.39 0 22.4-10.010 22.4-22.4v-6.4c0-12.39-10.061-22.4-22.4-22.4h-211.2z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "document-delete" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 35, - "id": 20, - "name": "document-delete", - "prevSize": 32, - "code": 59668 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 18 - }, - { - "icon": { - "paths": [ - "M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-358.4v51.2h358.4c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-343.4zM716.8 189.8l117.4 117.4h-117.4v-117.4zM332.8 460.8c-127.232 0-230.4 103.168-230.4 230.4s103.168 230.4 230.4 230.4c127.232 0 230.4-103.168 230.4-230.4s-103.168-230.4-230.4-230.4zM332.8 512c39.934 0 76.475 13.533 106.3 35.7l-250.4 249c-21.807-29.683-35.1-65.924-35.1-105.5 0-98.816 80.384-179.2 179.2-179.2zM477 585.7c21.785 29.674 35 65.947 35 105.5 0 98.816-80.384 179.2-179.2 179.2-39.906 0-76.386-13.561-106.2-35.7l250.4-249z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "document-disable" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 40, - "id": 19, - "name": "document-disable", - "prevSize": 32, - "code": 59669 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 19 - }, - { - "icon": { - "paths": [ - "M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-358.4v51.2h358.4c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-343.4zM716.8 189.8l117.4 117.4h-117.4v-117.4zM332.8 460.8l-230.4 256v51.2h102.4v153.6h256v-153.6h102.4v-51.2l-230.4-256zM332.8 537.3l161.5 179.5h-84.7v153.6h-153.6v-153.6h-84.7l161.5-179.5z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "document-publish" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 44, - "id": 18, - "name": "document-publish", - "prevSize": 32, - "code": 59670 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 20 - }, - { - "icon": { - "paths": [ - "M665.6 51.2v102.4h102.4v-102.4h-102.4zM460.8 153.6h102.4v-102.4h-102.4v102.4zM460.8 358.4h102.4v-102.4h-102.4v102.4zM665.6 358.4h102.4v-102.4h-102.4v102.4zM665.6 563.2h102.4v-102.4h-102.4v102.4zM460.8 563.2h102.4v-102.4h-102.4v102.4zM460.8 768h102.4v-102.4h-102.4v102.4zM665.6 768h102.4v-102.4h-102.4v102.4zM665.6 972.8h102.4v-102.4h-102.4v102.4zM460.8 972.8h102.4v-102.4h-102.4v102.4zM256 153.6h102.4v-102.4h-102.4v102.4zM256 358.4h102.4v-102.4h-102.4v102.4zM256 563.2h102.4v-102.4h-102.4v102.4zM256 768h102.4v-102.4h-102.4v102.4zM256 972.8h102.4v-102.4h-102.4v102.4z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "drag" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 43, - "id": 17, - "name": "drag", - "prevSize": 32, - "code": 59671 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 21 - }, - { - "icon": { - "paths": [ - "M921.6 281.958c0-70.707-171.878-128.154-384-128.154s-384 57.19-384 127.898c0 10.035 3.789 19.712 10.342 29.030 0-0.051 296.858 406.067 296.858 406.067v256l153.6-51.2v-204.8c0 0 298.752-408.166 299.725-409.702 0 0 7.475-16.64 7.475-25.139zM537.6 204.8c206.899 0 318.208 53.248 332.083 76.8-13.875 23.552-125.184 76.8-332.083 76.8s-318.208-53.248-332.083-76.8c13.875-23.552 125.184-76.8 332.083-76.8zM869.376 345.856v0 0zM573.030 686.592c-6.4 8.755-9.83 19.354-9.83 30.208v167.885l-51.2 17.050v-184.934c0-10.854-3.43-21.453-9.83-30.208l-228.147-312.115c68.762 21.709 161.382 35.123 263.578 35.123 102.298 0 195.021-13.414 263.834-35.174-0.102 0.051-0.205 0.051-0.307 0.102l-228.096 312.064z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "filter" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 18, - "id": 16, - "name": "filter", - "prevSize": 32, - "code": 59672 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 22 - }, - { - "icon": { - "paths": [ - "M512 512h-204.8v51.2h204.8v-51.2zM768 153.6h-51.2c0-28.314-22.886-51.2-51.2-51.2h-307.2c-28.314 0-51.2 22.886-51.2 51.2h-51.2c-28.314 0-51.2 22.886-51.2 51.2v665.6c0 28.314 22.886 51.2 51.2 51.2h512c28.314 0 51.2-22.886 51.2-51.2v-665.6c0-28.314-22.886-51.2-51.2-51.2zM358.4 153.6h307.2v51.2h-307.2v-51.2zM768 819.2c0 28.314-22.886 51.2-51.2 51.2h-409.6c-28.314 0-51.2-22.886-51.2-51.2v-563.2c0-28.314 22.886-51.2 51.2-51.2 0 28.314 22.886 51.2 51.2 51.2h307.2c28.314 0 51.2-22.886 51.2-51.2 28.314 0 51.2 22.886 51.2 51.2v563.2zM307.2 460.8h409.6v-51.2h-409.6v51.2zM307.2 665.6h409.6v-51.2h-409.6v51.2z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "help" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 19, - "id": 15, - "name": "help", - "prevSize": 32, - "code": 59673 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 23 - }, - { - "icon": { - "paths": [ - "M179.2 256c0-28.262 22.938-51.2 51.2-51.2h25.6c14.157 0 25.6-11.443 25.6-25.6 0-14.131-11.443-25.6-25.6-25.6h-25.6c-56.55 0-102.4 45.85-102.4 102.4v179.2c0 28.262-22.938 51.2-51.2 51.2h-25.6c-14.157 0-25.6 11.469-25.6 25.6 0 14.157 11.443 25.6 25.6 25.6h25.6c28.262 0 51.2 22.938 51.2 51.2v179.2c0 56.55 45.85 102.4 102.4 102.4h25.6c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-25.6c-28.262 0-51.2-22.938-51.2-51.2v-179.2c0-30.746-13.85-58.061-35.328-76.8 21.478-18.765 35.328-46.029 35.328-76.8v-179.2zM972.8 486.4h-25.6c-28.262 0-51.2-22.938-51.2-51.2v-179.2c0-56.55-45.85-102.4-102.4-102.4h-25.6c-14.157 0-25.6 11.469-25.6 25.6 0 14.157 11.443 25.6 25.6 25.6h25.6c28.262 0 51.2 22.938 51.2 51.2v179.2c0 30.771 13.85 58.035 35.328 76.8-21.478 18.739-35.328 46.054-35.328 76.8v179.2c0 28.262-22.938 51.2-51.2 51.2h-25.6c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h25.6c56.55 0 102.4-45.85 102.4-102.4v-179.2c0-28.262 22.938-51.2 51.2-51.2h25.6c14.157 0 25.6-11.443 25.6-25.6 0-14.131-11.443-25.6-25.6-25.6zM512 332.8c-14.157 0-25.6 11.469-25.6 25.6 0 14.157 11.443 25.6 25.6 25.6s25.6-11.443 25.6-25.6c0-14.131-11.443-25.6-25.6-25.6zM512 435.2c-14.157 0-25.6 11.469-25.6 25.6v204.8c0 14.157 11.443 25.6 25.6 25.6s25.6-11.443 25.6-25.6v-204.8c0-14.131-11.443-25.6-25.6-25.6z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "json" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 20, - "id": 14, - "name": "json", - "prevSize": 32, - "code": 59674 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 24 - }, - { - "icon": { - "paths": [ - "M512 0c-169.421 0-307.2 137.779-307.2 307.2 0 78.643 15.258 164.915 45.261 256.41 23.859 72.55 56.986 148.582 98.56 226.099 70.707 131.635 140.339 220.774 143.309 224.512 4.813 6.195 12.288 9.779 20.070 9.779 7.834 0 15.258-3.584 20.122-9.779 2.97-3.686 72.602-92.826 143.309-224.512 41.574-77.517 74.701-153.549 98.56-226.099 29.952-91.494 45.21-177.766 45.21-256.41 0-169.421-137.83-307.2-307.2-307.2zM630.682 764.672c-46.234 86.374-92.979 154.982-118.682 190.822-25.6-35.635-72.038-103.885-118.221-189.952-62.874-117.146-137.779-291.738-137.779-458.342 0-141.158 114.842-256 256-256s256 114.842 256 256c0 166.298-74.65 340.582-137.318 457.472zM512 153.6c-84.685 0-153.6 68.915-153.6 153.6s68.915 153.6 153.6 153.6 153.6-68.915 153.6-153.6-68.915-153.6-153.6-153.6zM512 409.6c-56.525 0-102.4-45.875-102.4-102.4 0-56.474 45.875-102.4 102.4-102.4 56.474 0 102.4 45.926 102.4 102.4 0 56.525-45.926 102.4-102.4 102.4z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "location" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 25, - "id": 13, - "name": "location", - "prevSize": 32, - "code": 59675 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 25 - }, - { - "icon": { - "paths": [ - "M512.273 83.782c-0.141 0.056-182.959 84.073-229.418 256.782-4.481 16.584 32.696 9.296 31.036 27.527-2.034 22.136-44.668 31.201-39.109 94.764 5.659 64.734 60.321 130.141 68.527 169.673v27.655c-0.497 8.54-4.566 31.715-18.018 43.036-7.378 6.19-17.322 8.421-30.436 6.782-18.205-2.275-25.449-14.468-28.345-24.309-4.753-16.218-0.322-35.123 10.345-44 10.724-8.924 12.17-24.842 3.236-35.564-8.934-10.712-24.858-12.161-35.582-3.218-25.995 21.64-36.887 61.52-26.491 97 9.815 33.392 36.197 55.884 70.6 60.182 4.903 0.609 9.566 0.909 14 0.909 26.623 0 44.661-10.175 55.582-19.455 32.866-27.97 35.449-74.593 35.636-79.818 0.009-0.309 0.018-0.618 0.018-0.927v-21.218h0.109v-1.418c0-12.351 10.008-22.364 22.382-22.364 11.944 0 21.609 9.346 22.273 21.109v202.491c-0.206 2.912-2.536 29.892-17.891 42.945-7.368 6.274-17.384 8.53-30.545 6.873-18.214-2.275-25.476-14.468-28.364-24.291-4.762-16.228-0.322-35.151 10.345-44.018 10.724-8.933 12.188-24.833 3.255-35.564-8.924-10.694-24.876-12.161-35.6-3.218-26.013 21.631-36.887 61.52-26.491 97 9.796 33.392 36.197 55.893 70.6 60.2 4.903 0.609 9.566 0.891 14 0.891 26.623 0 44.671-10.156 55.564-19.436 32.875-27.97 35.458-74.611 35.636-79.836 0.019-0.328 0.018-0.609 0.018-0.909v-225.636l0.127-0.055v-1c0-12.595 10.219-22.8 22.836-22.8 12.349 0 22.333 9.824 22.727 22.073v227.418c0 0.309-0 0.591 0.018 0.909 0.187 5.216 2.779 51.866 35.655 79.836 10.912 9.28 28.959 19.436 55.582 19.436 4.443 0 9.088-0.282 13.982-0.891 34.394-4.307 60.804-26.818 70.6-60.2 10.405-35.48-0.487-75.36-26.491-97-10.743-8.943-26.676-7.466-35.6 3.218-8.934 10.74-7.488 26.63 3.236 35.564 10.668 8.868 15.135 27.79 10.364 44.018-2.878 9.823-10.159 22.015-28.364 24.291-13.105 1.648-23.050-0.592-30.418-6.782-13.508-11.358-17.558-34.657-18.036-43v-201.818c0.297-12.093 10.14-21.818 22.327-21.818 12.374 0 22.4 10.003 22.4 22.364v1.418h0.073v21.218c0 0.318-0 0.628 0.018 0.927 0.178 5.216 2.779 51.848 35.655 79.818 10.912 9.28 28.941 19.455 55.564 19.455 4.434 0 9.107-0.292 14-0.891 34.394-4.298 60.786-26.818 70.582-60.2 10.405-35.48-0.487-75.351-26.491-97-10.743-8.933-26.667-7.476-35.582 3.236-8.943 10.722-7.488 26.622 3.236 35.545 10.668 8.877 15.117 27.8 10.345 44.018-2.878 9.842-10.159 22.025-28.364 24.291-13.086 1.648-23.050-0.583-30.418-6.764-13.508-11.368-17.549-34.675-18.018-43v-21.018c5.305-54.103 63.095-107.777 69.091-176.364 5.531-63.563-37.121-72.627-39.145-94.764-1.669-18.232 35.498-10.944 31.036-27.527-46.468-172.709-229.269-256.726-229.4-256.782z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "logo" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 31, - "id": 12, - "name": "logo", - "prevSize": 32, - "code": 59676 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 26 - }, - { - "icon": { - "paths": [ - "M947.2 0h-870.4c-42.342 0-76.8 34.458-76.8 76.8v870.4c0 42.342 34.458 76.8 76.8 76.8h870.4c42.342 0 76.8-34.458 76.8-76.8v-870.4c0-42.342-34.458-76.8-76.8-76.8zM972.8 947.2c0 14.157-11.443 25.6-25.6 25.6h-870.4c-14.131 0-25.6-11.443-25.6-25.6v-870.4c0-14.131 11.469-25.6 25.6-25.6h870.4c14.157 0 25.6 11.469 25.6 25.6v870.4zM665.6 460.8c56.448 0 102.4-45.926 102.4-102.4s-45.952-102.4-102.4-102.4c-56.448 0-102.4 45.926-102.4 102.4s45.952 102.4 102.4 102.4zM665.6 307.2c28.211 0 51.2 22.989 51.2 51.2s-22.989 51.2-51.2 51.2c-28.211 0-51.2-22.989-51.2-51.2s22.989-51.2 51.2-51.2zM896 102.4h-768c-14.131 0-25.6 11.469-25.6 25.6v614.4c0 14.157 11.469 25.6 25.6 25.6h768c14.157 0 25.6-11.443 25.6-25.6v-614.4c0-14.131-11.443-25.6-25.6-25.6zM153.6 716.8v-118.246l164.301-184.858c4.198-4.787 9.728-7.373 15.462-7.475 5.734-0.051 11.29 2.458 15.642 7.040l283.238 303.539h-478.643zM870.4 716.8h-168.090l-315.853-338.432c-14.285-15.334-33.331-23.603-53.709-23.347-20.326 0.256-39.219 9.011-53.094 24.627l-126.054 141.798v-367.846h716.8v563.2z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "media" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 30, - "id": 11, - "name": "media", - "prevSize": 32, - "code": 59677 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 27 - }, - { - "icon": { - "paths": [ - "M128 384c-70.656 0-128 57.344-128 128s57.344 128 128 128c70.656 0 128-57.344 128-128s-57.344-128-128-128zM512 384c-70.656 0-128 57.344-128 128s57.344 128 128 128c70.656 0 128-57.344 128-128s-57.344-128-128-128zM896 384c-70.656 0-128 57.344-128 128s57.344 128 128 128c70.656 0 128-57.344 128-128s-57.344-128-128-128z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "more" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 34, - "id": 10, - "name": "more, dots", - "prevSize": 32, - "code": 59678 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 28 - }, - { - "icon": { - "paths": [ - "M877.12 311.104l-66.304 66.368-228.224-228.224 66.368-66.368c25.216-25.152 66.048-25.152 91.264 0l136.896 137.024c25.216 25.216 25.216 65.984 0 91.2zM760.896 427.392l-386.176 386.112c-25.216 25.28-66.048 25.28-91.264 0l-136.96-136.896c-25.216-25.28-25.216-66.112 0-91.264l386.24-386.24 228.16 228.288zM64 896v-191.872l191.936 191.872h-191.936z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "pencil" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 47, - "id": 9, - "name": "pencil", - "prevSize": 32, - "code": 59679 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 29 - }, - { - "icon": { - "paths": [ - "M892.083 131.917c-73.523-73.498-193.152-73.498-266.65 0l-157.184 157.107c-9.958 10.035-9.958 26.214 0 36.275 10.061 9.984 26.24 9.984 36.25 0l157.133-157.107c53.504-53.555 140.672-53.555 194.176 0 53.581 53.504 53.581 140.672 0 194.176l-186.138 186.163c-53.53 53.581-140.672 53.581-194.176 0-10.086-10.010-26.24-10.010-36.275 0-10.035 10.086-10.035 26.189 0 36.25 36.787 36.736 84.992 55.117 133.325 55.117s96.589-18.432 133.376-55.117l186.163-186.214c73.498-73.472 73.498-193.152 0-266.65zM519.45 698.726l-157.082 157.082c-53.504 53.555-140.672 53.555-194.176 0-53.581-53.504-53.581-140.672 0-194.176l186.138-186.163c53.53-53.581 140.672-53.581 194.176 0 10.086 9.984 26.189 9.984 36.275 0 10.035-10.086 10.035-26.214 0-36.25-73.549-73.498-193.203-73.498-266.701 0l-186.163 186.163c-73.498 73.574-73.498 193.203 0 266.701 36.787 36.71 85.043 55.117 133.325 55.117 48.333 0 96.538-18.406 133.325-55.117l157.133-157.133c10.010-10.010 10.010-26.189 0-36.224-10.010-9.984-26.189-9.984-36.25 0z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "reference" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 45, - "id": 8, - "name": "reference", - "prevSize": 32, - "code": 59680 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 30 - }, - { - "icon": { - "paths": [ - "M15.667 381.722l486.4 205.235 9.933 1.997 9.958-1.997 486.4-205.235c9.446-3.994 15.642-13.312 15.642-23.654s-6.195-19.635-15.642-23.654l-486.4-205.235c-6.349-2.662-13.517-2.662-19.866 0l-486.4 205.235c-9.472 4.019-15.642 13.338-15.642 23.654s6.144 19.661 15.616 23.654zM512 180.71l420.454 177.357-420.454 177.382-420.454-177.382 420.454-177.357zM15.667 535.654l486.4 205.235 9.933 1.997 9.958-1.997 486.4-205.235c13.056-5.504 19.149-20.531 13.645-33.587-5.453-13.056-20.506-19.2-33.51-13.696l-476.493 201.062-476.442-201.088c-13.005-5.478-28.058 0.589-33.562 13.696-5.478 13.030 0.64 28.109 13.67 33.613zM988.493 642.278l-476.493 201.062-476.442-201.062c-13.005-5.53-28.058 0.589-33.562 13.67-5.478 13.030 0.614 28.109 13.67 33.613l486.4 205.235 9.933 1.997 9.958-1.997 486.4-205.235c13.056-5.53 19.149-20.557 13.645-33.613-5.453-13.030-20.506-19.2-33.51-13.67z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "schemas" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 46, - "id": 7, - "name": "schemas", - "prevSize": 32, - "code": 59681 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 31 - }, - { - "icon": { - "paths": [ - "M939.776 1003.776c-27.2 27.008-71.232 27.008-98.368 0l-168.96-168.96c-66.176 38.464-142.016 62.080-224 62.080-247.744 0-448.448-200.832-448.448-448.448 0-247.744 200.704-448.448 448.448-448.448 247.68 0 448.512 200.704 448.512 448.448 0 115.136-44.672 218.944-115.904 298.304l158.656 158.656c27.008 27.136 27.008 71.168 0.064 98.368zM448.448 128.128c-176.896 0-320.32 143.36-320.32 320.32s143.424 320.32 320.32 320.32c176.96 0 320.384-143.36 320.384-320.32s-143.488-320.32-320.384-320.32z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "search" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 23, - "id": 6, - "name": "search", - "prevSize": 32, - "code": 59682 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 32 - }, - { - "icon": { - "paths": [ - "M1019.11 440.755c-1.946-13.747-14.438-23.398-28.16-21.888-16.947 1.843-34.253-0.589-50.048-7.091-52.25-21.504-77.261-81.459-55.757-133.709 6.605-15.846 16.947-29.85 30.208-40.602 10.803-8.653 12.698-24.294 4.352-35.354-28.902-37.99-62.797-71.706-100.838-100.045-10.701-8.090-25.805-6.451-34.662 3.661-28.8 33.254-75.546 44.262-116.198 27.546-40.704-16.742-66.099-57.498-63.206-101.453 0.845-13.338-8.755-25.19-21.99-27.008-47.002-6.605-94.797-6.605-142.054 0.077-13.722 1.946-23.398 14.387-21.862 28.211 1.843 16.896-0.614 34.202-7.168 49.997-21.504 52.25-81.408 77.21-133.632 55.706-15.821-6.502-29.85-16.947-40.602-30.157-8.653-10.752-24.32-12.698-35.379-4.301-37.99 28.851-71.68 62.694-100.045 100.762-8.090 10.701-6.451 25.83 3.635 34.637 33.28 28.902 44.288 75.597 27.546 116.301-16.742 40.653-57.498 66.048-101.427 63.155-13.363-0.845-25.19 8.755-26.982 21.99-6.63 47.002-6.63 94.822 0.102 142.080 1.946 13.696 14.387 23.322 28.16 21.811 16.896-1.818 34.202 0.691 50.022 7.168 52.224 21.53 77.21 81.459 55.706 133.734-6.502 15.795-16.947 29.773-30.157 40.525-10.803 8.73-12.698 24.346-4.352 35.354 28.877 38.042 62.822 71.731 100.813 100.122 1.741 1.357 3.661 2.355 5.606 3.2 9.933 4.045 21.709 1.536 29.082-6.938 28.826-33.178 75.571-44.262 116.275-27.52 40.653 16.742 66.048 57.498 63.13 101.453-0.819 13.338 8.755 25.165 22.067 27.059 47.002 6.579 94.72 6.554 142.029-0.102 13.645-1.971 23.347-14.464 21.811-28.237-1.843-16.947 0.691-34.253 7.194-50.048 21.504-52.25 81.459-77.21 133.658-55.68 15.795 6.528 29.85 16.947 40.55 30.157 8.704 10.803 24.346 12.698 35.405 4.326 37.99-28.902 71.654-62.746 100.096-100.813 7.987-10.675 6.4-25.805-3.712-34.662-33.254-28.826-44.288-75.571-27.546-116.224 16.742-40.73 57.498-66.099 101.453-63.232 13.338 0.922 25.139-8.678 27.008-21.965 6.554-47.002 6.502-94.771-0.128-142.003zM971.059 554.010c-56.141 5.274-105.702 41.114-127.642 94.464s-12.058 113.613 24.090 156.902c-17.69 21.478-37.453 41.318-58.854 59.315-12.749-11.213-27.392-20.352-43.238-26.854-78.259-32.282-168.243 5.197-200.499 83.584-6.502 15.718-10.291 32.563-11.29 49.536-27.853 2.56-55.859 2.637-83.61 0.077-5.274-56.090-41.114-105.677-94.464-127.616-53.35-21.99-113.613-11.981-156.928 24.064-21.504-17.69-41.318-37.453-59.29-58.88 11.213-12.723 20.352-27.392 26.906-43.136 32.205-78.387-5.274-168.294-83.584-200.55-15.821-6.502-32.589-10.342-49.613-11.366-2.534-27.853-2.586-55.859 0-83.558 56.090-5.299 105.626-41.088 127.565-94.438 21.965-53.402 12.058-113.638-24.090-156.902 17.69-21.555 37.478-41.395 58.88-59.341 12.749 11.213 27.392 20.352 43.213 26.854 78.285 32.256 168.218-5.248 200.474-83.558 6.528-15.795 10.342-32.589 11.366-49.613 27.853-2.509 55.808-2.56 83.558 0 5.299 56.090 41.139 105.6 94.49 127.59 53.35 21.939 113.638 12.006 156.902-24.090 21.504 17.741 41.293 37.453 59.29 58.854-11.213 12.8-20.352 27.392-26.854 43.213-32.256 78.31 5.248 168.294 83.507 200.499 15.846 6.502 32.691 10.342 49.638 11.392 2.56 27.853 2.611 55.808 0.077 83.558zM512 307.2c-113.101 0-204.8 91.699-204.8 204.8 0 113.126 91.699 204.826 204.8 204.826s204.8-91.699 204.8-204.826c0-113.101-91.699-204.8-204.8-204.8zM512 665.626c-84.813 0-153.6-68.813-153.6-153.626 0-84.838 68.787-153.6 153.6-153.6 84.838 0 153.6 68.762 153.6 153.6 0 84.813-68.762 153.626-153.6 153.626z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "settings" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 22, - "id": 5, - "name": "settings", - "prevSize": 32, - "code": 59683 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 33 - }, - { - "icon": { - "paths": [ - "M77.005 102.605h128v332.8c0 14.131 11.418 25.6 25.6 25.6 14.106 0 25.6-11.469 25.6-25.6v-332.8h128c14.106 0 25.6-11.469 25.6-25.6 0-14.157-11.494-25.6-25.6-25.6h-307.2c-14.182 0-25.6 11.443-25.6 25.6 0 14.106 11.418 25.6 25.6 25.6zM947.405 716.979h-179.2v-102.4h179.2c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-204.8c-14.182 0-25.6 11.443-25.6 25.6v358.4c0 14.157 11.418 25.6 25.6 25.6 14.157 0 25.6-11.443 25.6-25.6v-179.2h179.2c14.157 0 25.6-11.443 25.6-25.6s-11.494-25.6-25.6-25.6zM965.094 58.47c-9.958-9.933-26.112-9.933-36.045 0l-870.605 870.579c-9.958 9.984-9.958 26.086 0 36.045 10.010 9.984 26.112 9.984 36.045 0l870.605-870.579c9.958-9.933 9.958-26.086 0-36.045z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "type-boolean" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 21, - "id": 4, - "name": "type-boolean", - "prevSize": 32, - "code": 59684 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 34 - }, - { - "icon": { - "paths": [ - "M947.2 102.4h-128v-25.6c0-14.131-11.469-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-512v-25.6c0-14.131-11.52-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-128c-42.342 0-76.8 34.458-76.8 76.8v716.8c0 42.342 34.458 76.8 76.8 76.8h870.4c42.342 0 76.8-34.458 76.8-76.8v-716.8c0-42.342-34.458-76.8-76.8-76.8zM972.8 896c0 14.131-11.469 25.6-25.6 25.6h-870.4c-14.080 0-25.6-11.469-25.6-25.6v-537.6h921.6v537.6zM972.8 307.2h-921.6v-128c0-14.080 11.52-25.6 25.6-25.6h128v76.8c0 14.080 11.52 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h512v76.8c0 14.080 11.469 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h128c14.131 0 25.6 11.52 25.6 25.6v128zM332.8 512h51.2c14.080 0 25.6-11.52 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM640 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "type-datetime" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 24, - "id": 3, - "name": "type-datetime", - "prevSize": 32, - "code": 59685 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 35 - }, - { - "icon": { - "paths": [ - "M256 665.6h-76.8v-332.8c0-14.131-11.469-25.6-25.6-25.6h-76.8c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h51.2v307.2h-76.8c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h204.8c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6zM614.4 307.2h-204.8c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h179.2v128h-179.2c-14.131 0-25.6 11.469-25.6 25.6v179.2c0 14.131 11.469 25.6 25.6 25.6h204.8c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-179.2v-128h179.2c14.131 0 25.6-11.469 25.6-25.6v-179.2c0-14.131-11.469-25.6-25.6-25.6zM972.8 307.2h-204.8c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h179.2v128h-179.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h179.2v128h-179.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h204.8c14.131 0 25.6-11.469 25.6-25.6v-358.4c0-14.131-11.469-25.6-25.6-25.6z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "type-number" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 32, - "id": 2, - "name": "type-number", - "prevSize": 32, - "code": 59686 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 36 - }, - { - "icon": { - "paths": [ - "M870.4 921.6h-716.8c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6h716.8c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6zM194.688 817.152c13.030 5.555 28.083-0.461 33.613-13.44l125.030-291.712h317.338l125.005 291.712c4.173 9.677 13.568 15.488 23.526 15.488 3.405 0 6.81-0.64 10.112-2.048 13.005-5.606 18.995-20.659 13.44-33.638l-131.61-306.944c-0.051-0.051-0.051-0.154-0.102-0.205l-175.488-409.6c-4.045-9.472-13.312-15.565-23.552-15.565s-19.507 6.093-23.552 15.514l-175.488 409.6c-0.051 0.051-0.051 0.154-0.102 0.205l-131.61 306.97c-5.53 13.005 0.461 28.058 13.44 33.664zM512 141.773l136.704 319.027h-273.408l136.704-319.027z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "type-string" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 48, - "id": 1, - "name": "type-string", - "prevSize": 32, - "code": 59687 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 37 - }, - { - "icon": { - "paths": [ - "M765.248 704c0 35.392-28.352 64-63.296 64h-379.904c-34.88 0-63.232-28.608-63.232-64 0-0.704-6.4-0.064 0 0 30.336-91.776 137.6-128 253.184-128 115.84 0 223.104 35.776 253.248 128 6.144 0 0-0.064 0 0zM385.344 384c0-70.656 56.704-128 126.656-128s126.656 57.344 126.656 128-56.704 192-126.656 192-126.656-121.344-126.656-192z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "user" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 33, - "id": 0, - "name": "user", - "prevSize": 32, - "code": 59688 - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 38 - }, - { - "icon": { - "paths": [ - "M329.143 512c0 9.714-4 18.857-10.857 25.714l-256 256c-6.857 6.857-16 10.857-25.714 10.857-20 0-36.571-16.571-36.571-36.571v-512c0-20 16.571-36.571 36.571-36.571 9.714 0 18.857 4 25.714 10.857l256 256c6.857 6.857 10.857 16 10.857 25.714z" - ], - "attrs": [ - {} - ], - "width": 329, - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "caret-right" - ], - "grid": 14 - }, - "attrs": [ - {} - ], - "properties": { - "order": 1, - "id": 7, - "prevSize": 28, - "code": 59689, - "name": "caret-right" - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 39 - }, - { - "icon": { - "paths": [ - "M365.714 256v512c0 20-16.571 36.571-36.571 36.571-9.714 0-18.857-4-25.714-10.857l-256-256c-6.857-6.857-10.857-16-10.857-25.714s4-18.857 10.857-25.714l256-256c6.857-6.857 16-10.857 25.714-10.857 20 0 36.571 16.571 36.571 36.571z" - ], - "attrs": [ - {} - ], - "width": 402, - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "caret-left" - ], - "grid": 14 - }, - "attrs": [ - {} - ], - "properties": { - "order": 2, - "id": 6, - "prevSize": 28, - "code": 59690, - "name": "caret-left" - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 40 - }, - { - "icon": { - "paths": [ - "M585.143 694.857c0 20-16.571 36.571-36.571 36.571h-512c-20 0-36.571-16.571-36.571-36.571 0-9.714 4-18.857 10.857-25.714l256-256c6.857-6.857 16-10.857 25.714-10.857s18.857 4 25.714 10.857l256 256c6.857 6.857 10.857 16 10.857 25.714z" - ], - "attrs": [ - {} - ], - "width": 585, - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "caret-up" - ], - "grid": 14 - }, - "attrs": [ - {} - ], - "properties": { - "order": 3, - "id": 5, - "prevSize": 28, - "code": 59691, - "name": "caret-up" - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 41 - }, - { - "icon": { - "paths": [ - "M585.143 402.286c0 9.714-4 18.857-10.857 25.714l-256 256c-6.857 6.857-16 10.857-25.714 10.857s-18.857-4-25.714-10.857l-256-256c-6.857-6.857-10.857-16-10.857-25.714 0-20 16.571-36.571 36.571-36.571h512c20 0 36.571 16.571 36.571 36.571z" - ], - "attrs": [ - {} - ], - "width": 585, - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "caret-down" - ], - "grid": 14 - }, - "attrs": [ - {} - ], - "properties": { - "order": 4, - "id": 4, - "prevSize": 28, - "code": 59692, - "name": "caret-down" - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 42 - }, - { - "icon": { - "paths": [ - "M614.286 676.571c0 4.571-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8 5.714-13.143 5.714-4.571 0-9.714-2.286-13.143-5.714l-224.571-224.571-224.571 224.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-28.571-28.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l266.286 266.286c3.429 3.429 5.714 8.571 5.714 13.143z" - ], - "attrs": [ - {} - ], - "width": 658, - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "angle-up" - ], - "grid": 14 - }, - "attrs": [ - {} - ], - "properties": { - "order": 2, - "id": 2, - "prevSize": 28, - "code": 59651, - "name": "angle-up" - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 43 - }, - { - "icon": { - "paths": [ - "M614.286 420.571c0 4.571-2.286 9.714-5.714 13.143l-266.286 266.286c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l28.571-28.571c3.429-3.429 8-5.714 13.143-5.714 4.571 0 9.714 2.286 13.143 5.714l224.571 224.571 224.571-224.571c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8.571 5.714 13.143z" - ], - "attrs": [ - {} - ], - "width": 658, - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "angle-down" - ], - "grid": 14 - }, - "attrs": [ - {} - ], - "properties": { - "order": 1, - "id": 1, - "prevSize": 28, - "code": 59648, - "name": "angle-down" - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 44 - }, - { - "icon": { - "paths": [ - "M358.286 310.857c0 4.571-2.286 9.714-5.714 13.143l-224.571 224.571 224.571 224.571c3.429 3.429 5.714 8.571 5.714 13.143s-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8 5.714 13.143z" - ], - "attrs": [ - {} - ], - "width": 384, - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "angle-left" - ], - "grid": 14 - }, - "attrs": [ - {} - ], - "properties": { - "order": 2, - "id": 0, - "prevSize": 28, - "code": 59649, - "name": "angle-left" - }, - "setIdx": 2, - "setId": 1, - "iconIdx": 45 - } - ], - "height": 1024, - "metadata": { - "name": "icomoon" - }, - "preferences": { - "showGlyphs": true, - "showCodes": true, - "showQuickUse": true, - "showQuickUse2": true, - "showSVGs": true, - "fontPref": { - "prefix": "icon-", - "metadata": { - "fontFamily": "icomoon" - }, - "metrics": { - "emSize": 1024, - "baseline": 6.25, - "whitespace": 50 - }, - "embed": false - }, - "imagePref": { - "prefix": "icon-", - "png": true, - "useClassSelector": true, - "color": 0, - "bgColor": 16777215 - }, - "historySize": 100 - } -} \ No newline at end of file diff --git a/src/Squidex/project.json b/src/Squidex/project.json deleted file mode 100644 index 7efda9a78..000000000 --- a/src/Squidex/project.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "dependencies": { - "Autofac": "4.3.0", - "Autofac.Extensions.DependencyInjection": "4.0.0", - "IdentityServer4": "1.0.2", - "IdentityServer4.AccessTokenValidation": "1.0.4", - "IdentityServer4.AspNetIdentity": "1.0.0", - "Microsoft.AspNetCore.Authentication.Cookies": "1.1.0", - "Microsoft.AspNetCore.Authentication.Google": "1.1.0", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.0", - "Microsoft.AspNetCore.DataProtection.Redis": "0.1.0", - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.HttpOverrides": "1.1.0", - "Microsoft.AspNetCore.Identity": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.1", - "Microsoft.AspNetCore.Razor.Tools": "1.1.0-preview4-final", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "MongoDB.Driver": "2.4.1", - "NJsonSchema": "7.10.6235.25398", - "NSwag.AspNetCore": "8.8.0", - "OpenCover": "4.6.519", - "ReportGenerator": "2.5.2", - "Squidex.Core": "1.0.0-*", - "Squidex.Events": "1.0.0-*", - "Squidex.Infrastructure": "1.0.0-*", - "Squidex.Infrastructure.MongoDb": "1.0.0-*", - "Squidex.Infrastructure.Redis": "1.0.0-*", - "Squidex.Read": "1.0.0-*", - "Squidex.Read.MongoDb": "1.0.0-*", - "Squidex.Write": "1.0.0-*", - "StackExchange.Redis.StrongName": "1.2.0", - "System.Linq": "4.3.0" - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final" - }, - - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.OData.Core": "6.15.0", - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "imports": "dnxcore50" - } - }, - "nowarn": [ "1591" ], - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "xmlDoc": true, - "nowarn": [ "CS1591", "1591", "1573", "1572" ], - "embed": { - "include": [ - "Config/Identity/Cert/*.*" - ] - } - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "appsettings.json", - "appsettings.Production.json", - "dockerfile", - "Views", - "web.config", - "wwwroot" - ] - }, - - "scripts": { - "postpublish": [ - "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - ] - } -} diff --git a/tests/Squidex.Core.Tests/Squidex.Core.Tests.csproj b/tests/Squidex.Core.Tests/Squidex.Core.Tests.csproj new file mode 100644 index 000000000..c8adff1a5 --- /dev/null +++ b/tests/Squidex.Core.Tests/Squidex.Core.Tests.csproj @@ -0,0 +1,25 @@ + + + Exe + netcoreapp1.1 + $(PackageTargetFallback);dnxcore50 + Squidex.Core + + + + + + + + + + + + + + + + + + + diff --git a/tests/Squidex.Core.Tests/Squidex.Core.Tests.xproj b/tests/Squidex.Core.Tests/Squidex.Core.Tests.xproj deleted file mode 100644 index 1b214aa30..000000000 --- a/tests/Squidex.Core.Tests/Squidex.Core.Tests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - fd0afd44-7a93-4f9e-b5ed-72582392e435 - Squidex.Core - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/tests/Squidex.Core.Tests/project.json b/tests/Squidex.Core.Tests/project.json deleted file mode 100644 index 8beffc526..000000000 --- a/tests/Squidex.Core.Tests/project.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "buildOptions": { - "copyToOutput": { - "include": [ - "xunit.runner.json" - ] - } - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "FluentAssertions": "4.18.0", - "Moq": "4.6.38-alpha", - "Squidex.Core": "1.0.0-*", - "Squidex.Infrastructure": "1.0.0-*", - "xunit": "2.2.0-beta5-build3474" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "imports": "dnxcore50" - } - }, - "testRunner": "xunit", - "tooling": { - "defaultNamespace": "Squidex.Core" - }, - "tools": { - "Microsoft.DotNet.Watcher.Tools": "1.1.0-preview4-final" - }, - "version": "1.0.0-*" -} \ No newline at end of file diff --git a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj new file mode 100644 index 000000000..5bc0fe25e --- /dev/null +++ b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj @@ -0,0 +1,24 @@ + + + Exe + netcoreapp1.1 + Squidex.Infrastructure + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.xproj b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.xproj deleted file mode 100644 index 678a46c3c..000000000 --- a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7fd0a92b-7862-4bb1-932b-b52a9cacb56b - Squidex.Infrastructure - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/tests/Squidex.Infrastructure.Tests/project.json b/tests/Squidex.Infrastructure.Tests/project.json deleted file mode 100644 index f4ec555b6..000000000 --- a/tests/Squidex.Infrastructure.Tests/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "buildOptions": { - "copyToOutput": { - "include": [ - "xunit.runner.json" - ] - } - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Microsoft.Extensions.Caching.Memory": "1.1.0", - "Moq": "4.6.38-alpha", - "Squidex.Infrastructure": "1.0.0-*", - "xunit": "2.2.0-beta5-build3474" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "imports": "dnxcore50" - } - }, - "testRunner": "xunit", - "tooling": { - "defaultNamespace": "Squidex.Core.Tests" - }, - "tools": { - "Microsoft.DotNet.Watcher.Tools": "1.1.0-preview4-final" - }, - "version": "1.0.0-*" -} \ No newline at end of file diff --git a/tests/Squidex.Read.Tests/Squidex.Read.Tests.csproj b/tests/Squidex.Read.Tests/Squidex.Read.Tests.csproj new file mode 100644 index 000000000..cf8496346 --- /dev/null +++ b/tests/Squidex.Read.Tests/Squidex.Read.Tests.csproj @@ -0,0 +1,28 @@ + + + Exe + netcoreapp1.1 + $(PackageTargetFallback);dnxcore50 + Squidex.Read + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Squidex.Read.Tests/Squidex.Read.Tests.xproj b/tests/Squidex.Read.Tests/Squidex.Read.Tests.xproj deleted file mode 100644 index d1cd17ea8..000000000 --- a/tests/Squidex.Read.Tests/Squidex.Read.Tests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 8b074219-f69a-4e41-83c6-12ee1e647779 - Squidex.Read - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/tests/Squidex.Read.Tests/project.json b/tests/Squidex.Read.Tests/project.json deleted file mode 100644 index d439a8a2c..000000000 --- a/tests/Squidex.Read.Tests/project.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "buildOptions": { - "copyToOutput": { - "include": [ - "xunit.runner.json" - ] - } - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "FluentAssertions": "4.18.0", - "Microsoft.Extensions.Options": "1.1.0", - "Moq": "4.6.38-alpha", - "Squidex.Core": "1.0.0-*", - "Squidex.Infrastructure": "1.0.0-*", - "Squidex.Read": "1.0.0-*", - "Squidex.Read.MongoDb": "1.0.0-*", - "xunit": "2.2.0-beta5-build3474" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "imports": "dnxcore50" - } - }, - "testRunner": "xunit", - "tooling": { - "defaultNamespace": "Squidex.Read" - }, - "tools": { - "Microsoft.DotNet.Watcher.Tools": "1.1.0-preview4-final" - }, - "version": "1.0.0-*" -} \ No newline at end of file diff --git a/tests/Squidex.Write.Tests/Squidex.Write.Tests.csproj b/tests/Squidex.Write.Tests/Squidex.Write.Tests.csproj new file mode 100644 index 000000000..acad1fcf1 --- /dev/null +++ b/tests/Squidex.Write.Tests/Squidex.Write.Tests.csproj @@ -0,0 +1,27 @@ + + + Exe + netcoreapp1.1 + $(PackageTargetFallback);dnxcore50 + Squidex.Write + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/Squidex.Write.Tests/Squidex.Write.Tests.xproj b/tests/Squidex.Write.Tests/Squidex.Write.Tests.xproj deleted file mode 100644 index f7a8076cf..000000000 --- a/tests/Squidex.Write.Tests/Squidex.Write.Tests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 9a3dea7e-1681-4d48-ac5c-1f0de421a203 - Squidex.Write - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/tests/Squidex.Write.Tests/project.json b/tests/Squidex.Write.Tests/project.json deleted file mode 100644 index ddb5ab215..000000000 --- a/tests/Squidex.Write.Tests/project.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "buildOptions": { - "copyToOutput": { - "include": [ - "xunit.runner.json" - ] - } - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "FluentAssertions": "4.18.0", - "Moq": "4.6.38-alpha", - "Squidex.Core": "1.0.0-*", - "Squidex.Infrastructure": "1.0.0-*", - "Squidex.Write": "1.0.0-*", - "xunit": "2.2.0-beta5-build3474" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "imports": "dnxcore50" - } - }, - "testRunner": "xunit", - "tooling": { - "defaultNamespace": "Squidex.Write" - }, - "tools": { - "Microsoft.DotNet.Watcher.Tools": "1.1.0-preview4-final" - }, - "version": "1.0.0-*" -} \ No newline at end of file diff --git a/tools/GenerateLanguages/GenerateLanguages.csproj b/tools/GenerateLanguages/GenerateLanguages.csproj new file mode 100644 index 000000000..d74819cd2 --- /dev/null +++ b/tools/GenerateLanguages/GenerateLanguages.csproj @@ -0,0 +1,6 @@ + + + netcoreapp1.1 + Exe + + diff --git a/tools/GenerateLanguages/Program.cs b/tools/GenerateLanguages/Program.cs index 4b17d746f..ebe493473 100644 --- a/tools/GenerateLanguages/Program.cs +++ b/tools/GenerateLanguages/Program.cs @@ -11,7 +11,7 @@ using System.Collections.Generic; using System.IO; using System.Text; -namespace ConsoleApplication +namespace GenerateLanguages { public class Program { diff --git a/tools/GenerateLanguages/project.json b/tools/GenerateLanguages/project.json deleted file mode 100644 index 861cef47d..000000000 --- a/tools/GenerateLanguages/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/tools/aspnetcore-build-phantomjs/Dockerfile b/tools/aspnetcore-build-phantomjs/Dockerfile index dd53839cc..e2ac1f7a9 100644 --- a/tools/aspnetcore-build-phantomjs/Dockerfile +++ b/tools/aspnetcore-build-phantomjs/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore-build:1.1.0-projectjson +FROM microsoft/dotnet:1.1.0-sdk-msbuild-rc4 # Install runtime dependencies RUN apt-get update \