Version 8.2.7 release (#4209)

rockfordlhotka · web-flow · commit 3349c298898a · 2024-09-06T14:38:14.000-05:00
* Update version numbers to 8.2.7 * #4208 Select the correct IContextManager * #4208 Update tests
diff --git a/Samples/ProjectTracker/ProjectTracker.AppServer/ProjectTracker.AppServer.csproj b/Samples/ProjectTracker/ProjectTracker.AppServer/ProjectTracker.AppServer.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Csla.AspNetCore" Version="8.2.6" />
+    <PackageReference Include="Csla.AspNetCore" Version="8.2.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Samples/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor.Client/ProjectTracker.Blazor.Client.csproj b/Samples/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor.Client/ProjectTracker.Blazor.Client.csproj
@@ -11,8 +11,8 @@
   <ItemGroup>
     <ProjectReference Include="..\..\ProjectTracker.BusinessLibrary\ProjectTracker.BusinessLibrary.csproj" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.8" />
-    <PackageReference Include="Csla.Blazor" Version="8.2.6" />
-    <PackageReference Include="Csla.Blazor.WebAssembly" Version="8.2.6" />
+    <PackageReference Include="Csla.Blazor" Version="8.2.7" />
+    <PackageReference Include="Csla.Blazor.WebAssembly" Version="8.2.7" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
diff --git a/Samples/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor/ProjectTracker.Blazor.csproj b/Samples/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor/ProjectTracker.Blazor.csproj
@@ -13,8 +13,8 @@
     <ProjectReference Include="..\..\ProjectTracker.Dal\ProjectTracker.Dal.csproj" />
     <ProjectReference Include="..\ProjectTracker.Blazor.Client\ProjectTracker.Blazor.Client.csproj" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.8" />
-    <PackageReference Include="Csla.AspNetCore" Version="8.2.6" />
-    <PackageReference Include="Csla.Blazor" Version="8.2.6" />
+    <PackageReference Include="Csla.AspNetCore" Version="8.2.7" />
+    <PackageReference Include="Csla.Blazor" Version="8.2.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Samples/ProjectTracker/ProjectTracker.BusinessLibrary/ProjectTracker.BusinessLibrary.csproj b/Samples/ProjectTracker/ProjectTracker.BusinessLibrary/ProjectTracker.BusinessLibrary.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Csla" Version="8.2.6" />
+    <PackageReference Include="Csla" Version="8.2.7" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
   </ItemGroup>
 
diff --git a/Samples/ProjectTracker/ProjectTracker.Dal/ProjectTracker.Dal.csproj b/Samples/ProjectTracker/ProjectTracker.Dal/ProjectTracker.Dal.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Csla" Version="8.2.6" />
+    <PackageReference Include="Csla" Version="8.2.7" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
   </ItemGroup>
 
diff --git a/Samples/ProjectTracker/ProjectTracker.DalMock/ProjectTracker.DalMock.csproj b/Samples/ProjectTracker/ProjectTracker.DalMock/ProjectTracker.DalMock.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Csla" Version="8.2.6" />
+    <PackageReference Include="Csla" Version="8.2.7" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
   </ItemGroup>
 
diff --git a/Source/Csla.Blazor.Test/AppContext/ContextManagerTests.cs b/Source/Csla.Blazor.Test/AppContext/ContextManagerTests.cs
@@ -77,7 +77,7 @@ public void UseAsyncLocalApplicationContextManager()
   }
 
   [TestMethod]
-  public void UseAspNetCoreApplicationContextManager()
+  public void UseBlazorApplicationContextManager()
   {
     var services = new ServiceCollection();
     services.AddScoped<AuthenticationStateProvider, AuthenticationStateProviderFake>();
@@ -90,6 +90,23 @@ public void UseAspNetCoreApplicationContextManager()
     var activeState = serviceProvider.GetRequiredService<AspNetCore.Blazor.ActiveCircuitState>();
     activeState.CircuitExists = false;
 
+    var applicationContext = serviceProvider.GetRequiredService<ApplicationContext>();
+    Assert.IsInstanceOfType(applicationContext.ContextManager, typeof(Csla.AspNetCore.Blazor.ApplicationContextManagerBlazor));
+  }
+
+  [TestMethod]
+  public void UseAspNetCoreApplicationContextManager()
+  {
+    var services = new ServiceCollection();
+    services.AddScoped<AuthenticationStateProvider, AuthenticationStateProviderFake>();
+    services.AddScoped<IHttpContextAccessor, HttpContextAccessorFake>();
+    services.AddCsla(o => o
+      .AddAspNetCore());
+    var serviceProvider = services.BuildServiceProvider();
+
+    var activeState = serviceProvider.GetRequiredService<AspNetCore.Blazor.ActiveCircuitState>();
+    activeState.CircuitExists = false;
+
     var applicationContext = serviceProvider.GetRequiredService<ApplicationContext>();
     Assert.IsInstanceOfType(applicationContext.ContextManager, typeof(Csla.AspNetCore.ApplicationContextManagerHttpContext));
   }
