[ODS-6327] Fix errors when publishing with Target runtimes win-x86 an…

…d win-x64 (#1020)
Ed-Fi-Alliance-OSS · Apr 11, 2024 · 8a82453 · 8a82453
1 parent 6491cd5
commit 8a82453
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 29 deletions.
diff --git a/Application/EdFi.Ods.Api/Controllers/DataManagementControllerBase.cs b/Application/EdFi.Ods.Api/Controllers/DataManagementControllerBase.cs
@@ -196,7 +196,7 @@ public virtual async Task<IActionResult> GetAll(
             // Return multiple results
             if (queryParameters.TotalCount)
             {
-                Response.Headers.Add(HeaderConstants.TotalCount, result.ResultMetadata.TotalCount.ToString());
+                Response.Headers.Append(HeaderConstants.TotalCount, result.ResultMetadata.TotalCount.ToString());
             }
 
             Response.GetTypedHeaders().ContentType = new MediaTypeHeaderValue(GetReadContentType());

diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj
@@ -25,7 +25,6 @@
     <PackageReference Include="EdFi.Suite3.Common" Version="6.2.78" />
     <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="6.2.61" />
     <PackageReference Include="FluentValidation" Version="11.9.0" />
-    <PackageReference Include="Iesi.Collections" Version="4.0.5" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
@@ -34,8 +33,6 @@
     <PackageReference Include="Npgsql" Version="8.0.1" />
     <PackageReference Include="Polly" Version="8.3.0" />
     <PackageReference Include="Quartz.AspNetCore" Version="3.8.0" />
-    <PackageReference Include="Remotion.Linq" Version="2.2.0" />
-    <PackageReference Include="Remotion.Linq.EagerFetching" Version="2.2.0" />
     <PackageReference Include="Sandwych.QuickGraph.Core" Version="1.0.0" />
     <PackageReference Include="Standart.Hash.xxHash" Version="4.0.5" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.1" />

diff --git a/Application/EdFi.Ods.Api/Middleware/EdFiOAuthAuthenticationHandler.cs b/Application/EdFi.Ods.Api/Middleware/EdFiOAuthAuthenticationHandler.cs
@@ -33,9 +33,8 @@ public EdFiOAuthAuthenticationHandler(
             IOptionsMonitor<AuthenticationSchemeOptions> options,
             ILoggerFactory loggerFactory,
             UrlEncoder encoder,
-            ISystemClock clock,
             IOAuthTokenAuthenticator oauthTokenAuthenticator)
-            : base(options, loggerFactory, encoder, clock)
+            : base(options, loggerFactory, encoder)
         {
             _logger = loggerFactory.CreateLogger(typeof(EdFiOAuthAuthenticationHandler).FullName!);
             _oauthTokenAuthenticator = oauthTokenAuthenticator;

diff --git a/...n/EdFi.Ods.Api/OperationalContext/PersonIdentification/AmbiguousUniqueIdMatchException.cs b/...n/EdFi.Ods.Api/OperationalContext/PersonIdentification/AmbiguousUniqueIdMatchException.cs
@@ -11,7 +11,6 @@ namespace EdFi.Ods.Api.OperationalContext.PersonIdentification
     /// <summary>
     /// Thrown when the client-supplied unique Id value resolves to multiple people.
     /// </summary>
-    [Serializable]
     public class AmbiguousUniqueIdMatchException : Exception
     {
         //
@@ -28,10 +27,5 @@ public AmbiguousUniqueIdMatchException(string message)
 
         public AmbiguousUniqueIdMatchException(string message, Exception inner)
             : base(message, inner) { }
-
-        protected AmbiguousUniqueIdMatchException(
-            SerializationInfo info,
-            StreamingContext context)
-            : base(info, context) { }
     }
 }
diff --git a/Application/EdFi.Ods.Api/OperationalContext/PersonIdentification/NoUniqueIdMatchException.cs b/Application/EdFi.Ods.Api/OperationalContext/PersonIdentification/NoUniqueIdMatchException.cs
@@ -11,7 +11,6 @@ namespace EdFi.Ods.Api.OperationalContext.PersonIdentification
     /// <summary>
     /// Thrown when the client-supplied unique Id value cannot be resolved to any person.
     /// </summary>
-    [Serializable]
     public class NoUniqueIdMatchException : Exception
     {
         //
@@ -28,10 +27,5 @@ public NoUniqueIdMatchException(string message)
 
         public NoUniqueIdMatchException(string message, Exception inner)
             : base(message, inner) { }
-
-        protected NoUniqueIdMatchException(
-            SerializationInfo info,
-            StreamingContext context)
-            : base(info, context) { }
     }
 }
diff --git a/Application/EdFi.Ods.Api/ScheduledJobs/Extensions/ServiceCollectionExtensions.cs b/Application/EdFi.Ods.Api/ScheduledJobs/Extensions/ServiceCollectionExtensions.cs
@@ -26,8 +26,7 @@ public static void AddScheduledJobs(this IServiceCollection services, ApiSetting
                 return;
             }
 
-            services.AddQuartz(
-                q => { q.UseMicrosoftDependencyInjectionJobFactory(); });
+            services.AddQuartz();
 
             services.AddQuartzServer(options => { options.WaitForJobsToComplete = true; });
         }

diff --git a/...tion/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj b/...tion/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj
@@ -20,7 +20,6 @@
     <PackageReference Include="EdFi.Suite3.Common" Version="6.2.78" />
     <PackageReference Include="Autofac" Version="8.0.0" />
     <PackageReference Include="FakeItEasy" Version="8.1.0" />
-    <PackageReference Include="Iesi.Collections" Version="4.0.5" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NHibernate" Version="5.5.0" />
@@ -29,8 +28,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Remotion.Linq" Version="2.2.0" />
-    <PackageReference Include="Remotion.Linq.EagerFetching" Version="2.2.0" />
     <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.36" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
   </ItemGroup>

diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj
@@ -25,7 +25,6 @@
     <PackageReference Include="EdFi.Suite3.Common" Version="6.2.78" />
     <PackageReference Include="FakeItEasy" Version="8.1.0" />
     <PackageReference Include="FluentValidation" Version="11.9.0" />
-    <PackageReference Include="Iesi.Collections" Version="4.0.5" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="Npgsql" Version="8.0.1" />
@@ -35,8 +34,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="NUnit.ConsoleRunner" Version="3.17.0" />
-    <PackageReference Include="Remotion.Linq" Version="2.2.0" />
-    <PackageReference Include="Remotion.Linq.EagerFetching" Version="2.2.0" />
     <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.36" />
     <PackageReference Include="Sandwych.QuickGraph.Core" Version="1.0.0" />
     <PackageReference Include="Shouldly" Version="4.2.1" />

diff --git a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj
@@ -31,16 +31,13 @@
     <PackageReference Include="FakeItEasy" Version="8.1.0" />
     <PackageReference Include="FluentValidation" Version="11.9.0" />
     <PackageReference Include="Gherkin" Version="27.0.0" />
-    <PackageReference Include="Iesi.Collections" Version="4.0.5" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="4.0.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Remotion.Linq" Version="2.2.0" />
-    <PackageReference Include="Remotion.Linq.EagerFetching" Version="2.2.0" />
     <PackageReference Include="Selenium.Support" Version="4.17.0" />
     <PackageReference Include="Selenium.WebDriver" Version="4.17.0" />
     <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.36" />