Sln: removed *_Ubuntu configuration

This commit is contained in:
pavelbannov 2020-09-04 12:06:30 +03:00
parent f48574a809
commit 897f3c910e
6 changed files with 23 additions and 151 deletions

View File

@ -70,228 +70,116 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{90183112-BCD6-4E16-9CA2-12231930DAB4}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{90183112-BCD6-4E16-9CA2-12231930DAB4}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{90183112-BCD6-4E16-9CA2-12231930DAB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{90183112-BCD6-4E16-9CA2-12231930DAB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{90183112-BCD6-4E16-9CA2-12231930DAB4}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{90183112-BCD6-4E16-9CA2-12231930DAB4}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{90183112-BCD6-4E16-9CA2-12231930DAB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{90183112-BCD6-4E16-9CA2-12231930DAB4}.Release|Any CPU.Build.0 = Release|Any CPU
{4AA9F8E3-2F48-44DA-B6C5-37ED7A4739C1}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{4AA9F8E3-2F48-44DA-B6C5-37ED7A4739C1}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{4AA9F8E3-2F48-44DA-B6C5-37ED7A4739C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4AA9F8E3-2F48-44DA-B6C5-37ED7A4739C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4AA9F8E3-2F48-44DA-B6C5-37ED7A4739C1}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{4AA9F8E3-2F48-44DA-B6C5-37ED7A4739C1}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{4AA9F8E3-2F48-44DA-B6C5-37ED7A4739C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4AA9F8E3-2F48-44DA-B6C5-37ED7A4739C1}.Release|Any CPU.Build.0 = Release|Any CPU
{EB8F47B3-39DE-4B7D-8EC6-01726368B45D}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{EB8F47B3-39DE-4B7D-8EC6-01726368B45D}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{EB8F47B3-39DE-4B7D-8EC6-01726368B45D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB8F47B3-39DE-4B7D-8EC6-01726368B45D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB8F47B3-39DE-4B7D-8EC6-01726368B45D}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{EB8F47B3-39DE-4B7D-8EC6-01726368B45D}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{EB8F47B3-39DE-4B7D-8EC6-01726368B45D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB8F47B3-39DE-4B7D-8EC6-01726368B45D}.Release|Any CPU.Build.0 = Release|Any CPU
{A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Release|Any CPU.Build.0 = Release|Any CPU
{BE4816E7-7CD2-4D9B-ABC6-D9E5C04E3926}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{BE4816E7-7CD2-4D9B-ABC6-D9E5C04E3926}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{BE4816E7-7CD2-4D9B-ABC6-D9E5C04E3926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE4816E7-7CD2-4D9B-ABC6-D9E5C04E3926}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE4816E7-7CD2-4D9B-ABC6-D9E5C04E3926}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{BE4816E7-7CD2-4D9B-ABC6-D9E5C04E3926}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{BE4816E7-7CD2-4D9B-ABC6-D9E5C04E3926}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE4816E7-7CD2-4D9B-ABC6-D9E5C04E3926}.Release|Any CPU.Build.0 = Release|Any CPU
{62C49C91-1A5A-4C0D-A3B3-A9AE8C9718CE}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{62C49C91-1A5A-4C0D-A3B3-A9AE8C9718CE}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{62C49C91-1A5A-4C0D-A3B3-A9AE8C9718CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{62C49C91-1A5A-4C0D-A3B3-A9AE8C9718CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62C49C91-1A5A-4C0D-A3B3-A9AE8C9718CE}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{62C49C91-1A5A-4C0D-A3B3-A9AE8C9718CE}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{62C49C91-1A5A-4C0D-A3B3-A9AE8C9718CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62C49C91-1A5A-4C0D-A3B3-A9AE8C9718CE}.Release|Any CPU.Build.0 = Release|Any CPU
{3ABB21D3-D990-4005-9EEF-701A93948C27}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{3ABB21D3-D990-4005-9EEF-701A93948C27}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{3ABB21D3-D990-4005-9EEF-701A93948C27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3ABB21D3-D990-4005-9EEF-701A93948C27}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3ABB21D3-D990-4005-9EEF-701A93948C27}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{3ABB21D3-D990-4005-9EEF-701A93948C27}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{3ABB21D3-D990-4005-9EEF-701A93948C27}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3ABB21D3-D990-4005-9EEF-701A93948C27}.Release|Any CPU.Build.0 = Release|Any CPU
{481B0D9C-B2F8-4DE9-8597-BA8D24585099}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{481B0D9C-B2F8-4DE9-8597-BA8D24585099}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{481B0D9C-B2F8-4DE9-8597-BA8D24585099}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{481B0D9C-B2F8-4DE9-8597-BA8D24585099}.Debug|Any CPU.Build.0 = Debug|Any CPU
{481B0D9C-B2F8-4DE9-8597-BA8D24585099}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{481B0D9C-B2F8-4DE9-8597-BA8D24585099}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{481B0D9C-B2F8-4DE9-8597-BA8D24585099}.Release|Any CPU.ActiveCfg = Release|Any CPU
{481B0D9C-B2F8-4DE9-8597-BA8D24585099}.Release|Any CPU.Build.0 = Release|Any CPU
{02C40A64-FE22-41D0-9037-69F0D6F787A9}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{02C40A64-FE22-41D0-9037-69F0D6F787A9}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{02C40A64-FE22-41D0-9037-69F0D6F787A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{02C40A64-FE22-41D0-9037-69F0D6F787A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{02C40A64-FE22-41D0-9037-69F0D6F787A9}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{02C40A64-FE22-41D0-9037-69F0D6F787A9}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{02C40A64-FE22-41D0-9037-69F0D6F787A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{02C40A64-FE22-41D0-9037-69F0D6F787A9}.Release|Any CPU.Build.0 = Release|Any CPU
{988536C1-4B89-4649-8F77-5C16F55D95D1}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{988536C1-4B89-4649-8F77-5C16F55D95D1}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{988536C1-4B89-4649-8F77-5C16F55D95D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{988536C1-4B89-4649-8F77-5C16F55D95D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{988536C1-4B89-4649-8F77-5C16F55D95D1}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{988536C1-4B89-4649-8F77-5C16F55D95D1}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{988536C1-4B89-4649-8F77-5C16F55D95D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{988536C1-4B89-4649-8F77-5C16F55D95D1}.Release|Any CPU.Build.0 = Release|Any CPU
{BD8A18A5-60C5-4411-9719-0AA11B4BE0E9}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{BD8A18A5-60C5-4411-9719-0AA11B4BE0E9}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{BD8A18A5-60C5-4411-9719-0AA11B4BE0E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BD8A18A5-60C5-4411-9719-0AA11B4BE0E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD8A18A5-60C5-4411-9719-0AA11B4BE0E9}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{BD8A18A5-60C5-4411-9719-0AA11B4BE0E9}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{BD8A18A5-60C5-4411-9719-0AA11B4BE0E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD8A18A5-60C5-4411-9719-0AA11B4BE0E9}.Release|Any CPU.Build.0 = Release|Any CPU
{2FF2177F-2D1A-4396-84EB-51F14FD99385}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{2FF2177F-2D1A-4396-84EB-51F14FD99385}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{2FF2177F-2D1A-4396-84EB-51F14FD99385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FF2177F-2D1A-4396-84EB-51F14FD99385}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FF2177F-2D1A-4396-84EB-51F14FD99385}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{2FF2177F-2D1A-4396-84EB-51F14FD99385}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{2FF2177F-2D1A-4396-84EB-51F14FD99385}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FF2177F-2D1A-4396-84EB-51F14FD99385}.Release|Any CPU.Build.0 = Release|Any CPU
{B0431EC9-21D8-4D96-B333-6DD430031C82}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{B0431EC9-21D8-4D96-B333-6DD430031C82}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{B0431EC9-21D8-4D96-B333-6DD430031C82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B0431EC9-21D8-4D96-B333-6DD430031C82}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B0431EC9-21D8-4D96-B333-6DD430031C82}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{B0431EC9-21D8-4D96-B333-6DD430031C82}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{B0431EC9-21D8-4D96-B333-6DD430031C82}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B0431EC9-21D8-4D96-B333-6DD430031C82}.Release|Any CPU.Build.0 = Release|Any CPU
{104D045A-F9CC-4DD7-B04D-8DA7543435DD}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{104D045A-F9CC-4DD7-B04D-8DA7543435DD}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{104D045A-F9CC-4DD7-B04D-8DA7543435DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{104D045A-F9CC-4DD7-B04D-8DA7543435DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{104D045A-F9CC-4DD7-B04D-8DA7543435DD}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{104D045A-F9CC-4DD7-B04D-8DA7543435DD}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{104D045A-F9CC-4DD7-B04D-8DA7543435DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{104D045A-F9CC-4DD7-B04D-8DA7543435DD}.Release|Any CPU.Build.0 = Release|Any CPU
{8484A675-1C93-4D87-8FF2-7530A5711208}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{8484A675-1C93-4D87-8FF2-7530A5711208}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{8484A675-1C93-4D87-8FF2-7530A5711208}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8484A675-1C93-4D87-8FF2-7530A5711208}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8484A675-1C93-4D87-8FF2-7530A5711208}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{8484A675-1C93-4D87-8FF2-7530A5711208}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{8484A675-1C93-4D87-8FF2-7530A5711208}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8484A675-1C93-4D87-8FF2-7530A5711208}.Release|Any CPU.Build.0 = Release|Any CPU
{E3567AB9-0926-444D-A0D0-A369D5890EAA}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{E3567AB9-0926-444D-A0D0-A369D5890EAA}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{E3567AB9-0926-444D-A0D0-A369D5890EAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E3567AB9-0926-444D-A0D0-A369D5890EAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E3567AB9-0926-444D-A0D0-A369D5890EAA}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{E3567AB9-0926-444D-A0D0-A369D5890EAA}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{E3567AB9-0926-444D-A0D0-A369D5890EAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E3567AB9-0926-444D-A0D0-A369D5890EAA}.Release|Any CPU.Build.0 = Release|Any CPU
{C8F410B4-B83B-47B9-9ECD-07590A8750A7}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{C8F410B4-B83B-47B9-9ECD-07590A8750A7}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{C8F410B4-B83B-47B9-9ECD-07590A8750A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C8F410B4-B83B-47B9-9ECD-07590A8750A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C8F410B4-B83B-47B9-9ECD-07590A8750A7}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{C8F410B4-B83B-47B9-9ECD-07590A8750A7}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{C8F410B4-B83B-47B9-9ECD-07590A8750A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C8F410B4-B83B-47B9-9ECD-07590A8750A7}.Release|Any CPU.Build.0 = Release|Any CPU
{DB50E2EF-B4D8-493A-8568-29CAC0DF9062}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{DB50E2EF-B4D8-493A-8568-29CAC0DF9062}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{DB50E2EF-B4D8-493A-8568-29CAC0DF9062}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DB50E2EF-B4D8-493A-8568-29CAC0DF9062}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DB50E2EF-B4D8-493A-8568-29CAC0DF9062}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{DB50E2EF-B4D8-493A-8568-29CAC0DF9062}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{DB50E2EF-B4D8-493A-8568-29CAC0DF9062}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DB50E2EF-B4D8-493A-8568-29CAC0DF9062}.Release|Any CPU.Build.0 = Release|Any CPU
{AE1A0E06-6CD4-4E1D-8209-22BBBD6D5652}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{AE1A0E06-6CD4-4E1D-8209-22BBBD6D5652}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{AE1A0E06-6CD4-4E1D-8209-22BBBD6D5652}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE1A0E06-6CD4-4E1D-8209-22BBBD6D5652}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE1A0E06-6CD4-4E1D-8209-22BBBD6D5652}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{AE1A0E06-6CD4-4E1D-8209-22BBBD6D5652}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{AE1A0E06-6CD4-4E1D-8209-22BBBD6D5652}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE1A0E06-6CD4-4E1D-8209-22BBBD6D5652}.Release|Any CPU.Build.0 = Release|Any CPU
{77BA2F61-6155-4283-BB39-F8E42F46A0B0}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{77BA2F61-6155-4283-BB39-F8E42F46A0B0}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{77BA2F61-6155-4283-BB39-F8E42F46A0B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{77BA2F61-6155-4283-BB39-F8E42F46A0B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{77BA2F61-6155-4283-BB39-F8E42F46A0B0}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{77BA2F61-6155-4283-BB39-F8E42F46A0B0}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{77BA2F61-6155-4283-BB39-F8E42F46A0B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{77BA2F61-6155-4283-BB39-F8E42F46A0B0}.Release|Any CPU.Build.0 = Release|Any CPU
{5D41FFFF-816C-40B2-95CD-E2DDDCB83784}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{5D41FFFF-816C-40B2-95CD-E2DDDCB83784}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{5D41FFFF-816C-40B2-95CD-E2DDDCB83784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D41FFFF-816C-40B2-95CD-E2DDDCB83784}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D41FFFF-816C-40B2-95CD-E2DDDCB83784}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{5D41FFFF-816C-40B2-95CD-E2DDDCB83784}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{5D41FFFF-816C-40B2-95CD-E2DDDCB83784}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D41FFFF-816C-40B2-95CD-E2DDDCB83784}.Release|Any CPU.Build.0 = Release|Any CPU
{C2BB03A0-C35B-433F-96D4-3A06CBC06AD7}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{C2BB03A0-C35B-433F-96D4-3A06CBC06AD7}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{C2BB03A0-C35B-433F-96D4-3A06CBC06AD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C2BB03A0-C35B-433F-96D4-3A06CBC06AD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C2BB03A0-C35B-433F-96D4-3A06CBC06AD7}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{C2BB03A0-C35B-433F-96D4-3A06CBC06AD7}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{C2BB03A0-C35B-433F-96D4-3A06CBC06AD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C2BB03A0-C35B-433F-96D4-3A06CBC06AD7}.Release|Any CPU.Build.0 = Release|Any CPU
{04A56018-C41E-4634-A185-A13E9250C75A}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{04A56018-C41E-4634-A185-A13E9250C75A}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{04A56018-C41E-4634-A185-A13E9250C75A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{04A56018-C41E-4634-A185-A13E9250C75A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{04A56018-C41E-4634-A185-A13E9250C75A}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{04A56018-C41E-4634-A185-A13E9250C75A}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{04A56018-C41E-4634-A185-A13E9250C75A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{04A56018-C41E-4634-A185-A13E9250C75A}.Release|Any CPU.Build.0 = Release|Any CPU
{07CCC11F-76CB-448E-B15A-72E09FBB348B}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{07CCC11F-76CB-448E-B15A-72E09FBB348B}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{07CCC11F-76CB-448E-B15A-72E09FBB348B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{07CCC11F-76CB-448E-B15A-72E09FBB348B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07CCC11F-76CB-448E-B15A-72E09FBB348B}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{07CCC11F-76CB-448E-B15A-72E09FBB348B}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{07CCC11F-76CB-448E-B15A-72E09FBB348B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{07CCC11F-76CB-448E-B15A-72E09FBB348B}.Release|Any CPU.Build.0 = Release|Any CPU
{1D2F61B2-B1F4-45F0-83CA-03370FD6E62C}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{1D2F61B2-B1F4-45F0-83CA-03370FD6E62C}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{1D2F61B2-B1F4-45F0-83CA-03370FD6E62C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D2F61B2-B1F4-45F0-83CA-03370FD6E62C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D2F61B2-B1F4-45F0-83CA-03370FD6E62C}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{1D2F61B2-B1F4-45F0-83CA-03370FD6E62C}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{1D2F61B2-B1F4-45F0-83CA-03370FD6E62C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1D2F61B2-B1F4-45F0-83CA-03370FD6E62C}.Release|Any CPU.Build.0 = Release|Any CPU
{DE3DAF51-FB29-41FC-AF41-A4BA8D91BFB6}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{DE3DAF51-FB29-41FC-AF41-A4BA8D91BFB6}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{DE3DAF51-FB29-41FC-AF41-A4BA8D91BFB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DE3DAF51-FB29-41FC-AF41-A4BA8D91BFB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DE3DAF51-FB29-41FC-AF41-A4BA8D91BFB6}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{DE3DAF51-FB29-41FC-AF41-A4BA8D91BFB6}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{DE3DAF51-FB29-41FC-AF41-A4BA8D91BFB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DE3DAF51-FB29-41FC-AF41-A4BA8D91BFB6}.Release|Any CPU.Build.0 = Release|Any CPU
{F0A39728-940D-4DBE-A37A-05D4EB57F342}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{F0A39728-940D-4DBE-A37A-05D4EB57F342}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{F0A39728-940D-4DBE-A37A-05D4EB57F342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F0A39728-940D-4DBE-A37A-05D4EB57F342}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F0A39728-940D-4DBE-A37A-05D4EB57F342}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{F0A39728-940D-4DBE-A37A-05D4EB57F342}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{F0A39728-940D-4DBE-A37A-05D4EB57F342}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F0A39728-940D-4DBE-A37A-05D4EB57F342}.Release|Any CPU.Build.0 = Release|Any CPU
{2DADEAD3-0FE9-4199-9817-41A32E6BF450}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
{2DADEAD3-0FE9-4199-9817-41A32E6BF450}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
{2DADEAD3-0FE9-4199-9817-41A32E6BF450}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2DADEAD3-0FE9-4199-9817-41A32E6BF450}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2DADEAD3-0FE9-4199-9817-41A32E6BF450}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
{2DADEAD3-0FE9-4199-9817-41A32E6BF450}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
{2DADEAD3-0FE9-4199-9817-41A32E6BF450}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2DADEAD3-0FE9-4199-9817-41A32E6BF450}.Release|Any CPU.Build.0 = Release|Any CPU
{02356BD7-7E99-457B-BEFF-090CE4DF067D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

View File

@ -53,7 +53,7 @@ namespace ASC.Core.Configuration
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<AmiPublicDnsSyncServiceScope>();
(var tenantManager, var coreBaseSettings) = scopeClass;
var (tenantManager, coreBaseSettings) = scopeClass;
if (coreBaseSettings.Standalone)
{
var tenants = tenantManager.GetTenants(false).Where(t => MappedDomainNotSettedByUser(t.MappedDomain));
@ -107,10 +107,7 @@ namespace ASC.Core.Configuration
CoreBaseSettings = coreBaseSettings;
}
public void Deconstruct(out TenantManager tenantManager, out CoreBaseSettings coreBaseSettings)
{
tenantManager = TenantManager;
coreBaseSettings = CoreBaseSettings;
}
public void Deconstruct(out TenantManager tenantManager, out CoreBaseSettings coreBaseSettings) =>
(tenantManager, coreBaseSettings) = (TenantManager, CoreBaseSettings);
}
}

