From 3a06b3862dc49e24b820ade2cc4b0740d1d6a609 Mon Sep 17 00:00:00 2001 From: RaidMax Date: Tue, 24 Dec 2019 15:23:43 -0600 Subject: [PATCH] Update projects to .NET Core 3.0 Increase max sv_hostname length on master --- Application/Application.csproj | 8 +++---- Master/master/schema/serverschema.py | 2 +- .../AutomessageFeed/AutomessageFeed.csproj | 2 +- .../IW4ScriptCommands.csproj | 2 +- Plugins/LiveRadar/LiveRadar.csproj | 2 +- Plugins/Login/Login.csproj | 4 ++-- .../ProfanityDeterment.csproj | 2 +- Plugins/Stats/Stats.csproj | 2 +- Plugins/Tests/Tests.csproj | 4 ++-- Plugins/Web/StatsWeb/StatsWeb.csproj | 2 +- Plugins/Welcome/Welcome.csproj | 2 +- SharedLibraryCore/SharedLibraryCore.csproj | 24 +++++++++---------- WebfrontCore/WebfrontCore.csproj | 2 +- azure-pipelines.yml | 2 +- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Application/Application.csproj b/Application/Application.csproj index 8c38f990..39aa79a3 100644 --- a/Application/Application.csproj +++ b/Application/Application.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.0 + netcoreapp3.1 false RaidMax.IW4MAdmin.Application 2.3.1.0 @@ -24,13 +24,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + diff --git a/Master/master/schema/serverschema.py b/Master/master/schema/serverschema.py index aa56347b..d6829bda 100644 --- a/Master/master/schema/serverschema.py +++ b/Master/master/schema/serverschema.py @@ -23,7 +23,7 @@ class ServerSchema(Schema): ) hostname = fields.String( required=True, - validate=validate.Length(1, 64, 'invalid hostname') + validate=validate.Length(1, 128, 'invalid hostname') ) clientnum = fields.Int( required=True, diff --git a/Plugins/AutomessageFeed/AutomessageFeed.csproj b/Plugins/AutomessageFeed/AutomessageFeed.csproj index 96672add..6e46fd42 100644 --- a/Plugins/AutomessageFeed/AutomessageFeed.csproj +++ b/Plugins/AutomessageFeed/AutomessageFeed.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 true 7.1 Debug;Release;Prerelease diff --git a/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj b/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj index d46d972e..35d5bd5c 100644 --- a/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj +++ b/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj @@ -2,7 +2,7 @@ Library - netcoreapp3.0 + netcoreapp3.1 Debug;Release;Prerelease diff --git a/Plugins/LiveRadar/LiveRadar.csproj b/Plugins/LiveRadar/LiveRadar.csproj index 60523a5e..292ba961 100644 --- a/Plugins/LiveRadar/LiveRadar.csproj +++ b/Plugins/LiveRadar/LiveRadar.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 true true false diff --git a/Plugins/Login/Login.csproj b/Plugins/Login/Login.csproj index df0089ad..1536f3a6 100644 --- a/Plugins/Login/Login.csproj +++ b/Plugins/Login/Login.csproj @@ -2,7 +2,7 @@ Library - netcoreapp3.0 + netcoreapp3.1 false @@ -15,7 +15,7 @@ - TRACE;DEBUG;NETCOREAPP2_0 + TRACE;DEBUG; diff --git a/Plugins/ProfanityDeterment/ProfanityDeterment.csproj b/Plugins/ProfanityDeterment/ProfanityDeterment.csproj index aad2d396..354838c4 100644 --- a/Plugins/ProfanityDeterment/ProfanityDeterment.csproj +++ b/Plugins/ProfanityDeterment/ProfanityDeterment.csproj @@ -2,7 +2,7 @@ Library - netcoreapp3.0 + netcoreapp3.1 RaidMax.IW4MAdmin.Plugins.ProfanityDeterment diff --git a/Plugins/Stats/Stats.csproj b/Plugins/Stats/Stats.csproj index 1e9a2052..031f5fd5 100644 --- a/Plugins/Stats/Stats.csproj +++ b/Plugins/Stats/Stats.csproj @@ -2,7 +2,7 @@ Library - netcoreapp3.0 + netcoreapp3.1 RaidMax.IW4MAdmin.Plugins.Stats diff --git a/Plugins/Tests/Tests.csproj b/Plugins/Tests/Tests.csproj index e129952a..824143ab 100644 --- a/Plugins/Tests/Tests.csproj +++ b/Plugins/Tests/Tests.csproj @@ -2,14 +2,14 @@ Library - netcoreapp3.0 + netcoreapp3.1 7.1 - TRACE;DEBUG;NETCOREAPP2_0 + TRACE;DEBUG diff --git a/Plugins/Web/StatsWeb/StatsWeb.csproj b/Plugins/Web/StatsWeb/StatsWeb.csproj index 7bc35ca4..ca48f271 100644 --- a/Plugins/Web/StatsWeb/StatsWeb.csproj +++ b/Plugins/Web/StatsWeb/StatsWeb.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp3.1 true true false diff --git a/Plugins/Welcome/Welcome.csproj b/Plugins/Welcome/Welcome.csproj index 1401994e..82258f0b 100644 --- a/Plugins/Welcome/Welcome.csproj +++ b/Plugins/Welcome/Welcome.csproj @@ -2,7 +2,7 @@ Library - netcoreapp3.0 + netcoreapp3.1 RaidMax.IW4MAdmin.Plugins.Welcome diff --git a/SharedLibraryCore/SharedLibraryCore.csproj b/SharedLibraryCore/SharedLibraryCore.csproj index ebec2a8b..18516f3d 100644 --- a/SharedLibraryCore/SharedLibraryCore.csproj +++ b/SharedLibraryCore/SharedLibraryCore.csproj @@ -2,7 +2,7 @@ Library - netcoreapp3.0 + netcoreapp3.1 RaidMax.IW4MAdmin.SharedLibraryCore @@ -49,22 +49,22 @@ - - - + + + all runtime; build; native; contentfiles - - - - - - + + + + + + - - + + diff --git a/WebfrontCore/WebfrontCore.csproj b/WebfrontCore/WebfrontCore.csproj index 35032b45..065701c7 100644 --- a/WebfrontCore/WebfrontCore.csproj +++ b/WebfrontCore/WebfrontCore.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 true true true diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8b287852..904dab22 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -106,7 +106,7 @@ steps: rootFolderOrFile: '$(outputFolder)' includeRootFolder: false archiveType: 'zip' - archiveFile: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-v$(VersionInformation.Major).$(VersionInformation.Minor)-$(buildConfiguration)$(VersionInformation.Build)r$(VersionInformation.Revision)-$(Build.BuildId).zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(VersionInformation.Major).$(VersionInformation.Minor)-$(buildConfiguration)$(VersionInformation.Build)r$(VersionInformation.Revision)-$(Build.BuildId).zip' replaceExistingArchive: true - task: FtpUpload@2