Merge pull request #174 from Lan2Play/feature/update_nuget_packages

Rename artefact to artifact, Update packages, Remove Microsoft.AspNetCore.WebUtilities
Lan2Play · Mar 8, 2024 · 9600421 · 9600421
2 parents ab1acff + 7eb9154
commit 9600421
Show file tree

Hide file tree

Showing 20 changed files with 128 additions and 253 deletions.
diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml
@@ -151,7 +151,7 @@ jobs:
         run: sed -i "s|%%CS2VERSION%%|1.39.6.5/13965 9842|g" ./release.json;
       - name: replace METAMODVERSION variable in meta files
         run: sed -i "s|%%METAMODVERSION%%|2.0 - 1256|g" ./release.json;
-      - name: upload artefact
+      - name: upload artifact
         if: github.event_name != 'pull_request'
         uses: actions/upload-artifact@v4
         with:
@@ -220,23 +220,23 @@ jobs:
       - name: move package
         run: mv PugSharp_with_cssharp_and_runtime_linux_$PUGSHARPNETVER.zip ../
         working-directory: ./packagebuild
-      - name: upload artefact
+      - name: upload artifact
         if: github.event_name != 'pull_request'
         uses: actions/upload-artifact@v4
         with:
           name: latest_build_linux
           path: |
             ./PugSharp_linux_*.zip
           retention-days: 10
-      - name: upload artefact
+      - name: upload artifact
         if: github.event_name != 'pull_request'
         uses: actions/upload-artifact@v4
         with:
           name: latest_build_linux_with_cssharp
           path: |
             ./PugSharp_with_cssharp_linux_*.zip
           retention-days: 10
-      - name: upload artefact
+      - name: upload artifact
         if: github.event_name != 'pull_request'
         uses: actions/upload-artifact@v4
         with:
@@ -318,23 +318,23 @@ jobs:
         shell: bash
         run: mv PugSharp_with_cssharp_and_runtime_windows_$PUGSHARPNETVER.zip ../
         working-directory: ./packagebuild
-      - name: upload artefact
+      - name: upload artifact
         if: github.event_name != 'pull_request'
         uses: actions/upload-artifact@v4
         with:
           name: latest_build_windows
           path: |
             ./PugSharp_windows_*.zip
           retention-days: 10
-      - name: upload artefact
+      - name: upload artifact
         if: github.event_name != 'pull_request'
         uses: actions/upload-artifact@v4
         with:
           name: latest_build_windows_with_cssharp
           path: |
             ./PugSharp_with_cssharp_windows_*.zip
           retention-days: 10
-      - name: upload artefact
+      - name: upload artifact
         if: github.event_name != 'pull_request'
         uses: actions/upload-artifact@v4
         with:

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -6,7 +6,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Meziantou.Analyzer" Version="2.0.136">
+		<PackageReference Include="Meziantou.Analyzer" Version="2.0.145">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>

diff --git a/PugSharp.Api.Contract/PugSharp.Api.Contract.csproj b/PugSharp.Api.Contract/PugSharp.Api.Contract.csproj
@@ -1,23 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.14" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="Meziantou.Analyzer" Version="2.0.127">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
+	<PropertyGroup>
+		<TargetFramework>net7.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.16" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+	</ItemGroup>
 </Project>
diff --git a/PugSharp.Api.G5Api.Tests/PugSharp.Api.G5Api.Tests.csproj b/PugSharp.Api.G5Api.Tests/PugSharp.Api.G5Api.Tests.csproj
@@ -1,39 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-
 		<IsPackable>false</IsPackable>
 		<IsTestProject>true</IsTestProject>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
 		<PackageReference Include="Testcontainers" Version="3.7.0" />
 		<PackageReference Include="Testcontainers.MariaDb" Version="3.7.0" />
-		<PackageReference Include="xunit" Version="2.6.6" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+		<PackageReference Include="xunit" Version="2.7.0" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="6.0.0">
+		<PackageReference Include="coverlet.collector" Version="6.0.1">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\PugSharp.Api.G5Api\PugSharp.Api.G5Api.csproj" />
+		<ProjectReference Include="..\PugSharp.Api.G5Api\PugSharp.Api.G5Api.csproj" />
 	</ItemGroup>
-
-
-	<ItemGroup>
-	  <PackageReference Update="Meziantou.Analyzer" Version="2.0.127">
-	    <PrivateAssets>all</PrivateAssets>
-	    <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-	  </PackageReference>
-	</ItemGroup>
-
 </Project>