View File

@ -95,17 +95,17 @@ namespace ASC.Core.Notify
CreationDate = DateTime.UtcNow.Ticks,
};
using var scope = ServiceProvider.CreateScope();
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<EmailSenderSinkScope>();
(var tenantManager, var coreConfiguration, var options) = scopeClass;
var (tenantManager, configuration, options) = scopeClass;
var tenant = tenantManager.GetCurrentTenant(false);
m.Tenant = tenant == null ? Tenant.DEFAULT_TENANT : tenant.TenantId;
var from = MailAddressUtils.Create(coreConfiguration.SmtpSettings.SenderAddress, coreConfiguration.SmtpSettings.SenderDisplayName);
var from = MailAddressUtils.Create(configuration.SmtpSettings.SenderAddress, configuration.SmtpSettings.SenderDisplayName);
var fromTag = message.Arguments.FirstOrDefault(x => x.Tag.Equals("MessageFrom"));
if ((coreConfiguration.SmtpSettings.IsDefaultSettings || string.IsNullOrEmpty(coreConfiguration.SmtpSettings.SenderDisplayName)) &&
if ((configuration.SmtpSettings.IsDefaultSettings || string.IsNullOrEmpty(configuration.SmtpSettings.SenderDisplayName)) &&
fromTag != null && fromTag.Value != null)
{
try
@ -165,12 +165,8 @@ namespace ASC.Core.Notify
Options = options;
}
public void Deconstruct(out TenantManager tenantManager, out CoreConfiguration coreConfiguration, out IOptionsMonitor<ILog> optionsMonitor)
{
tenantManager = TenantManager;
coreConfiguration = CoreConfiguration;
optionsMonitor = Options;
}
public void Deconstruct(out TenantManager tenantManager, out CoreConfiguration coreConfiguration, out IOptionsMonitor<ILog> optionsMonitor)
=> (tenantManager, coreConfiguration, optionsMonitor) = (TenantManager, CoreConfiguration, Options);
}
public static class EmailSenderSinkExtension

