diff --git a/Directory.Build.props b/Directory.Build.props index f14a9a710..492ec95d8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,11 +6,11 @@ link - + SIGN_ASSEMBLY;$(DefineConstants) true false - ..\Unicorn.pfx + ..\..\Unicorn.pfx diff --git a/SteamToolsV2+.sln b/SteamToolsV2+.sln index 82a8d5cb9..3034e2a52 100644 --- a/SteamToolsV2+.sln +++ b/SteamToolsV2+.sln @@ -3,73 +3,63 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31005.135 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.Repositories.sqlite-net-pcl", "System.Application.Repositories.sqlite-net-pcl\System.Application.Repositories.sqlite-net-pcl.csproj", "{512B0511-41AB-444D-BAD8-E19B7D3B52CB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Repositories.sqlite-net-pcl", "src\Repositories.sqlite-net-pcl\Repositories.sqlite-net-pcl.csproj", "{512B0511-41AB-444D-BAD8-E19B7D3B52CB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Common.ClientLib", "System.Common.ClientLib\System.Common.ClientLib.csproj", "{8B9F2E93-B31B-4BA7-920D-732695A473E6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.ClientLib", "src\Common.ClientLib\Common.ClientLib.csproj", "{8B9F2E93-B31B-4BA7-920D-732695A473E6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Common.CoreLib", "System.Common.CoreLib\System.Common.CoreLib.csproj", "{E7468FDD-75F7-4B08-BA47-B715BBCFCC11}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.CoreLib", "src\Common.CoreLib\Common.CoreLib.csproj", "{E7468FDD-75F7-4B08-BA47-B715BBCFCC11}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Common.ClientLib.Droid", "System.Common.ClientLib.Droid\System.Common.ClientLib.Droid.csproj", "{7C8D906E-426B-49AB-9072-178555370F62}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.ClientLib.Droid", "src\Common.ClientLib.Droid\Common.ClientLib.Droid.csproj", "{7C8D906E-426B-49AB-9072-178555370F62}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Common.ClientLib.iOS", "System.Common.ClientLib.iOS\System.Common.ClientLib.iOS.csproj", "{F8F6973C-5831-43D1-89C2-1AD543CE7408}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.ClientLib.iOS", "src\Common.ClientLib.iOS\Common.ClientLib.iOS.csproj", "{F8F6973C-5831-43D1-89C2-1AD543CE7408}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0_Common", "0_Common", "{2D44BDCF-B70C-4C02-BDC8-4F1DD5066A75}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0_Shared", "0_Shared", "{D40853F1-B3C5-418A-B1D3-E0FB70B2F394}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3_SteamTools_Libs", "3_SteamTools_Libs", "{B43459A1-709B-4623-9677-AAC2FEE4FBA3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2_Client", "2_Client", "{9AF522B5-8923-41E6-8A0A-FAE8E8F83439}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Services.CloudService.Models", "src\ST.Services.CloudService.Models\ST.Services.CloudService.Models.csproj", "{6CD71E14-5036-4A16-8084-4AD108D34FF7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4_Repositories.Implementation", "4_Repositories.Implementation", "{DA8EFCA8-5396-48C7-8DC0-CB28A09488D9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Services.CloudService", "src\ST.Services.CloudService\ST.Services.CloudService.csproj", "{65DE552F-5E62-4E4F-ADCB-F19AD3DB3F78}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1_SteamTools", "1_SteamTools", "{B43459A1-709B-4623-9677-AAC2FEE4FBA3}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2_Test", "2_Test", "{EBC9DD0C-F7D0-4A00-B263-E69CF4E194F1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools.Services.CloudService.Models", "System.Application.SteamTools.Services.CloudService.Models\System.Application.SteamTools.Services.CloudService.Models.csproj", "{6CD71E14-5036-4A16-8084-4AD108D34FF7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.UnitTest", "tests\Common.UnitTest\Common.UnitTest.csproj", "{B9D4C8C7-BF96-417B-A7F8-9A67AE75A38B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools.Services.CloudService", "System.Application.SteamTools.Services.CloudService\System.Application.SteamTools.Services.CloudService.csproj", "{65DE552F-5E62-4E4F-ADCB-F19AD3DB3F78}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.UnitTest.Droid", "tests\Common.UnitTest.Droid\Common.UnitTest.Droid.csproj", "{0073A08E-6336-4C09-99F9-2E808889D715}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1_ServerApiClient", "1_ServerApiClient", "{F7AFD002-B231-4A5E-B320-56EFC3210E2C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.UnitTest.Droid.App", "tests\Common.UnitTest.Droid.App\Common.UnitTest.Droid.App.csproj", "{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0_Launch", "0_Launch", "{1460800B-D9ED-4147-B1E7-ABF502BEF59A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST", "src\ST\ST.csproj", "{66B7BFD6-6D4D-421B-BA5B-915348E53708}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3_Test", "3_Test", "{EBC9DD0C-F7D0-4A00-B263-E69CF4E194F1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client", "src\ST.Client\ST.Client.csproj", "{0A624994-B0A9-4F1F-B7D0-97FE2929936B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Common.UnitTest", "System.Common.UnitTest\System.Common.UnitTest.csproj", "{B9D4C8C7-BF96-417B-A7F8-9A67AE75A38B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Desktop", "src\ST.Client.Desktop\ST.Client.Desktop.csproj", "{D1F15D97-802E-4AA3-A4A5-B890ABE32897}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Common.UnitTest.Droid", "System.Common.UnitTest.Droid\System.Common.UnitTest.Droid.csproj", "{0073A08E-6336-4C09-99F9-2E808889D715}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Desktop.Avalonia.App", "src\ST.Client.Desktop.Avalonia.App\ST.Client.Desktop.Avalonia.App.csproj", "{2FFA5BCE-B3C3-46EA-8830-838C938BF814}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Common.UnitTest.Droid.App", "System.Common.UnitTest.Droid.App\System.Common.UnitTest.Droid.App.csproj", "{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools", "System.Application.SteamTools\System.Application.SteamTools.csproj", "{66B7BFD6-6D4D-421B-BA5B-915348E53708}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools.Client", "System.Application.SteamTools.Client\System.Application.SteamTools.Client.csproj", "{0A624994-B0A9-4F1F-B7D0-97FE2929936B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools.Client.Desktop", "System.Application.SteamTools.Client.Desktop\System.Application.SteamTools.Client.Desktop.csproj", "{D1F15D97-802E-4AA3-A4A5-B890ABE32897}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools.Client.Desktop.Avalonia.App", "System.Application.SteamTools.Client.Desktop.Avalonia.App\System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj", "{2FFA5BCE-B3C3-46EA-8830-838C938BF814}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B4B548C1-9AFE-4EBB-96E4-990B57C0A953}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Root", "_Root", "{B4B548C1-9AFE-4EBB-96E4-990B57C0A953}" ProjectSection(SolutionItems) = preProject .gitignore = .gitignore Directory.Build.props = Directory.Build.props global.json = global.json + nuget.config = nuget.config + README.en.md = README.en.md README.md = README.md EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools.Client.Desktop.Avalonia", "System.Application.SteamTools.Client.Desktop.Avalonia\System.Application.SteamTools.Client.Desktop.Avalonia.csproj", "{4F09B6D1-3F83-45A0-AEC8-0F243E7CD263}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Desktop.Avalonia", "src\ST.Client.Desktop.Avalonia\ST.Client.Desktop.Avalonia.csproj", "{4F09B6D1-3F83-45A0-AEC8-0F243E7CD263}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools.Client.Desktop.Linux", "System.Application.SteamTools.Client.Desktop.Linux\System.Application.SteamTools.Client.Desktop.Linux.csproj", "{D4CF08F5-8EAB-48FB-AAA3-1A221F7B2A82}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Desktop.Linux", "src\ST.Client.Desktop.Linux\ST.Client.Desktop.Linux.csproj", "{D4CF08F5-8EAB-48FB-AAA3-1A221F7B2A82}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools.Client.Desktop.Mac", "System.Application.SteamTools.Client.Desktop.Mac\System.Application.SteamTools.Client.Desktop.Mac.csproj", "{948C1EA8-12DB-4F8A-A190-8615DFBD9FE4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Desktop.Mac", "src\ST.Client.Desktop.Mac\ST.Client.Desktop.Mac.csproj", "{948C1EA8-12DB-4F8A-A190-8615DFBD9FE4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools.Client.Desktop.Windows", "System.Application.SteamTools.Client.Desktop.Windows\System.Application.SteamTools.Client.Desktop.Windows.csproj", "{141532E1-540E-4E50-8723-96936C191281}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Desktop.Windows", "src\ST.Client.Desktop.Windows\ST.Client.Desktop.Windows.csproj", "{141532E1-540E-4E50-8723-96936C191281}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools.Tools.Win7Troubleshoot", "System.Application.SteamTools.Tools.Win7Troubleshoot\System.Application.SteamTools.Tools.Win7Troubleshoot.csproj", "{60530AF8-4790-4A85-BCE2-C5673E9C601B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Tools.Win7Troubleshoot", "src\ST.Tools.Win7Troubleshoot\ST.Tools.Win7Troubleshoot.csproj", "{60530AF8-4790-4A85-BCE2-C5673E9C601B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools.Tools.Packager", "System.Application.SteamTools.Tools.Packager\System.Application.SteamTools.Tools.Packager.csproj", "{5A539932-2EB9-40F6-A4C1-94E5ECAB3B34}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Tools.Packager", "src\ST.Tools.Packager\ST.Tools.Packager.csproj", "{5A539932-2EB9-40F6-A4C1-94E5ECAB3B34}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{CC6FF77A-6E6B-4D42-B12B-0177745E9D22}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2_Reference", "2_Reference", "{8EB91F53-1062-4E9B-8E4A-096F35EA688D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1_Reference", "1_Reference", "{8EB91F53-1062-4E9B-8E4A-096F35EA688D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authenticator", "references\WinAuth\Authenticator\Authenticator.csproj", "{D018C980-17FD-49BB-A95D-EDE3C18BBE0A}" EndProject @@ -79,13 +69,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steam4NET", "references\Ste EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Titanium.Web.Proxy", "references\Titanium-Web-Proxy\src\Titanium.Web.Proxy\Titanium.Web.Proxy.csproj", "{35D60129-6652-4B6E-A04A-9766C3CF1869}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools.Tools.OpenSourceLibraryList", "System.Application.SteamTools.Tools.OpenSourceLibraryList\System.Application.SteamTools.Tools.OpenSourceLibraryList.csproj", "{CF7C2B80-D393-45EA-A67D-DF46FF17B0F8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Tools.OpenSourceLibraryList", "src\ST.Tools.OpenSourceLibraryList\ST.Tools.OpenSourceLibraryList.csproj", "{CF7C2B80-D393-45EA-A67D-DF46FF17B0F8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3_Test", "3_Test", "{EA0809CE-2CE7-4173-B915-A6BB01522EB5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.UnitTest", "tests\ST.Client.UnitTest\ST.Client.UnitTest.csproj", "{8EDF4429-251A-416D-BB68-93F227191BCF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools.Client.Test", "System.Application.SteamTools.Client.Test\System.Application.SteamTools.Client.Test.csproj", "{8EDF4429-251A-416D-BB68-93F227191BCF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Tools.Translate", "src\ST.Tools.Translate\ST.Tools.Translate.csproj", "{ABAF70E5-A582-4916-B217-6A660BB31D52}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Application.SteamTools.Tools.Translate", "System.Application.SteamTools.Tools.Translate\System.Application.SteamTools.Tools.Translate.csproj", "{ABAF70E5-A582-4916-B217-6A660BB31D52}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4_SteamTools_Tools", "4_SteamTools_Tools", "{5A7A506C-4DFF-4941-A9A6-B1182C7D5825}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ST.Client.Desktop.Avalonia.Demo.App", "src\ST.Client.Desktop.Avalonia.Demo.App\ST.Client.Desktop.Avalonia.Demo.App.csproj", "{39C26BF0-E5FE-42B1-B011-B7300847DED6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -315,47 +307,45 @@ Global {ABAF70E5-A582-4916-B217-6A660BB31D52}.Release|Any CPU.Build.0 = Release|Any CPU {ABAF70E5-A582-4916-B217-6A660BB31D52}.Release|x86.ActiveCfg = Release|Any CPU {ABAF70E5-A582-4916-B217-6A660BB31D52}.Release|x86.Build.0 = Release|Any CPU + {39C26BF0-E5FE-42B1-B011-B7300847DED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {39C26BF0-E5FE-42B1-B011-B7300847DED6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {39C26BF0-E5FE-42B1-B011-B7300847DED6}.Debug|x86.ActiveCfg = Debug|Any CPU + {39C26BF0-E5FE-42B1-B011-B7300847DED6}.Debug|x86.Build.0 = Debug|Any CPU + {39C26BF0-E5FE-42B1-B011-B7300847DED6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {39C26BF0-E5FE-42B1-B011-B7300847DED6}.Release|Any CPU.Build.0 = Release|Any CPU + {39C26BF0-E5FE-42B1-B011-B7300847DED6}.Release|x86.ActiveCfg = Release|Any CPU + {39C26BF0-E5FE-42B1-B011-B7300847DED6}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {512B0511-41AB-444D-BAD8-E19B7D3B52CB} = {DA8EFCA8-5396-48C7-8DC0-CB28A09488D9} - {8B9F2E93-B31B-4BA7-920D-732695A473E6} = {9AF522B5-8923-41E6-8A0A-FAE8E8F83439} - {E7468FDD-75F7-4B08-BA47-B715BBCFCC11} = {D40853F1-B3C5-418A-B1D3-E0FB70B2F394} - {7C8D906E-426B-49AB-9072-178555370F62} = {9AF522B5-8923-41E6-8A0A-FAE8E8F83439} - {F8F6973C-5831-43D1-89C2-1AD543CE7408} = {9AF522B5-8923-41E6-8A0A-FAE8E8F83439} - {D40853F1-B3C5-418A-B1D3-E0FB70B2F394} = {2D44BDCF-B70C-4C02-BDC8-4F1DD5066A75} - {9AF522B5-8923-41E6-8A0A-FAE8E8F83439} = {2D44BDCF-B70C-4C02-BDC8-4F1DD5066A75} - {DA8EFCA8-5396-48C7-8DC0-CB28A09488D9} = {2D44BDCF-B70C-4C02-BDC8-4F1DD5066A75} - {6CD71E14-5036-4A16-8084-4AD108D34FF7} = {F7AFD002-B231-4A5E-B320-56EFC3210E2C} - {65DE552F-5E62-4E4F-ADCB-F19AD3DB3F78} = {F7AFD002-B231-4A5E-B320-56EFC3210E2C} - {F7AFD002-B231-4A5E-B320-56EFC3210E2C} = {B43459A1-709B-4623-9677-AAC2FEE4FBA3} - {1460800B-D9ED-4147-B1E7-ABF502BEF59A} = {B43459A1-709B-4623-9677-AAC2FEE4FBA3} - {EBC9DD0C-F7D0-4A00-B263-E69CF4E194F1} = {2D44BDCF-B70C-4C02-BDC8-4F1DD5066A75} + {512B0511-41AB-444D-BAD8-E19B7D3B52CB} = {2D44BDCF-B70C-4C02-BDC8-4F1DD5066A75} + {8B9F2E93-B31B-4BA7-920D-732695A473E6} = {2D44BDCF-B70C-4C02-BDC8-4F1DD5066A75} + {E7468FDD-75F7-4B08-BA47-B715BBCFCC11} = {2D44BDCF-B70C-4C02-BDC8-4F1DD5066A75} + {7C8D906E-426B-49AB-9072-178555370F62} = {2D44BDCF-B70C-4C02-BDC8-4F1DD5066A75} + {F8F6973C-5831-43D1-89C2-1AD543CE7408} = {2D44BDCF-B70C-4C02-BDC8-4F1DD5066A75} + {6CD71E14-5036-4A16-8084-4AD108D34FF7} = {B43459A1-709B-4623-9677-AAC2FEE4FBA3} + {65DE552F-5E62-4E4F-ADCB-F19AD3DB3F78} = {B43459A1-709B-4623-9677-AAC2FEE4FBA3} {B9D4C8C7-BF96-417B-A7F8-9A67AE75A38B} = {EBC9DD0C-F7D0-4A00-B263-E69CF4E194F1} {0073A08E-6336-4C09-99F9-2E808889D715} = {EBC9DD0C-F7D0-4A00-B263-E69CF4E194F1} {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA} = {EBC9DD0C-F7D0-4A00-B263-E69CF4E194F1} {66B7BFD6-6D4D-421B-BA5B-915348E53708} = {B43459A1-709B-4623-9677-AAC2FEE4FBA3} {0A624994-B0A9-4F1F-B7D0-97FE2929936B} = {B43459A1-709B-4623-9677-AAC2FEE4FBA3} {D1F15D97-802E-4AA3-A4A5-B890ABE32897} = {B43459A1-709B-4623-9677-AAC2FEE4FBA3} - {2FFA5BCE-B3C3-46EA-8830-838C938BF814} = {1460800B-D9ED-4147-B1E7-ABF502BEF59A} {4F09B6D1-3F83-45A0-AEC8-0F243E7CD263} = {B43459A1-709B-4623-9677-AAC2FEE4FBA3} {D4CF08F5-8EAB-48FB-AAA3-1A221F7B2A82} = {B43459A1-709B-4623-9677-AAC2FEE4FBA3} {948C1EA8-12DB-4F8A-A190-8615DFBD9FE4} = {B43459A1-709B-4623-9677-AAC2FEE4FBA3} {141532E1-540E-4E50-8723-96936C191281} = {B43459A1-709B-4623-9677-AAC2FEE4FBA3} - {60530AF8-4790-4A85-BCE2-C5673E9C601B} = {CC6FF77A-6E6B-4D42-B12B-0177745E9D22} - {5A539932-2EB9-40F6-A4C1-94E5ECAB3B34} = {CC6FF77A-6E6B-4D42-B12B-0177745E9D22} - {CC6FF77A-6E6B-4D42-B12B-0177745E9D22} = {1460800B-D9ED-4147-B1E7-ABF502BEF59A} - {8EB91F53-1062-4E9B-8E4A-096F35EA688D} = {B43459A1-709B-4623-9677-AAC2FEE4FBA3} + {60530AF8-4790-4A85-BCE2-C5673E9C601B} = {5A7A506C-4DFF-4941-A9A6-B1182C7D5825} + {5A539932-2EB9-40F6-A4C1-94E5ECAB3B34} = {5A7A506C-4DFF-4941-A9A6-B1182C7D5825} {D018C980-17FD-49BB-A95D-EDE3C18BBE0A} = {8EB91F53-1062-4E9B-8E4A-096F35EA688D} {6DD9644F-F005-4C19-8ADF-70C303EC5BB8} = {8EB91F53-1062-4E9B-8E4A-096F35EA688D} {3C05CED6-7712-40F0-AF17-8DD3F4C0A224} = {8EB91F53-1062-4E9B-8E4A-096F35EA688D} {35D60129-6652-4B6E-A04A-9766C3CF1869} = {8EB91F53-1062-4E9B-8E4A-096F35EA688D} - {CF7C2B80-D393-45EA-A67D-DF46FF17B0F8} = {CC6FF77A-6E6B-4D42-B12B-0177745E9D22} - {EA0809CE-2CE7-4173-B915-A6BB01522EB5} = {B43459A1-709B-4623-9677-AAC2FEE4FBA3} - {8EDF4429-251A-416D-BB68-93F227191BCF} = {EA0809CE-2CE7-4173-B915-A6BB01522EB5} - {ABAF70E5-A582-4916-B217-6A660BB31D52} = {CC6FF77A-6E6B-4D42-B12B-0177745E9D22} + {CF7C2B80-D393-45EA-A67D-DF46FF17B0F8} = {5A7A506C-4DFF-4941-A9A6-B1182C7D5825} + {8EDF4429-251A-416D-BB68-93F227191BCF} = {EBC9DD0C-F7D0-4A00-B263-E69CF4E194F1} + {ABAF70E5-A582-4916-B217-6A660BB31D52} = {5A7A506C-4DFF-4941-A9A6-B1182C7D5825} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3833E7C5-69BC-4CB3-92CE-A8854AA35D8A} diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Properties/PublishProfiles/linux-x64.pubxml b/System.Application.SteamTools.Client.Desktop.Avalonia.App/Properties/PublishProfiles/linux-x64.pubxml deleted file mode 100644 index a5dd9f248..000000000 --- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Properties/PublishProfiles/linux-x64.pubxml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - PUBLISH;$(DefineConstants) - Release - x64 - bin\Release\Publish\linux-x64 - FileSystem - linux-x64 - true - false - True - link - true - - false - false - false - false - false - false - true - none - false - false - false - - \ No newline at end of file diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Properties/PublishProfiles/osx-x64.pubxml b/System.Application.SteamTools.Client.Desktop.Avalonia.App/Properties/PublishProfiles/osx-x64.pubxml deleted file mode 100644 index 36b62acb7..000000000 --- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Properties/PublishProfiles/osx-x64.pubxml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - MAC;PUBLISH;$(DefineConstants) - Release - x64 - bin\Release\Publish\osx-x64 - FileSystem - osx-x64 - true - false - True - link - true - - false - false - false - false - false - false - true - none - false - false - false - - \ No newline at end of file diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Properties/PublishProfiles/win-x86.pubxml b/System.Application.SteamTools.Client.Desktop.Avalonia.App/Properties/PublishProfiles/win-x86.pubxml deleted file mode 100644 index 4004e4a2b..000000000 --- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Properties/PublishProfiles/win-x86.pubxml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - PUBLISH; - Release - x86 - bin\Release\Publish\win-x86 - FileSystem - - win7-x86 - true - false - true - true - link - true - false - false - false - false - false - false - true - none - false - false - false - net5.0-windows10.0.19041.0 - - \ No newline at end of file diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj b/System.Application.SteamTools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj deleted file mode 100644 index 1163961d0..000000000 --- a/System.Application.SteamTools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj +++ /dev/null @@ -1,145 +0,0 @@ - - - - netstandard2.1 - System - false - - System.Application.SteamTools.Client.Desktop.Avalonia - - - - - %(Filename) - - - Designer - - - - - - - - - - - - - - - - - - - - - - Properties\AssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - - - - - - TitleBar.axaml - - - PaperView.axaml - - - About_OpenSourcePage.axaml - - - AboutPage.axaml - - - LocalAuthPage.axaml - - - GameListPage.axaml - - - DebugPage.axaml - - - Settings_UIaxaml - - - StartPage.axaml - - - CommunityProxyPage.axaml - - - SteamAccountPage.axaml - - - AuthTradeWindow.axaml - - - UserProfileWindow.axaml - - - UserInfoWindow.axaml - - - ChangePhoneWindow.axaml - - - LoginUserWindow.axaml - - - ShowAuthWindow.axaml - - - MessageBoxWindow.axaml - - - \ No newline at end of file diff --git a/SteamTools.sln b/source/SteamTools.sln similarity index 91% rename from SteamTools.sln rename to source/SteamTools.sln index 617b18cf2..a2de95839 100644 --- a/SteamTools.sln +++ b/source/SteamTools.sln @@ -7,47 +7,47 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{45E5B6B2-0A6D- EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{350F425C-AF5A-4ED2-BDDC-B905A4E63A14}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Proxy", "source\SteamTool.Proxy\SteamTool.Proxy.csproj", "{A70C148D-042C-48DA-9963-0B777FC60215}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Proxy", "SteamTool.Proxy\SteamTool.Proxy.csproj", "{A70C148D-042C-48DA-9963-0B777FC60215}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reference", "Reference", "{F62E508E-B374-4149-B9AC-0A8090AA6CD1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Steam.Service", "source\SteamTool.Steam.Service\SteamTool.Steam.Service.csproj", "{2A155A7B-3DFD-4F16-929D-9693D2411B83}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Steam.Service", "SteamTool.Steam.Service\SteamTool.Steam.Service.csproj", "{2A155A7B-3DFD-4F16-929D-9693D2411B83}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Core", "source\SteamTool.Core\SteamTool.Core.csproj", "{23E26040-19A5-4623-8863-B9ED539403B0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Core", "SteamTool.Core\SteamTool.Core.csproj", "{23E26040-19A5-4623-8863-B9ED539403B0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTools", "source\SteamTools\SteamTools.csproj", "{0663899A-2EC5-4929-868C-9D9620FEA4FE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTools", "SteamTools\SteamTools.csproj", "{0663899A-2EC5-4929-868C-9D9620FEA4FE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Steam4NET.Test", "source\SteamTool.Steam4NET.Test\SteamTool.Steam4NET.Test.csproj", "{790D22D4-94B0-4575-8E2D-C451EC520407}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Steam4NET.Test", "SteamTool.Steam4NET.Test\SteamTool.Steam4NET.Test.csproj", "{790D22D4-94B0-4575-8E2D-C451EC520407}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Steam4NET", "source\SteamTool.Steam4NET\SteamTool.Steam4NET.csproj", "{D4157059-D31A-4A21-AF4C-2D458F768041}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Steam4NET", "SteamTool.Steam4NET\SteamTool.Steam4NET.csproj", "{D4157059-D31A-4A21-AF4C-2D458F768041}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{D245A82C-66B2-4CD5-881C-3ED4332FC91D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Steamworks.Test", "source\SteamTool.Steamworks.Test\SteamTool.Steamworks.Test.csproj", "{C03E4CF5-D68F-4CAC-B002-3A6799ED9E15}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Steamworks.Test", "SteamTool.Steamworks.Test\SteamTool.Steamworks.Test.csproj", "{C03E4CF5-D68F-4CAC-B002-3A6799ED9E15}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Proxy.Test", "source\SteamTool.Proxy.Test\SteamTool.Proxy.Test.csproj", "{4C441E34-FA65-4425-8242-4EB767BA9B95}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Proxy.Test", "SteamTool.Proxy.Test\SteamTool.Proxy.Test.csproj", "{4C441E34-FA65-4425-8242-4EB767BA9B95}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Model", "source\SteamTool.Model\SteamTool.Model.csproj", "{BDBACE3A-0138-4930-95F6-82562EA03F7A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Model", "SteamTool.Model\SteamTool.Model.csproj", "{BDBACE3A-0138-4930-95F6-82562EA03F7A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.SteamAPI", "source\SteamTool.SteamAPI\SteamTool.SteamAPI.csproj", "{4E66F4F4-7771-4FFA-A907-3F99A95C6A7F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.SteamAPI", "SteamTool.SteamAPI\SteamTool.SteamAPI.csproj", "{4E66F4F4-7771-4FFA-A907-3F99A95C6A7F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Authenticator", "source\SteamTool.Authenticator\SteamTool.Authenticator.csproj", "{86F6CF23-35C4-45AD-BC0D-6BD50C03F666}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamTool.Authenticator", "SteamTool.Authenticator\SteamTool.Authenticator.csproj", "{86F6CF23-35C4-45AD-BC0D-6BD50C03F666}" EndProject -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "SteamTools.UWP", "source\SteamTools.UWP\SteamTools.UWP.wapproj", "{2E755C75-E472-44E0-8AC4-F40209A60172}" +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "SteamTools.UWP", "SteamTools.UWP\SteamTools.UWP.wapproj", "{2E755C75-E472-44E0-8AC4-F40209A60172}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Titanium.Web.Proxy", "references\Titanium-Web-Proxy\src\Titanium.Web.Proxy\Titanium.Web.Proxy.csproj", "{BBB75CAC-2BA3-473D-935D-0E59406F5E61}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Titanium.Web.Proxy", "..\references\Titanium-Web-Proxy\src\Titanium.Web.Proxy\Titanium.Web.Proxy.csproj", "{BBB75CAC-2BA3-473D-935D-0E59406F5E61}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MetroRadiance", "MetroRadiance", "{2B74A2B2-148D-4518-BF74-3408095E920B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetroTrilithon.Desktop", "references\MetroRadiance\source\MetroTrilithon.Desktop\MetroTrilithon.Desktop.csproj", "{4E2EB2E0-E5FE-4FEB-A3E5-5F2F05CD1A67}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetroTrilithon.Desktop", "..\references\MetroRadiance\source\MetroTrilithon.Desktop\MetroTrilithon.Desktop.csproj", "{4E2EB2E0-E5FE-4FEB-A3E5-5F2F05CD1A67}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetroRadiance.Core", "references\MetroRadiance\source\MetroRadiance.Core\MetroRadiance.Core.csproj", "{AF006EF5-D4BC-49C6-8E0E-DC2B882BE767}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetroRadiance.Core", "..\references\MetroRadiance\source\MetroRadiance.Core\MetroRadiance.Core.csproj", "{AF006EF5-D4BC-49C6-8E0E-DC2B882BE767}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetroRadiance.Chrome", "references\MetroRadiance\source\MetroRadiance.Chrome\MetroRadiance.Chrome.csproj", "{DE0B3A58-C301-4671-8B32-4F195C9457A7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetroRadiance.Chrome", "..\references\MetroRadiance\source\MetroRadiance.Chrome\MetroRadiance.Chrome.csproj", "{DE0B3A58-C301-4671-8B32-4F195C9457A7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetroRadiance", "references\MetroRadiance\source\MetroRadiance\MetroRadiance.csproj", "{2E226B1E-80F6-448D-B02B-0A029C5BC09E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetroRadiance", "..\references\MetroRadiance\source\MetroRadiance\MetroRadiance.csproj", "{2E226B1E-80F6-448D-B02B-0A029C5BC09E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetroTrilithon", "references\MetroRadiance\source\MetroTrilithon\MetroTrilithon.csproj", "{2EE1744F-2D3C-4032-9A9E-C57FA3B512B3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetroTrilithon", "..\references\MetroRadiance\source\MetroTrilithon\MetroTrilithon.csproj", "{2EE1744F-2D3C-4032-9A9E-C57FA3B512B3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/System.Common.ClientLib.Droid/AndroidROM.cs b/src/Common.ClientLib.Droid/AndroidROM.cs similarity index 100% rename from System.Common.ClientLib.Droid/AndroidROM.cs rename to src/Common.ClientLib.Droid/AndroidROM.cs diff --git a/System.Common.ClientLib.Droid/AndroidROMType.cs b/src/Common.ClientLib.Droid/AndroidROMType.cs similarity index 100% rename from System.Common.ClientLib.Droid/AndroidROMType.cs rename to src/Common.ClientLib.Droid/AndroidROMType.cs diff --git a/System.Common.ClientLib.Droid/Application/App.cs b/src/Common.ClientLib.Droid/Application/App.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/App.cs rename to src/Common.ClientLib.Droid/Application/App.cs diff --git a/System.Common.ClientLib.Droid/Application/DarkModeUtil.cs b/src/Common.ClientLib.Droid/Application/DarkModeUtil.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/DarkModeUtil.cs rename to src/Common.ClientLib.Droid/Application/DarkModeUtil.cs diff --git a/System.Common.ClientLib.Droid/Application/GoToPlatformPages.cs b/src/Common.ClientLib.Droid/Application/GoToPlatformPages.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/GoToPlatformPages.cs rename to src/Common.ClientLib.Droid/Application/GoToPlatformPages.cs diff --git a/System.Common.ClientLib.Droid/Application/Security/DeviceSecurityCheckUtil.cs b/src/Common.ClientLib.Droid/Application/Security/DeviceSecurityCheckUtil.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/Security/DeviceSecurityCheckUtil.cs rename to src/Common.ClientLib.Droid/Application/Security/DeviceSecurityCheckUtil.cs diff --git a/System.Common.ClientLib.Droid/Application/Security/SecurityCheckUtil.cs b/src/Common.ClientLib.Droid/Application/Security/SecurityCheckUtil.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/Security/SecurityCheckUtil.cs rename to src/Common.ClientLib.Droid/Application/Security/SecurityCheckUtil.cs diff --git a/System.Common.ClientLib.Droid/Application/Security/VirtualApkCheckUtil.cs b/src/Common.ClientLib.Droid/Application/Security/VirtualApkCheckUtil.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/Security/VirtualApkCheckUtil.cs rename to src/Common.ClientLib.Droid/Application/Security/VirtualApkCheckUtil.cs diff --git a/System.Common.ClientLib.Droid/Application/Services/IPlatformNavigationService.cs b/src/Common.ClientLib.Droid/Application/Services/IPlatformNavigationService.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/Services/IPlatformNavigationService.cs rename to src/Common.ClientLib.Droid/Application/Services/IPlatformNavigationService.cs diff --git a/System.Common.ClientLib.Droid/Application/Services/Implementation/Permissions/GetPhoneNumberPermission.cs b/src/Common.ClientLib.Droid/Application/Services/Implementation/Permissions/GetPhoneNumberPermission.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/Services/Implementation/Permissions/GetPhoneNumberPermission.cs rename to src/Common.ClientLib.Droid/Application/Services/Implementation/Permissions/GetPhoneNumberPermission.cs diff --git a/System.Common.ClientLib.Droid/Application/Services/Implementation/PlatformNavigationServiceImpl.cs b/src/Common.ClientLib.Droid/Application/Services/Implementation/PlatformNavigationServiceImpl.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/Services/Implementation/PlatformNavigationServiceImpl.cs rename to src/Common.ClientLib.Droid/Application/Services/Implementation/PlatformNavigationServiceImpl.cs diff --git a/System.Common.ClientLib.Droid/Application/Services/Implementation/PlatformNotificationServiceImpl.cs b/src/Common.ClientLib.Droid/Application/Services/Implementation/PlatformNotificationServiceImpl.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/Services/Implementation/PlatformNotificationServiceImpl.cs rename to src/Common.ClientLib.Droid/Application/Services/Implementation/PlatformNotificationServiceImpl.cs diff --git a/System.Common.ClientLib.Droid/Application/Services/Implementation/PlatformTelephonyServiceImpl.cs b/src/Common.ClientLib.Droid/Application/Services/Implementation/PlatformTelephonyServiceImpl.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/Services/Implementation/PlatformTelephonyServiceImpl.cs rename to src/Common.ClientLib.Droid/Application/Services/Implementation/PlatformTelephonyServiceImpl.cs diff --git a/System.Common.ClientLib.Droid/Application/Services/Implementation/PlatformToastImpl.cs b/src/Common.ClientLib.Droid/Application/Services/Implementation/PlatformToastImpl.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/Services/Implementation/PlatformToastImpl.cs rename to src/Common.ClientLib.Droid/Application/Services/Implementation/PlatformToastImpl.cs diff --git a/System.Common.ClientLib.Droid/Application/StatusBarUtil.cs b/src/Common.ClientLib.Droid/Application/StatusBarUtil.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/StatusBarUtil.cs rename to src/Common.ClientLib.Droid/Application/StatusBarUtil.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Activities/BaseActivity.cs b/src/Common.ClientLib.Droid/Application/UI/Activities/BaseActivity.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Activities/BaseActivity.cs rename to src/Common.ClientLib.Droid/Application/UI/Activities/BaseActivity.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Activities/BaseSplashActivity.cs b/src/Common.ClientLib.Droid/Application/UI/Activities/BaseSplashActivity.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Activities/BaseSplashActivity.cs rename to src/Common.ClientLib.Droid/Application/UI/Activities/BaseSplashActivity.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Adapters/BaseRecycleViewAdapter.cs b/src/Common.ClientLib.Droid/Application/UI/Adapters/BaseRecycleViewAdapter.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Adapters/BaseRecycleViewAdapter.cs rename to src/Common.ClientLib.Droid/Application/UI/Adapters/BaseRecycleViewAdapter.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Adapters/BaseViewHolder.cs b/src/Common.ClientLib.Droid/Application/UI/Adapters/BaseViewHolder.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Adapters/BaseViewHolder.cs rename to src/Common.ClientLib.Droid/Application/UI/Adapters/BaseViewHolder.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Adapters/ListRecycleViewAdapter.cs b/src/Common.ClientLib.Droid/Application/UI/Adapters/ListRecycleViewAdapter.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Adapters/ListRecycleViewAdapter.cs rename to src/Common.ClientLib.Droid/Application/UI/Adapters/ListRecycleViewAdapter.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Adapters/PlatformItemClickEventArgs.cs b/src/Common.ClientLib.Droid/Application/UI/Adapters/PlatformItemClickEventArgs.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Adapters/PlatformItemClickEventArgs.cs rename to src/Common.ClientLib.Droid/Application/UI/Adapters/PlatformItemClickEventArgs.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Adapters/SortedListRecycleViewAdapter.cs b/src/Common.ClientLib.Droid/Application/UI/Adapters/SortedListRecycleViewAdapter.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Adapters/SortedListRecycleViewAdapter.cs rename to src/Common.ClientLib.Droid/Application/UI/Adapters/SortedListRecycleViewAdapter.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Adapters/ViewPagerAdapter.cs b/src/Common.ClientLib.Droid/Application/UI/Adapters/ViewPagerAdapter.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Adapters/ViewPagerAdapter.cs rename to src/Common.ClientLib.Droid/Application/UI/Adapters/ViewPagerAdapter.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Adapters/ViewPagerWithTabLayoutAdapter.cs b/src/Common.ClientLib.Droid/Application/UI/Adapters/ViewPagerWithTabLayoutAdapter.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Adapters/ViewPagerWithTabLayoutAdapter.cs rename to src/Common.ClientLib.Droid/Application/UI/Adapters/ViewPagerWithTabLayoutAdapter.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/EmojiCompatLibrary.cs b/src/Common.ClientLib.Droid/Application/UI/EmojiCompatLibrary.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/EmojiCompatLibrary.cs rename to src/Common.ClientLib.Droid/Application/UI/EmojiCompatLibrary.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/EmojiCompatLibraryConfig.cs b/src/Common.ClientLib.Droid/Application/UI/EmojiCompatLibraryConfig.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/EmojiCompatLibraryConfig.cs rename to src/Common.ClientLib.Droid/Application/UI/EmojiCompatLibraryConfig.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/EmojiFontType.cs b/src/Common.ClientLib.Droid/Application/UI/EmojiFontType.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/EmojiFontType.cs rename to src/Common.ClientLib.Droid/Application/UI/EmojiFontType.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Fragments/BaseBottomSheetDialogFragment.cs b/src/Common.ClientLib.Droid/Application/UI/Fragments/BaseBottomSheetDialogFragment.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Fragments/BaseBottomSheetDialogFragment.cs rename to src/Common.ClientLib.Droid/Application/UI/Fragments/BaseBottomSheetDialogFragment.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Fragments/BaseDialogFragment.cs b/src/Common.ClientLib.Droid/Application/UI/Fragments/BaseDialogFragment.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Fragments/BaseDialogFragment.cs rename to src/Common.ClientLib.Droid/Application/UI/Fragments/BaseDialogFragment.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Fragments/BaseFragment.cs b/src/Common.ClientLib.Droid/Application/UI/Fragments/BaseFragment.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Fragments/BaseFragment.cs rename to src/Common.ClientLib.Droid/Application/UI/Fragments/BaseFragment.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Fragments/IDialogFragment.cs b/src/Common.ClientLib.Droid/Application/UI/Fragments/IDialogFragment.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Fragments/IDialogFragment.cs rename to src/Common.ClientLib.Droid/Application/UI/Fragments/IDialogFragment.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Fragments/IFragment.cs b/src/Common.ClientLib.Droid/Application/UI/Fragments/IFragment.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Fragments/IFragment.cs rename to src/Common.ClientLib.Droid/Application/UI/Fragments/IFragment.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Fragments/ViewPagerWithTabLayoutFragment.cs b/src/Common.ClientLib.Droid/Application/UI/Fragments/ViewPagerWithTabLayoutFragment.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Fragments/ViewPagerWithTabLayoutFragment.cs rename to src/Common.ClientLib.Droid/Application/UI/Fragments/ViewPagerWithTabLayoutFragment.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Internals/IBtnBack.cs b/src/Common.ClientLib.Droid/Application/UI/Internals/IBtnBack.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Internals/IBtnBack.cs rename to src/Common.ClientLib.Droid/Application/UI/Internals/IBtnBack.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Internals/IFindViewById.cs b/src/Common.ClientLib.Droid/Application/UI/Internals/IFindViewById.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Internals/IFindViewById.cs rename to src/Common.ClientLib.Droid/Application/UI/Internals/IFindViewById.cs diff --git a/System.Common.ClientLib.Droid/Application/UI/Internals/IToolbar.cs b/src/Common.ClientLib.Droid/Application/UI/Internals/IToolbar.cs similarity index 100% rename from System.Common.ClientLib.Droid/Application/UI/Internals/IToolbar.cs rename to src/Common.ClientLib.Droid/Application/UI/Internals/IToolbar.cs diff --git a/System.Common.ClientLib.Droid/System.Common.ClientLib.Droid.csproj b/src/Common.ClientLib.Droid/Common.ClientLib.Droid.csproj similarity index 87% rename from System.Common.ClientLib.Droid/System.Common.ClientLib.Droid.csproj rename to src/Common.ClientLib.Droid/Common.ClientLib.Droid.csproj index cd8348480..fb17a8092 100644 --- a/System.Common.ClientLib.Droid/System.Common.ClientLib.Droid.csproj +++ b/src/Common.ClientLib.Droid/Common.ClientLib.Droid.csproj @@ -12,10 +12,10 @@ - + Properties\AssemblyInfo.cs - + Properties\InternalsVisibleTo.cs @@ -35,7 +35,7 @@ - + diff --git a/System.Common.ClientLib.Droid/Common/R.cs b/src/Common.ClientLib.Droid/Common/R.cs similarity index 100% rename from System.Common.ClientLib.Droid/Common/R.cs rename to src/Common.ClientLib.Droid/Common/R.cs diff --git a/System.Common.ClientLib.Droid/Diagnostics/PlatformDebuggerDisplayImpl.cs b/src/Common.ClientLib.Droid/Diagnostics/PlatformDebuggerDisplayImpl.cs similarity index 100% rename from System.Common.ClientLib.Droid/Diagnostics/PlatformDebuggerDisplayImpl.cs rename to src/Common.ClientLib.Droid/Diagnostics/PlatformDebuggerDisplayImpl.cs diff --git a/System.Common.ClientLib.Droid/Extensions/ActivityExtensions.cs b/src/Common.ClientLib.Droid/Extensions/ActivityExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/ActivityExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/ActivityExtensions.cs diff --git a/System.Common.ClientLib.Droid/Extensions/ActivityManagerExtensions.cs b/src/Common.ClientLib.Droid/Extensions/ActivityManagerExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/ActivityManagerExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/ActivityManagerExtensions.cs diff --git a/System.Common.ClientLib.Droid/Extensions/ContextExtensions.cs b/src/Common.ClientLib.Droid/Extensions/ContextExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/ContextExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/ContextExtensions.cs diff --git a/System.Common.ClientLib.Droid/Extensions/DimenUnitConverterExtensions.cs b/src/Common.ClientLib.Droid/Extensions/DimenUnitConverterExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/DimenUnitConverterExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/DimenUnitConverterExtensions.cs diff --git a/System.Common.ClientLib.Droid/Extensions/FragmentExtensions.cs b/src/Common.ClientLib.Droid/Extensions/FragmentExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/FragmentExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/FragmentExtensions.cs diff --git a/System.Common.ClientLib.Droid/Extensions/HttpClientExtensions.cs b/src/Common.ClientLib.Droid/Extensions/HttpClientExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/HttpClientExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/HttpClientExtensions.cs diff --git a/System.Common.ClientLib.Droid/Extensions/JObjectExtensions.cs b/src/Common.ClientLib.Droid/Extensions/JObjectExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/JObjectExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/JObjectExtensions.cs diff --git a/System.Common.ClientLib.Droid/Extensions/JavaExtensions.cs b/src/Common.ClientLib.Droid/Extensions/JavaExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/JavaExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/JavaExtensions.cs diff --git a/System.Common.ClientLib.Droid/Extensions/LocationManagerExtensions.cs b/src/Common.ClientLib.Droid/Extensions/LocationManagerExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/LocationManagerExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/LocationManagerExtensions.cs diff --git a/System.Common.ClientLib.Droid/Extensions/LogLevelEnumExtensions.cs b/src/Common.ClientLib.Droid/Extensions/LogLevelEnumExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/LogLevelEnumExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/LogLevelEnumExtensions.cs diff --git a/System.Common.ClientLib.Droid/Extensions/NavControllerExtensions.cs b/src/Common.ClientLib.Droid/Extensions/NavControllerExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/NavControllerExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/NavControllerExtensions.cs diff --git a/System.Common.ClientLib.Droid/Extensions/PackageManagerExtensions.cs b/src/Common.ClientLib.Droid/Extensions/PackageManagerExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/PackageManagerExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/PackageManagerExtensions.cs diff --git a/System.Common.ClientLib.Droid/Extensions/TextViewExtensions.cs b/src/Common.ClientLib.Droid/Extensions/TextViewExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/TextViewExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/TextViewExtensions.cs diff --git a/System.Common.ClientLib.Droid/Extensions/ViewExtensions.cs b/src/Common.ClientLib.Droid/Extensions/ViewExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/ViewExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/ViewExtensions.cs diff --git a/System.Common.ClientLib.Droid/Extensions/ViewPagerExtensions.cs b/src/Common.ClientLib.Droid/Extensions/ViewPagerExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/ViewPagerExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/ViewPagerExtensions.cs diff --git a/System.Common.ClientLib.Droid/Extensions/WebViewExtensions.cs b/src/Common.ClientLib.Droid/Extensions/WebViewExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/Extensions/WebViewExtensions.cs rename to src/Common.ClientLib.Droid/Extensions/WebViewExtensions.cs diff --git a/System.Common.ClientLib.Droid/JavaGenericHelper.cs b/src/Common.ClientLib.Droid/JavaGenericHelper.cs similarity index 100% rename from System.Common.ClientLib.Droid/JavaGenericHelper.cs rename to src/Common.ClientLib.Droid/JavaGenericHelper.cs diff --git a/System.Common.ClientLib.Droid/Logging/LogHelper.cs b/src/Common.ClientLib.Droid/Logging/LogHelper.cs similarity index 100% rename from System.Common.ClientLib.Droid/Logging/LogHelper.cs rename to src/Common.ClientLib.Droid/Logging/LogHelper.cs diff --git a/System.Common.ClientLib.Droid/Logging/PlatformLogger.cs b/src/Common.ClientLib.Droid/Logging/PlatformLogger.cs similarity index 100% rename from System.Common.ClientLib.Droid/Logging/PlatformLogger.cs rename to src/Common.ClientLib.Droid/Logging/PlatformLogger.cs diff --git a/System.Common.ClientLib.Droid/Logging/PlatformLoggerProvider.cs b/src/Common.ClientLib.Droid/Logging/PlatformLoggerProvider.cs similarity index 100% rename from System.Common.ClientLib.Droid/Logging/PlatformLoggerProvider.cs rename to src/Common.ClientLib.Droid/Logging/PlatformLoggerProvider.cs diff --git a/System.Common.ClientLib.Droid/Logging/ThreadUncaughtExceptionHandler.cs b/src/Common.ClientLib.Droid/Logging/ThreadUncaughtExceptionHandler.cs similarity index 100% rename from System.Common.ClientLib.Droid/Logging/ThreadUncaughtExceptionHandler.cs rename to src/Common.ClientLib.Droid/Logging/ThreadUncaughtExceptionHandler.cs diff --git a/System.Common.ClientLib.Droid/Properties/SR.Designer.cs b/src/Common.ClientLib.Droid/Properties/SR.Designer.cs similarity index 100% rename from System.Common.ClientLib.Droid/Properties/SR.Designer.cs rename to src/Common.ClientLib.Droid/Properties/SR.Designer.cs diff --git a/System.Common.ClientLib.Droid/Properties/SR.resx b/src/Common.ClientLib.Droid/Properties/SR.resx similarity index 100% rename from System.Common.ClientLib.Droid/Properties/SR.resx rename to src/Common.ClientLib.Droid/Properties/SR.resx diff --git a/System.Common.ClientLib.Droid/ServiceCollectionExtensions.cs b/src/Common.ClientLib.Droid/ServiceCollectionExtensions.cs similarity index 100% rename from System.Common.ClientLib.Droid/ServiceCollectionExtensions.cs rename to src/Common.ClientLib.Droid/ServiceCollectionExtensions.cs diff --git a/System.Common.ClientLib.Droid/SystemProperties.cs b/src/Common.ClientLib.Droid/SystemProperties.cs similarity index 100% rename from System.Common.ClientLib.Droid/SystemProperties.cs rename to src/Common.ClientLib.Droid/SystemProperties.cs diff --git a/System.Common.ClientLib.iOS/Application/Services/IPlatformNavigationService.cs b/src/Common.ClientLib.iOS/Application/Services/IPlatformNavigationService.cs similarity index 100% rename from System.Common.ClientLib.iOS/Application/Services/IPlatformNavigationService.cs rename to src/Common.ClientLib.iOS/Application/Services/IPlatformNavigationService.cs diff --git a/System.Common.ClientLib.iOS/Application/Services/Implementation/PlatformNavigationServiceImpl.cs b/src/Common.ClientLib.iOS/Application/Services/Implementation/PlatformNavigationServiceImpl.cs similarity index 100% rename from System.Common.ClientLib.iOS/Application/Services/Implementation/PlatformNavigationServiceImpl.cs rename to src/Common.ClientLib.iOS/Application/Services/Implementation/PlatformNavigationServiceImpl.cs diff --git a/System.Common.ClientLib.iOS/System.Common.ClientLib.iOS.csproj b/src/Common.ClientLib.iOS/Common.ClientLib.iOS.csproj similarity index 63% rename from System.Common.ClientLib.iOS/System.Common.ClientLib.iOS.csproj rename to src/Common.ClientLib.iOS/Common.ClientLib.iOS.csproj index f292a6f88..ba4fa7866 100644 --- a/System.Common.ClientLib.iOS/System.Common.ClientLib.iOS.csproj +++ b/src/Common.ClientLib.iOS/Common.ClientLib.iOS.csproj @@ -7,16 +7,16 @@ - + Properties\AssemblyInfo.cs - + Properties\InternalsVisibleTo.cs - + diff --git a/System.Common.ClientLib/Application/AppClientAttribute.cs b/src/Common.ClientLib/Application/AppClientAttribute.cs similarity index 100% rename from System.Common.ClientLib/Application/AppClientAttribute.cs rename to src/Common.ClientLib/Application/AppClientAttribute.cs diff --git a/System.Common.ClientLib/Application/Entities/KeyValuePair.cs b/src/Common.ClientLib/Application/Entities/KeyValuePair.cs similarity index 100% rename from System.Common.ClientLib/Application/Entities/KeyValuePair.cs rename to src/Common.ClientLib/Application/Entities/KeyValuePair.cs diff --git a/System.Common.ClientLib/Application/Models/IAppSettings.cs b/src/Common.ClientLib/Application/Models/IAppSettings.cs similarity index 100% rename from System.Common.ClientLib/Application/Models/IAppSettings.cs rename to src/Common.ClientLib/Application/Models/IAppSettings.cs diff --git a/System.Common.ClientLib/Application/Services/IEmbeddedAesDataProtectionProvider.cs b/src/Common.ClientLib/Application/Services/IEmbeddedAesDataProtectionProvider.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/IEmbeddedAesDataProtectionProvider.cs rename to src/Common.ClientLib/Application/Services/IEmbeddedAesDataProtectionProvider.cs diff --git a/System.Common.ClientLib/Application/Services/ILocalDataProtectionProvider.cs b/src/Common.ClientLib/Application/Services/ILocalDataProtectionProvider.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/ILocalDataProtectionProvider.cs rename to src/Common.ClientLib/Application/Services/ILocalDataProtectionProvider.cs diff --git a/System.Common.ClientLib/Application/Services/INavigationService.cs b/src/Common.ClientLib/Application/Services/INavigationService.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/INavigationService.cs rename to src/Common.ClientLib/Application/Services/INavigationService.cs diff --git a/System.Common.ClientLib/Application/Services/INotificationService.cs b/src/Common.ClientLib/Application/Services/INotificationService.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/INotificationService.cs rename to src/Common.ClientLib/Application/Services/INotificationService.cs diff --git a/System.Common.ClientLib/Application/Services/IPermissions.cs b/src/Common.ClientLib/Application/Services/IPermissions.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/IPermissions.cs rename to src/Common.ClientLib/Application/Services/IPermissions.cs diff --git a/System.Common.ClientLib/Application/Services/ISecondaryPasswordDataProtectionProvider.cs b/src/Common.ClientLib/Application/Services/ISecondaryPasswordDataProtectionProvider.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/ISecondaryPasswordDataProtectionProvider.cs rename to src/Common.ClientLib/Application/Services/ISecondaryPasswordDataProtectionProvider.cs diff --git a/System.Common.ClientLib/Application/Services/ISecurityService.cs b/src/Common.ClientLib/Application/Services/ISecurityService.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/ISecurityService.cs rename to src/Common.ClientLib/Application/Services/ISecurityService.cs diff --git a/System.Common.ClientLib/Application/Services/ITelephonyService.cs b/src/Common.ClientLib/Application/Services/ITelephonyService.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/ITelephonyService.cs rename to src/Common.ClientLib/Application/Services/ITelephonyService.cs diff --git a/System.Common.ClientLib/Application/Services/IToast.cs b/src/Common.ClientLib/Application/Services/IToast.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/IToast.cs rename to src/Common.ClientLib/Application/Services/IToast.cs diff --git a/System.Common.ClientLib/Application/Services/IToastIntercept.cs b/src/Common.ClientLib/Application/Services/IToastIntercept.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/IToastIntercept.cs rename to src/Common.ClientLib/Application/Services/IToastIntercept.cs diff --git a/System.Common.ClientLib/Application/Services/Implementation/EmbeddedAesDataProtectionProviderBase.cs b/src/Common.ClientLib/Application/Services/Implementation/EmbeddedAesDataProtectionProviderBase.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/Implementation/EmbeddedAesDataProtectionProviderBase.cs rename to src/Common.ClientLib/Application/Services/Implementation/EmbeddedAesDataProtectionProviderBase.cs diff --git a/System.Common.ClientLib/Application/Services/Implementation/LocalDataProtectionProviderBase.cs b/src/Common.ClientLib/Application/Services/Implementation/LocalDataProtectionProviderBase.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/Implementation/LocalDataProtectionProviderBase.cs rename to src/Common.ClientLib/Application/Services/Implementation/LocalDataProtectionProviderBase.cs diff --git a/System.Common.ClientLib/Application/Services/Implementation/NoneToastIntercept.cs b/src/Common.ClientLib/Application/Services/Implementation/NoneToastIntercept.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/Implementation/NoneToastIntercept.cs rename to src/Common.ClientLib/Application/Services/Implementation/NoneToastIntercept.cs diff --git a/System.Common.ClientLib/Application/Services/Implementation/PermissionsImpl.cs b/src/Common.ClientLib/Application/Services/Implementation/PermissionsImpl.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/Implementation/PermissionsImpl.cs rename to src/Common.ClientLib/Application/Services/Implementation/PermissionsImpl.cs diff --git a/System.Common.ClientLib/Application/Services/Implementation/SecondaryPasswordDataProtectionProvider.cs b/src/Common.ClientLib/Application/Services/Implementation/SecondaryPasswordDataProtectionProvider.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/Implementation/SecondaryPasswordDataProtectionProvider.cs rename to src/Common.ClientLib/Application/Services/Implementation/SecondaryPasswordDataProtectionProvider.cs diff --git a/System.Common.ClientLib/Application/Services/Implementation/SecurityService.cs b/src/Common.ClientLib/Application/Services/Implementation/SecurityService.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/Implementation/SecurityService.cs rename to src/Common.ClientLib/Application/Services/Implementation/SecurityService.cs diff --git a/System.Common.ClientLib/Application/Services/Implementation/TelephonyServiceImpl.cs b/src/Common.ClientLib/Application/Services/Implementation/TelephonyServiceImpl.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/Implementation/TelephonyServiceImpl.cs rename to src/Common.ClientLib/Application/Services/Implementation/TelephonyServiceImpl.cs diff --git a/System.Common.ClientLib/Application/Services/Implementation/ToastImpl.cs b/src/Common.ClientLib/Application/Services/Implementation/ToastImpl.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/Implementation/ToastImpl.cs rename to src/Common.ClientLib/Application/Services/Implementation/ToastImpl.cs diff --git a/System.Common.ClientLib/Application/Services/NotificationImportanceLevel.cs b/src/Common.ClientLib/Application/Services/NotificationImportanceLevel.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/NotificationImportanceLevel.cs rename to src/Common.ClientLib/Application/Services/NotificationImportanceLevel.cs diff --git a/System.Common.ClientLib/Application/Services/PushFlags.cs b/src/Common.ClientLib/Application/Services/PushFlags.cs similarity index 100% rename from System.Common.ClientLib/Application/Services/PushFlags.cs rename to src/Common.ClientLib/Application/Services/PushFlags.cs diff --git a/System.Common.ClientLib/Application/UI/Adapters/IAdapter.cs b/src/Common.ClientLib/Application/UI/Adapters/IAdapter.cs similarity index 100% rename from System.Common.ClientLib/Application/UI/Adapters/IAdapter.cs rename to src/Common.ClientLib/Application/UI/Adapters/IAdapter.cs diff --git a/System.Common.ClientLib/Application/UI/Adapters/ICreateViewModels.cs b/src/Common.ClientLib/Application/UI/Adapters/ICreateViewModels.cs similarity index 100% rename from System.Common.ClientLib/Application/UI/Adapters/ICreateViewModels.cs rename to src/Common.ClientLib/Application/UI/Adapters/ICreateViewModels.cs diff --git a/System.Common.ClientLib/Application/UI/Adapters/ItemClickEventArgs.cs b/src/Common.ClientLib/Application/UI/Adapters/ItemClickEventArgs.cs similarity index 100% rename from System.Common.ClientLib/Application/UI/Adapters/ItemClickEventArgs.cs rename to src/Common.ClientLib/Application/UI/Adapters/ItemClickEventArgs.cs diff --git a/System.Common.ClientLib/System.Common.ClientLib.csproj b/src/Common.ClientLib/Common.ClientLib.csproj similarity index 53% rename from System.Common.ClientLib/System.Common.ClientLib.csproj rename to src/Common.ClientLib/Common.ClientLib.csproj index 698efea42..40128484d 100644 --- a/System.Common.ClientLib/System.Common.ClientLib.csproj +++ b/src/Common.ClientLib/Common.ClientLib.csproj @@ -7,16 +7,16 @@ - + Properties\AssemblyInfo.cs - + Properties\InternalsVisibleTo.cs - - + + \ No newline at end of file diff --git a/System.Common.ClientLib/Logging/ClientLogger.cs b/src/Common.ClientLib/Logging/ClientLogger.cs similarity index 100% rename from System.Common.ClientLib/Logging/ClientLogger.cs rename to src/Common.ClientLib/Logging/ClientLogger.cs diff --git a/System.Common.ClientLib/Logging/NullScope.cs b/src/Common.ClientLib/Logging/NullScope.cs similarity index 100% rename from System.Common.ClientLib/Logging/NullScope.cs rename to src/Common.ClientLib/Logging/NullScope.cs diff --git a/System.Common.ClientLib/Security/ClientStorage.cs b/src/Common.ClientLib/Security/ClientStorage.cs similarity index 100% rename from System.Common.ClientLib/Security/ClientStorage.cs rename to src/Common.ClientLib/Security/ClientStorage.cs diff --git a/System.Common.ClientLib/Security/DesktopClientStorage.cs b/src/Common.ClientLib/Security/DesktopClientStorage.cs similarity index 100% rename from System.Common.ClientLib/Security/DesktopClientStorage.cs rename to src/Common.ClientLib/Security/DesktopClientStorage.cs diff --git a/System.Common.ClientLib/Security/EncryptionMode.cs b/src/Common.ClientLib/Security/EncryptionMode.cs similarity index 100% rename from System.Common.ClientLib/Security/EncryptionMode.cs rename to src/Common.ClientLib/Security/EncryptionMode.cs diff --git a/System.Common.ClientLib/ServiceCollectionExtensions.cs b/src/Common.ClientLib/ServiceCollectionExtensions.cs similarity index 100% rename from System.Common.ClientLib/ServiceCollectionExtensions.cs rename to src/Common.ClientLib/ServiceCollectionExtensions.cs diff --git a/System.Common.ClientLib/Toast.cs b/src/Common.ClientLib/Toast.cs similarity index 100% rename from System.Common.ClientLib/Toast.cs rename to src/Common.ClientLib/Toast.cs diff --git a/System.Common.ClientLib/ToastLength.cs b/src/Common.ClientLib/ToastLength.cs similarity index 100% rename from System.Common.ClientLib/ToastLength.cs rename to src/Common.ClientLib/ToastLength.cs diff --git a/System.Common.CoreLib/Application/BirthDateHelper.cs b/src/Common.CoreLib/Application/BirthDateHelper.cs similarity index 100% rename from System.Common.CoreLib/Application/BirthDateHelper.cs rename to src/Common.CoreLib/Application/BirthDateHelper.cs diff --git a/System.Common.CoreLib/Application/Columns/IAvatar.cs b/src/Common.CoreLib/Application/Columns/IAvatar.cs similarity index 100% rename from System.Common.CoreLib/Application/Columns/IAvatar.cs rename to src/Common.CoreLib/Application/Columns/IAvatar.cs diff --git a/System.Common.CoreLib/Application/Columns/IBirthDate.cs b/src/Common.CoreLib/Application/Columns/IBirthDate.cs similarity index 100% rename from System.Common.CoreLib/Application/Columns/IBirthDate.cs rename to src/Common.CoreLib/Application/Columns/IBirthDate.cs diff --git a/System.Common.CoreLib/Application/Columns/ICreationTime.cs b/src/Common.CoreLib/Application/Columns/ICreationTime.cs similarity index 100% rename from System.Common.CoreLib/Application/Columns/ICreationTime.cs rename to src/Common.CoreLib/Application/Columns/ICreationTime.cs diff --git a/System.Common.CoreLib/Application/Columns/IGender.cs b/src/Common.CoreLib/Application/Columns/IGender.cs similarity index 100% rename from System.Common.CoreLib/Application/Columns/IGender.cs rename to src/Common.CoreLib/Application/Columns/IGender.cs diff --git a/System.Common.CoreLib/Application/Columns/IOrder.cs b/src/Common.CoreLib/Application/Columns/IOrder.cs similarity index 100% rename from System.Common.CoreLib/Application/Columns/IOrder.cs rename to src/Common.CoreLib/Application/Columns/IOrder.cs diff --git a/System.Common.CoreLib/Application/Columns/IPAddress.cs b/src/Common.CoreLib/Application/Columns/IPAddress.cs similarity index 100% rename from System.Common.CoreLib/Application/Columns/IPAddress.cs rename to src/Common.CoreLib/Application/Columns/IPAddress.cs diff --git a/System.Common.CoreLib/Application/Columns/IPassword.cs b/src/Common.CoreLib/Application/Columns/IPassword.cs similarity index 100% rename from System.Common.CoreLib/Application/Columns/IPassword.cs rename to src/Common.CoreLib/Application/Columns/IPassword.cs diff --git a/System.Common.CoreLib/Application/Columns/IPhoneNumber.cs b/src/Common.CoreLib/Application/Columns/IPhoneNumber.cs similarity index 100% rename from System.Common.CoreLib/Application/Columns/IPhoneNumber.cs rename to src/Common.CoreLib/Application/Columns/IPhoneNumber.cs diff --git a/System.Common.CoreLib/Application/Columns/IResult.cs b/src/Common.CoreLib/Application/Columns/IResult.cs similarity index 100% rename from System.Common.CoreLib/Application/Columns/IResult.cs rename to src/Common.CoreLib/Application/Columns/IResult.cs diff --git a/System.Common.CoreLib/Application/Columns/ISoftDeleted.cs b/src/Common.CoreLib/Application/Columns/ISoftDeleted.cs similarity index 100% rename from System.Common.CoreLib/Application/Columns/ISoftDeleted.cs rename to src/Common.CoreLib/Application/Columns/ISoftDeleted.cs diff --git a/System.Common.CoreLib/Application/Entities/IEntity.cs b/src/Common.CoreLib/Application/Entities/IEntity.cs similarity index 100% rename from System.Common.CoreLib/Application/Entities/IEntity.cs rename to src/Common.CoreLib/Application/Entities/IEntity.cs diff --git a/System.Common.CoreLib/Application/Gender.cs b/src/Common.CoreLib/Application/Gender.cs similarity index 100% rename from System.Common.CoreLib/Application/Gender.cs rename to src/Common.CoreLib/Application/Gender.cs diff --git a/System.Common.CoreLib/Application/Models/IExplicitHasValue.cs b/src/Common.CoreLib/Application/Models/IExplicitHasValue.cs similarity index 100% rename from System.Common.CoreLib/Application/Models/IExplicitHasValue.cs rename to src/Common.CoreLib/Application/Models/IExplicitHasValue.cs diff --git a/System.Common.CoreLib/Application/Models/IPagedModel.cs b/src/Common.CoreLib/Application/Models/IPagedModel.cs similarity index 100% rename from System.Common.CoreLib/Application/Models/IPagedModel.cs rename to src/Common.CoreLib/Application/Models/IPagedModel.cs diff --git a/System.Common.CoreLib/Application/Models/JWTEntity.cs b/src/Common.CoreLib/Application/Models/JWTEntity.cs similarity index 100% rename from System.Common.CoreLib/Application/Models/JWTEntity.cs rename to src/Common.CoreLib/Application/Models/JWTEntity.cs diff --git a/System.Common.CoreLib/Application/Models/JsonModel.cs b/src/Common.CoreLib/Application/Models/JsonModel.cs similarity index 100% rename from System.Common.CoreLib/Application/Models/JsonModel.cs rename to src/Common.CoreLib/Application/Models/JsonModel.cs diff --git a/System.Common.CoreLib/Application/Models/PagedModel.cs b/src/Common.CoreLib/Application/Models/PagedModel.cs similarity index 100% rename from System.Common.CoreLib/Application/Models/PagedModel.cs rename to src/Common.CoreLib/Application/Models/PagedModel.cs diff --git a/System.Common.CoreLib/Application/PhoneNumberHelper.cs b/src/Common.CoreLib/Application/PhoneNumberHelper.cs similarity index 100% rename from System.Common.CoreLib/Application/PhoneNumberHelper.cs rename to src/Common.CoreLib/Application/PhoneNumberHelper.cs diff --git a/System.Common.CoreLib/Application/Repositories/DbRowExecResult.cs b/src/Common.CoreLib/Application/Repositories/DbRowExecResult.cs similarity index 100% rename from System.Common.CoreLib/Application/Repositories/DbRowExecResult.cs rename to src/Common.CoreLib/Application/Repositories/DbRowExecResult.cs diff --git a/System.Common.CoreLib/Application/Repositories/IGetPrimaryKey.cs b/src/Common.CoreLib/Application/Repositories/IGetPrimaryKey.cs similarity index 100% rename from System.Common.CoreLib/Application/Repositories/IGetPrimaryKey.cs rename to src/Common.CoreLib/Application/Repositories/IGetPrimaryKey.cs diff --git a/System.Common.CoreLib/Application/Repositories/IRepository.cs b/src/Common.CoreLib/Application/Repositories/IRepository.cs similarity index 100% rename from System.Common.CoreLib/Application/Repositories/IRepository.cs rename to src/Common.CoreLib/Application/Repositories/IRepository.cs diff --git a/System.Common.CoreLib/Application/Services/IModelValidator.cs b/src/Common.CoreLib/Application/Services/IModelValidator.cs similarity index 100% rename from System.Common.CoreLib/Application/Services/IModelValidator.cs rename to src/Common.CoreLib/Application/Services/IModelValidator.cs diff --git a/System.Common.CoreLib/Application/Services/Implementation/ModelValidator.cs b/src/Common.CoreLib/Application/Services/Implementation/ModelValidator.cs similarity index 100% rename from System.Common.CoreLib/Application/Services/Implementation/ModelValidator.cs rename to src/Common.CoreLib/Application/Services/Implementation/ModelValidator.cs diff --git a/System.Common.CoreLib/Application/UI/ViewModels/IReadOnlyItemViewType.cs b/src/Common.CoreLib/Application/UI/ViewModels/IReadOnlyItemViewType.cs similarity index 100% rename from System.Common.CoreLib/Application/UI/ViewModels/IReadOnlyItemViewType.cs rename to src/Common.CoreLib/Application/UI/ViewModels/IReadOnlyItemViewType.cs diff --git a/System.Common.CoreLib/Application/UI/ViewModels/RichText/Alignment.cs b/src/Common.CoreLib/Application/UI/ViewModels/RichText/Alignment.cs similarity index 100% rename from System.Common.CoreLib/Application/UI/ViewModels/RichText/Alignment.cs rename to src/Common.CoreLib/Application/UI/ViewModels/RichText/Alignment.cs diff --git a/System.Common.CoreLib/Application/UI/ViewModels/RichText/FontStyle.cs b/src/Common.CoreLib/Application/UI/ViewModels/RichText/FontStyle.cs similarity index 100% rename from System.Common.CoreLib/Application/UI/ViewModels/RichText/FontStyle.cs rename to src/Common.CoreLib/Application/UI/ViewModels/RichText/FontStyle.cs diff --git a/System.Common.CoreLib/Application/UI/ViewModels/RichText/SpanViewModel.cs b/src/Common.CoreLib/Application/UI/ViewModels/RichText/SpanViewModel.cs similarity index 100% rename from System.Common.CoreLib/Application/UI/ViewModels/RichText/SpanViewModel.cs rename to src/Common.CoreLib/Application/UI/ViewModels/RichText/SpanViewModel.cs diff --git a/System.Common.CoreLib/Application/UI/ViewModels/RichText/TextViewModel.cs b/src/Common.CoreLib/Application/UI/ViewModels/RichText/TextViewModel.cs similarity index 100% rename from System.Common.CoreLib/Application/UI/ViewModels/RichText/TextViewModel.cs rename to src/Common.CoreLib/Application/UI/ViewModels/RichText/TextViewModel.cs diff --git a/System.Common.CoreLib/ArchitectureFlags.cs b/src/Common.CoreLib/ArchitectureFlags.cs similarity index 100% rename from System.Common.CoreLib/ArchitectureFlags.cs rename to src/Common.CoreLib/ArchitectureFlags.cs diff --git a/System.Common.CoreLib/CodeValuePair.cs b/src/Common.CoreLib/CodeValuePair.cs similarity index 100% rename from System.Common.CoreLib/CodeValuePair.cs rename to src/Common.CoreLib/CodeValuePair.cs diff --git a/System.Common.CoreLib/Collections/Generic/SortedList.cs b/src/Common.CoreLib/Collections/Generic/SortedList.cs similarity index 100% rename from System.Common.CoreLib/Collections/Generic/SortedList.cs rename to src/Common.CoreLib/Collections/Generic/SortedList.cs diff --git a/System.Common.CoreLib/System.Common.CoreLib.csproj b/src/Common.CoreLib/Common.CoreLib.csproj similarity index 100% rename from System.Common.CoreLib/System.Common.CoreLib.csproj rename to src/Common.CoreLib/Common.CoreLib.csproj diff --git a/System.Common.CoreLib/Common/Constants.cs b/src/Common.CoreLib/Common/Constants.cs similarity index 100% rename from System.Common.CoreLib/Common/Constants.cs rename to src/Common.CoreLib/Common/Constants.cs diff --git a/System.Common.CoreLib/ComponentModel/EnumDescriptionTypeConverter.cs b/src/Common.CoreLib/ComponentModel/EnumDescriptionTypeConverter.cs similarity index 100% rename from System.Common.CoreLib/ComponentModel/EnumDescriptionTypeConverter.cs rename to src/Common.CoreLib/ComponentModel/EnumDescriptionTypeConverter.cs diff --git a/System.Common.CoreLib/DI.cs b/src/Common.CoreLib/DI.cs similarity index 100% rename from System.Common.CoreLib/DI.cs rename to src/Common.CoreLib/DI.cs diff --git a/System.Common.CoreLib/DateTimeFormat.cs b/src/Common.CoreLib/DateTimeFormat.cs similarity index 100% rename from System.Common.CoreLib/DateTimeFormat.cs rename to src/Common.CoreLib/DateTimeFormat.cs diff --git a/System.Common.CoreLib/DeviceIdiom.cs b/src/Common.CoreLib/DeviceIdiom.cs similarity index 100% rename from System.Common.CoreLib/DeviceIdiom.cs rename to src/Common.CoreLib/DeviceIdiom.cs diff --git a/System.Common.CoreLib/Diagnostics/IDebuggerDisplay.cs b/src/Common.CoreLib/Diagnostics/IDebuggerDisplay.cs similarity index 100% rename from System.Common.CoreLib/Diagnostics/IDebuggerDisplay.cs rename to src/Common.CoreLib/Diagnostics/IDebuggerDisplay.cs diff --git a/System.Common.CoreLib/Enum2.cs b/src/Common.CoreLib/Enum2.cs similarity index 100% rename from System.Common.CoreLib/Enum2.cs rename to src/Common.CoreLib/Enum2.cs diff --git a/System.Common.CoreLib/Extensions/ByteArrayExtensions.cs b/src/Common.CoreLib/Extensions/ByteArrayExtensions.cs similarity index 100% rename from System.Common.CoreLib/Extensions/ByteArrayExtensions.cs rename to src/Common.CoreLib/Extensions/ByteArrayExtensions.cs diff --git a/System.Common.CoreLib/Extensions/DayOfWeekEnumExtensions.cs b/src/Common.CoreLib/Extensions/DayOfWeekEnumExtensions.cs similarity index 100% rename from System.Common.CoreLib/Extensions/DayOfWeekEnumExtensions.cs rename to src/Common.CoreLib/Extensions/DayOfWeekEnumExtensions.cs diff --git a/System.Common.CoreLib/Extensions/EnumExtensions.cs b/src/Common.CoreLib/Extensions/EnumExtensions.cs similarity index 100% rename from System.Common.CoreLib/Extensions/EnumExtensions.cs rename to src/Common.CoreLib/Extensions/EnumExtensions.cs diff --git a/System.Common.CoreLib/Extensions/EnumerableExtensions.cs b/src/Common.CoreLib/Extensions/EnumerableExtensions.cs similarity index 100% rename from System.Common.CoreLib/Extensions/EnumerableExtensions.cs rename to src/Common.CoreLib/Extensions/EnumerableExtensions.cs diff --git a/System.Common.CoreLib/Extensions/ExceptionExtensions.cs b/src/Common.CoreLib/Extensions/ExceptionExtensions.cs similarity index 100% rename from System.Common.CoreLib/Extensions/ExceptionExtensions.cs rename to src/Common.CoreLib/Extensions/ExceptionExtensions.cs diff --git a/System.Common.CoreLib/Extensions/GuidExtensions.cs b/src/Common.CoreLib/Extensions/GuidExtensions.cs similarity index 100% rename from System.Common.CoreLib/Extensions/GuidExtensions.cs rename to src/Common.CoreLib/Extensions/GuidExtensions.cs diff --git a/System.Common.CoreLib/Extensions/MatchExtensions.cs b/src/Common.CoreLib/Extensions/MatchExtensions.cs similarity index 100% rename from System.Common.CoreLib/Extensions/MatchExtensions.cs rename to src/Common.CoreLib/Extensions/MatchExtensions.cs diff --git a/System.Common.CoreLib/Extensions/ObjectExtensions.cs b/src/Common.CoreLib/Extensions/ObjectExtensions.cs similarity index 100% rename from System.Common.CoreLib/Extensions/ObjectExtensions.cs rename to src/Common.CoreLib/Extensions/ObjectExtensions.cs diff --git a/System.Common.CoreLib/Extensions/PermissionStatusEnumExtensions.cs b/src/Common.CoreLib/Extensions/PermissionStatusEnumExtensions.cs similarity index 100% rename from System.Common.CoreLib/Extensions/PermissionStatusEnumExtensions.cs rename to src/Common.CoreLib/Extensions/PermissionStatusEnumExtensions.cs diff --git a/System.Common.CoreLib/Extensions/ReflectionExtensions.cs b/src/Common.CoreLib/Extensions/ReflectionExtensions.cs similarity index 100% rename from System.Common.CoreLib/Extensions/ReflectionExtensions.cs rename to src/Common.CoreLib/Extensions/ReflectionExtensions.cs diff --git a/System.Common.CoreLib/Extensions/SingleExtensions.cs b/src/Common.CoreLib/Extensions/SingleExtensions.cs similarity index 100% rename from System.Common.CoreLib/Extensions/SingleExtensions.cs rename to src/Common.CoreLib/Extensions/SingleExtensions.cs diff --git a/System.Common.CoreLib/Extensions/StreamExtensions.cs b/src/Common.CoreLib/Extensions/StreamExtensions.cs similarity index 100% rename from System.Common.CoreLib/Extensions/StreamExtensions.cs rename to src/Common.CoreLib/Extensions/StreamExtensions.cs diff --git a/System.Common.CoreLib/Extensions/StringExtensions.Enhance.cs b/src/Common.CoreLib/Extensions/StringExtensions.Enhance.cs similarity index 100% rename from System.Common.CoreLib/Extensions/StringExtensions.Enhance.cs rename to src/Common.CoreLib/Extensions/StringExtensions.Enhance.cs diff --git a/System.Common.CoreLib/Extensions/StringExtensions.Trim.cs b/src/Common.CoreLib/Extensions/StringExtensions.Trim.cs similarity index 100% rename from System.Common.CoreLib/Extensions/StringExtensions.Trim.cs rename to src/Common.CoreLib/Extensions/StringExtensions.Trim.cs diff --git a/System.Common.CoreLib/Extensions/StringExtensions.cs b/src/Common.CoreLib/Extensions/StringExtensions.cs similarity index 100% rename from System.Common.CoreLib/Extensions/StringExtensions.cs rename to src/Common.CoreLib/Extensions/StringExtensions.cs diff --git a/System.Common.CoreLib/Extensions/TaskExtensions.cs b/src/Common.CoreLib/Extensions/TaskExtensions.cs similarity index 100% rename from System.Common.CoreLib/Extensions/TaskExtensions.cs rename to src/Common.CoreLib/Extensions/TaskExtensions.cs diff --git a/System.Common.CoreLib/FileEx.cs b/src/Common.CoreLib/FileEx.cs similarity index 100% rename from System.Common.CoreLib/FileEx.cs rename to src/Common.CoreLib/FileEx.cs diff --git a/System.Common.CoreLib/IO/FileFormats/AudioFormat.cs b/src/Common.CoreLib/IO/FileFormats/AudioFormat.cs similarity index 100% rename from System.Common.CoreLib/IO/FileFormats/AudioFormat.cs rename to src/Common.CoreLib/IO/FileFormats/AudioFormat.cs diff --git a/System.Common.CoreLib/IO/FileFormats/FileFormat.MagicNumber.cs b/src/Common.CoreLib/IO/FileFormats/FileFormat.MagicNumber.cs similarity index 100% rename from System.Common.CoreLib/IO/FileFormats/FileFormat.MagicNumber.cs rename to src/Common.CoreLib/IO/FileFormats/FileFormat.MagicNumber.cs diff --git a/System.Common.CoreLib/IO/FileFormats/FileFormat.cs b/src/Common.CoreLib/IO/FileFormats/FileFormat.cs similarity index 100% rename from System.Common.CoreLib/IO/FileFormats/FileFormat.cs rename to src/Common.CoreLib/IO/FileFormats/FileFormat.cs diff --git a/System.Common.CoreLib/IO/FileFormats/ImageFormat.cs b/src/Common.CoreLib/IO/FileFormats/ImageFormat.cs similarity index 100% rename from System.Common.CoreLib/IO/FileFormats/ImageFormat.cs rename to src/Common.CoreLib/IO/FileFormats/ImageFormat.cs diff --git a/System.Common.CoreLib/IO/FileFormats/Internals/DataBaseFileFormat.SQLite3.cs b/src/Common.CoreLib/IO/FileFormats/Internals/DataBaseFileFormat.SQLite3.cs similarity index 100% rename from System.Common.CoreLib/IO/FileFormats/Internals/DataBaseFileFormat.SQLite3.cs rename to src/Common.CoreLib/IO/FileFormats/Internals/DataBaseFileFormat.SQLite3.cs diff --git a/System.Common.CoreLib/IO/FileFormats/Internals/DataBaseFileFormat.cs b/src/Common.CoreLib/IO/FileFormats/Internals/DataBaseFileFormat.cs similarity index 100% rename from System.Common.CoreLib/IO/FileFormats/Internals/DataBaseFileFormat.cs rename to src/Common.CoreLib/IO/FileFormats/Internals/DataBaseFileFormat.cs diff --git a/System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.BMP.cs b/src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.BMP.cs similarity index 100% rename from System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.BMP.cs rename to src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.BMP.cs diff --git a/System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.GIF.cs b/src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.GIF.cs similarity index 100% rename from System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.GIF.cs rename to src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.GIF.cs diff --git a/System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.HEIF_HEIC.cs b/src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.HEIF_HEIC.cs similarity index 100% rename from System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.HEIF_HEIC.cs rename to src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.HEIF_HEIC.cs diff --git a/System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.ICO.cs b/src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.ICO.cs similarity index 100% rename from System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.ICO.cs rename to src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.ICO.cs diff --git a/System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.JPG.cs b/src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.JPG.cs similarity index 100% rename from System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.JPG.cs rename to src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.JPG.cs diff --git a/System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.PNG.cs b/src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.PNG.cs similarity index 100% rename from System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.PNG.cs rename to src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.PNG.cs diff --git a/System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.WebP.cs b/src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.WebP.cs similarity index 100% rename from System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.WebP.cs rename to src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.WebP.cs diff --git a/System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.cs b/src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.cs similarity index 100% rename from System.Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.cs rename to src/Common.CoreLib/IO/FileFormats/Internals/ImageFileFormat.cs diff --git a/System.Common.CoreLib/IOPath.cs b/src/Common.CoreLib/IOPath.cs similarity index 100% rename from System.Common.CoreLib/IOPath.cs rename to src/Common.CoreLib/IOPath.cs diff --git a/System.Common.CoreLib/Linq/Expressions/ExpressionHelper.cs b/src/Common.CoreLib/Linq/Expressions/ExpressionHelper.cs similarity index 100% rename from System.Common.CoreLib/Linq/Expressions/ExpressionHelper.cs rename to src/Common.CoreLib/Linq/Expressions/ExpressionHelper.cs diff --git a/System.Common.CoreLib/Log.cs b/src/Common.CoreLib/Log.cs similarity index 100% rename from System.Common.CoreLib/Log.cs rename to src/Common.CoreLib/Log.cs diff --git a/System.Common.CoreLib/MediaTypeNames.cs b/src/Common.CoreLib/MediaTypeNames.cs similarity index 100% rename from System.Common.CoreLib/MediaTypeNames.cs rename to src/Common.CoreLib/MediaTypeNames.cs diff --git a/System.Common.CoreLib/Net/Http/GeneralHttpClientFactory.cs b/src/Common.CoreLib/Net/Http/GeneralHttpClientFactory.cs similarity index 100% rename from System.Common.CoreLib/Net/Http/GeneralHttpClientFactory.cs rename to src/Common.CoreLib/Net/Http/GeneralHttpClientFactory.cs diff --git a/System.Common.CoreLib/Net/Http/HttpPlatformHelper.cs b/src/Common.CoreLib/Net/Http/HttpPlatformHelper.cs similarity index 100% rename from System.Common.CoreLib/Net/Http/HttpPlatformHelper.cs rename to src/Common.CoreLib/Net/Http/HttpPlatformHelper.cs diff --git a/System.Common.CoreLib/Net/Http/IHttpPlatformHelper.cs b/src/Common.CoreLib/Net/Http/IHttpPlatformHelper.cs similarity index 100% rename from System.Common.CoreLib/Net/Http/IHttpPlatformHelper.cs rename to src/Common.CoreLib/Net/Http/IHttpPlatformHelper.cs diff --git a/System.Common.CoreLib/NumberToInt32Format.cs b/src/Common.CoreLib/NumberToInt32Format.cs similarity index 100% rename from System.Common.CoreLib/NumberToInt32Format.cs rename to src/Common.CoreLib/NumberToInt32Format.cs diff --git a/System.Common.CoreLib/Platform.cs b/src/Common.CoreLib/Platform.cs similarity index 100% rename from System.Common.CoreLib/Platform.cs rename to src/Common.CoreLib/Platform.cs diff --git a/System.Common.CoreLib/Properties/AssemblyInfo.cs b/src/Common.CoreLib/Properties/AssemblyInfo.cs similarity index 100% rename from System.Common.CoreLib/Properties/AssemblyInfo.cs rename to src/Common.CoreLib/Properties/AssemblyInfo.cs diff --git a/System.Common.CoreLib/Properties/InternalsVisibleTo.cs b/src/Common.CoreLib/Properties/InternalsVisibleTo.cs similarity index 100% rename from System.Common.CoreLib/Properties/InternalsVisibleTo.cs rename to src/Common.CoreLib/Properties/InternalsVisibleTo.cs diff --git a/System.Common.CoreLib/Properties/SR.Designer.cs b/src/Common.CoreLib/Properties/SR.Designer.cs similarity index 100% rename from System.Common.CoreLib/Properties/SR.Designer.cs rename to src/Common.CoreLib/Properties/SR.Designer.cs diff --git a/System.Common.CoreLib/Properties/SR.en.resx b/src/Common.CoreLib/Properties/SR.en.resx similarity index 100% rename from System.Common.CoreLib/Properties/SR.en.resx rename to src/Common.CoreLib/Properties/SR.en.resx diff --git a/System.Common.CoreLib/Properties/SR.ja.resx b/src/Common.CoreLib/Properties/SR.ja.resx similarity index 100% rename from System.Common.CoreLib/Properties/SR.ja.resx rename to src/Common.CoreLib/Properties/SR.ja.resx diff --git a/System.Common.CoreLib/Properties/SR.ko.resx b/src/Common.CoreLib/Properties/SR.ko.resx similarity index 100% rename from System.Common.CoreLib/Properties/SR.ko.resx rename to src/Common.CoreLib/Properties/SR.ko.resx diff --git a/System.Common.CoreLib/Properties/SR.resx b/src/Common.CoreLib/Properties/SR.resx similarity index 100% rename from System.Common.CoreLib/Properties/SR.resx rename to src/Common.CoreLib/Properties/SR.resx diff --git a/System.Common.CoreLib/Properties/SR.ru.resx b/src/Common.CoreLib/Properties/SR.ru.resx similarity index 100% rename from System.Common.CoreLib/Properties/SR.ru.resx rename to src/Common.CoreLib/Properties/SR.ru.resx diff --git a/System.Common.CoreLib/Properties/SR.zh-Hant.resx b/src/Common.CoreLib/Properties/SR.zh-Hant.resx similarity index 100% rename from System.Common.CoreLib/Properties/SR.zh-Hant.resx rename to src/Common.CoreLib/Properties/SR.zh-Hant.resx diff --git a/System.Common.CoreLib/Properties/ThisAssembly.cs b/src/Common.CoreLib/Properties/ThisAssembly.cs similarity index 100% rename from System.Common.CoreLib/Properties/ThisAssembly.cs rename to src/Common.CoreLib/Properties/ThisAssembly.cs diff --git a/System.Common.CoreLib/Random2.cs b/src/Common.CoreLib/Random2.cs similarity index 100% rename from System.Common.CoreLib/Random2.cs rename to src/Common.CoreLib/Random2.cs diff --git a/System.Common.CoreLib/Security/Cryptography/AESUtils.cs b/src/Common.CoreLib/Security/Cryptography/AESUtils.cs similarity index 100% rename from System.Common.CoreLib/Security/Cryptography/AESUtils.cs rename to src/Common.CoreLib/Security/Cryptography/AESUtils.cs diff --git a/System.Common.CoreLib/Security/Cryptography/Hashs.cs b/src/Common.CoreLib/Security/Cryptography/Hashs.cs similarity index 100% rename from System.Common.CoreLib/Security/Cryptography/Hashs.cs rename to src/Common.CoreLib/Security/Cryptography/Hashs.cs diff --git a/System.Common.CoreLib/Security/Cryptography/Hashs_Crc32.cs b/src/Common.CoreLib/Security/Cryptography/Hashs_Crc32.cs similarity index 100% rename from System.Common.CoreLib/Security/Cryptography/Hashs_Crc32.cs rename to src/Common.CoreLib/Security/Cryptography/Hashs_Crc32.cs diff --git a/System.Common.CoreLib/Security/Cryptography/Hashs_MD5.cs b/src/Common.CoreLib/Security/Cryptography/Hashs_MD5.cs similarity index 100% rename from System.Common.CoreLib/Security/Cryptography/Hashs_MD5.cs rename to src/Common.CoreLib/Security/Cryptography/Hashs_MD5.cs diff --git a/System.Common.CoreLib/Security/Cryptography/Hashs_SHA1.cs b/src/Common.CoreLib/Security/Cryptography/Hashs_SHA1.cs similarity index 100% rename from System.Common.CoreLib/Security/Cryptography/Hashs_SHA1.cs rename to src/Common.CoreLib/Security/Cryptography/Hashs_SHA1.cs diff --git a/System.Common.CoreLib/Security/Cryptography/Hashs_SHA256.cs b/src/Common.CoreLib/Security/Cryptography/Hashs_SHA256.cs similarity index 100% rename from System.Common.CoreLib/Security/Cryptography/Hashs_SHA256.cs rename to src/Common.CoreLib/Security/Cryptography/Hashs_SHA256.cs diff --git a/System.Common.CoreLib/Security/Cryptography/Hashs_SHA384.cs b/src/Common.CoreLib/Security/Cryptography/Hashs_SHA384.cs similarity index 100% rename from System.Common.CoreLib/Security/Cryptography/Hashs_SHA384.cs rename to src/Common.CoreLib/Security/Cryptography/Hashs_SHA384.cs diff --git a/System.Common.CoreLib/Security/Cryptography/Hashs_SHA512.cs b/src/Common.CoreLib/Security/Cryptography/Hashs_SHA512.cs similarity index 100% rename from System.Common.CoreLib/Security/Cryptography/Hashs_SHA512.cs rename to src/Common.CoreLib/Security/Cryptography/Hashs_SHA512.cs diff --git a/System.Common.CoreLib/Security/Cryptography/IProtectedData.cs b/src/Common.CoreLib/Security/Cryptography/IProtectedData.cs similarity index 100% rename from System.Common.CoreLib/Security/Cryptography/IProtectedData.cs rename to src/Common.CoreLib/Security/Cryptography/IProtectedData.cs diff --git a/System.Common.CoreLib/Security/Cryptography/RSAUtils.cs b/src/Common.CoreLib/Security/Cryptography/RSAUtils.cs similarity index 100% rename from System.Common.CoreLib/Security/Cryptography/RSAUtils.cs rename to src/Common.CoreLib/Security/Cryptography/RSAUtils.cs diff --git a/System.Common.CoreLib/Security/IStorage.cs b/src/Common.CoreLib/Security/IStorage.cs similarity index 100% rename from System.Common.CoreLib/Security/IStorage.cs rename to src/Common.CoreLib/Security/IStorage.cs diff --git a/System.Common.CoreLib/Serializable.cs b/src/Common.CoreLib/Serializable.cs similarity index 100% rename from System.Common.CoreLib/Serializable.cs rename to src/Common.CoreLib/Serializable.cs diff --git a/System.Common.CoreLib/ServiceCollectionExtensions.cs b/src/Common.CoreLib/ServiceCollectionExtensions.cs similarity index 100% rename from System.Common.CoreLib/ServiceCollectionExtensions.cs rename to src/Common.CoreLib/ServiceCollectionExtensions.cs diff --git a/System.Common.CoreLib/Text/Base64Extensions.cs b/src/Common.CoreLib/Text/Base64Extensions.cs similarity index 100% rename from System.Common.CoreLib/Text/Base64Extensions.cs rename to src/Common.CoreLib/Text/Base64Extensions.cs diff --git a/System.Common.CoreLib/Text/Base64Impl(gfoidl.Base64).cs b/src/Common.CoreLib/Text/Base64Impl(gfoidl.Base64).cs similarity index 100% rename from System.Common.CoreLib/Text/Base64Impl(gfoidl.Base64).cs rename to src/Common.CoreLib/Text/Base64Impl(gfoidl.Base64).cs diff --git a/System.Common.CoreLib/Text/Base64UrlExtensions.cs b/src/Common.CoreLib/Text/Base64UrlExtensions.cs similarity index 100% rename from System.Common.CoreLib/Text/Base64UrlExtensions.cs rename to src/Common.CoreLib/Text/Base64UrlExtensions.cs diff --git a/System.Common.CoreLib/Text/IStringBuilder.cs b/src/Common.CoreLib/Text/IStringBuilder.cs similarity index 100% rename from System.Common.CoreLib/Text/IStringBuilder.cs rename to src/Common.CoreLib/Text/IStringBuilder.cs diff --git a/System.Common.CoreLib/Text/StringBuilderBase.cs b/src/Common.CoreLib/Text/StringBuilderBase.cs similarity index 100% rename from System.Common.CoreLib/Text/StringBuilderBase.cs rename to src/Common.CoreLib/Text/StringBuilderBase.cs diff --git a/System.Common.CoreLib/Text/StringBuilderExtensions.cs b/src/Common.CoreLib/Text/StringBuilderExtensions.cs similarity index 100% rename from System.Common.CoreLib/Text/StringBuilderExtensions.cs rename to src/Common.CoreLib/Text/StringBuilderExtensions.cs diff --git a/System.Common.CoreLib/UnixTimestamp.cs b/src/Common.CoreLib/UnixTimestamp.cs similarity index 100% rename from System.Common.CoreLib/UnixTimestamp.cs rename to src/Common.CoreLib/UnixTimestamp.cs diff --git a/System.Common.CoreLib/UnixTimestampType.cs b/src/Common.CoreLib/UnixTimestampType.cs similarity index 100% rename from System.Common.CoreLib/UnixTimestampType.cs rename to src/Common.CoreLib/UnixTimestampType.cs diff --git a/System.Application.Repositories.sqlite-net-pcl/Application.Repositories/Repository.cs b/src/Repositories.sqlite-net-pcl/Application.Repositories/Repository.cs similarity index 100% rename from System.Application.Repositories.sqlite-net-pcl/Application.Repositories/Repository.cs rename to src/Repositories.sqlite-net-pcl/Application.Repositories/Repository.cs diff --git a/System.Application.Repositories.sqlite-net-pcl/AsyncTableQueryExtensions.cs b/src/Repositories.sqlite-net-pcl/AsyncTableQueryExtensions.cs similarity index 100% rename from System.Application.Repositories.sqlite-net-pcl/AsyncTableQueryExtensions.cs rename to src/Repositories.sqlite-net-pcl/AsyncTableQueryExtensions.cs diff --git a/System.Application.Repositories.sqlite-net-pcl/System.Application.Repositories.sqlite-net-pcl.csproj b/src/Repositories.sqlite-net-pcl/Repositories.sqlite-net-pcl.csproj similarity index 70% rename from System.Application.Repositories.sqlite-net-pcl/System.Application.Repositories.sqlite-net-pcl.csproj rename to src/Repositories.sqlite-net-pcl/Repositories.sqlite-net-pcl.csproj index 261f78f22..4691fef21 100644 --- a/System.Application.Repositories.sqlite-net-pcl/System.Application.Repositories.sqlite-net-pcl.csproj +++ b/src/Repositories.sqlite-net-pcl/Repositories.sqlite-net-pcl.csproj @@ -7,16 +7,16 @@ - + Properties\AssemblyInfo.cs - + Properties\InternalsVisibleTo.cs - + diff --git a/System.Application.Repositories.sqlite-net-pcl/SQLStrings.shared.cs b/src/Repositories.sqlite-net-pcl/SQLStrings.shared.cs similarity index 100% rename from System.Application.Repositories.sqlite-net-pcl/SQLStrings.shared.cs rename to src/Repositories.sqlite-net-pcl/SQLStrings.shared.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml b/src/ST.Client.Desktop.Avalonia.App/App.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml rename to src/ST.Client.Desktop.Avalonia.App/App.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs similarity index 94% rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs rename to src/ST.Client.Desktop.Avalonia.App/App.axaml.cs index 91c116205..81d1ef8e0 100644 --- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs +++ b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs @@ -25,13 +25,14 @@ using System.Application.Models; using Microsoft.Extensions.Options; using System.Diagnostics; using Avalonia; -using Avalonia.Platform; using System.Reflection; +using Avalonia.ReactiveUI; #if WINDOWS //using WpfApplication = System.Windows.Application; #endif using APIConst = System.Application.Services.CloudService.Constants; +[assembly: AssemblyTitle(ThisAssembly.AssemblyTrademark + " v" + ThisAssembly.Version)] namespace System.Application.UI { public partial class App : AvaloniaApplication, IDisposableHolder, IDesktopAppService, IDesktopAvaloniaAppService @@ -132,11 +133,11 @@ namespace System.Application.UI AvaloniaXamlLoader.Load(this); Name = ThisAssembly.AssemblyTrademark; - ViewModelBase.IsInDesignMode = ApplicationLifetime == null; Startup.Init(true); #region 启动时加载的资源 + SettingsHost.Load(); compositeDisposable.Add(SettingsHost.Save); Theme = (AppTheme)UISettings.Theme.Value; @@ -399,6 +400,23 @@ namespace System.Application.UI Log.Error(nameof(App), e, "ActiveUserPost"); } } + + // Avalonia configuration, don't remove; also used by visual designer. + static AppBuilder BuildAvaloniaApp() + => AppBuilder.Configure() + .UsePlatformDetect() + .With(new SkiaOptions + { + MaxGpuResourceSizeBytes = 8096000, + }) + .With(new Win32PlatformOptions + { + AllowEglInitialization = true, + }) + .LogToTrace() + .UseReactiveUI(); + + internal static void Init(string[] args) => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args); } } #pragma warning restore CA1416 // 验证平台兼容性 \ No newline at end of file diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Program.cs b/src/ST.Client.Desktop.Avalonia.App/Program.cs similarity index 85% rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Program.cs rename to src/ST.Client.Desktop.Avalonia.App/Program.cs index 21a12c3b5..071d4f69c 100644 --- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Program.cs +++ b/src/ST.Client.Desktop.Avalonia.App/Program.cs @@ -1,13 +1,9 @@ -using Avalonia; -using Avalonia.ReactiveUI; -using NLog; +using NLog; using NLog.Config; using System.IO; using System.Properties; -using System.Reflection; using LogLevel = Microsoft.Extensions.Logging.LogLevel; -[assembly: AssemblyTitle(ThisAssembly.AssemblyTrademark + " v" + ThisAssembly.Version)] namespace System.Application.UI { static class Program @@ -54,7 +50,7 @@ namespace System.Application.UI if (isMainProcess) { - BuildAvaloniaApp().StartWithClassicDesktopLifetime(args); + App.Init(args); } } catch (Exception ex) @@ -96,21 +92,6 @@ namespace System.Application.UI } } - // Avalonia configuration, don't remove; also used by visual designer. - static AppBuilder BuildAvaloniaApp() - => AppBuilder.Configure() - .UsePlatformDetect() - .With(new SkiaOptions - { - MaxGpuResourceSizeBytes = 8096000, - }) - .With(new Win32PlatformOptions - { - AllowEglInitialization = true, - }) - .LogToTrace() - .UseReactiveUI(); - static string InitLogDir() { var logDirPath = Path.Combine(AppContext.BaseDirectory, "Logs"); diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Properties/app.manifest b/src/ST.Client.Desktop.Avalonia.App/Properties/app.manifest similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Properties/app.manifest rename to src/ST.Client.Desktop.Avalonia.App/Properties/app.manifest diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj b/src/ST.Client.Desktop.Avalonia.App/ST.Client.Desktop.Avalonia.App.csproj similarity index 69% rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj rename to src/ST.Client.Desktop.Avalonia.App/ST.Client.Desktop.Avalonia.App.csproj index e6c6b9e3d..dda6686ca 100644 --- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj +++ b/src/ST.Client.Desktop.Avalonia.App/ST.Client.Desktop.Avalonia.App.csproj @@ -21,7 +21,7 @@ --> - ..\System.Application.SteamTools.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico + ..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico Properties\app.manifest net5.0-windows10.0.19041.0 7.0 @@ -35,31 +35,31 @@ - + Properties\AssemblyInfo.cs - - - + + + - + - + - + - + - + steam++.visualelementsmanifest.xml PreserveNewest - + Assets\VisualElements_150.png PreserveNewest - + Assets\VisualElements_70.png PreserveNewest - - + + - - + + - - + + - - + + - - + + - - + + - - + + \ No newline at end of file diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Startup.cs b/src/ST.Client.Desktop.Avalonia.App/Startup.ConfigureServices.cs similarity index 95% rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Startup.cs rename to src/ST.Client.Desktop.Avalonia.App/Startup.ConfigureServices.cs index 693163427..b42e858f0 100644 --- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Startup.cs +++ b/src/ST.Client.Desktop.Avalonia.App/Startup.ConfigureServices.cs @@ -12,24 +12,8 @@ using System.Text; namespace System.Application.UI { - internal static class Startup + partial class Startup { - static bool isInitialized; - - public static void Init(bool isMainProcess) - { - if (!isInitialized) - { - isInitialized = true; - FileSystemDesktop.InitFileSystem(); - if (isMainProcess) - { - ModelValidatorProvider.Init(); - } - DI.Init(s => ConfigureServices(s, isMainProcess)); - } - } - static void ConfigureServices(IServiceCollection services, bool isMainProcess) { ConfigureRequiredServices(services); @@ -166,7 +150,7 @@ namespace System.Application.UI return options; string? GetResValue(string name, bool isSingle) { - const string thisProjectRootNamespace = "System.Application.UI"; + const string thisProjectRootNamespace = "System.Application.UI.Resources"; var resName = isSingle ? $"{thisProjectRootNamespace}.{name}.pfx" : $"{thisProjectRootNamespace}.{name}-{(ThisAssembly.Debuggable ? "debug" : "release")}.pfx"; using var stream = assembly.GetManifestResourceStream(resName); if (stream != null) diff --git a/src/ST.Client.Desktop.Avalonia.App/Startup.cs b/src/ST.Client.Desktop.Avalonia.App/Startup.cs new file mode 100644 index 000000000..3d081bf3f --- /dev/null +++ b/src/ST.Client.Desktop.Avalonia.App/Startup.cs @@ -0,0 +1,21 @@ +namespace System.Application.UI +{ + internal static partial class Startup + { + static bool isInitialized; + + public static void Init(bool isMainProcess) + { + if (!isInitialized) + { + isInitialized = true; + FileSystemDesktop.InitFileSystem(); + if (isMainProcess) + { + ModelValidatorProvider.Init(); + } + DI.Init(s => ConfigureServices(s, isMainProcess)); + } + } + } +} \ No newline at end of file diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/ViewLocator.cs b/src/ST.Client.Desktop.Avalonia.App/ViewLocator.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/ViewLocator.cs rename to src/ST.Client.Desktop.Avalonia.App/ViewLocator.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainWindow.axaml b/src/ST.Client.Desktop.Avalonia.App/Views/MainWindow.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainWindow.axaml rename to src/ST.Client.Desktop.Avalonia.App/Views/MainWindow.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainWindow.axaml.cs b/src/ST.Client.Desktop.Avalonia.App/Views/MainWindow.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainWindow.axaml.cs rename to src/ST.Client.Desktop.Avalonia.App/Views/MainWindow.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/WebViewImplType.cs b/src/ST.Client.Desktop.Avalonia.App/WebViewImplType.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/WebViewImplType.cs rename to src/ST.Client.Desktop.Avalonia.App/WebViewImplType.cs diff --git a/src/ST.Client.Desktop.Avalonia.Demo.App/Program.cs b/src/ST.Client.Desktop.Avalonia.Demo.App/Program.cs new file mode 100644 index 000000000..bdc6ecfad --- /dev/null +++ b/src/ST.Client.Desktop.Avalonia.Demo.App/Program.cs @@ -0,0 +1,11 @@ +namespace System.Application.UI +{ + static class Program + { + [STAThread] + static void Main(string[] args) + { + App.Init(args); + } + } +} \ No newline at end of file diff --git a/src/ST.Client.Desktop.Avalonia.Demo.App/ST.Client.Desktop.Avalonia.Demo.App.csproj b/src/ST.Client.Desktop.Avalonia.Demo.App/ST.Client.Desktop.Avalonia.Demo.App.csproj new file mode 100644 index 000000000..c691e01bd --- /dev/null +++ b/src/ST.Client.Desktop.Avalonia.Demo.App/ST.Client.Desktop.Avalonia.Demo.App.csproj @@ -0,0 +1,61 @@ + + + + WinExe + net5.0 + false + + System.Application.UI + Steam++.Demo + UI_DEMO;$(DefineConstants) + + + + + Properties\AssemblyInfo.cs + + + Startup.cs + + + ViewLocator.cs + + + App.axaml.cs + %(Filename) + + + App.axaml + Designer + + + Views\MainWindow.axaml.cs + %(Filename) + + + Views\MainWindow.axaml + Designer + + + + + + + + + + + + %(Filename) + + + Designer + + + + + + + + + diff --git a/src/ST.Client.Desktop.Avalonia.Demo.App/Startup.ConfigureServices.cs b/src/ST.Client.Desktop.Avalonia.Demo.App/Startup.ConfigureServices.cs new file mode 100644 index 000000000..424837834 --- /dev/null +++ b/src/ST.Client.Desktop.Avalonia.Demo.App/Startup.ConfigureServices.cs @@ -0,0 +1,11 @@ +using Microsoft.Extensions.DependencyInjection; + +namespace System.Application.UI +{ + partial class Startup + { + static void ConfigureServices(IServiceCollection services, bool _) + { + } + } +} \ No newline at end of file diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/BitmapAssetValueConverter.cs b/src/ST.Client.Desktop.Avalonia/Application/Converters/BitmapAssetValueConverter.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/BitmapAssetValueConverter.cs rename to src/ST.Client.Desktop.Avalonia/Application/Converters/BitmapAssetValueConverter.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/CardTitleToPlaceholderConverter.cs b/src/ST.Client.Desktop.Avalonia/Application/Converters/CardTitleToPlaceholderConverter.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/CardTitleToPlaceholderConverter.cs rename to src/ST.Client.Desktop.Avalonia/Application/Converters/CardTitleToPlaceholderConverter.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/DateFormatConverter.cs b/src/ST.Client.Desktop.Avalonia/Application/Converters/DateFormatConverter.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/DateFormatConverter.cs rename to src/ST.Client.Desktop.Avalonia/Application/Converters/DateFormatConverter.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/DrawingKeyValueConverter.cs b/src/ST.Client.Desktop.Avalonia/Application/Converters/DrawingKeyValueConverter.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/DrawingKeyValueConverter.cs rename to src/ST.Client.Desktop.Avalonia/Application/Converters/DrawingKeyValueConverter.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/EnumDescriptionTypeConverter.cs b/src/ST.Client.Desktop.Avalonia/Application/Converters/EnumDescriptionTypeConverter.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/EnumDescriptionTypeConverter.cs rename to src/ST.Client.Desktop.Avalonia/Application/Converters/EnumDescriptionTypeConverter.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/IsNullConverter.cs b/src/ST.Client.Desktop.Avalonia/Application/Converters/IsNullConverter.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/IsNullConverter.cs rename to src/ST.Client.Desktop.Avalonia/Application/Converters/IsNullConverter.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/ReverseBooleanConverter.cs b/src/ST.Client.Desktop.Avalonia/Application/Converters/ReverseBooleanConverter.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/ReverseBooleanConverter.cs rename to src/ST.Client.Desktop.Avalonia/Application/Converters/ReverseBooleanConverter.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/StringFormatConverter.cs b/src/ST.Client.Desktop.Avalonia/Application/Converters/StringFormatConverter.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/Converters/StringFormatConverter.cs rename to src/ST.Client.Desktop.Avalonia/Application/Converters/StringFormatConverter.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/Services/IDesktopAvaloniaAppService.cs b/src/ST.Client.Desktop.Avalonia/Application/Services/IDesktopAvaloniaAppService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/Services/IDesktopAvaloniaAppService.cs rename to src/ST.Client.Desktop.Avalonia/Application/Services/IDesktopAvaloniaAppService.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/Services/Implementation/AvaloniaDesktopAppUpdateServiceImpl.cs b/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/AvaloniaDesktopAppUpdateServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/Services/Implementation/AvaloniaDesktopAppUpdateServiceImpl.cs rename to src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/AvaloniaDesktopAppUpdateServiceImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/Services/Implementation/MainThreadPlatformServiceImpl.cs b/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/MainThreadPlatformServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/Services/Implementation/MainThreadPlatformServiceImpl.cs rename to src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/MainThreadPlatformServiceImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/Services/Implementation/ShowWindowServiceImpl.cs b/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/ShowWindowServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/Services/Implementation/ShowWindowServiceImpl.cs rename to src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/ShowWindowServiceImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/AppResources/app.png b/src/ST.Client.Desktop.Avalonia/Application/UI/Assets/AppResources/app.png similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/AppResources/app.png rename to src/ST.Client.Desktop.Avalonia/Application/UI/Assets/AppResources/app.png diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/AppResources/avater.jpg b/src/ST.Client.Desktop.Avalonia/Application/UI/Assets/AppResources/avater.jpg similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/AppResources/avater.jpg rename to src/ST.Client.Desktop.Avalonia/Application/UI/Assets/AppResources/avater.jpg diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/Icon.ico b/src/ST.Client.Desktop.Avalonia/Application/UI/Assets/Icon.ico similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/Icon.ico rename to src/ST.Client.Desktop.Avalonia/Application/UI/Assets/Icon.ico diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/Icon_16.png b/src/ST.Client.Desktop.Avalonia/Application/UI/Assets/Icon_16.png similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/Icon_16.png rename to src/ST.Client.Desktop.Avalonia/Application/UI/Assets/Icon_16.png diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/CefNetApp.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/CefNetApp.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/CefNetApp.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/CefNetApp.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/DragDropUtil.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/DragDropUtil.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/DragDropUtil.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/DragDropUtil.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/INotifyIcon.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/INotifyIcon.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/INotifyIcon.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/INotifyIcon.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls.xaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls.xaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls.xaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Border.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Border.xaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Border.xaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Border.xaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Button.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Button.xaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Button.xaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Button.xaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/DrawingSvg.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/DrawingSvg.xaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/DrawingSvg.xaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/DrawingSvg.xaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Menu.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Menu.xaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Menu.xaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Menu.xaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/SideBar.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/SideBar.xaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/SideBar.xaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/SideBar.xaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TabControl.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TabControl.xaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TabControl.xaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TabControl.xaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TextBox.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TextBox.xaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TextBox.xaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Styles/Controls/TextBox.xaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/ThemeDark.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/ThemeDark.xaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/ThemeDark.xaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Styles/ThemeDark.xaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/ThemeLight.xaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Styles/ThemeLight.xaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/ThemeLight.xaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Styles/ThemeLight.xaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/CardView.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/CardView.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/CardView.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/CardView.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/CardView.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/CardView.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/CardView.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/CardView.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/PaperView.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/PaperView.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/PaperView.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/PaperView.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/PaperView.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/PaperView.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/PaperView.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/PaperView.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/ScrollingTextBlock.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ScrollingTextBlock.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/ScrollingTextBlock.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ScrollingTextBlock.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/TitleBar.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/TitleBar.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/TitleBar.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/TitleBar.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/TitleBar.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/TitleBar.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/TitleBar.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/TitleBar.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/ToastMessage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ToastMessage.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/ToastMessage.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ToastMessage.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/ToastMessage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ToastMessage.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/ToastMessage.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/ToastMessage.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/WebView3.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/WebView3.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Controls/WebView3.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Controls/WebView3.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_OpenSourcePage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_OpenSourcePage.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_OpenSourcePage.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_OpenSourcePage.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_OpenSourcePage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_OpenSourcePage.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_OpenSourcePage.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/About/About_OpenSourcePage.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/AboutPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/AboutPage.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/AboutPage.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/AboutPage.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/AboutPage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/AboutPage.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/AboutPage.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/AboutPage.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/CommunityProxyPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/CommunityProxyPage.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/CommunityProxyPage.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/CommunityProxyPage.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/CommunityProxyPage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/CommunityProxyPage.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/CommunityProxyPage.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/CommunityProxyPage.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugPage.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugPage.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugPage.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugPage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugPage.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugPage.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugPage.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/DebugWebViewPage.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/SettingsPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/SettingsPage.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/SettingsPage.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/SettingsPage.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/SettingsPage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/SettingsPage.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/SettingsPage.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/SettingsPage.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/StartPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/StartPage.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/StartPage.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/StartPage.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/StartPage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/StartPage.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/StartPage.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/StartPage.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/SteamAccountPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/SteamAccountPage.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/SteamAccountPage.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/SteamAccountPage.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/SteamAccountPage.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/SteamAccountPage.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Pages/SteamAccountPage.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/SteamAccountPage.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/AddAuthWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AddAuthWindow.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/AddAuthWindow.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AddAuthWindow.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/AddAuthWindow.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AddAuthWindow.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/AddAuthWindow.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AddAuthWindow.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/AuthTradeWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AuthTradeWindow.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/AuthTradeWindow.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AuthTradeWindow.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/AuthTradeWindow.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AuthTradeWindow.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/AuthTradeWindow.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/AuthTradeWindow.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangePhoneWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangePhoneWindow.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangePhoneWindow.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangePhoneWindow.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangePhoneWindow.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangePhoneWindow.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangePhoneWindow.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ChangePhoneWindow.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginUserWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginUserWindow.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginUserWindow.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginUserWindow.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginUserWindow.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginUserWindow.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginUserWindow.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginUserWindow.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/MessageBoxWindow.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/ShowAuthWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ShowAuthWindow.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/ShowAuthWindow.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ShowAuthWindow.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/ShowAuthWindow.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ShowAuthWindow.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/ShowAuthWindow.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/ShowAuthWindow.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserInfoWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserInfoWindow.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserInfoWindow.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserInfoWindow.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserInfoWindow.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserInfoWindow.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserInfoWindow.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserInfoWindow.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml.cs rename to src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/UserProfileWindow.axaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Extensions/WebViewExtensions.cs b/src/ST.Client.Desktop.Avalonia/Extensions/WebViewExtensions.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Extensions/WebViewExtensions.cs rename to src/ST.Client.Desktop.Avalonia/Extensions/WebViewExtensions.cs diff --git a/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj b/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj new file mode 100644 index 000000000..03721c787 --- /dev/null +++ b/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj @@ -0,0 +1,46 @@ + + + + netstandard2.1 + System + false + + System.Application.SteamTools.Client.Desktop.Avalonia + + + + + %(Filename) + + + Designer + + + + + + + + + + Properties\AssemblyInfo.cs + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/ServiceCollectionExtensions.cs b/src/ST.Client.Desktop.Avalonia/ServiceCollectionExtensions.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/ServiceCollectionExtensions.cs rename to src/ST.Client.Desktop.Avalonia/ServiceCollectionExtensions.cs diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Windows/WpfCompatExtensions.cs b/src/ST.Client.Desktop.Avalonia/Windows/WpfCompatExtensions.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Avalonia/Windows/WpfCompatExtensions.cs rename to src/ST.Client.Desktop.Avalonia/Windows/WpfCompatExtensions.cs diff --git a/System.Application.SteamTools.Client.Desktop.Linux/Application/Services/Implementation/LinuxDesktopPlatformServiceImpl.cs b/src/ST.Client.Desktop.Linux/Application/Services/Implementation/LinuxDesktopPlatformServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Linux/Application/Services/Implementation/LinuxDesktopPlatformServiceImpl.cs rename to src/ST.Client.Desktop.Linux/Application/Services/Implementation/LinuxDesktopPlatformServiceImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop.Linux/Application/UI/LinuxTrayIcon.cs b/src/ST.Client.Desktop.Linux/Application/UI/LinuxTrayIcon.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Linux/Application/UI/LinuxTrayIcon.cs rename to src/ST.Client.Desktop.Linux/Application/UI/LinuxTrayIcon.cs diff --git a/System.Application.SteamTools.Client.Desktop.Linux/Application/UI/NotifyIcon.cs b/src/ST.Client.Desktop.Linux/Application/UI/NotifyIcon.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Linux/Application/UI/NotifyIcon.cs rename to src/ST.Client.Desktop.Linux/Application/UI/NotifyIcon.cs diff --git a/System.Application.SteamTools.Client.Desktop.Linux/System.Application.SteamTools.Client.Desktop.Linux.csproj b/src/ST.Client.Desktop.Linux/ST.Client.Desktop.Linux.csproj similarity index 58% rename from System.Application.SteamTools.Client.Desktop.Linux/System.Application.SteamTools.Client.Desktop.Linux.csproj rename to src/ST.Client.Desktop.Linux/ST.Client.Desktop.Linux.csproj index b8c03d19f..8e5647502 100644 --- a/System.Application.SteamTools.Client.Desktop.Linux/System.Application.SteamTools.Client.Desktop.Linux.csproj +++ b/src/ST.Client.Desktop.Linux/ST.Client.Desktop.Linux.csproj @@ -7,17 +7,16 @@ - + Properties\AssemblyInfo.cs - + - + - - + \ No newline at end of file diff --git a/System.Application.SteamTools.Client.Desktop.Linux/ServiceCollectionExtensions.cs b/src/ST.Client.Desktop.Linux/ServiceCollectionExtensions.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Linux/ServiceCollectionExtensions.cs rename to src/ST.Client.Desktop.Linux/ServiceCollectionExtensions.cs diff --git a/System.Application.SteamTools.Client.Desktop.Mac/Application/Services/Implementation/MacDesktopPlatformServiceImpl.cs b/src/ST.Client.Desktop.Mac/Application/Services/Implementation/MacDesktopPlatformServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Mac/Application/Services/Implementation/MacDesktopPlatformServiceImpl.cs rename to src/ST.Client.Desktop.Mac/Application/Services/Implementation/MacDesktopPlatformServiceImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop.Mac/Application/UI/AppDelegate.cs b/src/ST.Client.Desktop.Mac/Application/UI/AppDelegate.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Mac/Application/UI/AppDelegate.cs rename to src/ST.Client.Desktop.Mac/Application/UI/AppDelegate.cs diff --git a/System.Application.SteamTools.Client.Desktop.Mac/Application/UI/NotifyIcon.cs b/src/ST.Client.Desktop.Mac/Application/UI/NotifyIcon.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Mac/Application/UI/NotifyIcon.cs rename to src/ST.Client.Desktop.Mac/Application/UI/NotifyIcon.cs diff --git a/System.Application.SteamTools.Client.Desktop.Mac/System.Application.SteamTools.Client.Desktop.Mac.csproj b/src/ST.Client.Desktop.Mac/ST.Client.Desktop.Mac.csproj similarity index 88% rename from System.Application.SteamTools.Client.Desktop.Mac/System.Application.SteamTools.Client.Desktop.Mac.csproj rename to src/ST.Client.Desktop.Mac/ST.Client.Desktop.Mac.csproj index 1d714c975..df85d3916 100644 --- a/System.Application.SteamTools.Client.Desktop.Mac/System.Application.SteamTools.Client.Desktop.Mac.csproj +++ b/src/ST.Client.Desktop.Mac/ST.Client.Desktop.Mac.csproj @@ -20,7 +20,7 @@ --> - + Properties\AssemblyInfo.cs @@ -44,7 +44,7 @@ --> - + diff --git a/System.Application.SteamTools.Client.Desktop.Mac/ServiceCollectionExtensions.cs b/src/ST.Client.Desktop.Mac/ServiceCollectionExtensions.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Mac/ServiceCollectionExtensions.cs rename to src/ST.Client.Desktop.Mac/ServiceCollectionExtensions.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Application/Services/Implementation/SteamworksLocalApiServiceImpl.cs b/src/ST.Client.Desktop.Windows/Application/Services/Implementation/SteamworksLocalApiServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Application/Services/Implementation/SteamworksLocalApiServiceImpl.cs rename to src/ST.Client.Desktop.Windows/Application/Services/Implementation/SteamworksLocalApiServiceImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Application/Services/Implementation/Windows10DataProtectionProvider.cs b/src/ST.Client.Desktop.Windows/Application/Services/Implementation/Windows10DataProtectionProvider.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Application/Services/Implementation/Windows10DataProtectionProvider.cs rename to src/ST.Client.Desktop.Windows/Application/Services/Implementation/Windows10DataProtectionProvider.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.Administrator.cs b/src/ST.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.Administrator.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.Administrator.cs rename to src/ST.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.Administrator.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.LightMode.cs b/src/ST.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.LightMode.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.LightMode.cs rename to src/ST.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.LightMode.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.WindowTopRightButtons.cs b/src/ST.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.WindowTopRightButtons.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.WindowTopRightButtons.cs rename to src/ST.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.WindowTopRightButtons.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.cs b/src/ST.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.cs rename to src/ST.Client.Desktop.Windows/Application/Services/Implementation/WindowsDesktopPlatformServiceImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Application/Services/Implementation/WindowsProtectedData.cs b/src/ST.Client.Desktop.Windows/Application/Services/Implementation/WindowsProtectedData.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Application/Services/Implementation/WindowsProtectedData.cs rename to src/ST.Client.Desktop.Windows/Application/Services/Implementation/WindowsProtectedData.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Application/UI/JumpLists.cs b/src/ST.Client.Desktop.Windows/Application/UI/JumpLists.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Application/UI/JumpLists.cs rename to src/ST.Client.Desktop.Windows/Application/UI/JumpLists.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Application/UI/NotifyIcon.cs b/src/ST.Client.Desktop.Windows/Application/UI/NotifyIcon.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Application/UI/NotifyIcon.cs rename to src/ST.Client.Desktop.Windows/Application/UI/NotifyIcon.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Application/UI/WpfApp.xaml b/src/ST.Client.Desktop.Windows/Application/UI/WpfApp.xaml similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Application/UI/WpfApp.xaml rename to src/ST.Client.Desktop.Windows/Application/UI/WpfApp.xaml diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Application/UI/WpfApp.xaml.cs b/src/ST.Client.Desktop.Windows/Application/UI/WpfApp.xaml.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Application/UI/WpfApp.xaml.cs rename to src/ST.Client.Desktop.Windows/Application/UI/WpfApp.xaml.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Application/VisualStudioAppCenterSDK.cs b/src/ST.Client.Desktop.Windows/Application/VisualStudioAppCenterSDK.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Application/VisualStudioAppCenterSDK.cs rename to src/ST.Client.Desktop.Windows/Application/VisualStudioAppCenterSDK.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Extensions/RegistryKeyExtensions.cs b/src/ST.Client.Desktop.Windows/Extensions/RegistryKeyExtensions.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Extensions/RegistryKeyExtensions.cs rename to src/ST.Client.Desktop.Windows/Extensions/RegistryKeyExtensions.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Internals/MouseHook.cs b/src/ST.Client.Desktop.Windows/Internals/MouseHook.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Internals/MouseHook.cs rename to src/ST.Client.Desktop.Windows/Internals/MouseHook.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Internals/NativeMethods.cs b/src/ST.Client.Desktop.Windows/Internals/NativeMethods.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Internals/NativeMethods.cs rename to src/ST.Client.Desktop.Windows/Internals/NativeMethods.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Internals/NativeWindow.cs b/src/ST.Client.Desktop.Windows/Internals/NativeWindow.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Internals/NativeWindow.cs rename to src/ST.Client.Desktop.Windows/Internals/NativeWindow.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Internals/Point.cs b/src/ST.Client.Desktop.Windows/Internals/Point.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Internals/Point.cs rename to src/ST.Client.Desktop.Windows/Internals/Point.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Internals/RECT.cs b/src/ST.Client.Desktop.Windows/Internals/RECT.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Internals/RECT.cs rename to src/ST.Client.Desktop.Windows/Internals/RECT.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Internals/UnmanagedMethods.cs b/src/ST.Client.Desktop.Windows/Internals/UnmanagedMethods.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Internals/UnmanagedMethods.cs rename to src/ST.Client.Desktop.Windows/Internals/UnmanagedMethods.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Internals/User32Window.cs b/src/ST.Client.Desktop.Windows/Internals/User32Window.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Internals/User32Window.cs rename to src/ST.Client.Desktop.Windows/Internals/User32Window.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Internals/WinHttp.cs b/src/ST.Client.Desktop.Windows/Internals/WinHttp.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Internals/WinHttp.cs rename to src/ST.Client.Desktop.Windows/Internals/WinHttp.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/Internals/WinInet.cs b/src/ST.Client.Desktop.Windows/Internals/WinInet.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/Internals/WinInet.cs rename to src/ST.Client.Desktop.Windows/Internals/WinInet.cs diff --git a/System.Application.SteamTools.Client.Desktop.Windows/System.Application.SteamTools.Client.Desktop.Windows.csproj b/src/ST.Client.Desktop.Windows/ST.Client.Desktop.Windows.csproj similarity index 66% rename from System.Application.SteamTools.Client.Desktop.Windows/System.Application.SteamTools.Client.Desktop.Windows.csproj rename to src/ST.Client.Desktop.Windows/ST.Client.Desktop.Windows.csproj index 555f465eb..7b740cfea 100644 --- a/System.Application.SteamTools.Client.Desktop.Windows/System.Application.SteamTools.Client.Desktop.Windows.csproj +++ b/src/ST.Client.Desktop.Windows/ST.Client.Desktop.Windows.csproj @@ -10,15 +10,7 @@ - - - - - - - - - + Properties\AssemblyInfo.cs @@ -33,9 +25,9 @@ - - - + + + diff --git a/System.Application.SteamTools.Client.Desktop.Windows/ServiceCollectionExtensions.cs b/src/ST.Client.Desktop.Windows/ServiceCollectionExtensions.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop.Windows/ServiceCollectionExtensions.cs rename to src/ST.Client.Desktop.Windows/ServiceCollectionExtensions.cs diff --git a/System.Application.SteamTools.Client.Desktop/CustomWindow.cs b/src/ST.Client.Desktop/CustomWindow.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/CustomWindow.cs rename to src/ST.Client.Desktop/CustomWindow.cs diff --git a/System.Application.SteamTools.Client.Desktop/DnsResolution.cs b/src/ST.Client.Desktop/DnsResolution.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/DnsResolution.cs rename to src/ST.Client.Desktop/DnsResolution.cs diff --git a/System.Application.SteamTools.Client.Desktop/Extensions/ProcessExtensions.cs b/src/ST.Client.Desktop/Extensions/ProcessExtensions.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Extensions/ProcessExtensions.cs rename to src/ST.Client.Desktop/Extensions/ProcessExtensions.cs diff --git a/System.Application.SteamTools.Client.Desktop/Extensions/PropertyChangedExtensions.cs b/src/ST.Client.Desktop/Extensions/PropertyChangedExtensions.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Extensions/PropertyChangedExtensions.cs rename to src/ST.Client.Desktop/Extensions/PropertyChangedExtensions.cs diff --git a/System.Application.SteamTools.Client.Desktop/Extensions/StartupArgsExtensions.cs b/src/ST.Client.Desktop/Extensions/StartupArgsExtensions.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Extensions/StartupArgsExtensions.cs rename to src/ST.Client.Desktop/Extensions/StartupArgsExtensions.cs diff --git a/System.Application.SteamTools.Client.Desktop/Extensions/TaskExtensions.cs b/src/ST.Client.Desktop/Extensions/TaskExtensions.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Extensions/TaskExtensions.cs rename to src/ST.Client.Desktop/Extensions/TaskExtensions.cs diff --git a/System.Application.SteamTools.Client.Desktop/Extensions/ViewModelExtensions.cs b/src/ST.Client.Desktop/Extensions/ViewModelExtensions.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Extensions/ViewModelExtensions.cs rename to src/ST.Client.Desktop/Extensions/ViewModelExtensions.cs diff --git a/System.Application.SteamTools.Client.Desktop/FileSystemDesktop.cs b/src/ST.Client.Desktop/FileSystemDesktop.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/FileSystemDesktop.cs rename to src/ST.Client.Desktop/FileSystemDesktop.cs diff --git a/System.Application.SteamTools.Client.Desktop/MainThreadDesktop.cs b/src/ST.Client.Desktop/MainThreadDesktop.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/MainThreadDesktop.cs rename to src/ST.Client.Desktop/MainThreadDesktop.cs diff --git a/System.Application.SteamTools.Client.Desktop/MessageBox/MessageBoxButtonCompat.cs b/src/ST.Client.Desktop/MessageBox/MessageBoxButtonCompat.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/MessageBox/MessageBoxButtonCompat.cs rename to src/ST.Client.Desktop/MessageBox/MessageBoxButtonCompat.cs diff --git a/System.Application.SteamTools.Client.Desktop/MessageBox/MessageBoxCompat.cs b/src/ST.Client.Desktop/MessageBox/MessageBoxCompat.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/MessageBox/MessageBoxCompat.cs rename to src/ST.Client.Desktop/MessageBox/MessageBoxCompat.cs diff --git a/System.Application.SteamTools.Client.Desktop/MessageBox/MessageBoxImageCompat.cs b/src/ST.Client.Desktop/MessageBox/MessageBoxImageCompat.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/MessageBox/MessageBoxImageCompat.cs rename to src/ST.Client.Desktop/MessageBox/MessageBoxImageCompat.cs diff --git a/System.Application.SteamTools.Client.Desktop/MessageBox/MessageBoxResultCompat.cs b/src/ST.Client.Desktop/MessageBox/MessageBoxResultCompat.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/MessageBox/MessageBoxResultCompat.cs rename to src/ST.Client.Desktop/MessageBox/MessageBoxResultCompat.cs diff --git a/System.Application.SteamTools.Client.Desktop/MessageBox/ResizeModeCompat.cs b/src/ST.Client.Desktop/MessageBox/ResizeModeCompat.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/MessageBox/ResizeModeCompat.cs rename to src/ST.Client.Desktop/MessageBox/ResizeModeCompat.cs diff --git a/System.Application.SteamTools.Client.Desktop/Migrations.cs b/src/ST.Client.Desktop/Migrations.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Migrations.cs rename to src/ST.Client.Desktop/Migrations.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/AchievementInfo.cs b/src/ST.Client.Desktop/Models/AchievementInfo.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/AchievementInfo.cs rename to src/ST.Client.Desktop/Models/AchievementInfo.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/Enum/AppTheme.cs b/src/ST.Client.Desktop/Models/Enum/AppTheme.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/Enum/AppTheme.cs rename to src/ST.Client.Desktop/Models/Enum/AppTheme.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/Enum/TextReaderProvider.cs b/src/ST.Client.Desktop/Models/Enum/TextReaderProvider.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/Enum/TextReaderProvider.cs rename to src/ST.Client.Desktop/Models/Enum/TextReaderProvider.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/FloatStatInfo.cs b/src/ST.Client.Desktop/Models/FloatStatInfo.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/FloatStatInfo.cs rename to src/ST.Client.Desktop/Models/FloatStatInfo.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/ImageClipStream.cs b/src/ST.Client.Desktop/Models/ImageClipStream.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/ImageClipStream.cs rename to src/ST.Client.Desktop/Models/ImageClipStream.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/IntStatInfo.cs b/src/ST.Client.Desktop/Models/IntStatInfo.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/IntStatInfo.cs rename to src/ST.Client.Desktop/Models/IntStatInfo.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/MyAuthenticator.cs b/src/ST.Client.Desktop/Models/MyAuthenticator.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/MyAuthenticator.cs rename to src/ST.Client.Desktop/Models/MyAuthenticator.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/ProxyDomain.cs b/src/ST.Client.Desktop/Models/ProxyDomain.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/ProxyDomain.cs rename to src/ST.Client.Desktop/Models/ProxyDomain.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/ProxyScript.cs b/src/ST.Client.Desktop/Models/ProxyScript.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/ProxyScript.cs rename to src/ST.Client.Desktop/Models/ProxyScript.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/Settings/AppUserSettings.cs b/src/ST.Client.Desktop/Models/Settings/AppUserSettings.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/Settings/AppUserSettings.cs rename to src/ST.Client.Desktop/Models/Settings/AppUserSettings.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/Settings/AuthSettings.cs b/src/ST.Client.Desktop/Models/Settings/AuthSettings.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/Settings/AuthSettings.cs rename to src/ST.Client.Desktop/Models/Settings/AuthSettings.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/Settings/GeneralSettings.cs b/src/ST.Client.Desktop/Models/Settings/GeneralSettings.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/Settings/GeneralSettings.cs rename to src/ST.Client.Desktop/Models/Settings/GeneralSettings.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/Settings/SettingsHost.cs b/src/ST.Client.Desktop/Models/Settings/SettingsHost.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/Settings/SettingsHost.cs rename to src/ST.Client.Desktop/Models/Settings/SettingsHost.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/Settings/SteamSettings.cs b/src/ST.Client.Desktop/Models/Settings/SteamSettings.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/Settings/SteamSettings.cs rename to src/ST.Client.Desktop/Models/Settings/SteamSettings.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/Settings/UISettings.cs b/src/ST.Client.Desktop/Models/Settings/UISettings.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/Settings/UISettings.cs rename to src/ST.Client.Desktop/Models/Settings/UISettings.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/StatInfo.cs b/src/ST.Client.Desktop/Models/StatInfo.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/StatInfo.cs rename to src/ST.Client.Desktop/Models/StatInfo.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/SteamApp.cs b/src/ST.Client.Desktop/Models/SteamApp.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/SteamApp.cs rename to src/ST.Client.Desktop/Models/SteamApp.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/SteamAppInfo.cs b/src/ST.Client.Desktop/Models/SteamAppInfo.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/SteamAppInfo.cs rename to src/ST.Client.Desktop/Models/SteamAppInfo.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/SteamAppList.cs b/src/ST.Client.Desktop/Models/SteamAppList.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/SteamAppList.cs rename to src/ST.Client.Desktop/Models/SteamAppList.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/SteamAppType.cs b/src/ST.Client.Desktop/Models/SteamAppType.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/SteamAppType.cs rename to src/ST.Client.Desktop/Models/SteamAppType.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/SteamApps.cs b/src/ST.Client.Desktop/Models/SteamApps.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/SteamApps.cs rename to src/ST.Client.Desktop/Models/SteamApps.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/SteamUser.cs b/src/ST.Client.Desktop/Models/SteamUser.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/SteamUser.cs rename to src/ST.Client.Desktop/Models/SteamUser.cs diff --git a/System.Application.SteamTools.Client.Desktop/Models/TradeCard.cs b/src/ST.Client.Desktop/Models/TradeCard.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Models/TradeCard.cs rename to src/ST.Client.Desktop/Models/TradeCard.cs diff --git a/System.Application.SteamTools.Client.Desktop/Mvvm/CompositeDisposable.cs b/src/ST.Client.Desktop/Mvvm/CompositeDisposable.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Mvvm/CompositeDisposable.cs rename to src/ST.Client.Desktop/Mvvm/CompositeDisposable.cs diff --git a/System.Application.SteamTools.Client.Desktop/Mvvm/EventArgsFactory.cs b/src/ST.Client.Desktop/Mvvm/EventArgsFactory.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Mvvm/EventArgsFactory.cs rename to src/ST.Client.Desktop/Mvvm/EventArgsFactory.cs diff --git a/System.Application.SteamTools.Client.Desktop/Mvvm/IDisposableHolder.cs b/src/ST.Client.Desktop/Mvvm/IDisposableHolder.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Mvvm/IDisposableHolder.cs rename to src/ST.Client.Desktop/Mvvm/IDisposableHolder.cs diff --git a/System.Application.SteamTools.Client.Desktop/Mvvm/NotificationObject.cs b/src/ST.Client.Desktop/Mvvm/NotificationObject.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Mvvm/NotificationObject.cs rename to src/ST.Client.Desktop/Mvvm/NotificationObject.cs diff --git a/System.Application.SteamTools.Client.Desktop/Mvvm/Notifier.cs b/src/ST.Client.Desktop/Mvvm/Notifier.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Mvvm/Notifier.cs rename to src/ST.Client.Desktop/Mvvm/Notifier.cs diff --git a/System.Application.SteamTools.Client.Desktop/Mvvm/NotifyPropertyChangedInvocatorAttribute.cs b/src/ST.Client.Desktop/Mvvm/NotifyPropertyChangedInvocatorAttribute.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Mvvm/NotifyPropertyChangedInvocatorAttribute.cs rename to src/ST.Client.Desktop/Mvvm/NotifyPropertyChangedInvocatorAttribute.cs diff --git a/System.Application.SteamTools.Client.Desktop/Properties/SR.Designer.cs b/src/ST.Client.Desktop/Properties/SR.Designer.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Properties/SR.Designer.cs rename to src/ST.Client.Desktop/Properties/SR.Designer.cs diff --git a/System.Application.SteamTools.Client.Desktop/Properties/SR.en.resx b/src/ST.Client.Desktop/Properties/SR.en.resx similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Properties/SR.en.resx rename to src/ST.Client.Desktop/Properties/SR.en.resx diff --git a/System.Application.SteamTools.Client.Desktop/Properties/SR.ja.resx b/src/ST.Client.Desktop/Properties/SR.ja.resx similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Properties/SR.ja.resx rename to src/ST.Client.Desktop/Properties/SR.ja.resx diff --git a/System.Application.SteamTools.Client.Desktop/Properties/SR.ko.resx b/src/ST.Client.Desktop/Properties/SR.ko.resx similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Properties/SR.ko.resx rename to src/ST.Client.Desktop/Properties/SR.ko.resx diff --git a/System.Application.SteamTools.Client.Desktop/Properties/SR.resx b/src/ST.Client.Desktop/Properties/SR.resx similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Properties/SR.resx rename to src/ST.Client.Desktop/Properties/SR.resx diff --git a/System.Application.SteamTools.Client.Desktop/Properties/SR.ru.resx b/src/ST.Client.Desktop/Properties/SR.ru.resx similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Properties/SR.ru.resx rename to src/ST.Client.Desktop/Properties/SR.ru.resx diff --git a/System.Application.SteamTools.Client.Desktop/Properties/SR.zh-Hant.resx b/src/ST.Client.Desktop/Properties/SR.zh-Hant.resx similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Properties/SR.zh-Hant.resx rename to src/ST.Client.Desktop/Properties/SR.zh-Hant.resx diff --git a/System.Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj b/src/ST.Client.Desktop/ST.Client.Desktop.csproj similarity index 75% rename from System.Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj rename to src/ST.Client.Desktop/ST.Client.Desktop.csproj index f289bd924..5f4fcea28 100644 --- a/System.Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj +++ b/src/ST.Client.Desktop/ST.Client.Desktop.csproj @@ -7,7 +7,7 @@ - + Properties\AssemblyInfo.cs @@ -25,9 +25,9 @@ - - - + + + @@ -54,10 +54,4 @@ - - - PreserveNewest - - - \ No newline at end of file diff --git a/System.Application.SteamTools.Client.Desktop/Serialization/ApplicationSettingsProvider.cs b/src/ST.Client.Desktop/Serialization/ApplicationSettingsProvider.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Serialization/ApplicationSettingsProvider.cs rename to src/ST.Client.Desktop/Serialization/ApplicationSettingsProvider.cs diff --git a/System.Application.SteamTools.Client.Desktop/Serialization/FileSettingsProvider.cs b/src/ST.Client.Desktop/Serialization/FileSettingsProvider.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Serialization/FileSettingsProvider.cs rename to src/ST.Client.Desktop/Serialization/FileSettingsProvider.cs diff --git a/System.Application.SteamTools.Client.Desktop/Serialization/ISerializationProvider.cs b/src/ST.Client.Desktop/Serialization/ISerializationProvider.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Serialization/ISerializationProvider.cs rename to src/ST.Client.Desktop/Serialization/ISerializationProvider.cs diff --git a/System.Application.SteamTools.Client.Desktop/Serialization/SerializableProperty.cs b/src/ST.Client.Desktop/Serialization/SerializableProperty.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Serialization/SerializableProperty.cs rename to src/ST.Client.Desktop/Serialization/SerializableProperty.cs diff --git a/System.Application.SteamTools.Client.Desktop/Serialization/SerializablePropertyBase.cs b/src/ST.Client.Desktop/Serialization/SerializablePropertyBase.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Serialization/SerializablePropertyBase.cs rename to src/ST.Client.Desktop/Serialization/SerializablePropertyBase.cs diff --git a/System.Application.SteamTools.Client.Desktop/Serialization/ValueChangedEventArgs.cs b/src/ST.Client.Desktop/Serialization/ValueChangedEventArgs.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Serialization/ValueChangedEventArgs.cs rename to src/ST.Client.Desktop/Serialization/ValueChangedEventArgs.cs diff --git a/System.Application.SteamTools.Client.Desktop/ServiceCollectionExtensions.cs b/src/ST.Client.Desktop/ServiceCollectionExtensions.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/ServiceCollectionExtensions.cs rename to src/ST.Client.Desktop/ServiceCollectionExtensions.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/IConfigFileService.cs b/src/ST.Client.Desktop/Services/IConfigFileService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/IConfigFileService.cs rename to src/ST.Client.Desktop/Services/IConfigFileService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/IDesktopAppService.cs b/src/ST.Client.Desktop/Services/IDesktopAppService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/IDesktopAppService.cs rename to src/ST.Client.Desktop/Services/IDesktopAppService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/IDesktopPlatformService.cs b/src/ST.Client.Desktop/Services/IDesktopPlatformService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/IDesktopPlatformService.cs rename to src/ST.Client.Desktop/Services/IDesktopPlatformService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/IHostsFileService.cs b/src/ST.Client.Desktop/Services/IHostsFileService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/IHostsFileService.cs rename to src/ST.Client.Desktop/Services/IHostsFileService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/IMainThreadPlatformService.cs b/src/ST.Client.Desktop/Services/IMainThreadPlatformService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/IMainThreadPlatformService.cs rename to src/ST.Client.Desktop/Services/IMainThreadPlatformService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/IMessageBoxCompatService.cs b/src/ST.Client.Desktop/Services/IMessageBoxCompatService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/IMessageBoxCompatService.cs rename to src/ST.Client.Desktop/Services/IMessageBoxCompatService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/IMessageWindowService.cs b/src/ST.Client.Desktop/Services/IMessageWindowService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/IMessageWindowService.cs rename to src/ST.Client.Desktop/Services/IMessageWindowService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/IShowWindowService.cs b/src/ST.Client.Desktop/Services/IShowWindowService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/IShowWindowService.cs rename to src/ST.Client.Desktop/Services/IShowWindowService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/ISteamDbWebApiService.cs b/src/ST.Client.Desktop/Services/ISteamDbWebApiService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/ISteamDbWebApiService.cs rename to src/ST.Client.Desktop/Services/ISteamDbWebApiService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/ISteamService.cs b/src/ST.Client.Desktop/Services/ISteamService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/ISteamService.cs rename to src/ST.Client.Desktop/Services/ISteamService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/ISteamworksLocalApiService.cs b/src/ST.Client.Desktop/Services/ISteamworksLocalApiService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/ISteamworksLocalApiService.cs rename to src/ST.Client.Desktop/Services/ISteamworksLocalApiService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/ISteamworksWebApiService.cs b/src/ST.Client.Desktop/Services/ISteamworksWebApiService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/ISteamworksWebApiService.cs rename to src/ST.Client.Desktop/Services/ISteamworksWebApiService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Implementation/ConfigFileServiceImpl.cs b/src/ST.Client.Desktop/Services/Implementation/ConfigFileServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Implementation/ConfigFileServiceImpl.cs rename to src/ST.Client.Desktop/Services/Implementation/ConfigFileServiceImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Implementation/DesktopAppUpdateServiceImpl.cs b/src/ST.Client.Desktop/Services/Implementation/DesktopAppUpdateServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Implementation/DesktopAppUpdateServiceImpl.cs rename to src/ST.Client.Desktop/Services/Implementation/DesktopAppUpdateServiceImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Implementation/DesktopHttpPlatformHelper.cs b/src/ST.Client.Desktop/Services/Implementation/DesktopHttpPlatformHelper.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Implementation/DesktopHttpPlatformHelper.cs rename to src/ST.Client.Desktop/Services/Implementation/DesktopHttpPlatformHelper.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Implementation/HostsFileServiceImpl.cs b/src/ST.Client.Desktop/Services/Implementation/HostsFileServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Implementation/HostsFileServiceImpl.cs rename to src/ST.Client.Desktop/Services/Implementation/HostsFileServiceImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Implementation/LocalDataProtectionProvider.cs b/src/ST.Client.Desktop/Services/Implementation/LocalDataProtectionProvider.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Implementation/LocalDataProtectionProvider.cs rename to src/ST.Client.Desktop/Services/Implementation/LocalDataProtectionProvider.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Implementation/PlatformToastImpl.cs b/src/ST.Client.Desktop/Services/Implementation/PlatformToastImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Implementation/PlatformToastImpl.cs rename to src/ST.Client.Desktop/Services/Implementation/PlatformToastImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Implementation/SteamDbWebApiServiceImpl.cs b/src/ST.Client.Desktop/Services/Implementation/SteamDbWebApiServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Implementation/SteamDbWebApiServiceImpl.cs rename to src/ST.Client.Desktop/Services/Implementation/SteamDbWebApiServiceImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Implementation/SteamServiceImpl.cs b/src/ST.Client.Desktop/Services/Implementation/SteamServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Implementation/SteamServiceImpl.cs rename to src/ST.Client.Desktop/Services/Implementation/SteamServiceImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Implementation/SteamworksLocalApiServiceImpl.cs b/src/ST.Client.Desktop/Services/Implementation/SteamworksLocalApiServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Implementation/SteamworksLocalApiServiceImpl.cs rename to src/ST.Client.Desktop/Services/Implementation/SteamworksLocalApiServiceImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Implementation/SteamworksWebApiServiceImpl.cs b/src/ST.Client.Desktop/Services/Implementation/SteamworksWebApiServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Implementation/SteamworksWebApiServiceImpl.cs rename to src/ST.Client.Desktop/Services/Implementation/SteamworksWebApiServiceImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Implementation/WindowServiceImpl.cs b/src/ST.Client.Desktop/Services/Implementation/WindowServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Implementation/WindowServiceImpl.cs rename to src/ST.Client.Desktop/Services/Implementation/WindowServiceImpl.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Mvvm/AuthService.cs b/src/ST.Client.Desktop/Services/Mvvm/AuthService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Mvvm/AuthService.cs rename to src/ST.Client.Desktop/Services/Mvvm/AuthService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Mvvm/ProxyService.cs b/src/ST.Client.Desktop/Services/Mvvm/ProxyService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Mvvm/ProxyService.cs rename to src/ST.Client.Desktop/Services/Mvvm/ProxyService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Mvvm/SteamConnectService.cs b/src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Mvvm/SteamConnectService.cs rename to src/ST.Client.Desktop/Services/Mvvm/SteamConnectService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Mvvm/ToastService.cs b/src/ST.Client.Desktop/Services/Mvvm/ToastService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Mvvm/ToastService.cs rename to src/ST.Client.Desktop/Services/Mvvm/ToastService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/Mvvm/UserService.cs b/src/ST.Client.Desktop/Services/Mvvm/UserService.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/Mvvm/UserService.cs rename to src/ST.Client.Desktop/Services/Mvvm/UserService.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/OperationResult.cs b/src/ST.Client.Desktop/Services/OperationResult.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/OperationResult.cs rename to src/ST.Client.Desktop/Services/OperationResult.cs diff --git a/System.Application.SteamTools.Client.Desktop/Services/OperationResultType.cs b/src/ST.Client.Desktop/Services/OperationResultType.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/Services/OperationResultType.cs rename to src/ST.Client.Desktop/Services/OperationResultType.cs diff --git a/System.Application.SteamTools.Client.Desktop/SteamApiUrls.cs b/src/ST.Client.Desktop/SteamApiUrls.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/SteamApiUrls.cs rename to src/ST.Client.Desktop/SteamApiUrls.cs diff --git a/System.Application.SteamTools.Client.Desktop/TarGZipHelper.cs b/src/ST.Client.Desktop/TarGZipHelper.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/TarGZipHelper.cs rename to src/ST.Client.Desktop/TarGZipHelper.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/AppHelper.cs b/src/ST.Client.Desktop/UI/AppHelper.cs similarity index 92% rename from System.Application.SteamTools.Client.Desktop/UI/AppHelper.cs rename to src/ST.Client.Desktop/UI/AppHelper.cs index 37764c06c..1a583ca47 100644 --- a/System.Application.SteamTools.Client.Desktop/UI/AppHelper.cs +++ b/src/ST.Client.Desktop/UI/AppHelper.cs @@ -1,6 +1,8 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using NLog.Extensions.Logging; +using System.Application.Models; +using System.Application.Security; using System.Application.Services; using System.Diagnostics; using System.IO; @@ -145,7 +147,17 @@ namespace System.Application.UI var pk = typeof(AppHelper).Assembly.GetName().GetPublicKey(); if (pk == null) return false; var pkStr = ", PublicKey=" + string.Join(string.Empty, pk.Select(x => x.ToString("x2"))); - return pkStr == ThisAssembly.PublicKey; + var r = pkStr == ThisAssembly.PublicKey; + if (!r) return false; + try + { + var s = DI.Get_Nullable>()?.Value; + return s != null && s.Aes != null && s.RSA != null; + } + catch (IsNotOfficialChannelPackageException) + { + return false; + } }); /// diff --git a/System.Application.SteamTools.Client.Desktop/UI/INotifyIcon.cs b/src/ST.Client.Desktop/UI/INotifyIcon.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/INotifyIcon.cs rename to src/ST.Client.Desktop/UI/INotifyIcon.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.Designer.cs b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.Designer.cs rename to src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.en.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.en.resx similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.en.resx rename to src/ST.Client.Desktop/UI/Resx/AppResources.en.resx diff --git a/System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.ja.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.ja.resx similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.ja.resx rename to src/ST.Client.Desktop/UI/Resx/AppResources.ja.resx diff --git a/System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.ko.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.ko.resx similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.ko.resx rename to src/ST.Client.Desktop/UI/Resx/AppResources.ko.resx diff --git a/System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.resx similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.resx rename to src/ST.Client.Desktop/UI/Resx/AppResources.resx diff --git a/System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.ru.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.ru.resx similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.ru.resx rename to src/ST.Client.Desktop/UI/Resx/AppResources.ru.resx diff --git a/System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.zh-Hant.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.zh-Hant.resx similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.zh-Hant.resx rename to src/ST.Client.Desktop/UI/Resx/AppResources.zh-Hant.resx diff --git a/System.Application.SteamTools.Client.Desktop/UI/Resx/R.cs b/src/ST.Client.Desktop/UI/Resx/R.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/Resx/R.cs rename to src/ST.Client.Desktop/UI/Resx/R.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/DialogWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Base/DialogWindowViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/DialogWindowViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Base/DialogWindowViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/ItemViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Base/ItemViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/ItemViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Base/ItemViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/MenuItemViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Base/MenuItemViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/MenuItemViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Base/MenuItemViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/TabItemViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Base/TabItemViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/TabItemViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Base/TabItemViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/ViewModelBase.cs b/src/ST.Client.Desktop/UI/ViewModels/Base/ViewModelBase.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/ViewModelBase.cs rename to src/ST.Client.Desktop/UI/ViewModels/Base/ViewModelBase.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/WindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Base/WindowViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Base/WindowViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Base/WindowViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/About/AboutPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/About/AboutPageViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/About/AboutPageViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Pages/About/AboutPageViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/ArchiSteamFarmPlusPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/ArchiSteamFarmPlusPageViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/ArchiSteamFarmPlusPageViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Pages/ArchiSteamFarmPlusPageViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/CommunityProxyPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/CommunityProxyPageViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/CommunityProxyPageViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Pages/CommunityProxyPageViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Pages/DebugPageViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/DebugWebViewPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/DebugWebViewPageViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/DebugWebViewPageViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Pages/DebugWebViewPageViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/GameListPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/GameListPageViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/GameListPageViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Pages/GameListPageViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/GameRelatedPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/GameRelatedPageViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/GameRelatedPageViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Pages/GameRelatedPageViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/LocalAuthPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/LocalAuthPageViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/LocalAuthPageViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Pages/LocalAuthPageViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/OtherPlatformPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/OtherPlatformPageViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/OtherPlatformPageViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Pages/OtherPlatformPageViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/Settings/SettingsPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/Settings/SettingsPageViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/Settings/SettingsPageViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Pages/Settings/SettingsPageViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/StartPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/StartPageViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/StartPageViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Pages/StartPageViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/SteamAccountPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/SteamAccountPageViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/SteamAccountPageViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Pages/SteamAccountPageViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/SteamIdlePageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/SteamIdlePageViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/SteamIdlePageViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Pages/SteamIdlePageViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/AchievementWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/AchievementWindowViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/AchievementWindowViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Windows/AchievementWindowViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/AddAuthWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/AddAuthWindowViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/AddAuthWindowViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Windows/AddAuthWindowViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/AuthTradeWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/AuthTradeWindowViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/AuthTradeWindowViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Windows/AuthTradeWindowViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/ChangePhoneWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/ChangePhoneWindowViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/ChangePhoneWindowViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Windows/ChangePhoneWindowViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/LoginUserWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/LoginUserWindowViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/LoginUserWindowViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Windows/LoginUserWindowViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/MessageBoxWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/MessageBoxWindowViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/MessageBoxWindowViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Windows/MessageBoxWindowViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/ShowAuthWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/ShowAuthWindowViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/ShowAuthWindowViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Windows/ShowAuthWindowViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/UserProfileWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/UserProfileWindowViewModel.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/ViewModels/Windows/UserProfileWindowViewModel.cs rename to src/ST.Client.Desktop/UI/ViewModels/Windows/UserProfileWindowViewModel.cs diff --git a/System.Application.SteamTools.Client.Desktop/UI/Views/INotifyIconWindow.cs b/src/ST.Client.Desktop/UI/Views/INotifyIconWindow.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/UI/Views/INotifyIconWindow.cs rename to src/ST.Client.Desktop/UI/Views/INotifyIconWindow.cs diff --git a/System.Application.SteamTools.Client.Desktop/VdfHelper.cs b/src/ST.Client.Desktop/VdfHelper.cs similarity index 100% rename from System.Application.SteamTools.Client.Desktop/VdfHelper.cs rename to src/ST.Client.Desktop/VdfHelper.cs diff --git a/System.Application.SteamTools.Client/AppFolder.cs b/src/ST.Client/AppFolder.cs similarity index 100% rename from System.Application.SteamTools.Client/AppFolder.cs rename to src/ST.Client/AppFolder.cs diff --git a/System.Application.SteamTools.Client/Entities/GameAccountPlatformAuthenticator.cs b/src/ST.Client/Entities/GameAccountPlatformAuthenticator.cs similarity index 100% rename from System.Application.SteamTools.Client/Entities/GameAccountPlatformAuthenticator.cs rename to src/ST.Client/Entities/GameAccountPlatformAuthenticator.cs diff --git a/System.Application.SteamTools.Client/Entities/User.cs b/src/ST.Client/Entities/User.cs similarity index 100% rename from System.Application.SteamTools.Client/Entities/User.cs rename to src/ST.Client/Entities/User.cs diff --git a/System.Application.SteamTools.Client/ImageChannelType.cs b/src/ST.Client/ImageChannelType.cs similarity index 100% rename from System.Application.SteamTools.Client/ImageChannelType.cs rename to src/ST.Client/ImageChannelType.cs diff --git a/System.Application.SteamTools.Client/ImageUrlHelper.cs b/src/ST.Client/ImageUrlHelper.cs similarity index 100% rename from System.Application.SteamTools.Client/ImageUrlHelper.cs rename to src/ST.Client/ImageUrlHelper.cs diff --git a/System.Application.SteamTools.Client/KeyConstants.cs b/src/ST.Client/KeyConstants.cs similarity index 100% rename from System.Application.SteamTools.Client/KeyConstants.cs rename to src/ST.Client/KeyConstants.cs diff --git a/System.Application.SteamTools.Client/Models/AppSettings.cs b/src/ST.Client/Models/AppSettings.cs similarity index 100% rename from System.Application.SteamTools.Client/Models/AppSettings.cs rename to src/ST.Client/Models/AppSettings.cs diff --git a/System.Application.SteamTools.Client/Models/CurrentUser.cs b/src/ST.Client/Models/CurrentUser.cs similarity index 100% rename from System.Application.SteamTools.Client/Models/CurrentUser.cs rename to src/ST.Client/Models/CurrentUser.cs diff --git a/System.Application.SteamTools.Client/Models/OpenSourceLibrary.Values.cs b/src/ST.Client/Models/OpenSourceLibrary.Values.cs similarity index 100% rename from System.Application.SteamTools.Client/Models/OpenSourceLibrary.Values.cs rename to src/ST.Client/Models/OpenSourceLibrary.Values.cs diff --git a/System.Application.SteamTools.Client/Models/OpenSourceLibrary.cs b/src/ST.Client/Models/OpenSourceLibrary.cs similarity index 100% rename from System.Application.SteamTools.Client/Models/OpenSourceLibrary.cs rename to src/ST.Client/Models/OpenSourceLibrary.cs diff --git a/System.Application.SteamTools.Client/NotificationChannelType.cs b/src/ST.Client/NotificationChannelType.cs similarity index 100% rename from System.Application.SteamTools.Client/NotificationChannelType.cs rename to src/ST.Client/NotificationChannelType.cs diff --git a/System.Application.SteamTools.Client/NotificationType.cs b/src/ST.Client/NotificationType.cs similarity index 100% rename from System.Application.SteamTools.Client/NotificationType.cs rename to src/ST.Client/NotificationType.cs diff --git a/System.Application.SteamTools.Client/NotificationType_Channel_EnumExtensions.cs b/src/ST.Client/NotificationType_Channel_EnumExtensions.cs similarity index 100% rename from System.Application.SteamTools.Client/NotificationType_Channel_EnumExtensions.cs rename to src/ST.Client/NotificationType_Channel_EnumExtensions.cs diff --git a/System.Application.SteamTools.Client/Properties/SR.Designer.cs b/src/ST.Client/Properties/SR.Designer.cs similarity index 100% rename from System.Application.SteamTools.Client/Properties/SR.Designer.cs rename to src/ST.Client/Properties/SR.Designer.cs diff --git a/System.Application.SteamTools.Client/Properties/SR.en.resx b/src/ST.Client/Properties/SR.en.resx similarity index 100% rename from System.Application.SteamTools.Client/Properties/SR.en.resx rename to src/ST.Client/Properties/SR.en.resx diff --git a/System.Application.SteamTools.Client/Properties/SR.ja.resx b/src/ST.Client/Properties/SR.ja.resx similarity index 100% rename from System.Application.SteamTools.Client/Properties/SR.ja.resx rename to src/ST.Client/Properties/SR.ja.resx diff --git a/System.Application.SteamTools.Client/Properties/SR.ko.resx b/src/ST.Client/Properties/SR.ko.resx similarity index 100% rename from System.Application.SteamTools.Client/Properties/SR.ko.resx rename to src/ST.Client/Properties/SR.ko.resx diff --git a/System.Application.SteamTools.Client/Properties/SR.resx b/src/ST.Client/Properties/SR.resx similarity index 97% rename from System.Application.SteamTools.Client/Properties/SR.resx rename to src/ST.Client/Properties/SR.resx index b961a55b9..c6957204a 100644 --- a/System.Application.SteamTools.Client/Properties/SR.resx +++ b/src/ST.Client/Properties/SR.resx @@ -140,7 +140,7 @@ - ..\..\Resources\OpenSourceLibraryList.mpo;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\..\..\Resources\OpenSourceLibraryList.mpo;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 文件校验失败，请打开官网手动更新 diff --git a/System.Application.SteamTools.Client/Properties/SR.ru.resx b/src/ST.Client/Properties/SR.ru.resx similarity index 100% rename from System.Application.SteamTools.Client/Properties/SR.ru.resx rename to src/ST.Client/Properties/SR.ru.resx diff --git a/System.Application.SteamTools.Client/Properties/SR.zh-Hant.resx b/src/ST.Client/Properties/SR.zh-Hant.resx similarity index 100% rename from System.Application.SteamTools.Client/Properties/SR.zh-Hant.resx rename to src/ST.Client/Properties/SR.zh-Hant.resx diff --git a/System.Application.SteamTools.Client/Repositories/IGameAccountPlatformAuthenticatorRepository.cs b/src/ST.Client/Repositories/IGameAccountPlatformAuthenticatorRepository.cs similarity index 100% rename from System.Application.SteamTools.Client/Repositories/IGameAccountPlatformAuthenticatorRepository.cs rename to src/ST.Client/Repositories/IGameAccountPlatformAuthenticatorRepository.cs diff --git a/System.Application.SteamTools.Client/Repositories/IUserRepository.cs b/src/ST.Client/Repositories/IUserRepository.cs similarity index 100% rename from System.Application.SteamTools.Client/Repositories/IUserRepository.cs rename to src/ST.Client/Repositories/IUserRepository.cs diff --git a/System.Application.SteamTools.Client/Repositories/Implementation/GameAccountPlatformAuthenticatorRepository.cs b/src/ST.Client/Repositories/Implementation/GameAccountPlatformAuthenticatorRepository.cs similarity index 100% rename from System.Application.SteamTools.Client/Repositories/Implementation/GameAccountPlatformAuthenticatorRepository.cs rename to src/ST.Client/Repositories/Implementation/GameAccountPlatformAuthenticatorRepository.cs diff --git a/System.Application.SteamTools.Client/Repositories/Implementation/UserRepository.cs b/src/ST.Client/Repositories/Implementation/UserRepository.cs similarity index 100% rename from System.Application.SteamTools.Client/Repositories/Implementation/UserRepository.cs rename to src/ST.Client/Repositories/Implementation/UserRepository.cs diff --git a/System.Application.SteamTools.Client/System.Application.SteamTools.Client.csproj b/src/ST.Client/ST.Client.csproj similarity index 60% rename from System.Application.SteamTools.Client/System.Application.SteamTools.Client.csproj rename to src/ST.Client/ST.Client.csproj index 891498526..cdc94485b 100644 --- a/System.Application.SteamTools.Client/System.Application.SteamTools.Client.csproj +++ b/src/ST.Client/ST.Client.csproj @@ -8,16 +8,16 @@ - + Properties\AssemblyInfo.cs - - - - + + + + diff --git a/System.Application.SteamTools.Client/ServiceCollectionExtensions.cs b/src/ST.Client/ServiceCollectionExtensions.cs similarity index 100% rename from System.Application.SteamTools.Client/ServiceCollectionExtensions.cs rename to src/ST.Client/ServiceCollectionExtensions.cs diff --git a/System.Application.SteamTools.Client/Services/IAppUpdateService.cs b/src/ST.Client/Services/IAppUpdateService.cs similarity index 100% rename from System.Application.SteamTools.Client/Services/IAppUpdateService.cs rename to src/ST.Client/Services/IAppUpdateService.cs diff --git a/System.Application.SteamTools.Client/Services/IHttpService.cs b/src/ST.Client/Services/IHttpService.cs similarity index 100% rename from System.Application.SteamTools.Client/Services/IHttpService.cs rename to src/ST.Client/Services/IHttpService.cs diff --git a/System.Application.SteamTools.Client/Services/INotificationService.cs b/src/ST.Client/Services/INotificationService.cs similarity index 100% rename from System.Application.SteamTools.Client/Services/INotificationService.cs rename to src/ST.Client/Services/INotificationService.cs diff --git a/System.Application.SteamTools.Client/Services/IUserManager.cs b/src/ST.Client/Services/IUserManager.cs similarity index 100% rename from System.Application.SteamTools.Client/Services/IUserManager.cs rename to src/ST.Client/Services/IUserManager.cs diff --git a/System.Application.SteamTools.Client/Services/Implementation/AppUpdateServiceImpl.cs b/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client/Services/Implementation/AppUpdateServiceImpl.cs rename to src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs diff --git a/System.Application.SteamTools.Client/Services/Implementation/CloudServiceClient.cs b/src/ST.Client/Services/Implementation/CloudServiceClient.cs similarity index 100% rename from System.Application.SteamTools.Client/Services/Implementation/CloudServiceClient.cs rename to src/ST.Client/Services/Implementation/CloudServiceClient.cs diff --git a/System.Application.SteamTools.Client/Services/Implementation/EmbeddedAesDataProtectionProvider.cs b/src/ST.Client/Services/Implementation/EmbeddedAesDataProtectionProvider.cs similarity index 100% rename from System.Application.SteamTools.Client/Services/Implementation/EmbeddedAesDataProtectionProvider.cs rename to src/ST.Client/Services/Implementation/EmbeddedAesDataProtectionProvider.cs diff --git a/System.Application.SteamTools.Client/Services/Implementation/EmptyLocalDataProtectionProvider.cs b/src/ST.Client/Services/Implementation/EmptyLocalDataProtectionProvider.cs similarity index 100% rename from System.Application.SteamTools.Client/Services/Implementation/EmptyLocalDataProtectionProvider.cs rename to src/ST.Client/Services/Implementation/EmptyLocalDataProtectionProvider.cs diff --git a/System.Application.SteamTools.Client/Services/Implementation/HttpServiceImpl.cs b/src/ST.Client/Services/Implementation/HttpServiceImpl.cs similarity index 100% rename from System.Application.SteamTools.Client/Services/Implementation/HttpServiceImpl.cs rename to src/ST.Client/Services/Implementation/HttpServiceImpl.cs diff --git a/System.Application.SteamTools.Client/Services/Implementation/UserManager.cs b/src/ST.Client/Services/Implementation/UserManager.cs similarity index 100% rename from System.Application.SteamTools.Client/Services/Implementation/UserManager.cs rename to src/ST.Client/Services/Implementation/UserManager.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/ActiveUserRecordDTO.cs b/src/ST.Services.CloudService.Models/Models/ActiveUserRecordDTO.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/ActiveUserRecordDTO.cs rename to src/ST.Services.CloudService.Models/Models/ActiveUserRecordDTO.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/ActiveUserType.cs b/src/ST.Services.CloudService.Models/Models/ActiveUserType.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/ActiveUserType.cs rename to src/ST.Services.CloudService.Models/Models/ActiveUserType.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/ApiResponse.cs b/src/ST.Services.CloudService.Models/Models/ApiResponse.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/ApiResponse.cs rename to src/ST.Services.CloudService.Models/Models/ApiResponse.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/ApiResponseCode.cs b/src/ST.Services.CloudService.Models/Models/ApiResponseCode.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/ApiResponseCode.cs rename to src/ST.Services.CloudService.Models/Models/ApiResponseCode.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/AppVersionDTO.cs b/src/ST.Services.CloudService.Models/Models/AppVersionDTO.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/AppVersionDTO.cs rename to src/ST.Services.CloudService.Models/Models/AppVersionDTO.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/ChangePhoneNumberRequest.cs b/src/ST.Services.CloudService.Models/Models/ChangePhoneNumberRequest.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/ChangePhoneNumberRequest.cs rename to src/ST.Services.CloudService.Models/Models/ChangePhoneNumberRequest.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/ClockInRequest.cs b/src/ST.Services.CloudService.Models/Models/ClockInRequest.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/ClockInRequest.cs rename to src/ST.Services.CloudService.Models/Models/ClockInRequest.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/ClockInResponse.cs b/src/ST.Services.CloudService.Models/Models/ClockInResponse.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/ClockInResponse.cs rename to src/ST.Services.CloudService.Models/Models/ClockInResponse.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/IApiResponse.cs b/src/ST.Services.CloudService.Models/Models/IApiResponse.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/IApiResponse.cs rename to src/ST.Services.CloudService.Models/Models/IApiResponse.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/ILoginResponse.cs b/src/ST.Services.CloudService.Models/Models/ILoginResponse.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/ILoginResponse.cs rename to src/ST.Services.CloudService.Models/Models/ILoginResponse.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/IReadOnlyAuthToken.cs b/src/ST.Services.CloudService.Models/Models/IReadOnlyAuthToken.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/IReadOnlyAuthToken.cs rename to src/ST.Services.CloudService.Models/Models/IReadOnlyAuthToken.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/IUserDTO.cs b/src/ST.Services.CloudService.Models/Models/IUserDTO.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/IUserDTO.cs rename to src/ST.Services.CloudService.Models/Models/IUserDTO.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/Internals/ApiResponseImpl.cs b/src/ST.Services.CloudService.Models/Models/Internals/ApiResponseImpl.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/Internals/ApiResponseImpl.cs rename to src/ST.Services.CloudService.Models/Models/Internals/ApiResponseImpl.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/LoginOrRegisterRequest.cs b/src/ST.Services.CloudService.Models/Models/LoginOrRegisterRequest.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/LoginOrRegisterRequest.cs rename to src/ST.Services.CloudService.Models/Models/LoginOrRegisterRequest.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/LoginOrRegisterResponse.cs b/src/ST.Services.CloudService.Models/Models/LoginOrRegisterResponse.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/LoginOrRegisterResponse.cs rename to src/ST.Services.CloudService.Models/Models/LoginOrRegisterResponse.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/SendSmsRequest.cs b/src/ST.Services.CloudService.Models/Models/SendSmsRequest.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/SendSmsRequest.cs rename to src/ST.Services.CloudService.Models/Models/SendSmsRequest.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/UserDTO.cs b/src/ST.Services.CloudService.Models/Models/UserDTO.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/UserDTO.cs rename to src/ST.Services.CloudService.Models/Models/UserDTO.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Models/UserInfoDTO.cs b/src/ST.Services.CloudService.Models/Models/UserInfoDTO.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Models/UserInfoDTO.cs rename to src/ST.Services.CloudService.Models/Models/UserInfoDTO.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Properties/SR.Designer.cs b/src/ST.Services.CloudService.Models/Properties/SR.Designer.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Properties/SR.Designer.cs rename to src/ST.Services.CloudService.Models/Properties/SR.Designer.cs diff --git a/System.Application.SteamTools.Services.CloudService.Models/Properties/SR.en.resx b/src/ST.Services.CloudService.Models/Properties/SR.en.resx similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Properties/SR.en.resx rename to src/ST.Services.CloudService.Models/Properties/SR.en.resx diff --git a/System.Application.SteamTools.Services.CloudService.Models/Properties/SR.ja.resx b/src/ST.Services.CloudService.Models/Properties/SR.ja.resx similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Properties/SR.ja.resx rename to src/ST.Services.CloudService.Models/Properties/SR.ja.resx diff --git a/System.Application.SteamTools.Services.CloudService.Models/Properties/SR.ko.resx b/src/ST.Services.CloudService.Models/Properties/SR.ko.resx similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Properties/SR.ko.resx rename to src/ST.Services.CloudService.Models/Properties/SR.ko.resx diff --git a/System.Application.SteamTools.Services.CloudService.Models/Properties/SR.resx b/src/ST.Services.CloudService.Models/Properties/SR.resx similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Properties/SR.resx rename to src/ST.Services.CloudService.Models/Properties/SR.resx diff --git a/System.Application.SteamTools.Services.CloudService.Models/Properties/SR.ru.resx b/src/ST.Services.CloudService.Models/Properties/SR.ru.resx similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Properties/SR.ru.resx rename to src/ST.Services.CloudService.Models/Properties/SR.ru.resx diff --git a/System.Application.SteamTools.Services.CloudService.Models/Properties/SR.zh-Hant.resx b/src/ST.Services.CloudService.Models/Properties/SR.zh-Hant.resx similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Properties/SR.zh-Hant.resx rename to src/ST.Services.CloudService.Models/Properties/SR.zh-Hant.resx diff --git a/System.Application.SteamTools.Services.CloudService.Models/System.Application.SteamTools.Services.CloudService.Models.csproj b/src/ST.Services.CloudService.Models/ST.Services.CloudService.Models.csproj similarity index 75% rename from System.Application.SteamTools.Services.CloudService.Models/System.Application.SteamTools.Services.CloudService.Models.csproj rename to src/ST.Services.CloudService.Models/ST.Services.CloudService.Models.csproj index 8823fdc0b..273bdb80f 100644 --- a/System.Application.SteamTools.Services.CloudService.Models/System.Application.SteamTools.Services.CloudService.Models.csproj +++ b/src/ST.Services.CloudService.Models/ST.Services.CloudService.Models.csproj @@ -7,14 +7,14 @@ - + Properties\AssemblyInfo.cs - - + + diff --git a/System.Application.SteamTools.Services.CloudService.Models/Services.CloudService/Constants.cs b/src/ST.Services.CloudService.Models/Services.CloudService/Constants.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService.Models/Services.CloudService/Constants.cs rename to src/ST.Services.CloudService.Models/Services.CloudService/Constants.cs diff --git a/System.Application.SteamTools.Services.CloudService/HttpContentCompat.cs b/src/ST.Services.CloudService/HttpContentCompat.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/HttpContentCompat.cs rename to src/ST.Services.CloudService/HttpContentCompat.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/GAPAuthenticatorDTO.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/GAPAuthenticatorDTO.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/GAPAuthenticatorDTO.cs rename to src/ST.Services.CloudService/Models/GAPAuthenticators/GAPAuthenticatorDTO.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/IGAPAuthenticatorDTO.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/IGAPAuthenticatorDTO.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/IGAPAuthenticatorDTO.cs rename to src/ST.Services.CloudService/Models/GAPAuthenticators/IGAPAuthenticatorDTO.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/Base/GAPAuthenticatorValueDTO.Compat_WinAuth3.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/GAPAuthenticatorValueDTO.Compat_WinAuth3.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/Base/GAPAuthenticatorValueDTO.Compat_WinAuth3.cs rename to src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/GAPAuthenticatorValueDTO.Compat_WinAuth3.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/Base/GAPAuthenticatorValueDTO.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/GAPAuthenticatorValueDTO.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/Base/GAPAuthenticatorValueDTO.cs rename to src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/GAPAuthenticatorValueDTO.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/Base/IGAPAuthenticatorValueDTO.Compat_WinAuth3.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/IGAPAuthenticatorValueDTO.Compat_WinAuth3.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/Base/IGAPAuthenticatorValueDTO.Compat_WinAuth3.cs rename to src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/IGAPAuthenticatorValueDTO.Compat_WinAuth3.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/Base/IGAPAuthenticatorValueDTO.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/IGAPAuthenticatorValueDTO.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/Base/IGAPAuthenticatorValueDTO.cs rename to src/ST.Services.CloudService/Models/GAPAuthenticators/Values/Base/IGAPAuthenticatorValueDTO.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/BattleNetAuthenticator.Compat_WinAuth3.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/BattleNetAuthenticator.Compat_WinAuth3.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/BattleNetAuthenticator.Compat_WinAuth3.cs rename to src/ST.Services.CloudService/Models/GAPAuthenticators/Values/BattleNetAuthenticator.Compat_WinAuth3.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/BattleNetAuthenticator.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/BattleNetAuthenticator.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/BattleNetAuthenticator.cs rename to src/ST.Services.CloudService/Models/GAPAuthenticators/Values/BattleNetAuthenticator.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/GoogleAuthenticator.Compat_WinAuth3.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/GoogleAuthenticator.Compat_WinAuth3.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/GoogleAuthenticator.Compat_WinAuth3.cs rename to src/ST.Services.CloudService/Models/GAPAuthenticators/Values/GoogleAuthenticator.Compat_WinAuth3.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/GoogleAuthenticator.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/GoogleAuthenticator.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/GoogleAuthenticator.cs rename to src/ST.Services.CloudService/Models/GAPAuthenticators/Values/GoogleAuthenticator.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/HOTPAuthenticator.Compat_WinAuth3.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/HOTPAuthenticator.Compat_WinAuth3.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/HOTPAuthenticator.Compat_WinAuth3.cs rename to src/ST.Services.CloudService/Models/GAPAuthenticators/Values/HOTPAuthenticator.Compat_WinAuth3.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/HOTPAuthenticator.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/HOTPAuthenticator.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/HOTPAuthenticator.cs rename to src/ST.Services.CloudService/Models/GAPAuthenticators/Values/HOTPAuthenticator.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/MicrosoftAuthenticator.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/MicrosoftAuthenticator.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/MicrosoftAuthenticator.cs rename to src/ST.Services.CloudService/Models/GAPAuthenticators/Values/MicrosoftAuthenticator.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.Compat_WinAuth3.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.Compat_WinAuth3.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.Compat_WinAuth3.cs rename to src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.Compat_WinAuth3.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.cs rename to src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/ICloudServiceSettings.cs b/src/ST.Services.CloudService/Models/ICloudServiceSettings.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/ICloudServiceSettings.cs rename to src/ST.Services.CloudService/Models/ICloudServiceSettings.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/IUploadFileSource.cs b/src/ST.Services.CloudService/Models/IUploadFileSource.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/IUploadFileSource.cs rename to src/ST.Services.CloudService/Models/IUploadFileSource.cs diff --git a/System.Application.SteamTools.Services.CloudService/Models/UploadFileSource.cs b/src/ST.Services.CloudService/Models/UploadFileSource.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Models/UploadFileSource.cs rename to src/ST.Services.CloudService/Models/UploadFileSource.cs diff --git a/System.Application.SteamTools.Services.CloudService/System.Application.SteamTools.Services.CloudService.csproj b/src/ST.Services.CloudService/ST.Services.CloudService.csproj similarity index 68% rename from System.Application.SteamTools.Services.CloudService/System.Application.SteamTools.Services.CloudService.csproj rename to src/ST.Services.CloudService/ST.Services.CloudService.csproj index 2a4e79c18..55ed8fa74 100644 --- a/System.Application.SteamTools.Services.CloudService/System.Application.SteamTools.Services.CloudService.csproj +++ b/src/ST.Services.CloudService/ST.Services.CloudService.csproj @@ -7,7 +7,7 @@ - + Properties\AssemblyInfo.cs @@ -17,6 +17,6 @@ - + \ No newline at end of file diff --git a/System.Application.SteamTools.Services.CloudService/ServiceCollectionExtensions.cs b/src/ST.Services.CloudService/ServiceCollectionExtensions.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/ServiceCollectionExtensions.cs rename to src/ST.Services.CloudService/ServiceCollectionExtensions.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/ApiConnection.cs b/src/ST.Services.CloudService/Services/CloudService/ApiConnection.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/ApiConnection.cs rename to src/ST.Services.CloudService/Services/CloudService/ApiConnection.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/ApiResponseCodeException.cs b/src/ST.Services.CloudService/Services/CloudService/ApiResponseCodeException.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/ApiResponseCodeException.cs rename to src/ST.Services.CloudService/Services/CloudService/ApiResponseCodeException.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/Abstractions/ApiClient.cs b/src/ST.Services.CloudService/Services/CloudService/Clients/Abstractions/ApiClient.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/Abstractions/ApiClient.cs rename to src/ST.Services.CloudService/Services/CloudService/Clients/Abstractions/ApiClient.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/Abstractions/IAccountClient.cs b/src/ST.Services.CloudService/Services/CloudService/Clients/Abstractions/IAccountClient.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/Abstractions/IAccountClient.cs rename to src/ST.Services.CloudService/Services/CloudService/Clients/Abstractions/IAccountClient.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/Abstractions/IActiveUserClient.cs b/src/ST.Services.CloudService/Services/CloudService/Clients/Abstractions/IActiveUserClient.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/Abstractions/IActiveUserClient.cs rename to src/ST.Services.CloudService/Services/CloudService/Clients/Abstractions/IActiveUserClient.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/Abstractions/IAuthMessageClient.cs b/src/ST.Services.CloudService/Services/CloudService/Clients/Abstractions/IAuthMessageClient.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/Abstractions/IAuthMessageClient.cs rename to src/ST.Services.CloudService/Services/CloudService/Clients/Abstractions/IAuthMessageClient.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/Abstractions/IManageClient.cs b/src/ST.Services.CloudService/Services/CloudService/Clients/Abstractions/IManageClient.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/Abstractions/IManageClient.cs rename to src/ST.Services.CloudService/Services/CloudService/Clients/Abstractions/IManageClient.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/Abstractions/IVersionClient.cs b/src/ST.Services.CloudService/Services/CloudService/Clients/Abstractions/IVersionClient.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/Abstractions/IVersionClient.cs rename to src/ST.Services.CloudService/Services/CloudService/Clients/Abstractions/IVersionClient.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/AccountClient.cs b/src/ST.Services.CloudService/Services/CloudService/Clients/AccountClient.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/AccountClient.cs rename to src/ST.Services.CloudService/Services/CloudService/Clients/AccountClient.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/ActiveUserClient.cs b/src/ST.Services.CloudService/Services/CloudService/Clients/ActiveUserClient.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/ActiveUserClient.cs rename to src/ST.Services.CloudService/Services/CloudService/Clients/ActiveUserClient.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/AuthMessageClient.cs b/src/ST.Services.CloudService/Services/CloudService/Clients/AuthMessageClient.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/AuthMessageClient.cs rename to src/ST.Services.CloudService/Services/CloudService/Clients/AuthMessageClient.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/AuthMessageClientHelper.cs b/src/ST.Services.CloudService/Services/CloudService/Clients/AuthMessageClientHelper.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/AuthMessageClientHelper.cs rename to src/ST.Services.CloudService/Services/CloudService/Clients/AuthMessageClientHelper.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/ManageClient.cs b/src/ST.Services.CloudService/Services/CloudService/Clients/ManageClient.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/ManageClient.cs rename to src/ST.Services.CloudService/Services/CloudService/Clients/ManageClient.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/VersionClient.cs b/src/ST.Services.CloudService/Services/CloudService/Clients/VersionClient.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/Clients/VersionClient.cs rename to src/ST.Services.CloudService/Services/CloudService/Clients/VersionClient.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/CloudServiceClientBase.cs b/src/ST.Services.CloudService/Services/CloudService/CloudServiceClientBase.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/CloudServiceClientBase.cs rename to src/ST.Services.CloudService/Services/CloudService/CloudServiceClientBase.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/IApiConnection.cs b/src/ST.Services.CloudService/Services/CloudService/IApiConnection.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/IApiConnection.cs rename to src/ST.Services.CloudService/Services/CloudService/IApiConnection.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/IApiConnectionPlatformHelper.cs b/src/ST.Services.CloudService/Services/CloudService/IApiConnectionPlatformHelper.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/IApiConnectionPlatformHelper.cs rename to src/ST.Services.CloudService/Services/CloudService/IApiConnectionPlatformHelper.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/CloudService/UploadFileContent.cs b/src/ST.Services.CloudService/Services/CloudService/UploadFileContent.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/CloudService/UploadFileContent.cs rename to src/ST.Services.CloudService/Services/CloudService/UploadFileContent.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/IAuthHelper.cs b/src/ST.Services.CloudService/Services/IAuthHelper.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/IAuthHelper.cs rename to src/ST.Services.CloudService/Services/IAuthHelper.cs diff --git a/System.Application.SteamTools.Services.CloudService/Services/ICloudServiceClient.cs b/src/ST.Services.CloudService/Services/ICloudServiceClient.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/Services/ICloudServiceClient.cs rename to src/ST.Services.CloudService/Services/ICloudServiceClient.cs diff --git a/System.Application.SteamTools.Services.CloudService/UploadFileType.cs b/src/ST.Services.CloudService/UploadFileType.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/UploadFileType.cs rename to src/ST.Services.CloudService/UploadFileType.cs diff --git a/System.Application.SteamTools.Services.CloudService/WinAuth/AuthenticatorException.cs b/src/ST.Services.CloudService/WinAuth/AuthenticatorException.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/WinAuth/AuthenticatorException.cs rename to src/ST.Services.CloudService/WinAuth/AuthenticatorException.cs diff --git a/System.Application.SteamTools.Services.CloudService/WinAuth/WinAuthBase32.cs b/src/ST.Services.CloudService/WinAuth/WinAuthBase32.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/WinAuth/WinAuthBase32.cs rename to src/ST.Services.CloudService/WinAuth/WinAuthBase32.cs diff --git a/System.Application.SteamTools.Services.CloudService/WinAuth/WinAuthSteamClient.cs b/src/ST.Services.CloudService/WinAuth/WinAuthSteamClient.cs similarity index 100% rename from System.Application.SteamTools.Services.CloudService/WinAuth/WinAuthSteamClient.cs rename to src/ST.Services.CloudService/WinAuth/WinAuthSteamClient.cs diff --git a/System.Application.SteamTools.Tools.OpenSourceLibraryList/Program.cs b/src/ST.Tools.OpenSourceLibraryList/Program.cs similarity index 100% rename from System.Application.SteamTools.Tools.OpenSourceLibraryList/Program.cs rename to src/ST.Tools.OpenSourceLibraryList/Program.cs diff --git a/System.Application.SteamTools.Tools.OpenSourceLibraryList/System.Application.SteamTools.Tools.OpenSourceLibraryList.csproj b/src/ST.Tools.OpenSourceLibraryList/ST.Tools.OpenSourceLibraryList.csproj similarity index 60% rename from System.Application.SteamTools.Tools.OpenSourceLibraryList/System.Application.SteamTools.Tools.OpenSourceLibraryList.csproj rename to src/ST.Tools.OpenSourceLibraryList/ST.Tools.OpenSourceLibraryList.csproj index 3423e70ed..4ba9f137b 100644 --- a/System.Application.SteamTools.Tools.OpenSourceLibraryList/System.Application.SteamTools.Tools.OpenSourceLibraryList.csproj +++ b/src/ST.Tools.OpenSourceLibraryList/ST.Tools.OpenSourceLibraryList.csproj @@ -5,23 +5,23 @@ net5.0 System Steam++.OpenSourceLibraryListGenerate - ..\System.Application.SteamTools.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico + ..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico - + Properties\AssemblyInfo.cs - + Properties\ThisAssembly.cs - + Application\Models\OpenSourceLibrary.cs - + Extensions\StringExtensions.cs - + ProjectPathUtil.cs diff --git a/System.Application.SteamTools.Tools.Packager/Application/UI/Views/Form1.Designer.cs b/src/ST.Tools.Packager/Application/UI/Views/Form1.Designer.cs similarity index 100% rename from System.Application.SteamTools.Tools.Packager/Application/UI/Views/Form1.Designer.cs rename to src/ST.Tools.Packager/Application/UI/Views/Form1.Designer.cs diff --git a/System.Application.SteamTools.Tools.Packager/Application/UI/Views/Form1.cs b/src/ST.Tools.Packager/Application/UI/Views/Form1.cs similarity index 100% rename from System.Application.SteamTools.Tools.Packager/Application/UI/Views/Form1.cs rename to src/ST.Tools.Packager/Application/UI/Views/Form1.cs diff --git a/System.Application.SteamTools.Tools.Packager/Application/UI/Views/Form1.resx b/src/ST.Tools.Packager/Application/UI/Views/Form1.resx similarity index 100% rename from System.Application.SteamTools.Tools.Packager/Application/UI/Views/Form1.resx rename to src/ST.Tools.Packager/Application/UI/Views/Form1.resx diff --git a/System.Application.SteamTools.Tools.Packager/Program.cs b/src/ST.Tools.Packager/Program.cs similarity index 100% rename from System.Application.SteamTools.Tools.Packager/Program.cs rename to src/ST.Tools.Packager/Program.cs diff --git a/System.Application.SteamTools.Tools.Packager/System.Application.SteamTools.Tools.Packager.csproj b/src/ST.Tools.Packager/ST.Tools.Packager.csproj similarity index 56% rename from System.Application.SteamTools.Tools.Packager/System.Application.SteamTools.Tools.Packager.csproj rename to src/ST.Tools.Packager/ST.Tools.Packager.csproj index 5e1cb959a..aab488645 100644 --- a/System.Application.SteamTools.Tools.Packager/System.Application.SteamTools.Tools.Packager.csproj +++ b/src/ST.Tools.Packager/ST.Tools.Packager.csproj @@ -6,29 +6,29 @@ true Steam++.Packager System - ..\System.Application.SteamTools.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico + ..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico - + Properties\AssemblyInfo.cs - + Properties\ThisAssembly.cs - + Application\TarGZipHelper.cs - + ObjectExtensions.cs - + StringExtensions.Trim.cs - + FileEx.cs - + ProjectPathUtil.cs diff --git a/System.Application.SteamTools.Tools.Translate/Program.cs b/src/ST.Tools.Translate/Program.cs similarity index 100% rename from System.Application.SteamTools.Tools.Translate/Program.cs rename to src/ST.Tools.Translate/Program.cs diff --git a/System.Application.SteamTools.Tools.Translate/System.Application.SteamTools.Tools.Translate.csproj b/src/ST.Tools.Translate/ST.Tools.Translate.csproj similarity index 59% rename from System.Application.SteamTools.Tools.Translate/System.Application.SteamTools.Tools.Translate.csproj rename to src/ST.Tools.Translate/ST.Tools.Translate.csproj index 56a40bc37..86fe7e59f 100644 --- a/System.Application.SteamTools.Tools.Translate/System.Application.SteamTools.Tools.Translate.csproj +++ b/src/ST.Tools.Translate/ST.Tools.Translate.csproj @@ -5,14 +5,14 @@ net5.0 Steam++.Translate System - ..\System.Application.SteamTools.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico + ..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico - + Properties\AssemblyInfo.cs - + ProjectPathUtil.cs @@ -22,7 +22,7 @@ - + diff --git a/System.Application.SteamTools.Tools.Translate/Translatecs.cs b/src/ST.Tools.Translate/Translatecs.cs similarity index 100% rename from System.Application.SteamTools.Tools.Translate/Translatecs.cs rename to src/ST.Tools.Translate/Translatecs.cs diff --git a/System.Application.SteamTools.Tools.Win7Troubleshoot/App.config b/src/ST.Tools.Win7Troubleshoot/App.config similarity index 100% rename from System.Application.SteamTools.Tools.Win7Troubleshoot/App.config rename to src/ST.Tools.Win7Troubleshoot/App.config diff --git a/System.Application.SteamTools.Tools.Win7Troubleshoot/Diagnostics.CodeAnalysis/NullableAttributes.cs b/src/ST.Tools.Win7Troubleshoot/Diagnostics.CodeAnalysis/NullableAttributes.cs similarity index 100% rename from System.Application.SteamTools.Tools.Win7Troubleshoot/Diagnostics.CodeAnalysis/NullableAttributes.cs rename to src/ST.Tools.Win7Troubleshoot/Diagnostics.CodeAnalysis/NullableAttributes.cs diff --git a/System.Application.SteamTools.Tools.Win7Troubleshoot/DownloadLinks.cs b/src/ST.Tools.Win7Troubleshoot/DownloadLinks.cs similarity index 100% rename from System.Application.SteamTools.Tools.Win7Troubleshoot/DownloadLinks.cs rename to src/ST.Tools.Win7Troubleshoot/DownloadLinks.cs diff --git a/System.Application.SteamTools.Tools.Win7Troubleshoot/EnvironmentEx.cs b/src/ST.Tools.Win7Troubleshoot/EnvironmentEx.cs similarity index 100% rename from System.Application.SteamTools.Tools.Win7Troubleshoot/EnvironmentEx.cs rename to src/ST.Tools.Win7Troubleshoot/EnvironmentEx.cs diff --git a/System.Application.SteamTools.Tools.Win7Troubleshoot/HashAlgorithm.cs b/src/ST.Tools.Win7Troubleshoot/HashAlgorithm.cs similarity index 100% rename from System.Application.SteamTools.Tools.Win7Troubleshoot/HashAlgorithm.cs rename to src/ST.Tools.Win7Troubleshoot/HashAlgorithm.cs diff --git a/System.Application.SteamTools.Tools.Win7Troubleshoot/Program.cs b/src/ST.Tools.Win7Troubleshoot/Program.cs similarity index 100% rename from System.Application.SteamTools.Tools.Win7Troubleshoot/Program.cs rename to src/ST.Tools.Win7Troubleshoot/Program.cs diff --git a/System.Application.SteamTools.Tools.Win7Troubleshoot/Properties/SR.Designer.cs b/src/ST.Tools.Win7Troubleshoot/Properties/SR.Designer.cs similarity index 100% rename from System.Application.SteamTools.Tools.Win7Troubleshoot/Properties/SR.Designer.cs rename to src/ST.Tools.Win7Troubleshoot/Properties/SR.Designer.cs diff --git a/System.Application.SteamTools.Tools.Win7Troubleshoot/Properties/SR.en.resx b/src/ST.Tools.Win7Troubleshoot/Properties/SR.en.resx similarity index 100% rename from System.Application.SteamTools.Tools.Win7Troubleshoot/Properties/SR.en.resx rename to src/ST.Tools.Win7Troubleshoot/Properties/SR.en.resx diff --git a/System.Application.SteamTools.Tools.Win7Troubleshoot/Properties/SR.ja.resx b/src/ST.Tools.Win7Troubleshoot/Properties/SR.ja.resx similarity index 100% rename from System.Application.SteamTools.Tools.Win7Troubleshoot/Properties/SR.ja.resx rename to src/ST.Tools.Win7Troubleshoot/Properties/SR.ja.resx diff --git a/System.Application.SteamTools.Tools.Win7Troubleshoot/Properties/SR.resx b/src/ST.Tools.Win7Troubleshoot/Properties/SR.resx similarity index 100% rename from System.Application.SteamTools.Tools.Win7Troubleshoot/Properties/SR.resx rename to src/ST.Tools.Win7Troubleshoot/Properties/SR.resx diff --git a/System.Application.SteamTools.Tools.Win7Troubleshoot/Properties/SR.ru.resx b/src/ST.Tools.Win7Troubleshoot/Properties/SR.ru.resx similarity index 100% rename from System.Application.SteamTools.Tools.Win7Troubleshoot/Properties/SR.ru.resx rename to src/ST.Tools.Win7Troubleshoot/Properties/SR.ru.resx diff --git a/System.Application.SteamTools.Tools.Win7Troubleshoot/Properties/SR.zh-Hant.resx b/src/ST.Tools.Win7Troubleshoot/Properties/SR.zh-Hant.resx similarity index 100% rename from System.Application.SteamTools.Tools.Win7Troubleshoot/Properties/SR.zh-Hant.resx rename to src/ST.Tools.Win7Troubleshoot/Properties/SR.zh-Hant.resx diff --git a/System.Application.SteamTools.Tools.Win7Troubleshoot/System.Application.SteamTools.Tools.Win7Troubleshoot.csproj b/src/ST.Tools.Win7Troubleshoot/ST.Tools.Win7Troubleshoot.csproj similarity index 61% rename from System.Application.SteamTools.Tools.Win7Troubleshoot/System.Application.SteamTools.Tools.Win7Troubleshoot.csproj rename to src/ST.Tools.Win7Troubleshoot/ST.Tools.Win7Troubleshoot.csproj index 47df86f51..19f3ba889 100644 --- a/System.Application.SteamTools.Tools.Win7Troubleshoot/System.Application.SteamTools.Tools.Win7Troubleshoot.csproj +++ b/src/ST.Tools.Win7Troubleshoot/ST.Tools.Win7Troubleshoot.csproj @@ -4,29 +4,29 @@ WinExe AnyCPU net35 - ..\System.Application.SteamTools.Client.Desktop.Avalonia.App\Properties\app.manifest + ..\ST.Client.Desktop.Avalonia.App\Properties\app.manifest Steam++.Win7 System - ..\System.Application.SteamTools.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico + ..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico - + Properties\AssemblyInfo.cs - + Properties\ThisAssembly.cs - + Security\Cryptography\Hashs.cs - + Security\Cryptography\Hashs_SHA1.cs - + IOPath.cs - + FileSystemDesktop.cs @@ -51,8 +51,8 @@ - - + + steam++.win7.visualelementsmanifest.xml PreserveNewest diff --git a/System.Application.SteamTools.Tools.Win7Troubleshoot/StringExtensions.cs b/src/ST.Tools.Win7Troubleshoot/StringExtensions.cs similarity index 100% rename from System.Application.SteamTools.Tools.Win7Troubleshoot/StringExtensions.cs rename to src/ST.Tools.Win7Troubleshoot/StringExtensions.cs diff --git a/System.Application.SteamTools/BuildConfig.cs b/src/ST/BuildConfig.cs similarity index 100% rename from System.Application.SteamTools/BuildConfig.cs rename to src/ST/BuildConfig.cs diff --git a/System.Application.SteamTools/Columns/INickName.cs b/src/ST/Columns/INickName.cs similarity index 100% rename from System.Application.SteamTools/Columns/INickName.cs rename to src/ST/Columns/INickName.cs diff --git a/System.Application.SteamTools/Columns/ISmsCode.cs b/src/ST/Columns/ISmsCode.cs similarity index 100% rename from System.Application.SteamTools/Columns/ISmsCode.cs rename to src/ST/Columns/ISmsCode.cs diff --git a/System.Application.SteamTools/Columns/ISmsCodeType.cs b/src/ST/Columns/ISmsCodeType.cs similarity index 100% rename from System.Application.SteamTools/Columns/ISmsCodeType.cs rename to src/ST/Columns/ISmsCodeType.cs diff --git a/System.Application.SteamTools/Constants.cs b/src/ST/Constants.cs similarity index 100% rename from System.Application.SteamTools/Constants.cs rename to src/ST/Constants.cs diff --git a/System.Application.SteamTools/Extensions/X509Certificate2Extensions.cs b/src/ST/Extensions/X509Certificate2Extensions.cs similarity index 100% rename from System.Application.SteamTools/Extensions/X509Certificate2Extensions.cs rename to src/ST/Extensions/X509Certificate2Extensions.cs diff --git a/System.Application.SteamTools/ForwardHelper.cs b/src/ST/ForwardHelper.cs similarity index 100% rename from System.Application.SteamTools/ForwardHelper.cs rename to src/ST/ForwardHelper.cs diff --git a/System.Application.SteamTools/GamePlatform.cs b/src/ST/GamePlatform.cs similarity index 100% rename from System.Application.SteamTools/GamePlatform.cs rename to src/ST/GamePlatform.cs diff --git a/System.Application.SteamTools/ModelValidatorProvider.cs b/src/ST/ModelValidatorProvider.cs similarity index 100% rename from System.Application.SteamTools/ModelValidatorProvider.cs rename to src/ST/ModelValidatorProvider.cs diff --git a/System.Application.SteamTools/Properties/SR.Designer.cs b/src/ST/Properties/SR.Designer.cs similarity index 100% rename from System.Application.SteamTools/Properties/SR.Designer.cs rename to src/ST/Properties/SR.Designer.cs diff --git a/System.Application.SteamTools/Properties/SR.resx b/src/ST/Properties/SR.resx similarity index 100% rename from System.Application.SteamTools/Properties/SR.resx rename to src/ST/Properties/SR.resx diff --git a/System.Application.SteamTools/ReleaseType.cs b/src/ST/ReleaseType.cs similarity index 100% rename from System.Application.SteamTools/ReleaseType.cs rename to src/ST/ReleaseType.cs diff --git a/System.Application.SteamTools/System.Application.SteamTools.csproj b/src/ST/ST.csproj similarity index 84% rename from System.Application.SteamTools/System.Application.SteamTools.csproj rename to src/ST/ST.csproj index b0cfc530f..85aac9707 100644 --- a/System.Application.SteamTools/System.Application.SteamTools.csproj +++ b/src/ST/ST.csproj @@ -7,7 +7,7 @@ - + Properties\AssemblyInfo.cs @@ -17,7 +17,7 @@ - + diff --git a/System.Application.SteamTools/Security/IsNotOfficialChannelPackageException.cs b/src/ST/Security/IsNotOfficialChannelPackageException.cs similarity index 100% rename from System.Application.SteamTools/Security/IsNotOfficialChannelPackageException.cs rename to src/ST/Security/IsNotOfficialChannelPackageException.cs diff --git a/System.Application.SteamTools/SmsCodeType.cs b/src/ST/SmsCodeType.cs similarity index 100% rename from System.Application.SteamTools/SmsCodeType.cs rename to src/ST/SmsCodeType.cs diff --git a/System.Application.SteamTools/UploadImageType.cs b/src/ST/UploadImageType.cs similarity index 100% rename from System.Application.SteamTools/UploadImageType.cs rename to src/ST/UploadImageType.cs diff --git a/System.Application.Services.SmsSender/Models/Abstractions/ISmsResult.cs b/src/Services.SmsSender/Models/Abstractions/ISmsResult.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/Abstractions/ISmsResult.cs rename to src/Services.SmsSender/Models/Abstractions/ISmsResult.cs diff --git a/System.Application.Services.SmsSender/Models/Abstractions/SmsResult.cs b/src/Services.SmsSender/Models/Abstractions/SmsResult.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/Abstractions/SmsResult.cs rename to src/Services.SmsSender/Models/Abstractions/SmsResult.cs diff --git a/System.Application.Services.SmsSender/Models/AlibabaCloud/AlibabaCloudResult.cs b/src/Services.SmsSender/Models/AlibabaCloud/AlibabaCloudResult.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/AlibabaCloud/AlibabaCloudResult.cs rename to src/Services.SmsSender/Models/AlibabaCloud/AlibabaCloudResult.cs diff --git a/System.Application.Services.SmsSender/Models/AlibabaCloud/SendSmsAlibabaCloudResult.cs b/src/Services.SmsSender/Models/AlibabaCloud/SendSmsAlibabaCloudResult.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/AlibabaCloud/SendSmsAlibabaCloudResult.cs rename to src/Services.SmsSender/Models/AlibabaCloud/SendSmsAlibabaCloudResult.cs diff --git a/System.Application.Services.SmsSender/Models/AlibabaCloud/SmsOptions.cs b/src/Services.SmsSender/Models/AlibabaCloud/SmsOptions.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/AlibabaCloud/SmsOptions.cs rename to src/Services.SmsSender/Models/AlibabaCloud/SmsOptions.cs diff --git a/System.Application.Services.SmsSender/Models/CheckSmsResult.cs b/src/Services.SmsSender/Models/CheckSmsResult.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/CheckSmsResult.cs rename to src/Services.SmsSender/Models/CheckSmsResult.cs diff --git a/System.Application.Services.SmsSender/Models/ICheckSmsResult.cs b/src/Services.SmsSender/Models/ICheckSmsResult.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/ICheckSmsResult.cs rename to src/Services.SmsSender/Models/ICheckSmsResult.cs diff --git a/System.Application.Services.SmsSender/Models/ISendSmsResult.cs b/src/Services.SmsSender/Models/ISendSmsResult.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/ISendSmsResult.cs rename to src/Services.SmsSender/Models/ISendSmsResult.cs diff --git a/System.Application.Services.SmsSender/Models/ISmsSettings.cs b/src/Services.SmsSender/Models/ISmsSettings.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/ISmsSettings.cs rename to src/Services.SmsSender/Models/ISmsSettings.cs diff --git a/System.Application.Services.SmsSender/Models/ISmsSubResult.cs b/src/Services.SmsSender/Models/ISmsSubResult.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/ISmsSubResult.cs rename to src/Services.SmsSender/Models/ISmsSubResult.cs diff --git a/System.Application.Services.SmsSender/Models/NetEaseCloud/NetEaseCloudResult.cs b/src/Services.SmsSender/Models/NetEaseCloud/NetEaseCloudResult.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/NetEaseCloud/NetEaseCloudResult.cs rename to src/Services.SmsSender/Models/NetEaseCloud/NetEaseCloudResult.cs diff --git a/System.Application.Services.SmsSender/Models/NetEaseCloud/SendSmsNetEaseCloudResult.cs b/src/Services.SmsSender/Models/NetEaseCloud/SendSmsNetEaseCloudResult.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/NetEaseCloud/SendSmsNetEaseCloudResult.cs rename to src/Services.SmsSender/Models/NetEaseCloud/SendSmsNetEaseCloudResult.cs diff --git a/System.Application.Services.SmsSender/Models/NetEaseCloud/SendSmsResponseCode.cs b/src/Services.SmsSender/Models/NetEaseCloud/SendSmsResponseCode.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/NetEaseCloud/SendSmsResponseCode.cs rename to src/Services.SmsSender/Models/NetEaseCloud/SendSmsResponseCode.cs diff --git a/System.Application.Services.SmsSender/Models/NetEaseCloud/SmsOptions.cs b/src/Services.SmsSender/Models/NetEaseCloud/SmsOptions.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/NetEaseCloud/SmsOptions.cs rename to src/Services.SmsSender/Models/NetEaseCloud/SmsOptions.cs diff --git a/System.Application.Services.SmsSender/Models/SendSmsResult.cs b/src/Services.SmsSender/Models/SendSmsResult.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/SendSmsResult.cs rename to src/Services.SmsSender/Models/SendSmsResult.cs diff --git a/System.Application.Services.SmsSender/Models/SmsOptions.cs b/src/Services.SmsSender/Models/SmsOptions.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/SmsOptions.cs rename to src/Services.SmsSender/Models/SmsOptions.cs diff --git a/System.Application.Services.SmsSender/Models/SmsOptionsTemplateId.cs b/src/Services.SmsSender/Models/SmsOptionsTemplateId.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/SmsOptionsTemplateId.cs rename to src/Services.SmsSender/Models/SmsOptionsTemplateId.cs diff --git a/System.Application.Services.SmsSender/Models/_21VianetBlueCloud/SendSms21VianetBlueCloudResult.cs b/src/Services.SmsSender/Models/_21VianetBlueCloud/SendSms21VianetBlueCloudResult.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/_21VianetBlueCloud/SendSms21VianetBlueCloudResult.cs rename to src/Services.SmsSender/Models/_21VianetBlueCloud/SendSms21VianetBlueCloudResult.cs diff --git a/System.Application.Services.SmsSender/Models/_21VianetBlueCloud/SmsOptions.cs b/src/Services.SmsSender/Models/_21VianetBlueCloud/SmsOptions.cs similarity index 100% rename from System.Application.Services.SmsSender/Models/_21VianetBlueCloud/SmsOptions.cs rename to src/Services.SmsSender/Models/_21VianetBlueCloud/SmsOptions.cs diff --git a/System.Application.Services.SmsSender/README.md b/src/Services.SmsSender/README.md similarity index 100% rename from System.Application.Services.SmsSender/README.md rename to src/Services.SmsSender/README.md diff --git a/System.Application.Services.SmsSender/ServiceCollectionExtensions.cs b/src/Services.SmsSender/ServiceCollectionExtensions.cs similarity index 100% rename from System.Application.Services.SmsSender/ServiceCollectionExtensions.cs rename to src/Services.SmsSender/ServiceCollectionExtensions.cs diff --git a/System.Application.Services.SmsSender/System.Application.Services.SmsSender.csproj b/src/Services.SmsSender/Services.SmsSender.csproj similarity index 100% rename from System.Application.Services.SmsSender/System.Application.Services.SmsSender.csproj rename to src/Services.SmsSender/Services.SmsSender.csproj diff --git a/System.Application.Services.SmsSender/Services/ISmsSender.cs b/src/Services.SmsSender/Services/ISmsSender.cs similarity index 100% rename from System.Application.Services.SmsSender/Services/ISmsSender.cs rename to src/Services.SmsSender/Services/ISmsSender.cs diff --git a/System.Application.Services.SmsSender/Services/Implementation/AlibabaCloud/SenderProviderInvoker.cs b/src/Services.SmsSender/Services/Implementation/AlibabaCloud/SenderProviderInvoker.cs similarity index 100% rename from System.Application.Services.SmsSender/Services/Implementation/AlibabaCloud/SenderProviderInvoker.cs rename to src/Services.SmsSender/Services/Implementation/AlibabaCloud/SenderProviderInvoker.cs diff --git a/System.Application.Services.SmsSender/Services/Implementation/AlibabaCloud/SmsSenderProvider.cs b/src/Services.SmsSender/Services/Implementation/AlibabaCloud/SmsSenderProvider.cs similarity index 100% rename from System.Application.Services.SmsSender/Services/Implementation/AlibabaCloud/SmsSenderProvider.cs rename to src/Services.SmsSender/Services/Implementation/AlibabaCloud/SmsSenderProvider.cs diff --git a/System.Application.Services.SmsSender/Services/Implementation/DebugSmsSenderProvider.cs b/src/Services.SmsSender/Services/Implementation/DebugSmsSenderProvider.cs similarity index 100% rename from System.Application.Services.SmsSender/Services/Implementation/DebugSmsSenderProvider.cs rename to src/Services.SmsSender/Services/Implementation/DebugSmsSenderProvider.cs diff --git a/System.Application.Services.SmsSender/Services/Implementation/NetEaseCloud/SenderProviderInvoker.cs b/src/Services.SmsSender/Services/Implementation/NetEaseCloud/SenderProviderInvoker.cs similarity index 100% rename from System.Application.Services.SmsSender/Services/Implementation/NetEaseCloud/SenderProviderInvoker.cs rename to src/Services.SmsSender/Services/Implementation/NetEaseCloud/SenderProviderInvoker.cs diff --git a/System.Application.Services.SmsSender/Services/Implementation/NetEaseCloud/SmsSenderProvider.cs b/src/Services.SmsSender/Services/Implementation/NetEaseCloud/SmsSenderProvider.cs similarity index 100% rename from System.Application.Services.SmsSender/Services/Implementation/NetEaseCloud/SmsSenderProvider.cs rename to src/Services.SmsSender/Services/Implementation/NetEaseCloud/SmsSenderProvider.cs diff --git a/System.Application.Services.SmsSender/Services/Implementation/SmsSenderBase.cs b/src/Services.SmsSender/Services/Implementation/SmsSenderBase.cs similarity index 100% rename from System.Application.Services.SmsSender/Services/Implementation/SmsSenderBase.cs rename to src/Services.SmsSender/Services/Implementation/SmsSenderBase.cs diff --git a/System.Application.Services.SmsSender/Services/Implementation/SmsSenderWrapper.cs b/src/Services.SmsSender/Services/Implementation/SmsSenderWrapper.cs similarity index 100% rename from System.Application.Services.SmsSender/Services/Implementation/SmsSenderWrapper.cs rename to src/Services.SmsSender/Services/Implementation/SmsSenderWrapper.cs diff --git a/System.Application.Services.SmsSender/Services/Implementation/_21VianetBlueCloud/SenderProviderInvoker.cs b/src/Services.SmsSender/Services/Implementation/_21VianetBlueCloud/SenderProviderInvoker.cs similarity index 100% rename from System.Application.Services.SmsSender/Services/Implementation/_21VianetBlueCloud/SenderProviderInvoker.cs rename to src/Services.SmsSender/Services/Implementation/_21VianetBlueCloud/SenderProviderInvoker.cs diff --git a/System.Application.Services.SmsSender/Services/Implementation/_21VianetBlueCloud/SmsSenderProvider.cs b/src/Services.SmsSender/Services/Implementation/_21VianetBlueCloud/SmsSenderProvider.cs similarity index 100% rename from System.Application.Services.SmsSender/Services/Implementation/_21VianetBlueCloud/SmsSenderProvider.cs rename to src/Services.SmsSender/Services/Implementation/_21VianetBlueCloud/SmsSenderProvider.cs diff --git a/System.Common.UnitTest.Droid.App/Assets/AboutAssets.txt b/tests/Common.UnitTest.Droid.App/Assets/AboutAssets.txt similarity index 100% rename from System.Common.UnitTest.Droid.App/Assets/AboutAssets.txt rename to tests/Common.UnitTest.Droid.App/Assets/AboutAssets.txt diff --git a/System.Common.UnitTest.Droid.App/System.Common.UnitTest.Droid.App.csproj b/tests/Common.UnitTest.Droid.App/Common.UnitTest.Droid.App.csproj similarity index 75% rename from System.Common.UnitTest.Droid.App/System.Common.UnitTest.Droid.App.csproj rename to tests/Common.UnitTest.Droid.App/Common.UnitTest.Droid.App.csproj index cb7230f54..77e3319e9 100644 --- a/System.Common.UnitTest.Droid.App/System.Common.UnitTest.Droid.App.csproj +++ b/tests/Common.UnitTest.Droid.App/Common.UnitTest.Droid.App.csproj @@ -47,52 +47,52 @@ False - + Properties\AssemblyInfo.cs - + Resources\mipmap-xxxhdpi\ic_launcher2.png - + Resources\mipmap-xxxhdpi\ic_launcher_round2.png - + Resources\mipmap-xxhdpi\ic_launcher2.png - + Resources\mipmap-xxhdpi\ic_launcher_round2.png - + Resources\mipmap-xhdpi\ic_launcher2.png - + Resources\mipmap-xhdpi\ic_launcher_round2.png - + Resources\mipmap-mdpi\ic_launcher2.png - + Resources\mipmap-mdpi\ic_launcher_round2.png - + Resources\mipmap-hdpi\ic_launcher2.png - + Resources\mipmap-hdpi\ic_launcher_round2.png - + Resources\mipmap-anydpi-v26\ic_launcher2.xml - + Resources\mipmap-anydpi-v26\ic_launcher_round2.xml - + Resources\drawable\ic_launcher_background2.xml - + Resources\drawable-v24\ic_launcher_foreground2.xml @@ -134,13 +134,13 @@ - - {372e8c00-cd73-400c-b4d8-ce99a1fb14d7} - System.Common.CoreLib + + {E7468FDD-75F7-4B08-BA47-B715BBCFCC11} + Common.CoreLib - - {1862ae96-119e-4277-93e0-c435985f4729} - System.Common.UnitTest.Droid + + {0073A08E-6336-4C09-99F9-2E808889D715} + Common.UnitTest.Droid diff --git a/System.Common.UnitTest.Droid.App/MainActivity.cs b/tests/Common.UnitTest.Droid.App/MainActivity.cs similarity index 100% rename from System.Common.UnitTest.Droid.App/MainActivity.cs rename to tests/Common.UnitTest.Droid.App/MainActivity.cs diff --git a/System.Common.UnitTest.Droid.App/Properties/AndroidManifest.xml b/tests/Common.UnitTest.Droid.App/Properties/AndroidManifest.xml similarity index 100% rename from System.Common.UnitTest.Droid.App/Properties/AndroidManifest.xml rename to tests/Common.UnitTest.Droid.App/Properties/AndroidManifest.xml diff --git a/System.Common.UnitTest.Droid.App/Resources/AboutResources.txt b/tests/Common.UnitTest.Droid.App/Resources/AboutResources.txt similarity index 100% rename from System.Common.UnitTest.Droid.App/Resources/AboutResources.txt rename to tests/Common.UnitTest.Droid.App/Resources/AboutResources.txt diff --git a/System.Common.UnitTest.Droid.App/Resources/Resource.Designer.cs b/tests/Common.UnitTest.Droid.App/Resources/Resource.Designer.cs similarity index 100% rename from System.Common.UnitTest.Droid.App/Resources/Resource.Designer.cs rename to tests/Common.UnitTest.Droid.App/Resources/Resource.Designer.cs diff --git a/System.Common.UnitTest.Droid/System.Common.UnitTest.Droid.csproj b/tests/Common.UnitTest.Droid/Common.UnitTest.Droid.csproj similarity index 58% rename from System.Common.UnitTest.Droid/System.Common.UnitTest.Droid.csproj rename to tests/Common.UnitTest.Droid/Common.UnitTest.Droid.csproj index d49e26e6d..2d6bdef99 100644 --- a/System.Common.UnitTest.Droid/System.Common.UnitTest.Droid.csproj +++ b/tests/Common.UnitTest.Droid/Common.UnitTest.Droid.csproj @@ -10,27 +10,27 @@ - + Properties\AssemblyInfo.cs - + Properties\InternalsVisibleTo.cs - + Utils\TargetFramework.cs - + - + Logging - + Utils - + Droid @@ -42,8 +42,8 @@ - - + + \ No newline at end of file diff --git a/System.Common.UnitTest/AsyncTest.cs b/tests/Common.UnitTest/AsyncTest.cs similarity index 100% rename from System.Common.UnitTest/AsyncTest.cs rename to tests/Common.UnitTest/AsyncTest.cs diff --git a/System.Common.UnitTest/ByteArrayTest.cs b/tests/Common.UnitTest/ByteArrayTest.cs similarity index 100% rename from System.Common.UnitTest/ByteArrayTest.cs rename to tests/Common.UnitTest/ByteArrayTest.cs diff --git a/System.Common.UnitTest/System.Common.UnitTest.csproj b/tests/Common.UnitTest/Common.UnitTest.csproj similarity index 62% rename from System.Common.UnitTest/System.Common.UnitTest.csproj rename to tests/Common.UnitTest/Common.UnitTest.csproj index e848bcbd6..656191197 100644 --- a/System.Common.UnitTest/System.Common.UnitTest.csproj +++ b/tests/Common.UnitTest/Common.UnitTest.csproj @@ -9,16 +9,16 @@ - + Properties\AssemblyInfo.cs - + Properties\InternalsVisibleTo.cs - + Utils\TargetFramework.cs - + Utils\LogHelper.cs @@ -31,8 +31,8 @@ - - + + \ No newline at end of file diff --git a/System.Common.UnitTest/LoggerTest.cs b/tests/Common.UnitTest/LoggerTest.cs similarity index 100% rename from System.Common.UnitTest/LoggerTest.cs rename to tests/Common.UnitTest/LoggerTest.cs diff --git a/System.Common.UnitTest/Logging/NUnitLogger.cs b/tests/Common.UnitTest/Logging/NUnitLogger.cs similarity index 100% rename from System.Common.UnitTest/Logging/NUnitLogger.cs rename to tests/Common.UnitTest/Logging/NUnitLogger.cs diff --git a/System.Common.UnitTest/Logging/NUnitLoggerProvider.cs b/tests/Common.UnitTest/Logging/NUnitLoggerProvider.cs similarity index 100% rename from System.Common.UnitTest/Logging/NUnitLoggerProvider.cs rename to tests/Common.UnitTest/Logging/NUnitLoggerProvider.cs diff --git a/System.Common.UnitTest/PinyinTest.cs b/tests/Common.UnitTest/PinyinTest.cs similarity index 100% rename from System.Common.UnitTest/PinyinTest.cs rename to tests/Common.UnitTest/PinyinTest.cs diff --git a/System.Common.UnitTest/SetupFixture.cs b/tests/Common.UnitTest/SetupFixture.cs similarity index 100% rename from System.Common.UnitTest/SetupFixture.cs rename to tests/Common.UnitTest/SetupFixture.cs diff --git a/System.Common.UnitTest/Utils/Crc32.cs b/tests/Common.UnitTest/Utils/Crc32.cs similarity index 100% rename from System.Common.UnitTest/Utils/Crc32.cs rename to tests/Common.UnitTest/Utils/Crc32.cs diff --git a/System.Common.UnitTest/Utils/Serializable2.cs b/tests/Common.UnitTest/Utils/Serializable2.cs similarity index 100% rename from System.Common.UnitTest/Utils/Serializable2.cs rename to tests/Common.UnitTest/Utils/Serializable2.cs diff --git a/System.Common.UnitTest/Utils/UnitTestHelper.cs b/tests/Common.UnitTest/Utils/UnitTestHelper.cs similarity index 100% rename from System.Common.UnitTest/Utils/UnitTestHelper.cs rename to tests/Common.UnitTest/Utils/UnitTestHelper.cs diff --git a/System.Application.SteamTools.Client.Test/HttpTest.cs b/tests/ST.Client.UnitTest/HttpTest.cs similarity index 100% rename from System.Application.SteamTools.Client.Test/HttpTest.cs rename to tests/ST.Client.UnitTest/HttpTest.cs diff --git a/System.Application.SteamTools.Client.Test/System.Application.SteamTools.Client.Test.csproj b/tests/ST.Client.UnitTest/ST.Client.UnitTest.csproj similarity index 58% rename from System.Application.SteamTools.Client.Test/System.Application.SteamTools.Client.Test.csproj rename to tests/ST.Client.UnitTest/ST.Client.UnitTest.csproj index 5a3815869..cbc3f7a44 100644 --- a/System.Application.SteamTools.Client.Test/System.Application.SteamTools.Client.Test.csproj +++ b/tests/ST.Client.UnitTest/ST.Client.UnitTest.csproj @@ -4,27 +4,27 @@ net5.0 System.Application UnitTest;$(DefineConstants) - System.Application.SteamTools.Client.Test + System.Application.SteamTools.Client.UnitTest - + Properties\AssemblyInfo.cs - + Logging\NUnitLogger.cs - + Logging\NUnitLoggerProvider.cs - + Utils\Serializable2.cs - - + + diff --git a/System.Application.SteamTools.Client.Test/SetupFixture.cs b/tests/ST.Client.UnitTest/SetupFixture.cs similarity index 100% rename from System.Application.SteamTools.Client.Test/SetupFixture.cs rename to tests/ST.Client.UnitTest/SetupFixture.cs