diff --git a/Source/Csla.Xaml.Uwp/Properties/AssemblyInfo.cs b/Source/Csla.Xaml.Uwp/Properties/AssemblyInfo.cs
@@ -27,5 +27,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("8.2.6.0")]
-[assembly: AssemblyFileVersion("8.2.6.0")]
+[assembly: AssemblyVersion("8.2.7.0")]
+[assembly: AssemblyFileVersion("8.2.7.0")]
diff --git a/Source/Csla/Core/ApplicationContextAccessor.cs b/Source/Csla/Core/ApplicationContextAccessor.cs
@@ -31,18 +31,16 @@ public ApplicationContextAccessor(
       ServiceProvider = serviceProvider;
       LocalContextManager = localContextManager;
 
-      foreach (var context in contextManagerList)
+      var managers = contextManagerList.ToList();
+      for (int i = managers.Count - 1; i >= 0; i--)
       {
-        if (context.IsValid)
+        if (managers[i].IsValid)
         {
-          ContextManager = context;
+          ContextManager = managers[i];
           break;
         }
       }
-      if (ContextManager is null)
-      {
-        ContextManager = new Core.ApplicationContextManagerAsyncLocal();
-      }
+      ContextManager ??= new Core.ApplicationContextManagerAsyncLocal();
     }
 
     internal IServiceProvider ServiceProvider { get; }
diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
@@ -6,7 +6,7 @@
  
  <!-- Common Package Settings -->
  <PropertyGroup>
-   <Version>8.2.6.0</Version>
+   <Version>8.2.7.0</Version>
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
    <PackageProjectUrl>https://cslanet.com</PackageProjectUrl>
    <RepositoryUrl>https://github.com/MarimerLLC/csla</RepositoryUrl>
diff --git a/releasenotes.md b/releasenotes.md
@@ -2,6 +2,18 @@
 
 CSLA 8 is a substantial update to CSLA .NET, adding support for .NET 8 and other enhancements.
 
+## CSLA .NET version 8.2.7 release
+
+Fixes a build issue with the 8.2.6 CSLA .NET NuGet packages.
+
+### Change List
+
+* https://github.com/MarimerLLC/csla/compare/v8.2.6...v8.2.7
+
+### Contributors
+
+* @rockfordlhotka
+
 ## CSLA .NET version 8.2.6 release
 
 Fixes issues with the way `IContextManager` is resolved in Blazor apps in #4089 and #4182.

Original file line number	Diff line number	Diff line change
`@@ -31,18 +31,16 @@ public ApplicationContextAccessor(`
`31`	`31`	`ServiceProvider = serviceProvider;`
`32`	`32`	`LocalContextManager = localContextManager;`
`33`	`33`
`34`		`- foreach (var context in contextManagerList)`
	`34`	`+ var managers = contextManagerList.ToList();`
	`35`	`+ for (int i = managers.Count - 1; i >= 0; i--)`
`35`	`36`	`{`
`36`		`- if (context.IsValid)`
	`37`	`+ if (managers[i].IsValid)`
`37`	`38`	`{`
`38`		`- ContextManager = context;`
	`39`	`+ ContextManager = managers[i];`
`39`	`40`	`break;`
`40`	`41`	`}`
`41`	`42`	`}`
`42`		`- if (ContextManager is null)`
`43`		`- {`
`44`		`- ContextManager = new Core.ApplicationContextManagerAsyncLocal();`
`45`		`- }`
	`43`	`+ ContextManager ??= new Core.ApplicationContextManagerAsyncLocal();`
`46`	`44`	`}`
`47`	`45`
`48`	`46`	`internal IServiceProvider ServiceProvider { get; }`