View File

@ -101,10 +101,7 @@ namespace ASC.Core.Notify
}
public void Deconstruct(out UserManager userManager, out TenantManager tenantManager)
{
userManager = UserManager;
tenantManager = TenantManager;
}
=> (userManager, tenantManager) = (UserManager, TenantManager);
}
public static class JabberSenderSinkExtension

View File

@ -81,14 +81,14 @@ namespace ASC.Core.Notify.Senders
Log.DebugFormat("Tenant: {0}, To: {1}", m.Tenant, m.To);
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<AWSSenderScope>();
(var tenantManager, var coreConfiguration) = scopeClass;
var (tenantManager, configuration) = scopeClass;
tenantManager.SetCurrentTenant(m.Tenant);
if (!coreConfiguration.SmtpSettings.IsDefaultSettings)
if (!configuration.SmtpSettings.IsDefaultSettings)
{
UseCoreSettings = true;
_useCoreSettings = true;
result = base.Send(m);
UseCoreSettings = false;
_useCoreSettings = false;
}
else
{
@ -227,7 +227,7 @@ namespace ASC.Core.Notify.Senders
private bool IsRefreshNeeded()
{
return quota == null || (DateTime.UtcNow - lastRefresh) > refreshTimeout;
}
}
}
public class AWSSenderScope
@ -242,10 +242,7 @@ namespace ASC.Core.Notify.Senders
}
public void Deconstruct(out TenantManager tenantManager, out CoreConfiguration coreConfiguration)
{
tenantManager = TenantManager;
coreConfiguration = CoreConfiguration;
}
=> (tenantManager, coreConfiguration) = (TenantManager, CoreConfiguration);
}
public static class AWSSenderExtension

