[ODS-6454] Timeout connecting to EdFi_Security Database in v6.2 - 5x (#…

…1138)
Ed-Fi-Alliance-OSS · Sep 16, 2024 · daa9bb1 · daa9bb1
1 parent 1489468
commit daa9bb1
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.2" />
     <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="5.4.476" />
     <PackageReference Include="EdFi.Suite3.Common" Version="5.4.459" />
-    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.454" />
+    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.630" />
     <PackageReference Include="FluentValidation" Version="11.9.2" />
     <PackageReference Include="Iesi.Collections" Version="4.1.1" />
     <PackageReference Include="log4net" Version="2.0.17" />

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
@@ -19,7 +19,7 @@
   <ItemGroup>
     <PackageReference Include="EdFi.Suite3.Common" Version="5.4.459" />
     <PackageReference Include="Autofac" Version="8.0.0" />
-    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.454" />
+    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.630" />
     <PackageReference Include="FakeItEasy" Version="8.3.0" />
     <PackageReference Include="Iesi.Collections" Version="4.1.1" />
     <PackageReference Include="log4net" Version="2.0.17" />

diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="5.4.476" />
-    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.454" />
+    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.630" />
     <PackageReference Include="NHibernate" Version="5.5.2" />
     <PackageReference Include="Autofac.Extras.FakeItEasy" Version="7.0.0" />
     <PackageReference Include="AutoMapper" Version="13.0.1" />

diff --git a/Application/EdFi.Security.DataAccess/Utils/ResettableLazy.cs b/Application/EdFi.Security.DataAccess/Utils/ResettableLazy.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 
 namespace EdFi.Security.DataAccess.Utils
 {
@@ -13,12 +14,12 @@ public class ResettableLazy<T>
         public ResettableLazy(Func<T> valueFactory)
         {
             _valueFactory = valueFactory;
-            _lazy = new Lazy<T>(_valueFactory);
+            _lazy = new Lazy<T>(_valueFactory, LazyThreadSafetyMode.PublicationOnly);
         }
 
         public void Reset()
         {
-            _lazy = new Lazy<T>(_valueFactory);
+            _lazy = new Lazy<T>(_valueFactory, LazyThreadSafetyMode.PublicationOnly);
         }
     }
 }
diff --git a/Utilities/Directory.Build.props b/Utilities/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+  <PropertyGroup>
+    <NuGetAudit>true</NuGetAudit>
+    <NuGetAuditLevel>high</NuGetAuditLevel>
+    <NuGetAuditMode>direct</NuGetAuditMode>  
+    <Copyright>Copyright © $([System.DateTime]::Now.ToString(`yyyy`)) Ed-Fi Alliance, LLC and Contributors</Copyright>
+  </PropertyGroup>
+</Project>
diff --git a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="5.4.476" />
-    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.454" />
+    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.630" />
     <PackageReference Include="NHibernate" Version="5.5.2" />
     <PackageReference Include="ApprovalTests" Version="6.0.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />

diff --git a/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj b/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="5.4.476" />
-    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.454" />
+    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="5.4.630" />
     <PackageReference Include="NHibernate" Version="5.5.2" />
     <PackageReference Include="ApprovalTests" Version="6.0.0" />
     <PackageReference Include="ApprovalUtilities" Version="6.0.0" />