diff --git a/.azure/pipelines/devops-pipeline-build-publish.yml b/.azure/pipelines/devops-pipeline-build-publish.yml deleted file mode 100644 index 6cf3a6b67..000000000 --- a/.azure/pipelines/devops-pipeline-build-publish.yml +++ /dev/null @@ -1,75 +0,0 @@ -# ASP.NET Core (.NET Framework) -# Build and test ASP.NET Core projects targeting the full .NET Framework. -# Add steps that publish symbols, save build artifacts, and more: -# https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core - -pool: - vmImage: 'windows-2022' # required to get Visual Studio 2022 - -variables: - solution: '**/*.sln' - projects: '**/*.csproj' - buildPlatform: 'Any CPU' - buildConfiguration: 'Release' - buildTargetFramework: '6.0.x' - -steps: -- task: UseDotNet@2 - displayName: 'Use .NET' - inputs: - packageType: 'sdk' - version: '$(buildTargetFramework)' - includePreviewVersions: true -- task: NuGetToolInstaller@1 - displayName: 'Use NuGet' - inputs: - versionSpec: '$(buildTargetFramework)' - checkLatest: true -- task: NuGetCommand@2 - displayName: 'Restore NuGet packages' - inputs: - restoreSolution: '$(solution)' -- task: Assembly-Info-NetCore@3 - displayName: 'Set Assembly Metadata' - inputs: - Path: '$(Build.SourcesDirectory)' - FileNames: '$(projects)' - InsertAttributes: true - IgnoreNetFrameworkProjects: true - FileEncoding: 'auto' - WriteBOM: false - Authors: 'Rhys Koedijk' - Product: 'SCMM' - Copyright: 'Copyright © 2022-$(date:YYYY) Rhys Koedijk' - PackageProjectUrl: 'https://scmm.app' - VersionNumber: '$(app.Version)' - FileVersionNumber: '$(app.Version)' - InformationalVersion: '$(app.Version)' - PackageVersion: '$(app.Version)' - LogLevel: 'verbose' - FailOnWarning: false - DisableTelemetry: true - UpdateBuildNumber: '$(app.Version)' - AddBuildTag: '$(app.Version)' -- task: DotNetCoreCLI@2 - displayName: 'Publish Solution' - inputs: - command: 'publish' - publishWebProjects: false - projects: '**/*.csproj' - arguments: '--configuration $(buildConfiguration)' -- task: CopyFiles@2 - displayName: 'Copy Artifacts' - inputs: - SourceFolder: '$(System.DefaultWorkingDirectory)' - Contents: | - **/SCMM.Discord.Bot.Server/**/*.zip - **/SCMM.Steam.Functions/**/*.zip - **/SCMM.Web.Server/**/*.zip - TargetFolder: '$(Build.ArtifactStagingDirectory)' -- task: PublishBuildArtifacts@1 - displayName: 'Publish Artifacts' - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)' - ArtifactName: 'packages' - publishLocation: 'Container' diff --git a/.azure/pipelines/devops-pipeline-build-test.yml b/.azure/pipelines/devops-pipeline-build-test.yml deleted file mode 100644 index 2ed41d077..000000000 --- a/.azure/pipelines/devops-pipeline-build-test.yml +++ /dev/null @@ -1,49 +0,0 @@ -# ASP.NET Core (.NET Framework) -# Build and test ASP.NET Core projects targeting the full .NET Framework. -# Add steps that publish symbols, save build artifacts, and more: -# https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core - -pool: - vmImage: 'windows-2022' # required to get Visual Studio 2022 - -variables: - solution: '**/*.sln' - buildPlatform: 'Any CPU' - buildConfiguration: 'Release' - buildTargetFramework: '6.0.x' - -steps: -- task: UseDotNet@2 - displayName: 'Use .NET' - inputs: - packageType: 'sdk' - version: '$(buildTargetFramework)' - includePreviewVersions: true -- task: NuGetToolInstaller@1 - displayName: 'Use NuGet' - inputs: - versionSpec: '$(buildTargetFramework)' - checkLatest: true -- task: NuGetCommand@2 - displayName: 'Restore NuGet packages' - inputs: - restoreSolution: '$(solution)' -- task: VSBuild@1 - displayName: 'Build Solution' - inputs: - solution: '$(solution)' - platform: '$(buildPlatform)' - configuration: '$(buildConfiguration)' - clean: true - msbuildArchitecture: 'x64' -- task: VSTest@2 - displayName: 'Run Unit Tests' - inputs: - testSelector: 'testAssemblies' - testAssemblyVer2: | - **\*test*.dll - !**\*TestAdapter.dll - !**\obj\** - searchFolder: '$(System.DefaultWorkingDirectory)' - platform: '$(buildPlatform)' - configuration: '$(buildConfiguration)' diff --git a/.github/workflows/github-action-build-and-deploy.yml b/.github/workflows/github-action-build-and-deploy.yml index 5a67a9bde..f6692ae68 100644 --- a/.github/workflows/github-action-build-and-deploy.yml +++ b/.github/workflows/github-action-build-and-deploy.yml @@ -2,7 +2,7 @@ name: Build and deploy solution to Azure env: - DOTNET_VERSION: '8.0.x' + DOTNET_VERSION: '9.0.x' on: push: diff --git a/.github/workflows/github-action-build-and-test.yml b/.github/workflows/github-action-build-and-test.yml index 1f4bcff3e..d6748a786 100644 --- a/.github/workflows/github-action-build-and-test.yml +++ b/.github/workflows/github-action-build-and-test.yml @@ -2,7 +2,7 @@ name: Build and test solution env: - DOTNET_VERSION: '8.0.x' + DOTNET_VERSION: '9.0.x' on: pull_request: diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 000000000..c0684ec2b --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,36 @@ + + + + net9.0 + true + true + + + + Rhys Koedijk + Steam Community Market Manager (SCMM) + Copyright © 2021-2024 Rhys Koedijk + + + + + + true + + $(NoWarn);CS0419;CS1570;CS1573;CS1574;CS1584;CS1591;SA1602 + + $(WarningsAsErrors);IDE0005;RT0000;RT0001;RT0002;RT0003 + $(WarningsAsErrors) + + + \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 000000000..3c636ee0d --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,85 @@ + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 64b150e54..ccd14a493 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,11 @@ SCMM started as a personal project to gain practical and hands-on experience usi TODO: Document this... You will need: -- [Visual Studio](https://visualstudio.microsoft.com/vs/community/) (2022/v17.7+) with the following workloads and components installed: +- [Visual Studio](https://visualstudio.microsoft.com/vs/community/) (2022/v17.13+) with the following workloads and components installed: - ASP.NET and web development - .NET SDK - - .NET 7.0 Runtime - - .NET 7.0 WebAssembly Build Tools + - .NET 9.0 Runtime + - .NET 9.0 WebAssembly Build Tools - Azure development - Azure Compute Emulator - [Azure Storage Emulator](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-emulator#get-the-storage-emulator) diff --git a/SCMM.Azure.AI/SCMM.Azure.AI.csproj b/SCMM.Azure.AI/SCMM.Azure.AI.csproj index 960577000..c63d3a3bf 100644 --- a/SCMM.Azure.AI/SCMM.Azure.AI.csproj +++ b/SCMM.Azure.AI/SCMM.Azure.AI.csproj @@ -1,18 +1,10 @@  - - - net8.0 - true - - - - - + + + - - - + \ No newline at end of file diff --git a/SCMM.Azure.ApplicationInsights/SCMM.Azure.ApplicationInsights.csproj b/SCMM.Azure.ApplicationInsights/SCMM.Azure.ApplicationInsights.csproj index 3d019657b..6e1d50392 100644 --- a/SCMM.Azure.ApplicationInsights/SCMM.Azure.ApplicationInsights.csproj +++ b/SCMM.Azure.ApplicationInsights/SCMM.Azure.ApplicationInsights.csproj @@ -1,12 +1,5 @@  - - - net8.0 - true - - - + - - + \ No newline at end of file diff --git a/SCMM.Azure.ServiceBus/SCMM.Azure.ServiceBus.csproj b/SCMM.Azure.ServiceBus/SCMM.Azure.ServiceBus.csproj index 0a5f77895..d94d83d98 100644 --- a/SCMM.Azure.ServiceBus/SCMM.Azure.ServiceBus.csproj +++ b/SCMM.Azure.ServiceBus/SCMM.Azure.ServiceBus.csproj @@ -1,20 +1,12 @@  - - - net8.0 - true - - - - - - + + + + - - - + \ No newline at end of file diff --git a/SCMM.Discord.API/SCMM.Discord.API.csproj b/SCMM.Discord.API/SCMM.Discord.API.csproj index 9d705c4c9..60446f41d 100644 --- a/SCMM.Discord.API/SCMM.Discord.API.csproj +++ b/SCMM.Discord.API/SCMM.Discord.API.csproj @@ -1,17 +1,8 @@  - - - net8.0 - true - - - + - - - - + \ No newline at end of file diff --git a/SCMM.Discord.Bot.Server/Pages/Shared/_Layout.cshtml b/SCMM.Discord.Bot.Server/Pages/Shared/_Layout.cshtml index 5eba89280..bdaca5e33 100644 --- a/SCMM.Discord.Bot.Server/Pages/Shared/_Layout.cshtml +++ b/SCMM.Discord.Bot.Server/Pages/Shared/_Layout.cshtml @@ -36,7 +36,7 @@ diff --git a/SCMM.Discord.Bot.Server/Program.cs b/SCMM.Discord.Bot.Server/Program.cs index fec3325ce..dbb4d8818 100644 --- a/SCMM.Discord.Bot.Server/Program.cs +++ b/SCMM.Discord.Bot.Server/Program.cs @@ -254,13 +254,14 @@ public static WebApplication Configure(this WebApplication app) } app.UseHttpsRedirection(); - app.UseStaticFiles(); app.UseRouting(); app.UseAuthentication(); app.UseAuthorization(); + app.MapStaticAssets(); + app.MapControllerRoute( name: "default", pattern: "{controller=Home}/{action=Index}/{id?}" diff --git a/SCMM.Discord.Bot.Server/SCMM.Discord.Bot.Server.csproj b/SCMM.Discord.Bot.Server/SCMM.Discord.Bot.Server.csproj index 4f84c1900..219286518 100644 --- a/SCMM.Discord.Bot.Server/SCMM.Discord.Bot.Server.csproj +++ b/SCMM.Discord.Bot.Server/SCMM.Discord.Bot.Server.csproj @@ -1,32 +1,25 @@ - - - - net8.0 - true - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SCMM.Discord.Client/SCMM.Discord.Client.csproj b/SCMM.Discord.Client/SCMM.Discord.Client.csproj index b9c312fdf..1171e5b6d 100644 --- a/SCMM.Discord.Client/SCMM.Discord.Client.csproj +++ b/SCMM.Discord.Client/SCMM.Discord.Client.csproj @@ -1,19 +1,11 @@ - - - - net8.0 - true - - - - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/SCMM.Discord.Data.Models/SCMM.Discord.Data.Models.csproj b/SCMM.Discord.Data.Models/SCMM.Discord.Data.Models.csproj index dada1af0a..c369e1140 100644 --- a/SCMM.Discord.Data.Models/SCMM.Discord.Data.Models.csproj +++ b/SCMM.Discord.Data.Models/SCMM.Discord.Data.Models.csproj @@ -1,8 +1,3 @@  - - net8.0 - true - - diff --git a/SCMM.Discord.Data.Store/SCMM.Discord.Data.Store.csproj b/SCMM.Discord.Data.Store/SCMM.Discord.Data.Store.csproj index 2a8c0706b..6744723f2 100644 --- a/SCMM.Discord.Data.Store/SCMM.Discord.Data.Store.csproj +++ b/SCMM.Discord.Data.Store/SCMM.Discord.Data.Store.csproj @@ -1,22 +1,13 @@ - - - - net8.0 - true - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - true - - - - - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + true + + + + + + \ No newline at end of file diff --git a/SCMM.Fixer.Client/SCMM.Fixer.Client.csproj b/SCMM.Fixer.Client/SCMM.Fixer.Client.csproj index 5813a08ec..a47b5dc60 100644 --- a/SCMM.Fixer.Client/SCMM.Fixer.Client.csproj +++ b/SCMM.Fixer.Client/SCMM.Fixer.Client.csproj @@ -1,17 +1,9 @@  - - - net8.0 - true - - - + - - + - - + \ No newline at end of file diff --git a/SCMM.Google.Client/SCMM.Google.Client.csproj b/SCMM.Google.Client/SCMM.Google.Client.csproj index 4e543cb36..a1bf2d66b 100644 --- a/SCMM.Google.Client/SCMM.Google.Client.csproj +++ b/SCMM.Google.Client/SCMM.Google.Client.csproj @@ -1,18 +1,10 @@ - - - - net8.0 - true - - - - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/SCMM.Market.Buff.Client/SCMM.Market.Buff.Client.csproj b/SCMM.Market.Buff.Client/SCMM.Market.Buff.Client.csproj index f800f9a39..2dd889f1a 100644 --- a/SCMM.Market.Buff.Client/SCMM.Market.Buff.Client.csproj +++ b/SCMM.Market.Buff.Client/SCMM.Market.Buff.Client.csproj @@ -1,16 +1,8 @@  - - - net8.0 - true - - - + - - - + \ No newline at end of file diff --git a/SCMM.Market.CSDeals.Client/SCMM.Market.CSDeals.Client.csproj b/SCMM.Market.CSDeals.Client/SCMM.Market.CSDeals.Client.csproj index 21e41149d..239a0012f 100644 --- a/SCMM.Market.CSDeals.Client/SCMM.Market.CSDeals.Client.csproj +++ b/SCMM.Market.CSDeals.Client/SCMM.Market.CSDeals.Client.csproj @@ -1,10 +1,5 @@  - - net8.0 - true - - diff --git a/SCMM.Market.CSTrade.Client/SCMM.Market.CSTrade.Client.csproj b/SCMM.Market.CSTrade.Client/SCMM.Market.CSTrade.Client.csproj index 21e41149d..239a0012f 100644 --- a/SCMM.Market.CSTrade.Client/SCMM.Market.CSTrade.Client.csproj +++ b/SCMM.Market.CSTrade.Client/SCMM.Market.CSTrade.Client.csproj @@ -1,10 +1,5 @@  - - net8.0 - true - - diff --git a/SCMM.Market.DMarket.Client/SCMM.Market.DMarket.Client.csproj b/SCMM.Market.DMarket.Client/SCMM.Market.DMarket.Client.csproj index de7f72a79..ff2c433f1 100644 --- a/SCMM.Market.DMarket.Client/SCMM.Market.DMarket.Client.csproj +++ b/SCMM.Market.DMarket.Client/SCMM.Market.DMarket.Client.csproj @@ -1,10 +1,5 @@  - - net8.0 - true - - diff --git a/SCMM.Market.LootFarm.Client/SCMM.Market.LootFarm.Client.csproj b/SCMM.Market.LootFarm.Client/SCMM.Market.LootFarm.Client.csproj index 21e41149d..239a0012f 100644 --- a/SCMM.Market.LootFarm.Client/SCMM.Market.LootFarm.Client.csproj +++ b/SCMM.Market.LootFarm.Client/SCMM.Market.LootFarm.Client.csproj @@ -1,10 +1,5 @@  - - net8.0 - true - - diff --git a/SCMM.Market.ManncoStore.Client/SCMM.Market.ManncoStore.Client.csproj b/SCMM.Market.ManncoStore.Client/SCMM.Market.ManncoStore.Client.csproj index de7f72a79..239a0012f 100644 --- a/SCMM.Market.ManncoStore.Client/SCMM.Market.ManncoStore.Client.csproj +++ b/SCMM.Market.ManncoStore.Client/SCMM.Market.ManncoStore.Client.csproj @@ -1,13 +1,7 @@  - - net8.0 - true - - - diff --git a/SCMM.Market.RapidSkins.Client/RapidSkinsWebClient.cs b/SCMM.Market.RapidSkins.Client/RapidSkinsWebClient.cs index 0669d8817..0e6c5b4cd 100644 --- a/SCMM.Market.RapidSkins.Client/RapidSkinsWebClient.cs +++ b/SCMM.Market.RapidSkins.Client/RapidSkinsWebClient.cs @@ -53,7 +53,7 @@ ... on SteamInventory { appIds = new ulong[] { UInt64.Parse(appId) }, - search = (string?) null, + search = (string) null, cs2ItemCategories = new string[] { }, rustItemCategories = new string[] { }, itemExteriors = new string[] { }, diff --git a/SCMM.Market.RapidSkins.Client/SCMM.Market.RapidSkins.Client.csproj b/SCMM.Market.RapidSkins.Client/SCMM.Market.RapidSkins.Client.csproj index de7f72a79..239a0012f 100644 --- a/SCMM.Market.RapidSkins.Client/SCMM.Market.RapidSkins.Client.csproj +++ b/SCMM.Market.RapidSkins.Client/SCMM.Market.RapidSkins.Client.csproj @@ -1,13 +1,7 @@  - - net8.0 - true - - - diff --git a/SCMM.Market.RustSkins.Client/SCMM.Market.RustSkins.Client.csproj b/SCMM.Market.RustSkins.Client/SCMM.Market.RustSkins.Client.csproj index de7f72a79..239a0012f 100644 --- a/SCMM.Market.RustSkins.Client/SCMM.Market.RustSkins.Client.csproj +++ b/SCMM.Market.RustSkins.Client/SCMM.Market.RustSkins.Client.csproj @@ -1,13 +1,7 @@  - - net8.0 - true - - - diff --git a/SCMM.Market.RustTM.Client/SCMM.Market.RustTM.Client.csproj b/SCMM.Market.RustTM.Client/SCMM.Market.RustTM.Client.csproj index de7f72a79..ff2c433f1 100644 --- a/SCMM.Market.RustTM.Client/SCMM.Market.RustTM.Client.csproj +++ b/SCMM.Market.RustTM.Client/SCMM.Market.RustTM.Client.csproj @@ -1,10 +1,5 @@  - - net8.0 - true - - diff --git a/SCMM.Market.RustyPot.Client/SCMM.Market.RustyPot.Client.csproj b/SCMM.Market.RustyPot.Client/SCMM.Market.RustyPot.Client.csproj index 0cc60b80f..aa88cd7e3 100644 --- a/SCMM.Market.RustyPot.Client/SCMM.Market.RustyPot.Client.csproj +++ b/SCMM.Market.RustyPot.Client/SCMM.Market.RustyPot.Client.csproj @@ -1,17 +1,9 @@  - - - net8.0 - true - - - + - - - + + - - + \ No newline at end of file diff --git a/SCMM.Market.Rustyloot.Client/SCMM.Market.Rustyloot.Client.csproj b/SCMM.Market.Rustyloot.Client/SCMM.Market.Rustyloot.Client.csproj index 0cc60b80f..0fe09fc86 100644 --- a/SCMM.Market.Rustyloot.Client/SCMM.Market.Rustyloot.Client.csproj +++ b/SCMM.Market.Rustyloot.Client/SCMM.Market.Rustyloot.Client.csproj @@ -1,17 +1,6 @@  - - - net8.0 - true - - - + + - - - - - - - + \ No newline at end of file diff --git a/SCMM.Market.ShadowPay.Client/SCMM.Market.ShadowPay.Client.csproj b/SCMM.Market.ShadowPay.Client/SCMM.Market.ShadowPay.Client.csproj index de7f72a79..239a0012f 100644 --- a/SCMM.Market.ShadowPay.Client/SCMM.Market.ShadowPay.Client.csproj +++ b/SCMM.Market.ShadowPay.Client/SCMM.Market.ShadowPay.Client.csproj @@ -1,13 +1,7 @@  - - net8.0 - true - - - diff --git a/SCMM.Market.SkinBaron.Client/SCMM.Market.SkinBaron.Client.csproj b/SCMM.Market.SkinBaron.Client/SCMM.Market.SkinBaron.Client.csproj index 21e41149d..239a0012f 100644 --- a/SCMM.Market.SkinBaron.Client/SCMM.Market.SkinBaron.Client.csproj +++ b/SCMM.Market.SkinBaron.Client/SCMM.Market.SkinBaron.Client.csproj @@ -1,10 +1,5 @@  - - net8.0 - true - - diff --git a/SCMM.Market.SkinSerpent.Client/SCMM.Market.SkinSerpent.Client.csproj b/SCMM.Market.SkinSerpent.Client/SCMM.Market.SkinSerpent.Client.csproj index 21e41149d..239a0012f 100644 --- a/SCMM.Market.SkinSerpent.Client/SCMM.Market.SkinSerpent.Client.csproj +++ b/SCMM.Market.SkinSerpent.Client/SCMM.Market.SkinSerpent.Client.csproj @@ -1,10 +1,5 @@  - - net8.0 - true - - diff --git a/SCMM.Market.SkinSwap.Client/SCMM.Market.SkinSwap.Client.csproj b/SCMM.Market.SkinSwap.Client/SCMM.Market.SkinSwap.Client.csproj index 21e41149d..239a0012f 100644 --- a/SCMM.Market.SkinSwap.Client/SCMM.Market.SkinSwap.Client.csproj +++ b/SCMM.Market.SkinSwap.Client/SCMM.Market.SkinSwap.Client.csproj @@ -1,10 +1,5 @@  - - net8.0 - true - - diff --git a/SCMM.Market.Skinport.Client/SCMM.Market.Skinport.Client.csproj b/SCMM.Market.Skinport.Client/SCMM.Market.Skinport.Client.csproj index 21e41149d..239a0012f 100644 --- a/SCMM.Market.Skinport.Client/SCMM.Market.Skinport.Client.csproj +++ b/SCMM.Market.Skinport.Client/SCMM.Market.Skinport.Client.csproj @@ -1,10 +1,5 @@  - - net8.0 - true - - diff --git a/SCMM.Market.SkinsMonkey.Client/SCMM.Market.SkinsMonkey.Client.csproj b/SCMM.Market.SkinsMonkey.Client/SCMM.Market.SkinsMonkey.Client.csproj index f800f9a39..2dd889f1a 100644 --- a/SCMM.Market.SkinsMonkey.Client/SCMM.Market.SkinsMonkey.Client.csproj +++ b/SCMM.Market.SkinsMonkey.Client/SCMM.Market.SkinsMonkey.Client.csproj @@ -1,16 +1,8 @@  - - - net8.0 - true - - - + - - - + \ No newline at end of file diff --git a/SCMM.Market.SnipeSkins.Client/SCMM.Market.SnipeSkins.Client.csproj b/SCMM.Market.SnipeSkins.Client/SCMM.Market.SnipeSkins.Client.csproj index 21e41149d..239a0012f 100644 --- a/SCMM.Market.SnipeSkins.Client/SCMM.Market.SnipeSkins.Client.csproj +++ b/SCMM.Market.SnipeSkins.Client/SCMM.Market.SnipeSkins.Client.csproj @@ -1,10 +1,5 @@  - - net8.0 - true - - diff --git a/SCMM.Market.SwapGG.Client/SCMM.Market.SwapGG.Client.csproj b/SCMM.Market.SwapGG.Client/SCMM.Market.SwapGG.Client.csproj index 21e41149d..239a0012f 100644 --- a/SCMM.Market.SwapGG.Client/SCMM.Market.SwapGG.Client.csproj +++ b/SCMM.Market.SwapGG.Client/SCMM.Market.SwapGG.Client.csproj @@ -1,10 +1,5 @@  - - net8.0 - true - - diff --git a/SCMM.Market.TradeitGG.Client/SCMM.Market.TradeitGG.Client.csproj b/SCMM.Market.TradeitGG.Client/SCMM.Market.TradeitGG.Client.csproj index 21e41149d..239a0012f 100644 --- a/SCMM.Market.TradeitGG.Client/SCMM.Market.TradeitGG.Client.csproj +++ b/SCMM.Market.TradeitGG.Client/SCMM.Market.TradeitGG.Client.csproj @@ -1,10 +1,5 @@  - - net8.0 - true - - diff --git a/SCMM.Market.Waxpeer.Client/SCMM.Market.Waxpeer.Client.csproj b/SCMM.Market.Waxpeer.Client/SCMM.Market.Waxpeer.Client.csproj index de7f72a79..239a0012f 100644 --- a/SCMM.Market.Waxpeer.Client/SCMM.Market.Waxpeer.Client.csproj +++ b/SCMM.Market.Waxpeer.Client/SCMM.Market.Waxpeer.Client.csproj @@ -1,13 +1,7 @@  - - net8.0 - true - - - diff --git a/SCMM.Market.iTradegg.Client/SCMM.Market.iTradegg.Client.csproj b/SCMM.Market.iTradegg.Client/SCMM.Market.iTradegg.Client.csproj index 21e41149d..239a0012f 100644 --- a/SCMM.Market.iTradegg.Client/SCMM.Market.iTradegg.Client.csproj +++ b/SCMM.Market.iTradegg.Client/SCMM.Market.iTradegg.Client.csproj @@ -1,10 +1,5 @@  - - net8.0 - true - - diff --git a/SCMM.Redis.Client/SCMM.Redis.Client.csproj b/SCMM.Redis.Client/SCMM.Redis.Client.csproj index fb19437f2..b99f0ac3e 100644 --- a/SCMM.Redis.Client/SCMM.Redis.Client.csproj +++ b/SCMM.Redis.Client/SCMM.Redis.Client.csproj @@ -1,16 +1,8 @@ - - - - net8.0 - true - - - - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/SCMM.Shared.API/SCMM.Shared.API.csproj b/SCMM.Shared.API/SCMM.Shared.API.csproj index 4f0ce7297..6bf573bd3 100644 --- a/SCMM.Shared.API/SCMM.Shared.API.csproj +++ b/SCMM.Shared.API/SCMM.Shared.API.csproj @@ -1,19 +1,11 @@  - - - net8.0 - true - - - - + + - - - + \ No newline at end of file diff --git a/SCMM.Shared.Abstractions/SCMM.Shared.Abstractions.csproj b/SCMM.Shared.Abstractions/SCMM.Shared.Abstractions.csproj index 6e139f99d..c369e1140 100644 --- a/SCMM.Shared.Abstractions/SCMM.Shared.Abstractions.csproj +++ b/SCMM.Shared.Abstractions/SCMM.Shared.Abstractions.csproj @@ -1,12 +1,3 @@  - - net8.0 - true - - - - - - diff --git a/SCMM.Shared.Data.Models/SCMM.Shared.Data.Models.csproj b/SCMM.Shared.Data.Models/SCMM.Shared.Data.Models.csproj index dada1af0a..c369e1140 100644 --- a/SCMM.Shared.Data.Models/SCMM.Shared.Data.Models.csproj +++ b/SCMM.Shared.Data.Models/SCMM.Shared.Data.Models.csproj @@ -1,8 +1,3 @@  - - net8.0 - true - - diff --git a/SCMM.Shared.Data.Store/SCMM.Shared.Data.Store.csproj b/SCMM.Shared.Data.Store/SCMM.Shared.Data.Store.csproj index 8605dfa40..5c905597d 100644 --- a/SCMM.Shared.Data.Store/SCMM.Shared.Data.Store.csproj +++ b/SCMM.Shared.Data.Store/SCMM.Shared.Data.Store.csproj @@ -1,18 +1,10 @@ - - - - net8.0 - true - - - - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/SCMM.Shared.Web.Client.Tests/SCMM.Shared.Web.Client.Tests.csproj b/SCMM.Shared.Web.Client.Tests/SCMM.Shared.Web.Client.Tests.csproj index 1b576e49c..7f41f2405 100644 --- a/SCMM.Shared.Web.Client.Tests/SCMM.Shared.Web.Client.Tests.csproj +++ b/SCMM.Shared.Web.Client.Tests/SCMM.Shared.Web.Client.Tests.csproj @@ -1,28 +1,22 @@ - - - - net8.0 - enable - false - true - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - + + + false + true + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + \ No newline at end of file diff --git a/SCMM.Shared.Web.Client/SCMM.Shared.Web.Client.csproj b/SCMM.Shared.Web.Client/SCMM.Shared.Web.Client.csproj index 685d2c32a..fd76e2be2 100644 --- a/SCMM.Shared.Web.Client/SCMM.Shared.Web.Client.csproj +++ b/SCMM.Shared.Web.Client/SCMM.Shared.Web.Client.csproj @@ -1,21 +1,13 @@ - - - - net8.0 - true - - - - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/SCMM.Shared.Web.Server/Middleware/OWASPSecurityHeadersMiddleware.cs b/SCMM.Shared.Web.Server/Middleware/OWASPSecurityHeadersMiddleware.cs index a6380edaf..d6e9b5bdb 100644 --- a/SCMM.Shared.Web.Server/Middleware/OWASPSecurityHeadersMiddleware.cs +++ b/SCMM.Shared.Web.Server/Middleware/OWASPSecurityHeadersMiddleware.cs @@ -145,7 +145,7 @@ public static void UseOWASPSecurityHeaders( // context.Response.Headers.TryAdd("Permissions-Policy", - "accelerometer=(),autoplay=(),camera=(),display-capture=(),encrypted-media=(),fullscreen=(),gamepad=(),geolocation=(),gyroscope=(),magnetometer=(),microphone=(),midi=(),payment=(),picture-in-picture=(),publickey-credentials-get=(),screen-wake-lock=(),sync-xhr=(self),usb=(),web-share=(),xr-spatial-tracking=()" + "accelerometer=(),autoplay=(),camera=(),display-capture=(),encrypted-media=(),fullscreen=(),gamepad=(),geolocation=(),gyroscope=(),magnetometer=(),microphone=(),midi=(),payment=(),publickey-credentials-get=(),screen-wake-lock=(),sync-xhr=(self),usb=(),web-share=(),xr-spatial-tracking=()" ); // diff --git a/SCMM.Shared.Web.Server/SCMM.Shared.Web.Server.csproj b/SCMM.Shared.Web.Server/SCMM.Shared.Web.Server.csproj index e7ea1867a..acb3384e9 100644 --- a/SCMM.Shared.Web.Server/SCMM.Shared.Web.Server.csproj +++ b/SCMM.Shared.Web.Server/SCMM.Shared.Web.Server.csproj @@ -1,20 +1,11 @@  - - - net8.0 - true - - - - - - + + + + - - - - + \ No newline at end of file diff --git a/SCMM.Steam.API/SCMM.Steam.API.csproj b/SCMM.Steam.API/SCMM.Steam.API.csproj index f7443ac47..461e642f9 100644 --- a/SCMM.Steam.API/SCMM.Steam.API.csproj +++ b/SCMM.Steam.API/SCMM.Steam.API.csproj @@ -1,27 +1,18 @@ - - - - net8.0 - true - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SCMM.Steam.Abstractions/SCMM.Steam.Abstractions.csproj b/SCMM.Steam.Abstractions/SCMM.Steam.Abstractions.csproj index 6e139f99d..1dd03a62a 100644 --- a/SCMM.Steam.Abstractions/SCMM.Steam.Abstractions.csproj +++ b/SCMM.Steam.Abstractions/SCMM.Steam.Abstractions.csproj @@ -1,10 +1,5 @@  - - net8.0 - true - - diff --git a/SCMM.Steam.Client/SCMM.Steam.Client.csproj b/SCMM.Steam.Client/SCMM.Steam.Client.csproj index 4264a23ed..dba4b19c2 100644 --- a/SCMM.Steam.Client/SCMM.Steam.Client.csproj +++ b/SCMM.Steam.Client/SCMM.Steam.Client.csproj @@ -1,20 +1,12 @@ - - - - net8.0 - true - - - - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/SCMM.Steam.Data.Models/Enums/MarketType.cs b/SCMM.Steam.Data.Models/Enums/MarketType.cs index 7be616b1a..ed3e7ed2c 100644 --- a/SCMM.Steam.Data.Models/Enums/MarketType.cs +++ b/SCMM.Steam.Data.Models/Enums/MarketType.cs @@ -191,25 +191,23 @@ public enum MarketType : byte /* - MARKETS TO BE INVESTIGATED - BUY: https://skinsdrip.com/ - BUY: https://skin.land/market/rust/ - BUY: https://rustysaloon.com/withdraw (gambling site) - BUY: https://bandit.camp/ (gambling site) - BUY: https://buff.market/ (western sister-site for https://buff.163.com/, no rust) - BUY: https://gameflip.com/shop/in-game-items/rust?status=onsale&limit=100&platform=252490&sort=price%3Aasc (has low stock) - BUY: https://lis-skins.ru/market/rust/ (has overly aggressive CloudFlare WAF policies, need to scrap HTML code) - BUY: https://gamerall.com/rust (has overly aggressive CloudFlare WAF policies) - SELL: https://rustysell.com/ - SELL: https://skincashier.com/ - SELL: https://skins.cash/ - - SUS LOOKING MARKETS - BUY: https://trade.skin/ - BUY: https://rustplus.com/ - BUY: https://www.rustreaper.com/marketplace/RUST (bad reviews) - - MARKET AGGRAGATORS + MARKETS TO BE INVESTIGATED: + BUY: https://skin.land/market/rust/ + BUY: https://buff.market/ (western sister-site for https://buff.163.com/, no rust) + BUY: https://gameflip.com/shop/in-game-items/rust?status=onsale&limit=100&platform=252490&sort=price%3Aasc (has low stock) + BUY: https://lis-skins.ru/market/rust/ (has overly aggressive CloudFlare WAF policies, need to scrap HTML code) + BUY: https://gamerall.com/rust (has overly aggressive CloudFlare WAF policies) + BUY: https://traderust.com/ + BUY: https://skinsdrip.com/ + SELL: https://skincashier.com/ + SELL: https://skins.cash/ + GAMBLE: https://bandit.camp/ (gambling site) + GAMBLE: https://rustbet.com (no inventory stock) + GAMBLE: https://rustchance.com/ (low inventory stock) + GAMBLE: https://rustreaper.com (bad reviews?) + GAMBLE: https://rustysaloon.com (dead?) + + MARKET AGGRAGATORS: https://pricempire.com/api */ diff --git a/SCMM.Steam.Data.Models/SCMM.Steam.Data.Models.csproj b/SCMM.Steam.Data.Models/SCMM.Steam.Data.Models.csproj index 6e139f99d..1dd03a62a 100644 --- a/SCMM.Steam.Data.Models/SCMM.Steam.Data.Models.csproj +++ b/SCMM.Steam.Data.Models/SCMM.Steam.Data.Models.csproj @@ -1,10 +1,5 @@  - - net8.0 - true - - diff --git a/SCMM.Steam.Data.Store/SCMM.Steam.Data.Store.csproj b/SCMM.Steam.Data.Store/SCMM.Steam.Data.Store.csproj index 58e32e2b3..f44e46e2d 100644 --- a/SCMM.Steam.Data.Store/SCMM.Steam.Data.Store.csproj +++ b/SCMM.Steam.Data.Store/SCMM.Steam.Data.Store.csproj @@ -1,23 +1,15 @@ - - - - net8.0 - true - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - true - - - - - - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + true + + + + + + + + \ No newline at end of file diff --git a/SCMM.Steam.Functions/SCMM.Steam.Functions.csproj b/SCMM.Steam.Functions/SCMM.Steam.Functions.csproj index 20dc0317d..14ab28b81 100644 --- a/SCMM.Steam.Functions/SCMM.Steam.Functions.csproj +++ b/SCMM.Steam.Functions/SCMM.Steam.Functions.csproj @@ -1,71 +1,64 @@ - - - - net8.0 - v4 - Exe - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - Never - - - - + + + v4 + Exe + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + Never + + + \ No newline at end of file diff --git a/SCMM.Steam.Job.Server/Pages/Shared/_Layout.cshtml b/SCMM.Steam.Job.Server/Pages/Shared/_Layout.cshtml index 8359f2e46..6975a38b8 100644 --- a/SCMM.Steam.Job.Server/Pages/Shared/_Layout.cshtml +++ b/SCMM.Steam.Job.Server/Pages/Shared/_Layout.cshtml @@ -36,7 +36,7 @@
- © 2021 Rhys Koedijk + © 2021-2024 Rhys Koedijk
diff --git a/SCMM.Steam.Job.Server/Program.cs b/SCMM.Steam.Job.Server/Program.cs index 4446571a9..ebb79d7c9 100644 --- a/SCMM.Steam.Job.Server/Program.cs +++ b/SCMM.Steam.Job.Server/Program.cs @@ -250,13 +250,14 @@ public static WebApplication Configure(this WebApplication app) } app.UseHttpsRedirection(); - app.UseStaticFiles(); app.UseRouting(); app.UseAuthentication(); app.UseAuthorization(); + app.MapStaticAssets(); + app.MapControllerRoute( name: "default", pattern: "{controller=Home}/{action=Index}/{id?}" diff --git a/SCMM.Steam.Job.Server/SCMM.Steam.Job.Server.csproj b/SCMM.Steam.Job.Server/SCMM.Steam.Job.Server.csproj index 09bf9ab13..98c127809 100644 --- a/SCMM.Steam.Job.Server/SCMM.Steam.Job.Server.csproj +++ b/SCMM.Steam.Job.Server/SCMM.Steam.Job.Server.csproj @@ -1,30 +1,24 @@ - - - - net8.0 - true - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SCMM.SteamCMD/SCMM.SteamCMD.csproj b/SCMM.SteamCMD/SCMM.SteamCMD.csproj index 7454c058e..b70e247ef 100644 --- a/SCMM.SteamCMD/SCMM.SteamCMD.csproj +++ b/SCMM.SteamCMD/SCMM.SteamCMD.csproj @@ -1,18 +1,9 @@  - - - net8.0 - enable - enable - - - + - - - + \ No newline at end of file diff --git a/SCMM.SteamCMD/SteamCmdProcessWrapper.cs b/SCMM.SteamCMD/SteamCmdProcessWrapper.cs index 9dbb0fc62..70b41e72b 100644 --- a/SCMM.SteamCMD/SteamCmdProcessWrapper.cs +++ b/SCMM.SteamCMD/SteamCmdProcessWrapper.cs @@ -63,7 +63,7 @@ private async Task DownloadSteamCmdExecutable() return File.Exists(steamCmdExecutablePath); } - public async Task DownloadWorkshopFile(string appId, string workshopFileId, bool clearCache = true) + public async Task DownloadWorkshopFile(string appId, string workshopFileId, bool clearCache = true) { var workshopFileName = $"{appId}-{workshopFileId}.zip"; var workshopFileBasePath = $"{SteamCmdRootPath}{Path.DirectorySeparatorChar}steamapps{Path.DirectorySeparatorChar}workshop{Path.DirectorySeparatorChar}content{Path.DirectorySeparatorChar}{appId}{Path.DirectorySeparatorChar}{workshopFileId}"; diff --git a/SCMM.Web.Client/SCMM.Web.Client.csproj b/SCMM.Web.Client/SCMM.Web.Client.csproj index 753ebba00..de995a7a3 100644 --- a/SCMM.Web.Client/SCMM.Web.Client.csproj +++ b/SCMM.Web.Client/SCMM.Web.Client.csproj @@ -1,44 +1,31 @@ - - - - net8.0 - true - false - true - false - false - true - true - false - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - - + + + true + true + true + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + \ No newline at end of file diff --git a/SCMM.Web.Client/Shared/Components/SearchBar.razor b/SCMM.Web.Client/Shared/Components/SearchBar.razor index 4099504fd..99d1bb9af 100644 --- a/SCMM.Web.Client/Shared/Components/SearchBar.razor +++ b/SCMM.Web.Client/Shared/Components/SearchBar.razor @@ -94,7 +94,7 @@ } } - private async Task OnActionSelected(string type, string url, string description) + private void OnActionSelected(string type, string url, string description) { Search = null; switch (type) diff --git a/SCMM.Web.Data.Models/SCMM.Web.Data.Models.csproj b/SCMM.Web.Data.Models/SCMM.Web.Data.Models.csproj index a2a011e49..d07701d0c 100644 --- a/SCMM.Web.Data.Models/SCMM.Web.Data.Models.csproj +++ b/SCMM.Web.Data.Models/SCMM.Web.Data.Models.csproj @@ -1,18 +1,10 @@  - - - net8.0 - true - - - - + + - - - + \ No newline at end of file diff --git a/SCMM.Web.Server/Program.cs b/SCMM.Web.Server/Program.cs index e16ff6a9b..84fab9449 100644 --- a/SCMM.Web.Server/Program.cs +++ b/SCMM.Web.Server/Program.cs @@ -447,7 +447,6 @@ public static WebApplication Configure(this WebApplication app) ); app.UseBlazorFrameworkFiles(); // Wasm - app.UseStaticFiles(); app.UseRouting(); @@ -456,6 +455,8 @@ public static WebApplication Configure(this WebApplication app) app.UseOutputCache(); + app.MapStaticAssets(); + app.MapControllers(); app.MapDefaultControllerRoute(); diff --git a/SCMM.Web.Server/SCMM.Web.Server.csproj b/SCMM.Web.Server/SCMM.Web.Server.csproj index 9383c275c..54f5dafe7 100644 --- a/SCMM.Web.Server/SCMM.Web.Server.csproj +++ b/SCMM.Web.Server/SCMM.Web.Server.csproj @@ -1,51 +1,38 @@ - - - - net8.0 - true - - - - SCMM.Web.Server.xml - - - - SCMM.Web.Server.xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + SCMM.Web.Server.xml + + + SCMM.Web.Server.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SCMM.Webshare.Client/SCMM.Webshare.Client.csproj b/SCMM.Webshare.Client/SCMM.Webshare.Client.csproj index 5813a08ec..a47b5dc60 100644 --- a/SCMM.Webshare.Client/SCMM.Webshare.Client.csproj +++ b/SCMM.Webshare.Client/SCMM.Webshare.Client.csproj @@ -1,17 +1,9 @@  - - - net8.0 - true - - - + - - + - - + \ No newline at end of file diff --git a/SCMM.Worker.Server/SCMM.Worker.Server.csproj b/SCMM.Worker.Server/SCMM.Worker.Server.csproj index 57a319f0c..df7282ea2 100644 --- a/SCMM.Worker.Server/SCMM.Worker.Server.csproj +++ b/SCMM.Worker.Server/SCMM.Worker.Server.csproj @@ -1,32 +1,24 @@ - - - - Exe - net8.0 - enable - enable - - - - - - - - - - - - - - - - - - - - - - - - - + + + Exe + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SCMM.sln b/SCMM.sln index a8b67bf1c..003f13c18 100644 --- a/SCMM.sln +++ b/SCMM.sln @@ -56,6 +56,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A5AFCC31-F308-4FE4-9330-9EF05F72C4F4}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + Directory.Build.props = Directory.Build.props + Directory.Packages.props = Directory.Packages.props + README.md = README.md EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SCMM.Steam.Functions", "SCMM.Steam.Functions\SCMM.Steam.Functions.csproj", "{D0AEAD2F-E9E9-44F8-84D1-A0E1448ADEFA}"