addressed breaking changes

petrsvihlik · Feb 24, 2024 · 6984a83 · 6984a83
1 parent afbeacc
commit 6984a83
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 17 deletions.
diff --git a/src/WopiHost.Abstractions/WopiHost.Abstractions.csproj b/src/WopiHost.Abstractions/WopiHost.Abstractions.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>WopiHost.Abstractions Class Library</Description>
     <Authors>Petr Svihlik</Authors>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>WopiHost.Abstractions</AssemblyName>
     <PackageId>WopiHost.Abstractions</PackageId>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>

diff --git a/src/WopiHost.Cobalt/WopiHost.Cobalt.csproj b/src/WopiHost.Cobalt/WopiHost.Cobalt.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>WopiHost.Cobalt Class Library</Description>
     <Authors>Petr Svihlik</Authors>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>WopiHost.Cobalt</AssemblyName>
     <PackageId>WopiHost.Cobalt</PackageId>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>

diff --git a/src/WopiHost.Core/Controllers/FilesController.cs b/src/WopiHost.Core/Controllers/FilesController.cs
@@ -189,8 +189,8 @@ public async Task<IActionResult> ProcessCobalt(string id)
         }
 
         var responseAction = CobaltProcessor.ProcessCobalt(file, User, await HttpContext.Request.Body.ReadBytesAsync());
-        HttpContext.Response.Headers.Add(WopiHeaders.CORRELATION_ID, HttpContext.Request.Headers[WopiHeaders.CORRELATION_ID]);
-        HttpContext.Response.Headers.Add("request-id", HttpContext.Request.Headers[WopiHeaders.CORRELATION_ID]);
+        HttpContext.Response.Headers.Append(WopiHeaders.CORRELATION_ID, HttpContext.Request.Headers[WopiHeaders.CORRELATION_ID]);
+        HttpContext.Response.Headers.Append("request-id", HttpContext.Request.Headers[WopiHeaders.CORRELATION_ID]);
         return new Results.FileResult(responseAction, "application/octet-stream");
     }
 

diff --git a/src/WopiHost.Core/Controllers/WopiBootstrapperController.cs b/src/WopiHost.Core/Controllers/WopiBootstrapperController.cs
@@ -1,4 +1,5 @@
 using System.Net.Mime;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
@@ -90,7 +91,7 @@ public IActionResult GetRootContainer() //TODO: fix the path
             var tokenIssuanceUri = "https://contoso.com/api/oauth2/token";
             var providerId = "tp_contoso";
             var urlSchemes = Uri.EscapeDataString("{\"iOS\" : [\"contoso\",\"contoso - EMM\"], \"Android\" : [\"contoso\",\"contoso - EMM\"], \"UWP\": [\"contoso\",\"contoso - EMM\"]}");
-            Response.Headers.Add("WWW-Authenticate", $"Bearer authorization_uri=\"{authorizationUri}\",tokenIssuance_uri=\"{tokenIssuanceUri}\",providerId=\"{providerId}\", UrlSchemes=\"{urlSchemes}\"");
+            Response.Headers.Append("WWW-Authenticate", $"Bearer authorization_uri=\"{authorizationUri}\",tokenIssuance_uri=\"{tokenIssuanceUri}\",providerId=\"{providerId}\", UrlSchemes=\"{urlSchemes}\"");
             return new UnauthorizedResult();
         }
     }

diff --git a/src/WopiHost.Core/Security/Authentication/AccessTokenHandler.cs b/src/WopiHost.Core/Security/Authentication/AccessTokenHandler.cs
@@ -74,8 +74,7 @@ protected override Task<AuthenticateResult> HandleAuthenticateAsync()
     /// <param name="options">The monitor for the options instance.</param>
     /// <param name="logger">The Microsoft.Extensions.Logging.ILoggerFactory.</param>
     /// <param name="encoder">The System.Text.Encodings.Web.UrlEncoder.</param>
-    /// <param name="clock">The Microsoft.AspNetCore.Authentication.ISystemClock.</param>
-    public AccessTokenHandler(IOptionsMonitor<AccessTokenAuthenticationOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock)
+    public AccessTokenHandler(IOptionsMonitor<AccessTokenAuthenticationOptions> options, ILoggerFactory logger, UrlEncoder encoder) : base(options, logger, encoder)
     {
         // Used by for Dependency Injection
     }

diff --git a/src/WopiHost.Core/WopiHost.Core.csproj b/src/WopiHost.Core/WopiHost.Core.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<Description>WopiHost.Core Class Library</Description>
 		<Authors>Petr Svihlik</Authors>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<AssemblyName>WopiHost.Core</AssemblyName>
 		<PackageId>WopiHost.Core</PackageId>
 		<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>

diff --git a/src/WopiHost.Discovery/WopiHost.Discovery.csproj b/src/WopiHost.Discovery/WopiHost.Discovery.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<Description>WopiHost.Discovery Class Library</Description>
 		<Authors>Petr Svihlik</Authors>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<AssemblyName>WopiHost.Discovery</AssemblyName>
 		<PackageId>WopiHost.Discovery</PackageId>
 		<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>

diff --git a/src/WopiHost.FileSystemProvider/WopiHost.FileSystemProvider.csproj b/src/WopiHost.FileSystemProvider/WopiHost.FileSystemProvider.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>WopiHost.FileSystemProvider Class Library</Description>
     <Authors>Petr Svihlik</Authors>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>WopiHost.FileSystemProvider</AssemblyName>
     <PackageId>WopiHost.FileSystemProvider</PackageId>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>

diff --git a/src/WopiHost.Url/WopiHost.Url.csproj b/src/WopiHost.Url/WopiHost.Url.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>WopiHost.Url Class Library</Description>
     <Authors>Petr Svihlik</Authors>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>WopiHost.Url</AssemblyName>
     <PackageId>WopiHost.Url</PackageId>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>

diff --git a/src/WopiHost.Web/WopiHost.Web.csproj b/src/WopiHost.Web/WopiHost.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>WopiHost.Web</AssemblyName>

diff --git a/src/WopiHost/WopiHost.csproj b/src/WopiHost/WopiHost.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>WopiHost</AssemblyName>
     <OutputType>Exe</OutputType>
     <PublishReadyToRun>true</PublishReadyToRun>

diff --git a/test/WopiHost.Core.Tests/WopiHost.Core.Tests.csproj b/test/WopiHost.Core.Tests/WopiHost.Core.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\src\WopiHost.Core\WopiHost.Core.csproj" />

diff --git a/test/WopiHost.Discovery.Tests/WopiHost.Discovery.Tests.csproj b/test/WopiHost.Discovery.Tests/WopiHost.Discovery.Tests.csproj
@@ -6,7 +6,7 @@
 	</ItemGroup>
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/test/WopiHost.FileSystemProvider.Tests/WopiHost.FileSystemProvider.Tests.csproj b/test/WopiHost.FileSystemProvider.Tests/WopiHost.FileSystemProvider.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\src\WopiHost.FileSystemProvider\WopiHost.FileSystemProvider.csproj" />

diff --git a/test/WopiHost.Url.Tests/WopiHost.Url.Tests.csproj b/test/WopiHost.Url.Tests/WopiHost.Url.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\src\WopiHost.Url\WopiHost.Url.csproj" />