diff --git a/PugSharp.Api.G5Api/PugSharp.Api.G5Api.csproj b/PugSharp.Api.G5Api/PugSharp.Api.G5Api.csproj
@@ -1,26 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-	  <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.14" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.16" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\PugSharp.Config\PugSharp.Config.csproj" />
-	  <ProjectReference Include="..\PugSharp.Shared\PugSharp.Shared.csproj" />
+		<ProjectReference Include="..\PugSharp.Config\PugSharp.Config.csproj" />
+		<ProjectReference Include="..\PugSharp.Shared\PugSharp.Shared.csproj" />
 	</ItemGroup>
-
-	<ItemGroup>
-	  <PackageReference Update="Meziantou.Analyzer" Version="2.0.127">
-	    <PrivateAssets>all</PrivateAssets>
-	    <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-	  </PackageReference>
-	</ItemGroup>
-
 </Project>
diff --git a/PugSharp.Api.Json/PugSharp.Api.Json.csproj b/PugSharp.Api.Json/PugSharp.Api.Json.csproj
@@ -1,27 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net7.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
 
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.14" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\PugSharp.Api.Contract\PugSharp.Api.Contract.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="Meziantou.Analyzer" Version="2.0.127">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.16" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+	</ItemGroup>
 
+	<ItemGroup>
+		<ProjectReference Include="..\PugSharp.Api.Contract\PugSharp.Api.Contract.csproj" />
+	</ItemGroup>
 </Project>
diff --git a/PugSharp.ApiStats/ApiStats.cs b/PugSharp.ApiStats/ApiStats.cs
@@ -1,6 +1,6 @@
 using System.Globalization;
+using System.Web;
 
-using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
 
 using PugSharp.Api.Contract;
@@ -42,7 +42,7 @@ public async Task GoingLiveAsync(GoingLiveParams goingLiveParams, CancellationTo
                 {ApiStatsConstants.StatsMapName, goingLiveParams.MapName},
             };
 
-            var uri = QueryHelpers.AddQueryString(string.Create(CultureInfo.InvariantCulture, $"golive/{goingLiveParams.MapNumber}"), queryParams);
+            var uri = AppendQuery(string.Create(CultureInfo.InvariantCulture, $"golive/{goingLiveParams.MapNumber}"), queryParams);
 
             var response = await HttpClient.PostAsync(uri, content: null, cancellationToken).ConfigureAwait(false);
 
@@ -69,7 +69,7 @@ public async Task RoundStatsUpdateAsync(RoundStatusUpdateParams roundStatusUpdat
                 {"team2score", CreateIntParam(roundStatusUpdateParams.CurrentMap.Team2.Score)},
             };
 
-            var uri = QueryHelpers.AddQueryString(string.Create(CultureInfo.InvariantCulture, $"updateround/{roundStatusUpdateParams.MapNumber}"), queryParams);
+            var uri = AppendQuery(string.Create(CultureInfo.InvariantCulture, $"updateround/{roundStatusUpdateParams.MapNumber}"), queryParams);
 
             var response = await HttpClient.PostAsync(uri, content: null, cancellationToken).ConfigureAwait(false);
 
@@ -105,7 +105,7 @@ public async Task FinalizeMapAsync(MapResultParams finalizeMapParams, Cancellati
                 {ApiStatsConstants.StatsMapWinner, finalizeMapParams.WinnerTeamName},
             };
 
-            var uri = QueryHelpers.AddQueryString(string.Create(CultureInfo.InvariantCulture, $"finalize/{finalizeMapParams.MapNumber}"), queryParams);
+            var uri = AppendQuery(string.Create(CultureInfo.InvariantCulture, $"finalize/{finalizeMapParams.MapNumber}"), queryParams);
 
             var response = await HttpClient.PostAsync(uri, content: null, cancellationToken).ConfigureAwait(false);
 
@@ -130,7 +130,7 @@ public async Task FinalizeAsync(SeriesResultParams seriesResultParams, Cancellat
             {ApiStatsConstants.StatsSeriesForfeit, CreateIntParam(Convert.ToInt32(seriesResultParams.Forfeit))},
         };
 
-        var uri = QueryHelpers.AddQueryString($"finalize", queryParams);
+        var uri = AppendQuery(string.Create(CultureInfo.InvariantCulture, $"finalize"), queryParams);
 
         var response = await HttpClient.PostAsync(uri, content: null, cancellationToken).ConfigureAwait(false);
 