View File

@ -65,7 +65,7 @@ namespace ASC.Core.Notify.Senders
private int Port { get; set; }
private bool Ssl { get; set; }
private ICredentials Credentials { get; set; }
protected bool UseCoreSettings { get; set; }
protected bool _useCoreSettings { get; set; }
const int NETWORK_TIMEOUT = 30000;
public SmtpSender(
@ -81,7 +81,7 @@ namespace ASC.Core.Notify.Senders
{
if (properties.ContainsKey("useCoreSettings") && bool.Parse(properties["useCoreSettings"]))
{
UseCoreSettings = true;
_useCoreSettings = true;
}
else
{
@ -113,7 +113,7 @@ namespace ASC.Core.Notify.Senders
{
using var scope = ServiceProvider.CreateScope();
var scopeClass = scope.ServiceProvider.GetService<SmtpSenderScope>();
(var tenantManager, var coreConfiguration) = scopeClass;
var (tenantManager, configuration) = scopeClass;
tenantManager.SetCurrentTenant(m.Tenant);
var smtpClient = GetSmtpClient();
@ -122,8 +122,8 @@ namespace ASC.Core.Notify.Senders
{
try
{
if (UseCoreSettings)
InitUseCoreSettings(coreConfiguration);
if (_useCoreSettings)
InitUseCoreSettings(configuration);
var mail = BuildMailMessage(m);
@ -334,10 +334,7 @@ namespace ASC.Core.Notify.Senders
}
public void Deconstruct(out TenantManager tenantManager, out CoreConfiguration coreConfiguration)
{
tenantManager = TenantManager;
coreConfiguration = CoreConfiguration;
}
=> (tenantManager, coreConfiguration) = (TenantManager, CoreConfiguration);
}
public static class SmtpSenderExtension