@@ -179,7 +179,7 @@ private async Task UpdatePlayerStatsInternalAsync(int mapNumber, ITeamInfo teamI
 
                 Dictionary<string, string> queryParams = CreateUpdatePlayerQueryParameters(teamName, playerStatistics);
 
-                var uri = QueryHelpers.AddQueryString(string.Create(CultureInfo.InvariantCulture, $"updateplayer/{mapNumber}/{player.Key}"), queryParams);
+                var uri = AppendQuery(string.Create(CultureInfo.InvariantCulture, $"updateplayer/{mapNumber}/{player.Key}"), queryParams);
 
                 var response = await HttpClient.PostAsync(uri, content: null, cancellationToken).ConfigureAwait(false);
 
@@ -235,6 +235,17 @@ internal static string CreateIntParam(int param)
         return param.ToString(CultureInfo.InvariantCulture);
     }
 
+    internal static string AppendQuery(string baseUri, Dictionary<string, string> queryParams)
+    {
+        var query = HttpUtility.ParseQueryString(string.Empty);
+        foreach (var dict in queryParams)
+        {
+            query[dict.Key] = dict.Value;
+        }
+
+        return string.Join('?', baseUri.TrimEnd('/').TrimEnd('?'), query.ToString());
+    }
+
     private static class ApiStatsConstants
     {
 #pragma warning disable S125 // Sections of code should not be commented out

diff --git a/PugSharp.ApiStats/BaseApi.cs b/PugSharp.ApiStats/BaseApi.cs
@@ -1,5 +1,6 @@
-using Microsoft.Extensions.Logging;
-using Microsoft.Net.Http.Headers;
+using System.Net;
+
+using Microsoft.Extensions.Logging;
 
 namespace PugSharp.ApiStats;
 
@@ -33,11 +34,11 @@ protected void InitializeBase(string? baseUrl, string? authKey)
 
             HttpClient.BaseAddress = new Uri(baseUrl);
 
-            HttpClient.DefaultRequestHeaders.Remove(HeaderNames.Authorization);
+            HttpClient.DefaultRequestHeaders.Remove(nameof(HttpRequestHeader.Authorization));
 
             if (!string.IsNullOrEmpty(authKey))
             {
-                HttpClient.DefaultRequestHeaders.Add(HeaderNames.Authorization, authKey);
+                HttpClient.DefaultRequestHeaders.Add(nameof(HttpRequestHeader.Authorization), authKey);
             }
         }
         catch (Exception ex)

diff --git a/PugSharp.ApiStats/PugSharp.ApiStats.csproj b/PugSharp.ApiStats/PugSharp.ApiStats.csproj
@@ -1,26 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\PugSharp.Config\PugSharp.Config.csproj" />
-	  <ProjectReference Include="..\PugSharp.Match.Contract\PugSharp.Match.Contract.csproj" />
+		<ProjectReference Include="..\PugSharp.Config\PugSharp.Config.csproj" />
+		<ProjectReference Include="..\PugSharp.Match.Contract\PugSharp.Match.Contract.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.14" />
+		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.16" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-	  <PackageReference Update="Meziantou.Analyzer" Version="2.0.127">
-	    <PrivateAssets>all</PrivateAssets>
-	    <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-	  </PackageReference>
 	</ItemGroup>
-
-</Project>
+</Project>
diff --git a/PugSharp.Config/ConfigProvider.cs b/PugSharp.Config/ConfigProvider.cs
@@ -1,7 +1,7 @@
-using System.Text.Json;
+using System.Net;
+using System.Text.Json;
 
 using Microsoft.Extensions.Logging;
-using Microsoft.Net.Http.Headers;
 
 using OneOf;
 using OneOf.Types;
@@ -72,7 +72,7 @@ public async Task<OneOf<Error<string>, MatchConfig>> LoadMatchConfigFromUrlAsync
 
             if (!string.IsNullOrEmpty(authToken))
             {
-                httpRequestMessage.Headers.Add(HeaderNames.Authorization, authToken);
+                httpRequestMessage.Headers.Add(nameof(HttpRequestHeader.Authorization), authToken);
             }
 
             var response = await _HttpClient.SendAsync(httpRequestMessage).ConfigureAwait(false);

diff --git a/PugSharp.Config/PugSharp.Config.csproj b/PugSharp.Config/PugSharp.Config.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
@@ -8,18 +7,9 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.14" />
+		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.16" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
 		<PackageReference Include="OneOf" Version="3.0.263" />
 	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-		<PackageReference Update="Meziantou.Analyzer" Version="2.0.127">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-
 </Project>